From 1c75d4d2fab98906935f4ec02c83984b61af6537 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Thu, 6 May 2021 11:46:31 -0700 Subject: [PATCH] bump scratch-gui to scratch-desktop-v3.22.0 --- package-lock.json | 143 ++++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 82 insertions(+), 63 deletions(-) diff --git a/package-lock.json b/package-lock.json index f0a8773..494f150 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,9 +17,9 @@ "dev": true }, "@babel/cli": { - "version": "7.13.14", - "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.13.14.tgz", - "integrity": "sha512-zmEFV8WBRsW+mPQumO1/4b34QNALBVReaiHJOkxhUsdo/AvYM62c+SKSuLi2aZ42t3ocK6OI0uwUXRvrIbREZw==", + "version": "7.13.16", + "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.13.16.tgz", + "integrity": "sha512-cL9tllhqvsQ6r1+d9Invf7nNXg/3BlfL1vvvL/AdH9fZ2l5j0CeBcoq6UjsqHpvyN1v5nXSZgqJZoGeK+ZOAbw==", "dev": true, "requires": { "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents", @@ -28,16 +28,15 @@ "convert-source-map": "^1.1.0", "fs-readdir-recursive": "^1.1.0", "glob": "^7.0.0", - "lodash": "^4.17.19", "make-dir": "^2.1.0", "slash": "^2.0.0", "source-map": "^0.5.0" }, "dependencies": { "anymatch": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", - "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "optional": true, "requires": { @@ -123,12 +122,6 @@ "dev": true, "optional": true }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, "readdirp": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", @@ -2123,9 +2116,9 @@ }, "dependencies": { "caniuse-lite": { - "version": "1.0.30001205", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz", - "integrity": "sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==", + "version": "1.0.30001223", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz", + "integrity": "sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==", "dev": true } } @@ -9747,9 +9740,9 @@ "dev": true }, "picomatch": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz", + "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", "dev": true, "optional": true }, @@ -11207,9 +11200,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210324033606", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210324033606.tgz", - "integrity": "sha512-zCf7mN64RLME1tA9t2HcDEnf5h5+ziMyksbQj3gsWOUylYLrrYksMBw7wprVEMdPBJwz+4HhpcpkkrCQV1NVnw==", + "version": "0.1.0-prerelease.20210425032411", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210425032411.tgz", + "integrity": "sha512-9z0biJJYYIQSNyvItH1Ys2V8KSlTrqZrjlb11ei26Z1tNg0dbGpDxj6fNxKbOz911kinRdUvsvBksDx42JS3Rg==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -11217,8 +11210,8 @@ } }, "scratch-gui": { - "version": "github:LLK/scratch-gui#3f3c7dd2e277be6e9972c48149f0552b72d790fb", - "from": "github:LLK/scratch-gui#scratch-desktop-v3.21.0", + "version": "github:LLK/scratch-gui#1fc7dae35e93418525add21b8879b185df8faaab", + "from": "github:LLK/scratch-gui#scratch-desktop-v3.22.0", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -11270,14 +11263,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210324033606", - "scratch-l10n": "3.11.20210324031512", - "scratch-paint": "0.2.0-prerelease.20210319222931", - "scratch-render": "0.1.0-prerelease.20210317200605", - "scratch-render-fonts": "1.0.0-prerelease.20200507182347", + "scratch-blocks": "0.1.0-prerelease.20210425032411", + "scratch-l10n": "3.11.20210425031513", + "scratch-paint": "0.2.0-prerelease.20210407203313", + "scratch-render": "0.1.0-prerelease.20210325231800", + "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.3", - "scratch-svg-renderer": "0.2.0-prerelease.20210317184701", - "scratch-vm": "0.2.0-prerelease.20210324111836", + "scratch-svg-renderer": "0.2.0-prerelease.20210408171934", + "scratch-vm": "0.2.0-prerelease.20210412181234", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -11438,9 +11431,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210324031512", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210324031512.tgz", - "integrity": "sha512-dyv2cjNWVHrL78XpW64uF2azYaUhMKLjfJVH6vSCPJxm3EKCvO6EoaUSlIAwhsGoMwgfxWZ8D74+IaifGJfnCQ==", + "version": "3.11.20210425031513", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210425031513.tgz", + "integrity": "sha512-SX26P8zrUTIWyP7Q/1eojJ1e3t8HiNcZ/fTLHBz4Sjkba7ZkqwKq9T9UopX9KstaQJcAekwCyfhIoO1Ad+60kQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", @@ -11498,9 +11491,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210319222931", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210319222931.tgz", - "integrity": "sha512-O5tIIQ6ECsLZ3iol2S3OV3yaVyM1i6Kk0YVAR219t6GnSv1ux6RCD3qs7g8HCa+G3f+PHKBcCIk4DCR8Qv59Uw==", + "version": "0.2.0-prerelease.20210407203313", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210407203313.tgz", + "integrity": "sha512-dAg+7Bh8X4PxukXnIXN1NVDELSCmPsTRh2a2taM1MGIl9zqZLTo3nxz95qZ2aC6tnVZYY/oJRjl9UAnm47Fe4g==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -11510,8 +11503,7 @@ "lodash.omit": "4.5.0", "minilog": "3.1.0", "parse-color": "1.0.0", - "prop-types": "^15.5.10", - "scratch-render-fonts": "^1.0.0-prerelease.20210325224822" + "prop-types": "^15.5.10" }, "dependencies": { "classnames": { @@ -11519,15 +11511,6 @@ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz", "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0=", "dev": true - }, - "scratch-render-fonts": { - "version": "1.0.0-prerelease.20210325224822", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.0-prerelease.20210325224822.tgz", - "integrity": "sha512-N68YRKGEbFvMAhfNFEluDuWFXUCbO9ezRahqJKwCFpEQuhgQ9tmA+y+GZ5ETQwI/e9M1tHAfX/8DxK5yBdQT1A==", - "dev": true, - "requires": { - "base64-loader": "1.0.0" - } } } }, @@ -11622,9 +11605,9 @@ } }, "scratch-render": { - "version": "0.1.0-prerelease.20210317200605", - "resolved": "https://registry.npmjs.org/scratch-render/-/scratch-render-0.1.0-prerelease.20210317200605.tgz", - "integrity": "sha512-HbWHTOX9X/jlZw0HINKfHkZ8H7GHiyqR8Cj3jKowHrH2r8bTn7K8DfT3Ql81fepMxVqqeKFPPnpvHwvDEaYWKg==", + "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==", "dev": true, "requires": { "grapheme-breaker": "0.3.2", @@ -11636,12 +11619,43 @@ "scratch-storage": "^1.0.0", "scratch-svg-renderer": "0.2.0-prerelease.20210317184701", "twgl.js": "4.4.0" + }, + "dependencies": { + "base64-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "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" + } + }, + "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==", + "dev": true, + "requires": { + "base64-js": "1.2.1", + "base64-loader": "1.0.0", + "dompurify": "2.1.1", + "minilog": "3.1.0", + "scratch-render-fonts": "1.0.0-prerelease.20200507182347", + "transformation-matrix": "1.15.0" + } + } } }, "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==", + "version": "1.0.0-prerelease.20210401210003", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.0-prerelease.20210401210003.tgz", + "integrity": "sha512-sgU+LIXTLKk4f7FZOv/B61dpvmfpnlXFf912T6T4GpOfzx99JPRhXPyErZWuwPz8NEzthkhpO7iF2AqgzUxJfA==", "dev": true, "requires": { "base64-loader": "1.0.0" @@ -11682,16 +11696,15 @@ } }, "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.20210408171934", + "resolved": "https://registry.npmjs.org/scratch-svg-renderer/-/scratch-svg-renderer-0.2.0-prerelease.20210408171934.tgz", + "integrity": "sha512-kc59fyZlJ58ooW86VQo9oqXNzpR48RH7vObehekVyPq4FMRENwtv9gCZ5XitLPNsLEheFCJdfRVPkVsMAjhPYQ==", "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" }, "dependencies": { @@ -11700,6 +11713,12 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", "dev": true + }, + "dompurify": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.2.7.tgz", + "integrity": "sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg==", + "dev": true } } }, @@ -11710,9 +11729,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210324111836", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210324111836.tgz", - "integrity": "sha512-vOayLHJJ3ZYS2XUIVPnIMZmaW/JuazC9x32Lc/i64ZxPsQjO8pANgeUN/8A5LdEc5ZO2YG2I3JWRBLnK6o+LEw==", + "version": "0.2.0-prerelease.20210412181234", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210412181234.tgz", + "integrity": "sha512-xhLd4GJ9O9kgPzHj4LJhOALYbR/9FJBszrnsjKoiU2ErQD3/iZwWYqsnFjHKVvqv8wo27SAmF4crjDQyEIGY+A==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 67e9e14..24a5a82 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "react-redux": "5.0.7", "redux": "3.7.2", "rimraf": "^3.0.2", - "scratch-gui": "github:LLK/scratch-gui#scratch-desktop-v3.21.0", + "scratch-gui": "github:LLK/scratch-gui#scratch-desktop-v3.22.0", "uuid": "^8.0.0", "webpack": "^4.43.0" },