From 49453162120724be978a361e10af661074f8e59a Mon Sep 17 00:00:00 2001 From: Muffin Date: Wed, 3 Jan 2024 01:18:11 -0600 Subject: [PATCH] Use TurboWarp/scratch-parser We don't even change that much at this point, but we have this fork, so let's actually use it --- package-lock.json | 70 ++++------------------------------------------- package.json | 2 +- 2 files changed, 7 insertions(+), 65 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd480db51f8..8f039df06ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "immutable": "3.8.2", "jszip": "^3.1.5", "minilog": "3.1.0", - "scratch-parser": "5.1.1", + "scratch-parser": "github:TurboWarp/scratch-parser", "scratch-sb1-converter": "0.2.7", "scratch-translate-extension-languages": "0.0.20191118205314", "text-encoding": "0.7.0", @@ -5647,11 +5647,6 @@ "event-emitter": "~0.3.5" } }, - "node_modules/es6-promise": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz", - "integrity": "sha512-CUD62/uqeE0L+EJeypOKuFfM56CFaH4vo+++J76bff0NkeQ2bBmWVCTNxL2hj9HeCYPkof6Gqea0BSeK17gBzA==" - }, "node_modules/es6-set": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz", @@ -13384,12 +13379,13 @@ } }, "node_modules/scratch-parser": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.1.1.tgz", - "integrity": "sha512-Kh1ddyNDgnzaVQrEaA5L4hYeSoqrXBXDMb1xKycrauFZNcOcbcBpE1X6bE2mA5fK6B0Dd+yuaRyKpMHJYlC69g==", + "version": "0.0.0-development", + "resolved": "git+ssh://git@github.com/TurboWarp/scratch-parser.git#d651c39b0054dcba83eb8753bd27f987fb642e26", + "license": "BSD-3-Clause", "dependencies": { + "@turbowarp/json": "^0.1.1", "ajv": "6.3.0", - "jszip": "3.1.5", + "jszip": "^3.10.1", "pify": "4.0.1" }, "engines": { @@ -13406,47 +13402,16 @@ "json-schema-traverse": "^0.3.0" } }, - "node_modules/scratch-parser/node_modules/core-js": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz", - "integrity": "sha512-N41UFUZNqoTSGUSyL7kiStAkH31Hxq197A4Gp9MxTZfAd52pXod7VM7kWiRP0J0YpQDeaE4SLsb+2OGgtgvUEw==", - "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js." - }, "node_modules/scratch-parser/node_modules/fast-deep-equal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", "integrity": "sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw==" }, - "node_modules/scratch-parser/node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" - }, "node_modules/scratch-parser/node_modules/json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", "integrity": "sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA==" }, - "node_modules/scratch-parser/node_modules/jszip": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz", - "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==", - "dependencies": { - "core-js": "~2.3.0", - "es6-promise": "~3.0.2", - "lie": "~3.1.0", - "pako": "~1.0.2", - "readable-stream": "~2.0.6" - } - }, - "node_modules/scratch-parser/node_modules/lie": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", - "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", - "dependencies": { - "immediate": "~3.0.5" - } - }, "node_modules/scratch-parser/node_modules/pify": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", @@ -13455,29 +13420,6 @@ "node": ">=6" } }, - "node_modules/scratch-parser/node_modules/process-nextick-args": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha512-yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw==" - }, - "node_modules/scratch-parser/node_modules/readable-stream": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz", - "integrity": "sha512-TXcFfb63BQe1+ySzsHZI/5v1aJPCShfqvWJ64ayNImXMsN1Cd0YGk/wm8KB7/OeessgPc9QvS9Zou8QTkFzsLw==", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "~1.0.0", - "process-nextick-args": "~1.0.6", - "string_decoder": "~0.10.x", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/scratch-parser/node_modules/string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==" - }, "node_modules/scratch-render": { "version": "0.1.0-prerelease.20231220210403", "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20231220210403.tgz", diff --git a/package.json b/package.json index 96f536997ab..a79586af12b 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "immutable": "3.8.2", "jszip": "^3.1.5", "minilog": "3.1.0", - "scratch-parser": "5.1.1", + "scratch-parser": "github:TurboWarp/scratch-parser", "scratch-sb1-converter": "0.2.7", "scratch-translate-extension-languages": "0.0.20191118205314", "text-encoding": "0.7.0",