scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-04-08 05:16:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

fix: use scratch-blocks@^2.0.0-beta

Browse source
This commit is contained in:
Christopher Willis-Ford 2024-10-18 15:33:18 -07:00
parent 01742ee5ec
commit e92a2c64d0
3 changed files with 128 additions and 66 deletions

190
package-lock.json generated
View file

@ -54,7 +54,7 @@
"jsdoc": "3.6.11",
"json": "^9.0.4",
"pngjs": "3.4.0",
"scratch-blocks": "1.1.206",
"scratch-blocks": "^2.0.0-beta",
"scratch-l10n": "3.18.341",
"scratch-render-fonts": "1.0.113",
"scratch-semantic-release-config": "1.0.16",
@ -1625,6 +1625,30 @@
"node": ">=6.9.0"
}
},
"node_modules/@blockly/continuous-toolbox": {
"version": "6.0.9",
"resolved": "https://registry.npmjs.org/@blockly/continuous-toolbox/-/continuous-toolbox-6.0.9.tgz",
"integrity": "sha512-b7WrMeZwxOJJ35aJggJ8ndBt8yUzm2i+HsfmQ78Ti7+xHHlJ2+DMLWORKoDc9HYVtYwiwZzjbJd3LucFm7mE2w==",
"dev": true,
"engines": {
"node": ">=8.17.0"
},
"peerDependencies": {
"blockly": "^11.0.0"
}
},
"node_modules/@blockly/field-colour": {
"version": "5.0.9",
"resolved": "https://registry.npmjs.org/@blockly/field-colour/-/field-colour-5.0.9.tgz",
"integrity": "sha512-ebj4oGwrqkcGKTYjLDHLQYilZ1qfmiPIfi3QVv/ROfSut4VPEf4JEnTmc/AJJrKQgzygdbz02QLZ2DBlVkoWNg==",
"dev": true,
"engines": {
"node": ">=8.0.0"
},
"peerDependencies": {
"blockly": "^11.0.0"
}
},
"node_modules/@colors/colors": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@ -4654,6 +4678,101 @@
"safe-buffer": "~5.1.0"
}
},
"node_modules/blockly": {
"version": "11.1.1",
"resolved": "https://registry.npmjs.org/blockly/-/blockly-11.1.1.tgz",
"integrity": "sha512-PmInYM9zH1HcYMffqnfmeu2O3g0intsowy08S0KDu3q8/95TfGo1tcDYpeWNQDkPOEzN1yy3oocsRO4NPDHtKA==",
"dev": true,
"dependencies": {
"jsdom": "23.0.0"
},
"engines": {
"node": ">=18"
}
},
"node_modules/blockly/node_modules/cssstyle": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
"integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
"dev": true,
"dependencies": {
"rrweb-cssom": "^0.6.0"
},
"engines": {
"node": ">=14"
}
},
"node_modules/blockly/node_modules/jsdom": {
"version": "23.0.0",
"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.0.tgz",
"integrity": "sha512-cbL/UCtohJguhFC7c2/hgW6BeZCNvP7URQGnx9tSJRYKCdnfbfWOrtuLTMfiB2VxKsx5wPHVsh/J0aBy9lIIhQ==",
"dev": true,
"dependencies": {
"cssstyle": "^3.0.0",
"data-urls": "^5.0.0",
"decimal.js": "^10.4.3",
"form-data": "^4.0.0",
"html-encoding-sniffer": "^4.0.0",
"http-proxy-agent": "^7.0.0",
"https-proxy-agent": "^7.0.2",
"is-potential-custom-element-name": "^1.0.1",
"nwsapi": "^2.2.7",
"parse5": "^7.1.2",
"rrweb-cssom": "^0.6.0",
"saxes": "^6.0.0",
"symbol-tree": "^3.2.4",
"tough-cookie": "^4.1.3",
"w3c-xmlserializer": "^5.0.0",
"webidl-conversions": "^7.0.0",
"whatwg-encoding": "^3.1.1",
"whatwg-mimetype": "^4.0.0",
"whatwg-url": "^14.0.0",
"ws": "^8.14.2",
"xml-name-validator": "^5.0.0"
},
"engines": {
"node": ">=18"
},
"peerDependencies": {
"canvas": "^3.0.0"
},
"peerDependenciesMeta": {
"canvas": {
"optional": true
}
}
},
"node_modules/blockly/node_modules/rrweb-cssom": {
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
"integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
"dev": true
},
"node_modules/blockly/node_modules/tr46": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
"integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
"dev": true,
"dependencies": {
"punycode": "^2.3.1"
},
"engines": {
"node": ">=18"
}
},
"node_modules/blockly/node_modules/whatwg-url": {
"version": "14.0.0",
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz",
"integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==",
"dev": true,
"dependencies": {
"tr46": "^5.0.0",
"webidl-conversions": "^7.0.0"
},
"engines": {
"node": ">=18"
}
},
"node_modules/bluebird": {
"version": "3.7.2",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@ -8862,30 +8981,6 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"license": "MIT"
},
"node_modules/exports-loader": {
"version": "0.7.0",
"resolved": "https://registry.npmjs.org/exports-loader/-/exports-loader-0.7.0.tgz",
"integrity": "sha512-RKwCrO4A6IiKm0pG3c9V46JxIHcDplwwGJn6+JJ1RcVnh/WSGJa0xkmk5cRVtgOPzCAtTMGj2F7nluh9L0vpSA==",
"dev": true,
"license": "MIT",
"dependencies": {
"loader-utils": "^1.1.0",
"source-map": "0.5.0"
},
"engines": {
"node": ">= 4"
}
},
"node_modules/exports-loader/node_modules/source-map": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.0.tgz",
"integrity": "sha512-gjGnxNN0K+/Pr4Mi4fs/pOtda10dKB6Wn9QvjOrH6v5TWsI7ghHuJUHoIgyM6DkUL5kr2GtPFGererzKpMBWfA==",
"dev": true,
"license": "BSD-3-Clause",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/expose-loader": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/expose-loader/-/expose-loader-1.0.3.tgz",
@ -10840,13 +10935,6 @@
"dev": true,
"license": "MIT"
},
"node_modules/google-closure-library": {
"version": "20190301.0.0",
"resolved": "https://registry.npmjs.org/google-closure-library/-/google-closure-library-20190301.0.0.tgz",
"integrity": "sha512-mpeszbnXpRhXZ0sPqUxBgUmk0RtmzrJRy3KFygp0Ih9JuRUjQTCLhwYQeIlK2vB2lShhY/KUo9E1Z1gvxDFxOQ==",
"dev": true,
"license": "Apache-2.0"
},
"node_modules/gopd": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@ -11965,30 +12053,6 @@
"node": ">=8"
}
},
"node_modules/imports-loader": {
"version": "0.8.0",
"resolved": "https://registry.npmjs.org/imports-loader/-/imports-loader-0.8.0.tgz",
"integrity": "sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"loader-utils": "^1.0.2",
"source-map": "^0.6.1"
},
"engines": {
"node": ">= 4"
}
},
"node_modules/imports-loader/node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"license": "BSD-3-Clause",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/imurmurhash": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@ -20733,16 +20797,14 @@
}
},
"node_modules/scratch-blocks": {
"version": "1.1.206",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-1.1.206.tgz",
"integrity": "sha512-pjry8XGFlP2Gm3VJEuz7983oJE3fp2Gd1AzLDGaQSV8hDcAISzEd5GF0PoTZ2qQStp5G4b3eK/Xs9M+LEKmuJw==",
"version": "2.0.0-beta.2",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-2.0.0-beta.2.tgz",
"integrity": "sha512-j/2F1/tIGoPMeQHVIDXzEh21fdQTwhLDSCv9Qo8J0wIq+v2EYipHMbV3QvQloheBaXdTpLsn9SJnUjOmiICFUA==",
"dev": true,
"license": "Apache-2.0",
"dependencies": {
"exports-loader": "^0.7.0",
"google-closure-library": "^20190301.0.0",
"imports-loader": "^0.8.0",
"scratch-l10n": "^3.18.3"
"@blockly/continuous-toolbox": "^6.0.9",
"@blockly/field-colour": "^5.0.9",
"blockly": "^11.0.0"
}
},
"node_modules/scratch-l10n": {

2
package.json
View file

@ -98,7 +98,7 @@
"jsdoc": "3.6.11",
"json": "^9.0.4",
"pngjs": "3.4.0",
"scratch-blocks": "1.1.206",
"scratch-blocks": "^2.0.0-beta",
"scratch-l10n": "3.18.341",
"scratch-render-fonts": "1.0.113",
"scratch-semantic-release-config": "1.0.16",

2
webpack.config.js
View file

@ -81,7 +81,7 @@ const playgroundBuilder = webBuilder.clone()
}
})
.addModuleRule({
test: require.resolve('scratch-blocks/dist/vertical.js'),
test: require.resolve('scratch-blocks/dist/main.js'),
loader: 'expose-loader',
options: {
exposes: 'Blockly'