From ba24845a80eff706dbeadf39ba0ab72c803741c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 23:35:27 +0000 Subject: [PATCH 1/2] fix(deps): update dependency scratch-gui to v3.6.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2bfbbab12..fe2f186f6 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.71.0", "sass-loader": "10.5.2", - "scratch-gui": "3.6.6", + "scratch-gui": "3.6.8", "scratch-l10n": "3.18.9", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", From df0eeddd37edb6a33beb4ed7aedaa231fa69cca4 Mon Sep 17 00:00:00 2001 From: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com> Date: Wed, 21 Feb 2024 15:43:12 -0800 Subject: [PATCH 2/2] fix(deps): for reals update scratch-gui to v3.6.8 --- package-lock.json | 335 ++++++++++------------------------------------ 1 file changed, 70 insertions(+), 265 deletions(-) diff --git a/package-lock.json b/package-lock.json index 141534e85..bdd8462a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -103,7 +103,7 @@ "regenerator-runtime": "0.13.9", "sass": "1.71.0", "sass-loader": "10.5.2", - "scratch-gui": "3.6.6", + "scratch-gui": "3.6.8", "scratch-l10n": "3.18.9", "selenium-webdriver": "4.1.0", "slick-carousel": "1.6.0", @@ -21731,38 +21731,15 @@ } }, "node_modules/scratch-blocks": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-1.1.2.tgz", - "integrity": "sha512-QXZM9rGmYy9kBUkY0E938VXwJyLoLeFK39HQY0EtDKXckkyneSKG8AXZgD2HVc/7w9d7Tp8Wfe+rqoz285VOmw==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-1.1.8.tgz", + "integrity": "sha512-UMmmnQYEA25X89+2ZDNMyphBsMszunOldVMTfV3nXOr+P08nnIlOFgtbujtSlFMujz4rIfqWkUkOdgrpsTZDcA==", "dev": true, "dependencies": { - "chromedriver": "^118.0.1", - "exports-loader": "0.7.0", - "google-closure-library": "20190301.0.0", - "imports-loader": "0.8.0", - "scratch-l10n": "3.18.3" - } - }, - "node_modules/scratch-blocks/node_modules/chromedriver": { - "version": "118.0.1", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-118.0.1.tgz", - "integrity": "sha512-GlGfyRE47IuSJnuadIiDy89EMDMQFBVWxUmiclLJKzQhFsiWAtcIr/mNOxjljZdsw9IwIOQEkrB9wympKYFPLw==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "@testim/chrome-version": "^1.1.3", - "axios": "^1.4.0", - "compare-versions": "^6.0.0", - "extract-zip": "^2.0.1", - "https-proxy-agent": "^5.0.1", - "proxy-from-env": "^1.1.0", - "tcp-port-used": "^1.0.1" - }, - "bin": { - "chromedriver": "bin/chromedriver" - }, - "engines": { - "node": ">=18" + "exports-loader": "^0.7.0", + "google-closure-library": "^20190301.0.0", + "imports-loader": "^0.8.0", + "scratch-l10n": "^3.18.3" } }, "node_modules/scratch-blocks/node_modules/exports-loader": { @@ -21826,114 +21803,84 @@ "node": ">=4.0.0" } }, - "node_modules/scratch-blocks/node_modules/scratch-l10n": { - "version": "3.18.3", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.18.3.tgz", - "integrity": "sha512-WpBExUSiyWrxFgE5weZ9/lXIst77sJMwCQis+IddnJ6qbGti/GQNWM75k5OeXI9l4h7BCz3pNL24SQBopqG3TA==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@transifex/api": "4.3.0", - "babel-plugin-react-intl": "^3.0.1", - "download": "^8.0.0", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" - } - }, "node_modules/scratch-gui": { - "version": "3.6.6", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-3.6.6.tgz", - "integrity": "sha512-nU6l5+G22uJP811ufKMnEL5wTTJz9Qz7ThyIxy2ZOoR2k6omwCqbSkz/6YziagaHu/mGtSYMWvP6paJzyQqslg==", + "version": "3.6.8", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-3.6.8.tgz", + "integrity": "sha512-RkbwsGB+OUzROWi8Zm0Y205IiZfC4iWs8RY/hmgZKVzgVEMXGzV8LKMoOmfCNAjAwd2K5P76dImmXY0pDJH7ww==", "dev": true, "dependencies": { - "@microbit/microbit-universal-hex": "0.2.2", + "@microbit/microbit-universal-hex": "^0.2.2", "arraybuffer-loader": "^1.0.6", "autoprefixer": "^9.0.1", - "balance-text": "3.3.1", - "base64-loader": "1.0.0", - "bowser": "1.9.4", + "balance-text": "^3.3.1", + "base64-loader": "^1.0.0", + "bowser": "^1.9.4", "cat-blocks": "npm:scratch-blocks@0.1.0-prerelease.20220318143026", - "classnames": "2.2.6", - "computed-style-to-inline-style": "3.0.0", - "cookie": "0.5.0", - "copy-webpack-plugin": "6.4.1", - "core-js": "2.5.7", + "classnames": "^2.2.6", + "computed-style-to-inline-style": "^3.0.0", + "cookie": "^0.5.0", + "copy-webpack-plugin": "^6.4.1", + "core-js": "^2.5.7", "css-loader": "^1.0.0", - "dapjs": "2.3.0", - "es6-object-assign": "1.1.0", - "get-float-time-domain-data": "0.1.0", - "get-user-media-promise": "1.1.4", - "immutable": "3.8.2", - "intl": "1.2.5", - "js-base64": "2.4.9", - "keymirror": "0.1.1", - "lodash.bindall": "4.4.0", - "lodash.debounce": "4.0.8", - "lodash.defaultsdeep": "4.6.1", - "lodash.omit": "4.5.0", - "lodash.throttle": "4.0.1", - "minilog": "3.1.0", - "omggif": "1.0.9", - "papaparse": "5.3.0", + "dapjs": "^2.3.0", + "es6-object-assign": "^1.1.0", + "get-float-time-domain-data": "^0.1.0", + "get-user-media-promise": "^1.1.4", + "immutable": "^3.8.2", + "intl": "^1.2.5", + "js-base64": "^2.4.9", + "keymirror": "^0.1.1", + "lodash.bindall": "^4.4.0", + "lodash.debounce": "^4.0.8", + "lodash.defaultsdeep": "^4.6.1", + "lodash.omit": "^4.5.0", + "lodash.throttle": "^4.0.1", + "minilog": "^3.1.0", + "omggif": "^1.0.9", + "papaparse": "^5.3.0", "postcss-import": "^12.0.0", "postcss-loader": "^3.0.0", "postcss-simple-vars": "^5.0.1", "prop-types": "^15.5.10", "query-string": "^5.1.1", "raw-loader": "^0.5.1", - "react": "16.14.0", - "react-contextmenu": "2.9.4", - "react-dom": "16.14.0", - "react-draggable": "3.0.5", - "react-ga": "2.5.3", - "react-intl": "2.9.0", - "react-modal": "3.9.1", - "react-popover": "0.5.10", - "react-redux": "5.0.7", - "react-responsive": "5.0.0", - "react-style-proptype": "3.2.2", - "react-tabs": "2.3.0", - "react-tooltip": "3.8.0", - "react-virtualized": "9.20.1", - "redux": "3.7.2", - "redux-throttle": "0.1.1", - "scratch-audio": "1.0.0", - "scratch-blocks": "1.1.2", - "scratch-l10n": "3.18.3", - "scratch-paint": "2.2.2", - "scratch-render": "1.0.0", - "scratch-render-fonts": "1.0.0-prerelease.20231017225105", - "scratch-storage": "2.3.1", - "scratch-svg-renderer": "0.2.0", - "scratch-vm": "2.3.4", - "startaudiocontext": "1.2.1", + "react": "^16.0.0", + "react-contextmenu": "^2.9.4", + "react-dom": "^16.0.0", + "react-draggable": "^3.0.5", + "react-ga": "^2.5.3", + "react-intl": "^2.9.0", + "react-modal": "^3.9.1", + "react-popover": "^0.5.10", + "react-redux": "^5.0.7", + "react-responsive": "^5.0.0", + "react-style-proptype": "^3.2.2", + "react-tabs": "^2.3.0", + "react-tooltip": "^3.8.0", + "react-virtualized": "^9.20.1", + "redux": "^3.7.2", + "redux-throttle": "^0.1.1", + "scratch-audio": "^1.0.0", + "scratch-blocks": "^1.1.6", + "scratch-l10n": "^3.18.3", + "scratch-paint": "^2.2.2", + "scratch-render": "^1.0.0", + "scratch-render-fonts": "^1.0.2", + "scratch-storage": "^2.3.1", + "scratch-svg-renderer": "^0.2.0", + "scratch-vm": "^2.3.4", + "startaudiocontext": "^1.2.1", "style-loader": "^0.23.0", - "text-encoding": "0.7.0", - "to-style": "1.3.3", - "wav-encoder": "1.3.0", - "xhr": "2.5.0" + "text-encoding": "^0.7.0", + "to-style": "^1.3.3", + "wav-encoder": "^1.3.0", + "xhr": "^2.5.0" }, "peerDependencies": { "react": "^16.0.0", "react-dom": "^16.0.0" } }, - "node_modules/scratch-gui/node_modules/@babel/runtime": { - "version": "7.21.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz", - "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==", - "dev": true, - "dependencies": { - "regenerator-runtime": "^0.13.11" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/scratch-gui/node_modules/@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -22100,12 +22047,6 @@ "url": "https://tidelift.com/funding/github/npm/autoprefixer" } }, - "node_modules/scratch-gui/node_modules/base64-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", - "dev": true - }, "node_modules/scratch-gui/node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -22195,15 +22136,6 @@ "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.", "dev": true }, - "node_modules/scratch-gui/node_modules/cross-fetch": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz", - "integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==", - "dev": true, - "dependencies": { - "node-fetch": "2.6.7" - } - }, "node_modules/scratch-gui/node_modules/css-loader": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.1.tgz", @@ -22585,26 +22517,6 @@ "mkdirp": "bin/cmd.js" } }, - "node_modules/scratch-gui/node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", - "dev": true, - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/scratch-gui/node_modules/picocolors": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", @@ -22802,22 +22714,6 @@ "react-redux": "^5.0.1" } }, - "node_modules/scratch-gui/node_modules/react-modal": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.9.1.tgz", - "integrity": "sha512-k+TUkhGWpIVHLsEyjNmlyOYL0Uz03fNZvlkhCImd1h+6fhNgTi6H6jexVXPVhD2LMMDzJyfugxMN+APN/em+eQ==", - "dev": true, - "dependencies": { - "exenv": "^1.2.0", - "prop-types": "^15.5.10", - "react-lifecycles-compat": "^3.0.0", - "warning": "^4.0.3" - }, - "peerDependencies": { - "react": "^0.14.0 || ^15.0.0 || ^16", - "react-dom": "^0.14.0 || ^15.0.0 || ^16" - } - }, "node_modules/scratch-gui/node_modules/react-responsive": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/react-responsive/-/react-responsive-5.0.0.tgz", @@ -22863,12 +22759,6 @@ "symbol-observable": "^1.0.3" } }, - "node_modules/scratch-gui/node_modules/regenerator-runtime": { - "version": "0.13.11", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", - "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "dev": true - }, "node_modules/scratch-gui/node_modules/rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -22896,24 +22786,6 @@ "node": ">= 4" } }, - "node_modules/scratch-gui/node_modules/scratch-l10n": { - "version": "3.18.3", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.18.3.tgz", - "integrity": "sha512-WpBExUSiyWrxFgE5weZ9/lXIst77sJMwCQis+IddnJ6qbGti/GQNWM75k5OeXI9l4h7BCz3pNL24SQBopqG3TA==", - "dev": true, - "dependencies": { - "@babel/cli": "^7.1.2", - "@babel/core": "^7.1.2", - "@transifex/api": "4.3.0", - "babel-plugin-react-intl": "^3.0.1", - "download": "^8.0.0", - "transifex": "1.6.6" - }, - "bin": { - "build-i18n-src": "scripts/build-i18n-src.js", - "tx-push-src": "scripts/tx-push-src.js" - } - }, "node_modules/scratch-gui/node_modules/scratch-paint": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-2.2.2.tgz", @@ -22949,22 +22821,6 @@ "integrity": "sha512-DTt3GhOUDKhh4ONwIJW4lmhyotQmV2LjNlGK/J2hkwUcqcbKkCLAdJPtxQnxnlc7SR3f1CEXCyMmc7WLUsWbNA==", "dev": true }, - "node_modules/scratch-gui/node_modules/scratch-storage": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-2.3.1.tgz", - "integrity": "sha512-kBxJLFGQsimP35YHig+8op5V9+FLfO7mXbhSLj4712dyHTXvyMKYY8GAf7KT283kQrUpDApehJU4Jx5PXSjLXQ==", - "dev": true, - "dependencies": { - "@babel/runtime": "7.21.0", - "arraybuffer-loader": "^1.0.3", - "base64-js": "1.3.0", - "cross-fetch": "3.1.5", - "fastestsmallesttextencoderdecoder": "^1.0.7", - "js-md5": "0.7.3", - "minilog": "3.1.0", - "worker-loader": "^2.0.0" - } - }, "node_modules/scratch-gui/node_modules/serialize-javascript": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", @@ -23083,12 +22939,6 @@ "node": ">=0.10.0" } }, - "node_modules/scratch-gui/node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "dev": true - }, "node_modules/scratch-gui/node_modules/watchpack": { "version": "1.7.5", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", @@ -23104,12 +22954,6 @@ "watchpack-chokidar2": "^2.0.1" } }, - "node_modules/scratch-gui/node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true - }, "node_modules/scratch-gui/node_modules/webpack": { "version": "4.47.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz", @@ -23171,45 +23015,6 @@ "source-map": "~0.6.1" } }, - "node_modules/scratch-gui/node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dev": true, - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, - "node_modules/scratch-gui/node_modules/worker-loader": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz", - "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==", - "dev": true, - "dependencies": { - "loader-utils": "^1.0.0", - "schema-utils": "^0.4.0" - }, - "engines": { - "node": ">= 6.9.0 || >= 8.9.0" - }, - "peerDependencies": { - "webpack": "^3.0.0 || ^4.0.0-alpha.0 || ^4.0.0" - } - }, - "node_modules/scratch-gui/node_modules/worker-loader/node_modules/schema-utils": { - "version": "0.4.7", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz", - "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==", - "dev": true, - "dependencies": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" - }, - "engines": { - "node": ">= 4" - } - }, "node_modules/scratch-gui/node_modules/xhr": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/xhr/-/xhr-2.5.0.tgz", @@ -23294,12 +23099,12 @@ } }, "node_modules/scratch-render-fonts": { - "version": "1.0.0-prerelease.20231017225105", - "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.0-prerelease.20231017225105.tgz", - "integrity": "sha512-Ske5+x9OzfT7wf+eAnMQHutCzyle1er3ncywPMLPC6UDjKrlHYUFVNeTR3vJb3EoMdBNPl/yVKuJItGPQoUugg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.2.tgz", + "integrity": "sha512-LXyW4COEVZkAGOxLakdd9FOWSuOXv0s6jqbV9R4Xc+7YF37KVnbaZZdoVCgmsz+LvBcCHlIzpvnWFJfu4jnuYw==", "dev": true, "dependencies": { - "base64-loader": "1.0.0" + "base64-loader": "^1.0.0" } }, "node_modules/scratch-render/node_modules/@webassemblyjs/ast": {