mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2024-11-14 19:35:09 -05:00
Use Webpack to generate the whole playground
The previous configuration mixed Webpack output with static content in order to create the playground. This change moves that static content from `/playground/` into `/src/playground/` and adds a Webpack rule to copy it into the playground as part of the build. On the surface this might seem unnecessary, but it provides at least two benefits: - It's no longer possible to accidentally load stale build output through `webpack-dev-server` in the event of a misconfiguration. This was very easy in the previous configuration, and might in fact be the only way that `webpack-dev-server` ever worked for this repository. - It's simpler to ensure that various rules apply to the hand-authored content and not build outputs. This includes lint rules, `.gitignore`, IDE symbol search paths, etc.
This commit is contained in:
parent
99be466aa7
commit
243d68f88b
5 changed files with 24 additions and 29 deletions
8
.gitignore
vendored
8
.gitignore
vendored
|
@ -14,10 +14,4 @@ npm-*
|
|||
|
||||
# Build
|
||||
/dist
|
||||
/playground/assets
|
||||
/playground/media
|
||||
/playground/scratch-vm.js
|
||||
/playground/scratch-vm.js.map
|
||||
/playground/vendor.js
|
||||
/playground/vendor.js.map
|
||||
/playground/zenburn.css
|
||||
/playground
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
var loadProject = function () {
|
||||
var id = location.hash.substring(1);
|
||||
if (id.length < 1 || !isFinite(id)) {
|
||||
|
@ -7,7 +6,7 @@ var loadProject = function () {
|
|||
var url = 'https://projects.scratch.mit.edu/internalapi/project/' +
|
||||
id + '/get/';
|
||||
var r = new XMLHttpRequest();
|
||||
r.onreadystatechange = function() {
|
||||
r.onreadystatechange = function () {
|
||||
if (this.readyState === 4) {
|
||||
if (r.status === 200) {
|
||||
window.vm.loadProject(this.responseText);
|
||||
|
@ -18,7 +17,7 @@ var loadProject = function () {
|
|||
r.send();
|
||||
};
|
||||
|
||||
window.onload = function() {
|
||||
window.onload = function () {
|
||||
// Lots of global variables to make debugging easier
|
||||
// Instantiate the VM.
|
||||
var vm = new window.VirtualMachine();
|
||||
|
@ -74,7 +73,7 @@ window.onload = function() {
|
|||
// Playground data tabs.
|
||||
// Block representation tab.
|
||||
var blockexplorer = document.getElementById('blockexplorer');
|
||||
var updateBlockExplorer = function(blocks) {
|
||||
var updateBlockExplorer = function (blocks) {
|
||||
blockexplorer.innerHTML = JSON.stringify(blocks, null, 2);
|
||||
window.hljs.highlightBlock(blockexplorer);
|
||||
};
|
||||
|
@ -83,7 +82,7 @@ window.onload = function() {
|
|||
var threadexplorer = document.getElementById('threadexplorer');
|
||||
var cachedThreadJSON = '';
|
||||
var updateThreadExplorer = function (newJSON) {
|
||||
if (newJSON != cachedThreadJSON) {
|
||||
if (newJSON !== cachedThreadJSON) {
|
||||
cachedThreadJSON = newJSON;
|
||||
threadexplorer.innerHTML = cachedThreadJSON;
|
||||
window.hljs.highlightBlock(threadexplorer);
|
||||
|
@ -101,7 +100,7 @@ window.onload = function() {
|
|||
|
||||
// VM handlers.
|
||||
// Receipt of new playground data (thread, block representations).
|
||||
vm.on('playgroundData', function(data) {
|
||||
vm.on('playgroundData', function (data) {
|
||||
updateThreadExplorer(data.threads);
|
||||
updateBlockExplorer(data.blocks);
|
||||
});
|
||||
|
@ -125,7 +124,7 @@ window.onload = function() {
|
|||
var targetOption = document.createElement('option');
|
||||
targetOption.setAttribute('value', data.targetList[i].id);
|
||||
// If target id matches editingTarget id, select it.
|
||||
if (data.targetList[i].id == data.editingTarget) {
|
||||
if (data.targetList[i].id === data.editingTarget) {
|
||||
targetOption.setAttribute('selected', 'selected');
|
||||
}
|
||||
targetOption.appendChild(
|
||||
|
@ -139,23 +138,23 @@ window.onload = function() {
|
|||
};
|
||||
|
||||
// Feedback for stacks and blocks running.
|
||||
vm.on('SCRIPT_GLOW_ON', function(data) {
|
||||
vm.on('SCRIPT_GLOW_ON', function (data) {
|
||||
workspace.glowStack(data.id, true);
|
||||
});
|
||||
vm.on('SCRIPT_GLOW_OFF', function(data) {
|
||||
vm.on('SCRIPT_GLOW_OFF', function (data) {
|
||||
workspace.glowStack(data.id, false);
|
||||
});
|
||||
vm.on('BLOCK_GLOW_ON', function(data) {
|
||||
vm.on('BLOCK_GLOW_ON', function (data) {
|
||||
workspace.glowBlock(data.id, true);
|
||||
});
|
||||
vm.on('BLOCK_GLOW_OFF', function(data) {
|
||||
vm.on('BLOCK_GLOW_OFF', function (data) {
|
||||
workspace.glowBlock(data.id, false);
|
||||
});
|
||||
vm.on('VISUAL_REPORT', function(data) {
|
||||
vm.on('VISUAL_REPORT', function (data) {
|
||||
workspace.reportValue(data.id, data.value);
|
||||
});
|
||||
|
||||
vm.on('SPRITE_INFO_REPORT', function(data) {
|
||||
vm.on('SPRITE_INFO_REPORT', function (data) {
|
||||
if (data.id !== selectedTarget.value) return; // Not the editingTarget
|
||||
document.getElementById('sinfo-x').value = data.x;
|
||||
document.getElementById('sinfo-y').value = data.y;
|
||||
|
@ -213,7 +212,7 @@ window.onload = function() {
|
|||
// Feed keyboard events as VM I/O events.
|
||||
document.addEventListener('keydown', function (e) {
|
||||
// Don't capture keys intended for Blockly inputs.
|
||||
if (e.target != document && e.target != document.body) {
|
||||
if (e.target !== document && e.target !== document.body) {
|
||||
return;
|
||||
}
|
||||
window.vm.postIOData('keyboard', {
|
||||
|
@ -222,7 +221,7 @@ window.onload = function() {
|
|||
});
|
||||
e.preventDefault();
|
||||
});
|
||||
document.addEventListener('keyup', function(e) {
|
||||
document.addEventListener('keyup', function (e) {
|
||||
// Always capture up events,
|
||||
// even those that have switched to other targets.
|
||||
window.vm.postIOData('keyboard', {
|
||||
|
@ -230,7 +229,7 @@ window.onload = function() {
|
|||
isDown: false
|
||||
});
|
||||
// E.g., prevent scroll.
|
||||
if (e.target != document && e.target != document.body) {
|
||||
if (e.target !== document && e.target !== document.body) {
|
||||
e.preventDefault();
|
||||
}
|
||||
});
|
||||
|
@ -239,25 +238,25 @@ window.onload = function() {
|
|||
vm.start();
|
||||
|
||||
// Inform VM of animation frames.
|
||||
var animate = function() {
|
||||
var animate = function () {
|
||||
stats.update();
|
||||
requestAnimationFrame(animate);
|
||||
};
|
||||
requestAnimationFrame(animate);
|
||||
|
||||
// Handlers for green flag and stop all.
|
||||
document.getElementById('greenflag').addEventListener('click', function() {
|
||||
document.getElementById('greenflag').addEventListener('click', function () {
|
||||
vm.greenFlag();
|
||||
});
|
||||
document.getElementById('stopall').addEventListener('click', function() {
|
||||
document.getElementById('stopall').addEventListener('click', function () {
|
||||
vm.stopAll();
|
||||
});
|
||||
document.getElementById('turbomode').addEventListener('change', function() {
|
||||
document.getElementById('turbomode').addEventListener('change', function () {
|
||||
var turboOn = document.getElementById('turbomode').checked;
|
||||
vm.setTurboMode(turboOn);
|
||||
});
|
||||
document.getElementById('compatmode').addEventListener('change',
|
||||
function() {
|
||||
function () {
|
||||
var compatibilityMode = document.getElementById('compatmode').checked;
|
||||
vm.setCompatibilityMode(compatibilityMode);
|
||||
});
|
|
@ -5,7 +5,7 @@ var webpack = require('webpack');
|
|||
|
||||
var base = {
|
||||
devServer: {
|
||||
contentBase: path.resolve(__dirname, 'playground'),
|
||||
contentBase: false,
|
||||
host: '0.0.0.0',
|
||||
port: process.env.PORT || 8073
|
||||
},
|
||||
|
@ -108,6 +108,8 @@ module.exports = [
|
|||
to: 'media'
|
||||
}, {
|
||||
from: 'node_modules/highlightjs/styles/zenburn.css'
|
||||
}, {
|
||||
from: 'src/playground'
|
||||
}])
|
||||
])
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue