scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of https://github.com/LLK/scratch-vm into bugfix/2230

Browse source
This commit is contained in:
Kevin Andersen 2019-07-23 13:09:07 -04:00
commit 1daffa7570
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
package-lock.json generated
View file

@ -2183,9 +2183,9 @@
},
"dependencies": {
"process-nextick-args": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
"dev": true
},
"readable-stream": {
@ -7495,9 +7495,9 @@
"dev": true
},
"lodash.defaultsdeep": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz",
"integrity": "sha1-vsECT4WxvZbL6kBbI8FK1kQ6b4E=",
"version": "4.6.1",
"resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
"integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
"dev": true
},
"lodash.isarguments": {
@ -12130,9 +12130,9 @@
}
},
"scratch-blocks": {
"version": "0.1.0-prerelease.1552662801",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.1552662801.tgz",
"integrity": "sha512-OPTvPvzsV0ryhOGNfV9F0dopsuohIyu0SglzQw7jmEf6eeQ3yW0hOGqUeU2HR3c9F/uS3Uy7PispXhYCAZo/tg==",
"version": "0.1.0-prerelease.1561987297",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.1561987297.tgz",
"integrity": "sha512-BwL5sN8JcbiCHfUo7rfrPlNkvnBEMyL6V06xl9ZFztuoubyRAeDSHAJttNnFKj4yTNZsQEmi7umiwHeayXtRGA==",
"dev": true,
"requires": {
"exports-loader": "0.6.3",
@ -12179,9 +12179,9 @@
}
},
"scratch-render": {
"version": "0.1.0-prerelease.20190312125229",
"resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20190312125229.tgz",
"integrity": "sha512-BVjqODi1kBL+lt7Trve0MiVNmq3KTVrcm1IT0oeeVnCkYw1/iUvQoOArdfmsN/vFdOTpk9w3Y6w7ZLyrCr9ALw==",
"version": "0.1.0-prerelease.20190701174822",
"resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20190701174822.tgz",
"integrity": "sha512-C3uW99MCHxf4OsWnx8MYRvqP5hZh82CiHZ5k69SODKSCNFZMLPl6lepnKcLORhJ+GNxKL2bd/YL6FAMNBwlS8Q==",
"dev": true,
"requires": {
"grapheme-breaker": "0.3.2",
@ -12191,7 +12191,7 @@
"minilog": "3.1.0",
"raw-loader": "^0.5.1",
"scratch-storage": "^1.0.0",
"scratch-svg-renderer": "0.2.0-prerelease.20190304180800",
"scratch-svg-renderer": "0.2.0-prerelease.20190523193400",
"twgl.js": "4.4.0"
}
},
@ -12237,9 +12237,9 @@
}
},
"scratch-svg-renderer": {
"version": "0.2.0-prerelease.20190304180800",
"resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20190304180800.tgz",
"integrity": "sha512-fFePDGb65g1YaN/fkBl6hfgvjxr3hE9TMWuAYU1MeK5vVeZA+HPslUyMIvsEvLV5nCqs+0Jv7ievnP39ihhHLQ==",
"version": "0.2.0-prerelease.20190523193400",
"resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20190523193400.tgz",
"integrity": "sha512-IzvbM5X7RtEmkLbTwGrvAha/eAOCOU9TFA/BfPR7h2htd2UkkulumRHZzvQoy4gTB7W7CaQvPmz45dYWGcdvkw==",
"dev": true,
"requires": {
"base64-js": "1.2.1",
@ -12990,9 +12990,9 @@
},
"dependencies": {
"process-nextick-args": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
"dev": true
},
"readable-stream": {

2
package.json
View file

@ -66,7 +66,7 @@
"in-publish": "^2.0.0",
"jsdoc": "^3.5.5",
"json": "^9.0.4",
"lodash.defaultsdeep": "4.6.0",
"lodash.defaultsdeep": "4.6.1",
"pngjs": "^3.3.2",
"scratch-audio": "latest",
"scratch-blocks": "latest",