From 6771da8a38c98d2fdd48e370b41a56fc8e26eac1 Mon Sep 17 00:00:00 2001 From: Thomas Weber Date: Thu, 19 Aug 2021 11:11:45 -0500 Subject: [PATCH] Use our scratch-parser instead --- package-lock.json | 77 +++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index 55571985..a1b1421b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7497,6 +7497,12 @@ } } }, + "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 + }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", @@ -7738,9 +7744,9 @@ } }, "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==", + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "hpack.js": { @@ -13361,13 +13367,29 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210331033330", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210331033330.tgz", - "integrity": "sha512-7Z4R0vwBPr4fJHonj4PIlMhoNMxiDdJzLv0elBeVIqS/eblOkicilmkinTxSWdUdAifMHBTnMOUZmA3jF1+htA==", + "version": "0.1.0-prerelease.20210819044315", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210819044315.tgz", + "integrity": "sha512-mBX7E7gZiZNKBvTwqQNvF/9h4mm0Ha9aljfnlJVbUz5+w89YrfK1hfjFHpRSzQyo6iRD4vMS6VnTSQHuTgCDng==", "dev": true, "requires": { "exports-loader": "0.6.3", - "imports-loader": "0.6.5" + "google-closure-library": "20190301.0.0", + "imports-loader": "0.6.5", + "scratch-l10n": "3.14.20210819031659" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20210819031659", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210819031659.tgz", + "integrity": "sha512-JVuj258DpXy5QuflLCfqbPqW+FmabucKfOuPuKSPHCVAkn8kg4Sg6UsXN4/HIrQabIJ9zBxZwU+o62HE7f2Aiw==", + "dev": true, + "requires": { + "@babel/cli": "^7.1.2", + "@babel/core": "^7.1.2", + "babel-plugin-react-intl": "^3.0.1", + "transifex": "1.6.6" + } + } } }, "scratch-l10n": { @@ -13384,9 +13406,8 @@ } }, "scratch-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/scratch-parser/-/scratch-parser-5.0.0.tgz", - "integrity": "sha512-7kjxoxivLgYYvmAJVLOOWnca4CigwuCpgjy9+6UuxOMgSZKO1xqIjxIADupabmh1ZLZZDVe45DBM/CQTdtVDkw==", + "version": "github:TurboWarp/scratch-parser#c09cd27c6421d4a00790c2002617b86a1d3bfc08", + "from": "github:TurboWarp/scratch-parser", "requires": { "ajv": "6.3.0", "jszip": "3.1.5", @@ -13449,9 +13470,9 @@ } }, "scratch-render": { - "version": "0.1.0-prerelease.20210325231800", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20210325231800.tgz", - "integrity": "sha512-hjiIHRR8SuP/8UKKZ4O+TIJaCZ2wSN6uoEM49jwNjZecAaflBvd5t/OLL3NFQp3q7Ra6ncDi+B7URy7WRdm2fg==", + "version": "0.1.0-prerelease.20210727084512", + "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20210727084512.tgz", + "integrity": "sha512-c6PCKljCHaNHBC8IendN3P8FDEk66+DKANrds9Xur9YeRna2CINAC/r12DbGE8Ra9LpAIlvKcX5DcuqNULlx5g==", "dev": true, "requires": { "grapheme-breaker": "0.3.2", @@ -13461,7 +13482,7 @@ "minilog": "3.1.0", "raw-loader": "^0.5.1", "scratch-storage": "^1.0.0", - "scratch-svg-renderer": "0.2.0-prerelease.20210317184701", + "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", "twgl.js": "4.4.0" }, "dependencies": { @@ -13471,26 +13492,22 @@ "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", "dev": true }, - "scratch-render-fonts": { - "version": "1.0.0-prerelease.20200507182347", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.0-prerelease.20200507182347.tgz", - "integrity": "sha512-tVt2s7lxsBhme9WKIZTnluMerdJVGEc80QSrDdIIzUvHXGCIYkLh6j7ytwXcyq2UsA34d93op9+I9Bh1SPkQkA==", - "dev": true, - "requires": { - "base64-loader": "1.0.0" - } + "dompurify": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz", + "integrity": "sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg==", + "dev": true }, "scratch-svg-renderer": { - "version": "0.2.0-prerelease.20210317184701", - "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20210317184701.tgz", - "integrity": "sha512-drHD8kRTU//Rqgs8F6oWmBIQi6TunI86Skvp7BfM+mqalds3GzaPjZHKSCFkdkXbHO4i/zAPLvkQtMDdLm4Y6g==", + "version": "0.2.0-prerelease.20210727023023", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20210727023023.tgz", + "integrity": "sha512-vEGZFFPm03LsHeRnIVQoJBoM3dV23daZCHWM0Yb0Rwa1xvymqTWHXRx8ryL5Q94TyceuguqPVAsE66n5S/0fdQ==", "dev": true, "requires": { "base64-js": "1.2.1", "base64-loader": "1.0.0", - "dompurify": "2.1.1", + "dompurify": "2.2.7", "minilog": "3.1.0", - "scratch-render-fonts": "1.0.0-prerelease.20200507182347", "transformation-matrix": "1.15.0" } } @@ -14144,9 +14161,9 @@ } }, "spdx-license-ids": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", - "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz", + "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==", "dev": true }, "spdy": { diff --git a/package.json b/package.json index d0881a93..cb3c8703 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "immutable": "3.8.2", "jszip": "^3.1.5", "minilog": "3.1.0", - "scratch-parser": "5.0.0", + "scratch-parser": "github:TurboWarp/scratch-parser", "scratch-sb1-converter": "0.2.7", "scratch-translate-extension-languages": "0.0.20191118205314", "text-encoding": "0.7.0",