scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 10:39:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix escapeHtml error caused by rebase

Browse source
This commit is contained in:
Christopher Willis-Ford 2017-10-06 23:44:27 -07:00
parent 67c788ec8d
commit 2f9796c163
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -31,6 +31,7 @@
"babel-loader": "^7.0.0", "babel-loader": "^7.0.0",
"babel-preset-es2015": "^6.24.1", "babel-preset-es2015": "^6.24.1",
"copy-webpack-plugin": "4.0.1", "copy-webpack-plugin": "4.0.1",
"escape-html": "1.0.3",
"eslint": "^4.5.0", "eslint": "^4.5.0",
"eslint-config-scratch": "^4.0.0", "eslint-config-scratch": "^4.0.0",
"expose-loader": "0.7.3", "expose-loader": "0.7.3",

1
src/engine/runtime.js
View file

@ -1,5 +1,6 @@
const EventEmitter = require('events'); const EventEmitter = require('events');
const {OrderedMap} = require('immutable'); const {OrderedMap} = require('immutable');
const escapeHtml = require('escape-html');
const ArgumentType = require('../extension-support/argument-type'); const ArgumentType = require('../extension-support/argument-type');
const Blocks = require('./blocks'); const Blocks = require('./blocks');