From 8e4ee5fb7a32bbd2250871b6b699bf39207f80d2 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Fri, 9 Jul 2021 09:35:50 -0400 Subject: [PATCH 01/32] feat(build): support dynamic import add the babel plugin for dynamic import syntax and fixup the path references in webpack and template so the chunks can be loaded dynamically --- .babelrc | 3 ++- package-lock.json | 6 ++++++ package.json | 1 + src/template.ejs | 4 ++-- webpack.config.js | 3 ++- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.babelrc b/.babelrc index b687cb485..43e3ed2f5 100644 --- a/.babelrc +++ b/.babelrc @@ -1,7 +1,8 @@ { "plugins": [ "transform-object-rest-spread", - "transform-require-context" + "transform-require-context", + "syntax-dynamic-import" ], "presets": ["es2015", "react"], } diff --git a/package-lock.json b/package-lock.json index 4bf74b320..09a4b0fae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3370,6 +3370,12 @@ } } }, + "babel-plugin-syntax-dynamic-import": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", + "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", + "dev": true + }, "babel-plugin-syntax-flow": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz", diff --git a/package.json b/package.json index 54f6ca27e..56c65e53a 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "babel-core": "6.23.1", "babel-eslint": "10.0.3", "babel-loader": "7.1.0", + "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-transform-object-rest-spread": "6.26.0", "babel-plugin-transform-require-context": "0.1.1", "babel-preset-es2015": "6.22.0", diff --git a/src/template.ejs b/src/template.ejs index afa720981..89afd7f66 100644 --- a/src/template.ejs +++ b/src/template.ejs @@ -59,11 +59,11 @@
- + - + <% if (!htmlWebpackPlugin.options.dynamicMetaTags) { %> diff --git a/webpack.config.js b/webpack.config.js index b1880bc1b..0748d8601 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -72,7 +72,8 @@ module.exports = { mode: process.env.NODE_ENV === 'production' ? 'production' : 'development', output: { path: path.resolve(__dirname, 'build'), - filename: 'js/[name].bundle.js' + filename: 'js/[name].bundle.js', + publicPath: '/' }, resolve: { symlinks: false // Fix local development with `npm link` packages From bc43ad7e29ffa67177d0663bd7c4e15262f38b08 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Mon, 12 Jul 2021 14:32:54 -0400 Subject: [PATCH 02/32] feat(annual-report): dynamically load the world map when it is scrolled to --- src/components/world-map/world-map.jsx | 16 ++--- src/views/annual-report/annual-report.jsx | 86 +++++++++++++---------- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/src/components/world-map/world-map.jsx b/src/components/world-map/world-map.jsx index d99d9cb5f..9f179bfa3 100644 --- a/src/components/world-map/world-map.jsx +++ b/src/components/world-map/world-map.jsx @@ -1,17 +1,15 @@ -const Plotly = require('plotly.js/lib/core'); +import React from 'react'; +import PropTypes from 'prop-types'; +import Plotly from 'plotly.js/lib/core'; +import choropleth from 'plotly.js/lib/choropleth'; +import createPlotlyComponent from 'react-plotly.js/factory'; // Load in the trace type for choropleth -Plotly.register([ - require('plotly.js/lib/choropleth') -]); +Plotly.register([choropleth]); // create plotly bundle that only has choropleth plots -import createPlotlyComponent from 'react-plotly.js/factory'; const Plot = createPlotlyComponent(Plotly); -const React = require('react'); -const PropTypes = require('prop-types'); - const WorldMap = props => ( import( + /* webpackChunkName: "world-map" */ + '../../components/world-map/world-map.jsx' +)); + require('./annual-report.scss'); // Some constants used for the page subnav and section refs @@ -831,44 +835,48 @@ class AnnualReport extends React.Component {
- - - - - - - - - - - - + {this.state.currentlyVisible === SECTIONS.reach && + + + + + + + + + + + + + + + }
From f134dbf201e408c2ffdd52db7577bfbc2dfa99f5 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Fri, 9 Jul 2021 11:09:51 -0400 Subject: [PATCH 03/32] perf(styles): extract css from js into stylesheets --- package-lock.json | 92 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 6 ++-- src/template.ejs | 2 ++ webpack.config.js | 6 ++-- 4 files changed, 102 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4bf74b320..bec5321bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2114,6 +2114,12 @@ "@babel/types": "^7.3.0" } }, + "@types/json-schema": { + "version": "7.0.8", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz", + "integrity": "sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==", + "dev": true + }, "@types/node": { "version": "12.6.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.2.tgz", @@ -14852,6 +14858,92 @@ "tiny-warning": "^1.0.3" } }, + "mini-css-extract-plugin": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz", + "integrity": "sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q==", + "dev": true, + "requires": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0", + "webpack-sources": "^1.1.0" + }, + "dependencies": { + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "json5": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz", + "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "schema-utils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.0.tgz", + "integrity": "sha512-tTEaeYkyIhEZ9uWgAjDerWov3T9MgX8dhhy2r0IGeeX4W8ngtGl1++dUve/RUqzuaASSh7shwCDJjEzthxki8w==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.7", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + } + } + }, "minilog": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/minilog/-/minilog-2.0.8.tgz", diff --git a/package.json b/package.json index 54f6ca27e..d06c43faa 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,12 @@ "clean": "rm -rf ./build && rm -rf ./intl && mkdir -p build && mkdir -p intl", "deploy": "npm run deploy:s3 && npm run deploy:fastly", "deploy:fastly": "node ./bin/configure-fastly.js", - "deploy:s3": "npm run deploy:s3:all && npm run deploy:s3:svg && npm run deploy:s3:js", + "deploy:s3": "npm run deploy:s3:all && npm run deploy:s3:svg && npm run deploy:s3:js && npm run deploy:s3:css", "deploy:s3cmd": "s3cmd sync -P --delete-removed --add-header=Cache-Control:no-cache,public,max-age=3600 --add-header=x-amz-meta-surrogate-key:static-assets", - "deploy:s3:all": "npm run deploy:s3cmd -- --exclude '.DS_Store' --exclude '*.svg' --exclude '*.js' ./build/ s3://$S3_BUCKET_NAME/", + "deploy:s3:all": "npm run deploy:s3cmd -- --exclude '.DS_Store' --exclude '*.svg' --exclude '*.js' --exclude '*.css' ./build/ s3://$S3_BUCKET_NAME/", "deploy:s3:svg": "npm run deploy:s3cmd -- --exclude '*' --include '*.svg' --mime-type 'image/svg+xml' ./build/ s3://$S3_BUCKET_NAME/", "deploy:s3:js": "npm run deploy:s3cmd -- --exclude '*' --include '*.js' --mime-type 'application/javascript' ./build/ s3://$S3_BUCKET_NAME/", + "deploy:s3:css": "npm run deploy:s3cmd -- --exclude '*' --include '*.css' --mime-type 'text/css' ./build/ s3://$S3_BUCKET_NAME/", "i18n:push": "./bin/tx-push-www --execute", "translate:urls": "node ./bin/get-localized-urls localized-urls.json", "translate:files": "node ./bin/build-locales node_modules/scratch-l10n/www intl", @@ -105,6 +106,7 @@ "lodash.mergewith": "4.6.2", "lodash.omit": "3.1.0", "lodash.uniqby": "4.7.0", + "mini-css-extract-plugin": "^1.6.2", "minilog": "2.0.8", "node-sass": "4.14.1", "pako": "0.2.8", diff --git a/src/template.ejs b/src/template.ejs index afa720981..61880c318 100644 --- a/src/template.ejs +++ b/src/template.ejs @@ -31,6 +31,8 @@ + + diff --git a/webpack.config.js b/webpack.config.js index b1880bc1b..44645de5c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -7,6 +7,7 @@ const webpack = require('webpack'); const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const CopyWebpackPlugin = require('copy-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin'); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); // PostCss const autoprefixer = require('autoprefixer'); @@ -92,7 +93,7 @@ module.exports = { { test: /\.scss$/, use: [ - 'style-loader', + MiniCssExtractPlugin.loader, 'css-loader', { loader: 'postcss-loader', @@ -108,7 +109,7 @@ module.exports = { { test: /\.css$/, use: [ - 'style-loader', + MiniCssExtractPlugin.loader, 'css-loader', { loader: 'postcss-loader', @@ -142,6 +143,7 @@ module.exports = { } }, plugins: [ + new MiniCssExtractPlugin(), new VersionPlugin({length: 5}) ].concat(pageRoutes .map(function (route) { From 7684716ecc414db6f4f43571cffe77419ba3822b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Aug 2021 13:59:51 +0000 Subject: [PATCH 04/32] chore(deps): update dependency scratch-l10n to v3.14.20210805134927 --- package-lock.json | 274 ++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 145 insertions(+), 131 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9920d3f94..2631457ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -219,26 +219,26 @@ } }, "@babel/compat-data": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.14.9.tgz", - "integrity": "sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz", + "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==", "dev": true }, "@babel/core": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.14.8.tgz", - "integrity": "sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz", + "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.8", - "@babel/helper-compilation-targets": "^7.14.5", - "@babel/helper-module-transforms": "^7.14.8", + "@babel/generator": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.0", + "@babel/helper-module-transforms": "^7.15.0", "@babel/helpers": "^7.14.8", - "@babel/parser": "^7.14.8", + "@babel/parser": "^7.15.0", "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8", + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -257,12 +257,12 @@ } }, "@babel/generator": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz", - "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", "dev": true, "requires": { - "@babel/types": "^7.14.9", + "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -308,9 +308,9 @@ } }, "@babel/parser": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", - "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", "dev": true }, "@babel/template": { @@ -325,26 +325,26 @@ } }, "@babel/traverse": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", - "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.9", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.9", - "@babel/types": "^7.14.9", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -479,12 +479,12 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz", - "integrity": "sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", + "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==", "dev": true, "requires": { - "@babel/compat-data": "^7.14.5", + "@babel/compat-data": "^7.15.0", "@babel/helper-validator-option": "^7.14.5", "browserslist": "^4.16.6", "semver": "^6.3.0" @@ -503,22 +503,10 @@ "node-releases": "^1.1.73" } }, - "caniuse-lite": { - "version": "1.0.30001248", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz", - "integrity": "sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw==", - "dev": true - }, "electron-to-chromium": { - "version": "1.3.795", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz", - "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==", - "dev": true - }, - "node-releases": { - "version": "1.1.73", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", - "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==", + "version": "1.3.796", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz", + "integrity": "sha512-agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ==", "dev": true }, "semver": { @@ -559,9 +547,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -577,18 +565,18 @@ } }, "@babel/helper-member-expression-to-functions": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz", - "integrity": "sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz", + "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.0" }, "dependencies": { "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -613,9 +601,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -631,19 +619,19 @@ } }, "@babel/helper-module-transforms": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz", - "integrity": "sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz", + "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-replace-supers": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.0", "@babel/helper-simple-access": "^7.14.8", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/helper-validator-identifier": "^7.14.8", + "@babel/helper-validator-identifier": "^7.14.9", "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.8", - "@babel/types": "^7.14.8" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" }, "dependencies": { "@babel/code-frame": { @@ -656,12 +644,12 @@ } }, "@babel/generator": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz", - "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", "dev": true, "requires": { - "@babel/types": "^7.14.9", + "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -707,9 +695,9 @@ } }, "@babel/parser": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", - "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", "dev": true }, "@babel/template": { @@ -724,26 +712,26 @@ } }, "@babel/traverse": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", - "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.9", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.9", - "@babel/types": "^7.14.9", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -830,9 +818,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -854,15 +842,15 @@ "dev": true }, "@babel/helper-replace-supers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz", - "integrity": "sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz", + "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.14.5", + "@babel/helper-member-expression-to-functions": "^7.15.0", "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/traverse": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/traverse": "^7.15.0", + "@babel/types": "^7.15.0" }, "dependencies": { "@babel/code-frame": { @@ -875,12 +863,12 @@ } }, "@babel/generator": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz", - "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", "dev": true, "requires": { - "@babel/types": "^7.14.9", + "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -926,9 +914,9 @@ } }, "@babel/parser": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", - "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", "dev": true }, "@babel/template": { @@ -943,26 +931,26 @@ } }, "@babel/traverse": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", - "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.9", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.9", - "@babel/types": "^7.14.9", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -1049,9 +1037,9 @@ }, "dependencies": { "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -1108,12 +1096,12 @@ } }, "@babel/generator": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.9.tgz", - "integrity": "sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", + "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", "dev": true, "requires": { - "@babel/types": "^7.14.9", + "@babel/types": "^7.15.0", "jsesc": "^2.5.1", "source-map": "^0.5.0" } @@ -1159,9 +1147,9 @@ } }, "@babel/parser": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.9.tgz", - "integrity": "sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", + "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", "dev": true }, "@babel/template": { @@ -1176,26 +1164,26 @@ } }, "@babel/traverse": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.14.9.tgz", - "integrity": "sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", + "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.14.9", + "@babel/generator": "^7.15.0", "@babel/helper-function-name": "^7.14.5", "@babel/helper-hoist-variables": "^7.14.5", "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.14.9", - "@babel/types": "^7.14.9", + "@babel/parser": "^7.15.0", + "@babel/types": "^7.15.0", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.14.9.tgz", - "integrity": "sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==", + "version": "7.15.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", + "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -20900,6 +20888,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.13.20210804031526" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.13.20210804031526", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210804031526.tgz", + "integrity": "sha512-fF/Aqilg4PsVK6sw96Hk6OjAF4erW3Wc+GheHIfTwLiUW784cV7wLEzZ9HRIWJ/wuAxTjFzxPzWE+uqXmtCgeA==", + "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-gui": { @@ -21326,6 +21328,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.13.20210804031526", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210804031526.tgz", + "integrity": "sha512-fF/Aqilg4PsVK6sw96Hk6OjAF4erW3Wc+GheHIfTwLiUW784cV7wLEzZ9HRIWJ/wuAxTjFzxPzWE+uqXmtCgeA==", + "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21392,9 +21406,9 @@ } }, "scratch-l10n": { - "version": "3.13.20210804031526", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210804031526.tgz", - "integrity": "sha512-fF/Aqilg4PsVK6sw96Hk6OjAF4erW3Wc+GheHIfTwLiUW784cV7wLEzZ9HRIWJ/wuAxTjFzxPzWE+uqXmtCgeA==", + "version": "3.14.20210805134927", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210805134927.tgz", + "integrity": "sha512-d1UP975+tef1zuVIeVfm2NZHWPKeqdBZIPNG5o2H2DTHD1p/NNGA9YNiEnWQW9LENXP75hl9ofSqE57utXq+bg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 34ce459db..c569b9102 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210804101730", - "scratch-l10n": "3.13.20210804031526", + "scratch-l10n": "3.14.20210805134927", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 81ff3d6216d6a6dcffb103d84d323509c1ee722f Mon Sep 17 00:00:00 2001 From: rschamp Date: Thu, 5 Aug 2021 11:09:04 -0400 Subject: [PATCH 05/32] Revert "feat(annual-report): dynamically load the world map when it is scrolled to" This reverts commit bc43ad7e29ffa67177d0663bd7c4e15262f38b08. --- src/components/world-map/world-map.jsx | 16 +++-- src/views/annual-report/annual-report.jsx | 86 ++++++++++------------- 2 files changed, 48 insertions(+), 54 deletions(-) diff --git a/src/components/world-map/world-map.jsx b/src/components/world-map/world-map.jsx index 9f179bfa3..d99d9cb5f 100644 --- a/src/components/world-map/world-map.jsx +++ b/src/components/world-map/world-map.jsx @@ -1,15 +1,17 @@ -import React from 'react'; -import PropTypes from 'prop-types'; -import Plotly from 'plotly.js/lib/core'; -import choropleth from 'plotly.js/lib/choropleth'; -import createPlotlyComponent from 'react-plotly.js/factory'; +const Plotly = require('plotly.js/lib/core'); // Load in the trace type for choropleth -Plotly.register([choropleth]); +Plotly.register([ + require('plotly.js/lib/choropleth') +]); // create plotly bundle that only has choropleth plots +import createPlotlyComponent from 'react-plotly.js/factory'; const Plot = createPlotlyComponent(Plotly); +const React = require('react'); +const PropTypes = require('prop-types'); + const WorldMap = props => ( import( - /* webpackChunkName: "world-map" */ - '../../components/world-map/world-map.jsx' -)); - require('./annual-report.scss'); // Some constants used for the page subnav and section refs @@ -835,48 +831,44 @@ class AnnualReport extends React.Component {
- {this.state.currentlyVisible === SECTIONS.reach && - - - - - - - - - - - - - - - } + + + + + + + + + + + +
From c07e1994950e8c99a55c9ee6d490b015d87413cf Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Aug 2021 15:40:20 +0000 Subject: [PATCH 06/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210805152821 --- package-lock.json | 26 +++++++------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c519efbd..5552b0b4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20911,9 +20911,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210804101730", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210804101730.tgz", - "integrity": "sha512-1s2gEf50WqZ1cny/uDjc+HGM0NIywrg3qO2ATsZqs8FRD6JhXFcbgUI/ZR2eciQ+cXBS6piVtriAJKTVqiP7vw==", + "version": "0.1.0-prerelease.20210805152821", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210805152821.tgz", + "integrity": "sha512-3MUEsrpn2eUezLhauL9yRXRwRMi97/ePDiM/zTEokNNAKwsSYtELOOuKDLD9VEzNtgzmV/8gc5zz9OLz384OpQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20965,7 +20965,7 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20210804044921", - "scratch-l10n": "3.13.20210804031526", + "scratch-l10n": "3.14.20210805134927", "scratch-paint": "0.2.0-prerelease.20210804042639", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", @@ -21134,9 +21134,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.795", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz", - "integrity": "sha512-4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==", + "version": "1.3.796", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz", + "integrity": "sha512-agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ==", "dev": true }, "has-flag": { @@ -21334,18 +21334,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.13.20210804031526", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210804031526.tgz", - "integrity": "sha512-fF/Aqilg4PsVK6sw96Hk6OjAF4erW3Wc+GheHIfTwLiUW784cV7wLEzZ9HRIWJ/wuAxTjFzxPzWE+uqXmtCgeA==", - "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", diff --git a/package.json b/package.json index 2b8ae0271..ab6200210 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210804101730", + "scratch-gui": "0.1.0-prerelease.20210805152821", "scratch-l10n": "3.14.20210805134927", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From a196b3d4da7ba9addbf671d80f851fd651b05842 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Aug 2021 18:04:17 +0000 Subject: [PATCH 07/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210805172454 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5552b0b4c..6ef84bb6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20911,9 +20911,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210805152821", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210805152821.tgz", - "integrity": "sha512-3MUEsrpn2eUezLhauL9yRXRwRMi97/ePDiM/zTEokNNAKwsSYtELOOuKDLD9VEzNtgzmV/8gc5zz9OLz384OpQ==", + "version": "0.1.0-prerelease.20210805172454", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210805172454.tgz", + "integrity": "sha512-T+Fj+V0aFNKm9GiTfYdMF7qgqu7mByJiVUMo+R9GSuGy1HyTMMGkoCusmw5MOWQqAf7F4j8FcSgQVtLJ0jF6Kg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", diff --git a/package.json b/package.json index ab6200210..4d52d080e 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210805152821", + "scratch-gui": "0.1.0-prerelease.20210805172454", "scratch-l10n": "3.14.20210805134927", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 3bab071f65fdfb54906771a9708d9504a63afacd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 5 Aug 2021 20:32:23 +0000 Subject: [PATCH 08/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210805195438 --- package-lock.json | 30 ++++++++---------------------- package.json | 2 +- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ef84bb6b..4170ba354 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,35 +20885,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210804044921", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210804044921.tgz", - "integrity": "sha512-Kx+sOHdF9ubDt34k2cM633cberB7+x2HnUNw2d6JA15XzNP4uZoqttoQOMt6i/vrh905bbJjqgg28h7ZWOS2zQ==", + "version": "0.1.0-prerelease.20210805150037", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210805150037.tgz", + "integrity": "sha512-AZiNZfjS8yAYG3JI+2TL6gRZLCJKmkYfnqjFuKiC4Mi8IJ3v+L9fFd3n9ZNnXWX7PrwX/tpbnBYCWva83O026A==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.13.20210804031526" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.13.20210804031526", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.13.20210804031526.tgz", - "integrity": "sha512-fF/Aqilg4PsVK6sw96Hk6OjAF4erW3Wc+GheHIfTwLiUW784cV7wLEzZ9HRIWJ/wuAxTjFzxPzWE+uqXmtCgeA==", - "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": "3.14.20210805134927" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210805172454", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210805172454.tgz", - "integrity": "sha512-T+Fj+V0aFNKm9GiTfYdMF7qgqu7mByJiVUMo+R9GSuGy1HyTMMGkoCusmw5MOWQqAf7F4j8FcSgQVtLJ0jF6Kg==", + "version": "0.1.0-prerelease.20210805195438", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210805195438.tgz", + "integrity": "sha512-Qr1CPvKWpX+zbTU7QvvPnu64EPrw7kqnHR/JOakIE4fnCY56porRGWY+l1+IQDPheDDUujHzoQxftWnaKjb9yA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20964,7 +20950,7 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210804044921", + "scratch-blocks": "0.1.0-prerelease.20210805150037", "scratch-l10n": "3.14.20210805134927", "scratch-paint": "0.2.0-prerelease.20210804042639", "scratch-render": "0.1.0-prerelease.20210325231800", diff --git a/package.json b/package.json index 4d52d080e..4b35f093f 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210805172454", + "scratch-gui": "0.1.0-prerelease.20210805195438", "scratch-l10n": "3.14.20210805134927", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 05b61dacebbcce0a23b18ec7f9bde269df9e5856 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 Aug 2021 00:29:28 +0000 Subject: [PATCH 09/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210805235034 --- package-lock.json | 28 ++++++++++++++-------------- package.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4170ba354..6d21bdc13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20897,9 +20897,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210805195438", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210805195438.tgz", - "integrity": "sha512-Qr1CPvKWpX+zbTU7QvvPnu64EPrw7kqnHR/JOakIE4fnCY56porRGWY+l1+IQDPheDDUujHzoQxftWnaKjb9yA==", + "version": "0.1.0-prerelease.20210805235034", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210805235034.tgz", + "integrity": "sha512-45IHGGZQCfHlz9aQOSJQB4X/xnsOi4KJ3/zMVBWLjdavhv/VoZeBl5K2hZz3fGXEttYWYc+2dc4Xn4iDivRt+Q==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20952,12 +20952,12 @@ "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20210805150037", "scratch-l10n": "3.14.20210805134927", - "scratch-paint": "0.2.0-prerelease.20210804042639", + "scratch-paint": "0.2.0-prerelease.20210805145701", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210804080338", + "scratch-vm": "0.2.0-prerelease.20210805170633", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21120,9 +21120,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.796", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz", - "integrity": "sha512-agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ==", + "version": "1.3.797", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.797.tgz", + "integrity": "sha512-ASVBCRy2E6mPRSFqUxvi5OjMRVHzv36PXfbIllFlRc4ZLPNuhAZjKRHgmtlv37CLvVU/XYdftwtMxW5iYxGlcg==", "dev": true }, "has-flag": { @@ -21398,9 +21398,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210804042639", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210804042639.tgz", - "integrity": "sha512-iFCFWeGCXGmfQpYRRgHYdMX8hMoo68MoDY2dgCzU5RFUrmE/r8THztRhDjK0VYK+lCgSAxjAtMuU/8uyXxwUCA==", + "version": "0.2.0-prerelease.20210805145701", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210805145701.tgz", + "integrity": "sha512-qwLUCFkHZqI4dG6f8cEARyUW3Vu77ib93GjsK01XYql7/wCNViIl0+I8aBkRhCD1M1hFV9B1rcbF6YC3W1x1BA==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21654,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210804080338", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210804080338.tgz", - "integrity": "sha512-oxeqXRCM2EmWbqy05yHlRwOto2/Miqgh+WEYWwjFZPD9XjuXGUSULXwhFbC/vaBA3K4HH2x+wszMCeFunb2JSA==", + "version": "0.2.0-prerelease.20210805170633", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210805170633.tgz", + "integrity": "sha512-VvQcGOIw6g/oBXI0Mt/JykS7PxJdx7QQlK12IU8E2zvGmoIsTamCkgeMpRHNXW6kuWg1rHLx2KpJ4ZGZ50upMQ==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 4b35f093f..39611341d 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210805195438", + "scratch-gui": "0.1.0-prerelease.20210805235034", "scratch-l10n": "3.14.20210805134927", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From afb5d5af3d3a2455f400c25dc02656374fb704c0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 Aug 2021 04:01:47 +0000 Subject: [PATCH 10/32] chore(deps): update dependency scratch-l10n to v3.14.20210806031538 --- package-lock.json | 38 ++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6d21bdc13..9818789bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -504,9 +504,9 @@ } }, "electron-to-chromium": { - "version": "1.3.796", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz", - "integrity": "sha512-agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ==", + "version": "1.3.798", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.798.tgz", + "integrity": "sha512-fwsr6oXAORoV9a6Ak2vMCdXfmHIpAGgpOGesulS1cbGgJmrMl3H+GicUyRG3t+z9uHTMrIuMTleFDW+EUFYT3g==", "dev": true }, "semver": { @@ -20894,6 +20894,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20210805134927" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20210805134927", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210805134927.tgz", + "integrity": "sha512-d1UP975+tef1zuVIeVfm2NZHWPKeqdBZIPNG5o2H2DTHD1p/NNGA9YNiEnWQW9LENXP75hl9ofSqE57utXq+bg==", + "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-gui": { @@ -21320,6 +21334,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20210805134927", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210805134927.tgz", + "integrity": "sha512-d1UP975+tef1zuVIeVfm2NZHWPKeqdBZIPNG5o2H2DTHD1p/NNGA9YNiEnWQW9LENXP75hl9ofSqE57utXq+bg==", + "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21386,9 +21412,9 @@ } }, "scratch-l10n": { - "version": "3.14.20210805134927", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210805134927.tgz", - "integrity": "sha512-d1UP975+tef1zuVIeVfm2NZHWPKeqdBZIPNG5o2H2DTHD1p/NNGA9YNiEnWQW9LENXP75hl9ofSqE57utXq+bg==", + "version": "3.14.20210806031538", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210806031538.tgz", + "integrity": "sha512-fbCQhPc2Xw91bHohbnDSu3ieA9+ITlPKC4nyEmWpKgLuyDLC5mVQx4+S9cwUgcQeiQxjiNA7lyvPjG94bdRMuA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 39611341d..2e3c6c24a 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210805235034", - "scratch-l10n": "3.14.20210805134927", + "scratch-l10n": "3.14.20210806031538", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From a81673720eda651f559a442a77f88f8fdfebb04b Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 6 Aug 2021 11:01:56 +0000 Subject: [PATCH 11/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210806105658 --- package-lock.json | 66 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 21 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9818789bf..c274b2ed6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,35 +20885,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210805150037", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210805150037.tgz", - "integrity": "sha512-AZiNZfjS8yAYG3JI+2TL6gRZLCJKmkYfnqjFuKiC4Mi8IJ3v+L9fFd3n9ZNnXWX7PrwX/tpbnBYCWva83O026A==", + "version": "0.1.0-prerelease.20210806050906", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210806050906.tgz", + "integrity": "sha512-gPWJ3YGbuMTTxWbL3J7mLN0bQ9OGFJuuB8Pw7KS490f0zUNgDxIsuPIEYkvvGrWbTusz84KZ0aXsNGGG47rlog==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20210805134927" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20210805134927", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210805134927.tgz", - "integrity": "sha512-d1UP975+tef1zuVIeVfm2NZHWPKeqdBZIPNG5o2H2DTHD1p/NNGA9YNiEnWQW9LENXP75hl9ofSqE57utXq+bg==", - "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": "3.14.20210806031538" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210805235034", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210805235034.tgz", - "integrity": "sha512-45IHGGZQCfHlz9aQOSJQB4X/xnsOi4KJ3/zMVBWLjdavhv/VoZeBl5K2hZz3fGXEttYWYc+2dc4Xn4iDivRt+Q==", + "version": "0.1.0-prerelease.20210806105658", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210806105658.tgz", + "integrity": "sha512-Ou0A5noMNIZ7QkqX/s8/SHmgVZ9/OJJtUecZJNSr47YY8AC23Ga+/ZM1ZiUicVkWDs5/eBsf2pqbiVDV7y8xcQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20964,14 +20950,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210805150037", - "scratch-l10n": "3.14.20210805134927", - "scratch-paint": "0.2.0-prerelease.20210805145701", + "scratch-blocks": "0.1.0-prerelease.20210806050906", + "scratch-l10n": "3.14.20210806031538", + "scratch-paint": "0.2.0-prerelease.20210806051700", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210805170633", + "scratch-vm": "0.2.0-prerelease.20210806090752", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21134,9 +21120,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.797", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.797.tgz", - "integrity": "sha512-ASVBCRy2E6mPRSFqUxvi5OjMRVHzv36PXfbIllFlRc4ZLPNuhAZjKRHgmtlv37CLvVU/XYdftwtMxW5iYxGlcg==", + "version": "1.3.798", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.798.tgz", + "integrity": "sha512-fwsr6oXAORoV9a6Ak2vMCdXfmHIpAGgpOGesulS1cbGgJmrMl3H+GicUyRG3t+z9uHTMrIuMTleFDW+EUFYT3g==", "dev": true }, "has-flag": { @@ -21334,18 +21320,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20210805134927", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210805134927.tgz", - "integrity": "sha512-d1UP975+tef1zuVIeVfm2NZHWPKeqdBZIPNG5o2H2DTHD1p/NNGA9YNiEnWQW9LENXP75hl9ofSqE57utXq+bg==", - "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21424,9 +21398,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210805145701", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210805145701.tgz", - "integrity": "sha512-qwLUCFkHZqI4dG6f8cEARyUW3Vu77ib93GjsK01XYql7/wCNViIl0+I8aBkRhCD1M1hFV9B1rcbF6YC3W1x1BA==", + "version": "0.2.0-prerelease.20210806051700", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210806051700.tgz", + "integrity": "sha512-43FPN/r6UzwoZtjTyHOlVdxoTNjvUF18zlnrRFd4uYrO7vUCgsjgpB3FMRcNuZo3/4EhCXOQfVkdrXZBTB3GfA==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21680,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210805170633", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210805170633.tgz", - "integrity": "sha512-VvQcGOIw6g/oBXI0Mt/JykS7PxJdx7QQlK12IU8E2zvGmoIsTamCkgeMpRHNXW6kuWg1rHLx2KpJ4ZGZ50upMQ==", + "version": "0.2.0-prerelease.20210806090752", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210806090752.tgz", + "integrity": "sha512-fUfFpOQJqsCZlzkvga7bzLC1oCvHOlPLW2c7c++IMnhssypFyOoHRuxrkAWNGq/8IcVUcQdSTgyKZlGcSWg6nA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 2e3c6c24a..a90920a8b 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210805235034", + "scratch-gui": "0.1.0-prerelease.20210806105658", "scratch-l10n": "3.14.20210806031538", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From c5818d60f82e663ce9887921b8b0901fa3763f44 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 7 Aug 2021 04:04:52 +0000 Subject: [PATCH 12/32] chore(deps): update dependency scratch-l10n to v3.14.20210807031704 --- package-lock.json | 38 ++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index c274b2ed6..ff3f252be 100644 --- a/package-lock.json +++ b/package-lock.json @@ -504,9 +504,9 @@ } }, "electron-to-chromium": { - "version": "1.3.798", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.798.tgz", - "integrity": "sha512-fwsr6oXAORoV9a6Ak2vMCdXfmHIpAGgpOGesulS1cbGgJmrMl3H+GicUyRG3t+z9uHTMrIuMTleFDW+EUFYT3g==", + "version": "1.3.799", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz", + "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw==", "dev": true }, "semver": { @@ -20894,6 +20894,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20210806031538" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20210806031538", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210806031538.tgz", + "integrity": "sha512-fbCQhPc2Xw91bHohbnDSu3ieA9+ITlPKC4nyEmWpKgLuyDLC5mVQx4+S9cwUgcQeiQxjiNA7lyvPjG94bdRMuA==", + "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-gui": { @@ -21320,6 +21334,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20210806031538", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210806031538.tgz", + "integrity": "sha512-fbCQhPc2Xw91bHohbnDSu3ieA9+ITlPKC4nyEmWpKgLuyDLC5mVQx4+S9cwUgcQeiQxjiNA7lyvPjG94bdRMuA==", + "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21386,9 +21412,9 @@ } }, "scratch-l10n": { - "version": "3.14.20210806031538", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210806031538.tgz", - "integrity": "sha512-fbCQhPc2Xw91bHohbnDSu3ieA9+ITlPKC4nyEmWpKgLuyDLC5mVQx4+S9cwUgcQeiQxjiNA7lyvPjG94bdRMuA==", + "version": "3.14.20210807031704", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210807031704.tgz", + "integrity": "sha512-VDKcE3a/OJ7oZUvr6uoJfHrzeTnAmZGXJO1mb62w2AFQlgdK5tyIIMVxOwd781WRL7l7bgIeCQbZbdOfyna1FA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index a90920a8b..701f46477 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210806105658", - "scratch-l10n": "3.14.20210806031538", + "scratch-l10n": "3.14.20210807031704", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 2f4ea868c590ebe0027fe123bb146dda92c97221 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 7 Aug 2021 09:11:04 +0000 Subject: [PATCH 13/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210807084105 --- package-lock.json | 34 +++++++++++----------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff3f252be..8e3ef5ae7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20911,9 +20911,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210806105658", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210806105658.tgz", - "integrity": "sha512-Ou0A5noMNIZ7QkqX/s8/SHmgVZ9/OJJtUecZJNSr47YY8AC23Ga+/ZM1ZiUicVkWDs5/eBsf2pqbiVDV7y8xcQ==", + "version": "0.1.0-prerelease.20210807084105", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210807084105.tgz", + "integrity": "sha512-hQXCLpCFf/cy8z8jUsnvVM0trbLRHqIco/Ar8/opOsg25E9wkuGA7Zpm1rxuwuz8s+2twULi4G6dNWswddfmSg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20965,8 +20965,8 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20210806050906", - "scratch-l10n": "3.14.20210806031538", - "scratch-paint": "0.2.0-prerelease.20210806051700", + "scratch-l10n": "3.14.20210807031704", + "scratch-paint": "0.2.0-prerelease.20210807045427", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", @@ -21134,9 +21134,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.798", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.798.tgz", - "integrity": "sha512-fwsr6oXAORoV9a6Ak2vMCdXfmHIpAGgpOGesulS1cbGgJmrMl3H+GicUyRG3t+z9uHTMrIuMTleFDW+EUFYT3g==", + "version": "1.3.799", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz", + "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw==", "dev": true }, "has-flag": { @@ -21334,18 +21334,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20210806031538", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210806031538.tgz", - "integrity": "sha512-fbCQhPc2Xw91bHohbnDSu3ieA9+ITlPKC4nyEmWpKgLuyDLC5mVQx4+S9cwUgcQeiQxjiNA7lyvPjG94bdRMuA==", - "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21424,9 +21412,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210806051700", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210806051700.tgz", - "integrity": "sha512-43FPN/r6UzwoZtjTyHOlVdxoTNjvUF18zlnrRFd4uYrO7vUCgsjgpB3FMRcNuZo3/4EhCXOQfVkdrXZBTB3GfA==", + "version": "0.2.0-prerelease.20210807045427", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210807045427.tgz", + "integrity": "sha512-sMMaRxdId7criMxstYk/aGVOtk6vDjxTK/K6XUIuUD0H3JPXR0PsUEMkyVPjx9+WrTsl79QkpPnv2JPqS2dADw==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", diff --git a/package.json b/package.json index 701f46477..1be311be3 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210806105658", + "scratch-gui": "0.1.0-prerelease.20210807084105", "scratch-l10n": "3.14.20210807031704", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 481fd0024676b2b75e0623f0ba8f3a06abc0cc0c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 7 Aug 2021 12:11:35 +0000 Subject: [PATCH 14/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210807115522 --- package-lock.json | 38 ++++++++++++-------------------------- package.json | 2 +- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8e3ef5ae7..81942bdc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,35 +20885,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210806050906", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210806050906.tgz", - "integrity": "sha512-gPWJ3YGbuMTTxWbL3J7mLN0bQ9OGFJuuB8Pw7KS490f0zUNgDxIsuPIEYkvvGrWbTusz84KZ0aXsNGGG47rlog==", + "version": "0.1.0-prerelease.20210807044309", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210807044309.tgz", + "integrity": "sha512-PmlJu6BR2bB8bYwCuNAmzUwVrTR4TWCNIq7GU0/5c1Zm8MjFIuM61gnimxwbL4RXXqsK2Rd4oSHl06IhB5BW7w==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20210806031538" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20210806031538", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210806031538.tgz", - "integrity": "sha512-fbCQhPc2Xw91bHohbnDSu3ieA9+ITlPKC4nyEmWpKgLuyDLC5mVQx4+S9cwUgcQeiQxjiNA7lyvPjG94bdRMuA==", - "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": "3.14.20210807031704" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210807084105", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210807084105.tgz", - "integrity": "sha512-hQXCLpCFf/cy8z8jUsnvVM0trbLRHqIco/Ar8/opOsg25E9wkuGA7Zpm1rxuwuz8s+2twULi4G6dNWswddfmSg==", + "version": "0.1.0-prerelease.20210807115522", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210807115522.tgz", + "integrity": "sha512-JzWgmzX27yzqQFzQKvLuZWe6APQSVlX1bWaAEdcisUHVZ5oLvXi2suettfthuo+78M/6nZNGXxrEq0DMaQHfNA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20964,14 +20950,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210806050906", + "scratch-blocks": "0.1.0-prerelease.20210807044309", "scratch-l10n": "3.14.20210807031704", "scratch-paint": "0.2.0-prerelease.20210807045427", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210806090752", + "scratch-vm": "0.2.0-prerelease.20210807080536", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21668,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210806090752", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210806090752.tgz", - "integrity": "sha512-fUfFpOQJqsCZlzkvga7bzLC1oCvHOlPLW2c7c++IMnhssypFyOoHRuxrkAWNGq/8IcVUcQdSTgyKZlGcSWg6nA==", + "version": "0.2.0-prerelease.20210807080536", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210807080536.tgz", + "integrity": "sha512-JuyqulqSbMzwsvJzxKhFR1m8KlQe/IFW5wIkOwlm7+WNksXiScec2or2+0sH9kyI6KLJkMdHKfxcKeVLt+XsVg==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 1be311be3..7f7f4dec5 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210807084105", + "scratch-gui": "0.1.0-prerelease.20210807115522", "scratch-l10n": "3.14.20210807031704", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 497772a12009838dbeaa1423b97af8e4c8894c1d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 8 Aug 2021 04:19:10 +0000 Subject: [PATCH 15/32] chore(deps): update dependency scratch-l10n to v3.14.20210808031521 --- package-lock.json | 32 +++++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 81942bdc0..418793128 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20894,6 +20894,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20210807031704" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20210807031704", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210807031704.tgz", + "integrity": "sha512-VDKcE3a/OJ7oZUvr6uoJfHrzeTnAmZGXJO1mb62w2AFQlgdK5tyIIMVxOwd781WRL7l7bgIeCQbZbdOfyna1FA==", + "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-gui": { @@ -21320,6 +21334,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20210807031704", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210807031704.tgz", + "integrity": "sha512-VDKcE3a/OJ7oZUvr6uoJfHrzeTnAmZGXJO1mb62w2AFQlgdK5tyIIMVxOwd781WRL7l7bgIeCQbZbdOfyna1FA==", + "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21386,9 +21412,9 @@ } }, "scratch-l10n": { - "version": "3.14.20210807031704", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210807031704.tgz", - "integrity": "sha512-VDKcE3a/OJ7oZUvr6uoJfHrzeTnAmZGXJO1mb62w2AFQlgdK5tyIIMVxOwd781WRL7l7bgIeCQbZbdOfyna1FA==", + "version": "3.14.20210808031521", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210808031521.tgz", + "integrity": "sha512-vNigM68cxWYXkjvajJzxQalp60ZAzNCmiUPe+atbrJdk6WeKyjodywe2N8+Wr+5INtXXKJJlnk4bxq1eMf6pig==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 7f7f4dec5..a1ae41ebf 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210807115522", - "scratch-l10n": "3.14.20210807031704", + "scratch-l10n": "3.14.20210808031521", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 9ca20c00e9c62c2c403d4b7d6454e95e74fa64a8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 8 Aug 2021 10:40:24 +0000 Subject: [PATCH 16/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210808102431 --- package-lock.json | 60 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index 418793128..db8e6a6a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,35 +20885,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210807044309", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210807044309.tgz", - "integrity": "sha512-PmlJu6BR2bB8bYwCuNAmzUwVrTR4TWCNIq7GU0/5c1Zm8MjFIuM61gnimxwbL4RXXqsK2Rd4oSHl06IhB5BW7w==", + "version": "0.1.0-prerelease.20210808052010", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210808052010.tgz", + "integrity": "sha512-f/FWNdI1elep+VsAHyYDnXqC90XOp7N2VslKpWscVnPUkQEtTvzLc8cQOzgGObcEQGGak07lirFf+KfKSk6Epg==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20210807031704" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20210807031704", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210807031704.tgz", - "integrity": "sha512-VDKcE3a/OJ7oZUvr6uoJfHrzeTnAmZGXJO1mb62w2AFQlgdK5tyIIMVxOwd781WRL7l7bgIeCQbZbdOfyna1FA==", - "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": "3.14.20210808031521" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210807115522", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210807115522.tgz", - "integrity": "sha512-JzWgmzX27yzqQFzQKvLuZWe6APQSVlX1bWaAEdcisUHVZ5oLvXi2suettfthuo+78M/6nZNGXxrEq0DMaQHfNA==", + "version": "0.1.0-prerelease.20210808102431", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210808102431.tgz", + "integrity": "sha512-ZaSqLZJqAtZOy5fHzwbNq/UYztAqbs7DdcaPPhgaySsPQiPshucwxcYp0u6oWUDatsYDuDfH8tgViaxF4F57HQ==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20964,14 +20950,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210807044309", - "scratch-l10n": "3.14.20210807031704", - "scratch-paint": "0.2.0-prerelease.20210807045427", + "scratch-blocks": "0.1.0-prerelease.20210808052010", + "scratch-l10n": "3.14.20210808031521", + "scratch-paint": "0.2.0-prerelease.20210808074450", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210807080536", + "scratch-vm": "0.2.0-prerelease.20210808043254", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21334,18 +21320,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20210807031704", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210807031704.tgz", - "integrity": "sha512-VDKcE3a/OJ7oZUvr6uoJfHrzeTnAmZGXJO1mb62w2AFQlgdK5tyIIMVxOwd781WRL7l7bgIeCQbZbdOfyna1FA==", - "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21424,9 +21398,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210807045427", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210807045427.tgz", - "integrity": "sha512-sMMaRxdId7criMxstYk/aGVOtk6vDjxTK/K6XUIuUD0H3JPXR0PsUEMkyVPjx9+WrTsl79QkpPnv2JPqS2dADw==", + "version": "0.2.0-prerelease.20210808074450", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210808074450.tgz", + "integrity": "sha512-Hp8c0k5iKcXPibf4uN0xSp2T38q2PHlrlLlz+T0MEO+Mb7cFjKIofAusVa9YP1ygmv5iYoy6yGOsbepJuH32OQ==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21680,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210807080536", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210807080536.tgz", - "integrity": "sha512-JuyqulqSbMzwsvJzxKhFR1m8KlQe/IFW5wIkOwlm7+WNksXiScec2or2+0sH9kyI6KLJkMdHKfxcKeVLt+XsVg==", + "version": "0.2.0-prerelease.20210808043254", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210808043254.tgz", + "integrity": "sha512-DlOGm6Sw8Mb7yY/t/1kIJY6NpyoNFVCyyzk6IAQrv4E1QKp0CRFa6KeoLCId3EI7KQZ0ewa6mcv/Q7VvSJimOw==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index a1ae41ebf..25995a28f 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210807115522", + "scratch-gui": "0.1.0-prerelease.20210808102431", "scratch-l10n": "3.14.20210808031521", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From c2a9b9290b7280e350502d7148b3a005bae393ce Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 8 Aug 2021 14:16:46 +0000 Subject: [PATCH 17/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210808125811 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index db8e6a6a0..fa9df166c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20897,9 +20897,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210808102431", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210808102431.tgz", - "integrity": "sha512-ZaSqLZJqAtZOy5fHzwbNq/UYztAqbs7DdcaPPhgaySsPQiPshucwxcYp0u6oWUDatsYDuDfH8tgViaxF4F57HQ==", + "version": "0.1.0-prerelease.20210808125811", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210808125811.tgz", + "integrity": "sha512-CJuWT9dZtnbW24upOAfoRzsvAIAXGEgRsQJ7gxG3ZVhj+09IAT/CMJlcrxM63ig8RIKmzWlXm/ag0FUaY6wVBw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20957,7 +20957,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210808043254", + "scratch-vm": "0.2.0-prerelease.20210808083838", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21654,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210808043254", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210808043254.tgz", - "integrity": "sha512-DlOGm6Sw8Mb7yY/t/1kIJY6NpyoNFVCyyzk6IAQrv4E1QKp0CRFa6KeoLCId3EI7KQZ0ewa6mcv/Q7VvSJimOw==", + "version": "0.2.0-prerelease.20210808083838", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210808083838.tgz", + "integrity": "sha512-CqggRqMY/aMTEXCIMygfiGw5we6CS+dMDxaq0HfA0XmXzY3F+IM8uWH0T/vptRZ0zMVJyw9tDjQ5jK3pfs0AIQ==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 25995a28f..b1d866c55 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210808102431", + "scratch-gui": "0.1.0-prerelease.20210808125811", "scratch-l10n": "3.14.20210808031521", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From e8b9404c4f797a455afda8dd5d06091d6c3c7e1f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Aug 2021 01:39:28 +0000 Subject: [PATCH 18/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210809002239 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index fa9df166c..1765e58c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,9 +20885,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210808052010", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210808052010.tgz", - "integrity": "sha512-f/FWNdI1elep+VsAHyYDnXqC90XOp7N2VslKpWscVnPUkQEtTvzLc8cQOzgGObcEQGGak07lirFf+KfKSk6Epg==", + "version": "0.1.0-prerelease.20210808201335", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210808201335.tgz", + "integrity": "sha512-p8Q9E7sFvwFJTCWY12u5YgBT4lDixT82pcVPF8ELFjAyK7LXCnIBmNnzRFtVPO8yP9OO6t3SghmcSBS+fj6g4w==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20897,9 +20897,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210808125811", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210808125811.tgz", - "integrity": "sha512-CJuWT9dZtnbW24upOAfoRzsvAIAXGEgRsQJ7gxG3ZVhj+09IAT/CMJlcrxM63ig8RIKmzWlXm/ag0FUaY6wVBw==", + "version": "0.1.0-prerelease.20210809002239", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809002239.tgz", + "integrity": "sha512-FtBJqk1nOSXpW7sfteRgGumn8q2dLZJSVKoaKx5rUPdwKiO8uyfZNOlKcTs3rRHtGBiUSqZ0f7LO1dZSWERLPw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20950,7 +20950,7 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210808052010", + "scratch-blocks": "0.1.0-prerelease.20210808201335", "scratch-l10n": "3.14.20210808031521", "scratch-paint": "0.2.0-prerelease.20210808074450", "scratch-render": "0.1.0-prerelease.20210325231800", diff --git a/package.json b/package.json index b1d866c55..f267825fd 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210808125811", + "scratch-gui": "0.1.0-prerelease.20210809002239", "scratch-l10n": "3.14.20210808031521", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 9f6ecb3c560546267e417550f2b9f90275e3d027 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Aug 2021 05:42:40 +0000 Subject: [PATCH 19/32] chore(deps): update dependency scratch-l10n to v3.14.20210809031602 --- package-lock.json | 56 ++++++++++++++++++++++++++++++++++------------- package.json | 2 +- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1765e58c3..e0f35a170 100644 --- a/package-lock.json +++ b/package-lock.json @@ -308,9 +308,9 @@ } }, "@babel/parser": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", - "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", + "version": "7.15.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz", + "integrity": "sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==", "dev": true }, "@babel/template": { @@ -695,9 +695,9 @@ } }, "@babel/parser": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", - "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", + "version": "7.15.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz", + "integrity": "sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==", "dev": true }, "@babel/template": { @@ -914,9 +914,9 @@ } }, "@babel/parser": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", - "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", + "version": "7.15.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz", + "integrity": "sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==", "dev": true }, "@babel/template": { @@ -1147,9 +1147,9 @@ } }, "@babel/parser": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz", - "integrity": "sha512-0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==", + "version": "7.15.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz", + "integrity": "sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==", "dev": true }, "@babel/template": { @@ -20894,6 +20894,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20210808031521" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20210808031521", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210808031521.tgz", + "integrity": "sha512-vNigM68cxWYXkjvajJzxQalp60ZAzNCmiUPe+atbrJdk6WeKyjodywe2N8+Wr+5INtXXKJJlnk4bxq1eMf6pig==", + "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-gui": { @@ -21320,6 +21334,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20210808031521", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210808031521.tgz", + "integrity": "sha512-vNigM68cxWYXkjvajJzxQalp60ZAzNCmiUPe+atbrJdk6WeKyjodywe2N8+Wr+5INtXXKJJlnk4bxq1eMf6pig==", + "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21386,9 +21412,9 @@ } }, "scratch-l10n": { - "version": "3.14.20210808031521", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210808031521.tgz", - "integrity": "sha512-vNigM68cxWYXkjvajJzxQalp60ZAzNCmiUPe+atbrJdk6WeKyjodywe2N8+Wr+5INtXXKJJlnk4bxq1eMf6pig==", + "version": "3.14.20210809031602", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210809031602.tgz", + "integrity": "sha512-qZr1AR2i2Mqhpw9iwFjFhlXfPiy4dHOYMt9RE1AU+CosZlOsRA5rC0/eUa+DMcMXX7oUDNpJ+tIjuV8ZJMpCSw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index f267825fd..0a646f421 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210809002239", - "scratch-l10n": "3.14.20210808031521", + "scratch-l10n": "3.14.20210809031602", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 53821dc93d7a23d87f8bbc5a404b71e575bc3222 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Aug 2021 10:02:22 +0000 Subject: [PATCH 20/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210809084050 --- package-lock.json | 28 ++++++++-------------------- package.json | 2 +- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0f35a170..f5cc783ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20911,9 +20911,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210809002239", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809002239.tgz", - "integrity": "sha512-FtBJqk1nOSXpW7sfteRgGumn8q2dLZJSVKoaKx5rUPdwKiO8uyfZNOlKcTs3rRHtGBiUSqZ0f7LO1dZSWERLPw==", + "version": "0.1.0-prerelease.20210809084050", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809084050.tgz", + "integrity": "sha512-QgRxTyr9YiouMUXR+8eSXC3VpTZ3OUPi8QlI5LGq+A+IejKxQNpb4Aqk89UPrPan+h0uzLJ9KO96kmmmBeDS2A==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20965,13 +20965,13 @@ "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-blocks": "0.1.0-prerelease.20210808201335", - "scratch-l10n": "3.14.20210808031521", + "scratch-l10n": "3.14.20210809031602", "scratch-paint": "0.2.0-prerelease.20210808074450", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210808083838", + "scratch-vm": "0.2.0-prerelease.20210808215300", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21334,18 +21334,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20210808031521", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210808031521.tgz", - "integrity": "sha512-vNigM68cxWYXkjvajJzxQalp60ZAzNCmiUPe+atbrJdk6WeKyjodywe2N8+Wr+5INtXXKJJlnk4bxq1eMf6pig==", - "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21680,9 +21668,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210808083838", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210808083838.tgz", - "integrity": "sha512-CqggRqMY/aMTEXCIMygfiGw5we6CS+dMDxaq0HfA0XmXzY3F+IM8uWH0T/vptRZ0zMVJyw9tDjQ5jK3pfs0AIQ==", + "version": "0.2.0-prerelease.20210808215300", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210808215300.tgz", + "integrity": "sha512-JLl9kESnFuUFNhsZd6VZ+OUXOK/AaT1ibVTgvBfLDdU/b/z8xI6RcN0J6+A4GesoNOgrgMnQy7PZluAsqdYyZg==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 0a646f421..9a9d5dc42 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210809002239", + "scratch-gui": "0.1.0-prerelease.20210809084050", "scratch-l10n": "3.14.20210809031602", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 4e0d38556bf07f312c8c702ac553635505323da0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Aug 2021 15:32:37 +0000 Subject: [PATCH 21/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210809144356 --- package-lock.json | 46 ++++++++++++++++------------------------------ package.json | 2 +- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5cc783ff..779f11e5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,35 +20885,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210808201335", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210808201335.tgz", - "integrity": "sha512-p8Q9E7sFvwFJTCWY12u5YgBT4lDixT82pcVPF8ELFjAyK7LXCnIBmNnzRFtVPO8yP9OO6t3SghmcSBS+fj6g4w==", + "version": "0.1.0-prerelease.20210809095031", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210809095031.tgz", + "integrity": "sha512-GK7+Ha8qCDnynSrJRJTFqKiGKogJNBZaNtDNzscD7+oc/CF3bYVlGgHc5e3a5XIG/xBjPlS4RJ45ZRiYs6aFqA==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20210808031521" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20210808031521", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210808031521.tgz", - "integrity": "sha512-vNigM68cxWYXkjvajJzxQalp60ZAzNCmiUPe+atbrJdk6WeKyjodywe2N8+Wr+5INtXXKJJlnk4bxq1eMf6pig==", - "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": "3.14.20210809031602" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210809084050", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809084050.tgz", - "integrity": "sha512-QgRxTyr9YiouMUXR+8eSXC3VpTZ3OUPi8QlI5LGq+A+IejKxQNpb4Aqk89UPrPan+h0uzLJ9KO96kmmmBeDS2A==", + "version": "0.1.0-prerelease.20210809144356", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809144356.tgz", + "integrity": "sha512-TPJkvfkJnI+ocCgdrEAHIqmv+ekyquyJfcginxLL2mVYe0AHKdSj/sO4XdLLHObTPesD3C0Y7w6fCWiyBVNWMA==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20964,14 +20950,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210808201335", + "scratch-blocks": "0.1.0-prerelease.20210809095031", "scratch-l10n": "3.14.20210809031602", - "scratch-paint": "0.2.0-prerelease.20210808074450", + "scratch-paint": "0.2.0-prerelease.20210809090942", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210808215300", + "scratch-vm": "0.2.0-prerelease.20210809125956", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21412,9 +21398,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210808074450", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210808074450.tgz", - "integrity": "sha512-Hp8c0k5iKcXPibf4uN0xSp2T38q2PHlrlLlz+T0MEO+Mb7cFjKIofAusVa9YP1ygmv5iYoy6yGOsbepJuH32OQ==", + "version": "0.2.0-prerelease.20210809090942", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210809090942.tgz", + "integrity": "sha512-vf86SQWS40dszI19BSSXKu5EXScnpkFi/ZDhFHnuJNjub9LXQaSh39hFVoQ76WqfC/NelBaJ4ucOruq/LLRKBg==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21668,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210808215300", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210808215300.tgz", - "integrity": "sha512-JLl9kESnFuUFNhsZd6VZ+OUXOK/AaT1ibVTgvBfLDdU/b/z8xI6RcN0J6+A4GesoNOgrgMnQy7PZluAsqdYyZg==", + "version": "0.2.0-prerelease.20210809125956", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210809125956.tgz", + "integrity": "sha512-QAShSWpnYIiqSdzI3rMCl7dFplU/FO9sl0Mg6yvAF+hUQb9yBen1pe0YAZXs5N3dmue7Ej3ifdl6yyRzKYCexA==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 9a9d5dc42..cfa5d6ea8 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210809084050", + "scratch-gui": "0.1.0-prerelease.20210809144356", "scratch-l10n": "3.14.20210809031602", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 378f1db78309c104817fa6115c817ee5c0443c16 Mon Sep 17 00:00:00 2001 From: rschamp Date: Mon, 9 Aug 2021 13:42:59 -0400 Subject: [PATCH 22/32] Update link to download AIR, remove outdated content Resolves #5132. Thanks to @carljbowman for support --- src/views/download/scratch2/download.jsx | 23 ----------------------- src/views/download/scratch2/l10n.json | 3 +-- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/views/download/scratch2/download.jsx b/src/views/download/scratch2/download.jsx index edbf5afe2..1bb90e664 100644 --- a/src/views/download/scratch2/download.jsx +++ b/src/views/download/scratch2/download.jsx @@ -113,9 +113,6 @@ class Download extends React.Component { id="installation" >
-

- -

@@ -123,26 +120,6 @@ class Download extends React.Component {

-
diff --git a/src/views/download/scratch2/l10n.json b/src/views/download/scratch2/l10n.json index 3c5144115..266b7a653 100644 --- a/src/views/download/scratch2/l10n.json +++ b/src/views/download/scratch2/l10n.json @@ -1,10 +1,9 @@ { "download.title": "Scratch 2.0 Offline Editor", "download.intro": "You can install the Scratch 2.0 editor to work on projects without an internet connection. This version will work on Windows and MacOS.", - "download.introMac": "Note for Mac Users: the latest version of Scratch 2.0 Offline requires Adobe AIR 20. To upgrade to Adobe AIR 20 manually, go here.", "download.installation": "Installation", "download.airTitle": "Adobe AIR", - "download.airBody": "If you don't already have it, download and install the latest Adobe AIR", + "download.airBody": "If you don't already have it, download and install the latest Adobe AIR", "download.macOSX": "Mac OS X", "download.macOlder": "Mac OS 10.5 & Older", "download.windows": "Windows", From 699f256735e02ea01cfd112076591ca4a1adefd2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 9 Aug 2021 19:41:14 +0000 Subject: [PATCH 23/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210809193312 --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 779f11e5c..6258bc0f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,9 +20885,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210809095031", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210809095031.tgz", - "integrity": "sha512-GK7+Ha8qCDnynSrJRJTFqKiGKogJNBZaNtDNzscD7+oc/CF3bYVlGgHc5e3a5XIG/xBjPlS4RJ45ZRiYs6aFqA==", + "version": "0.1.0-prerelease.20210809161304", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210809161304.tgz", + "integrity": "sha512-u2FCSezDF5yCZ4GFRK40Zh767zVuX5YboPVdXz1uQomg0jN8iYmx71m7lSX+sR4WyQT8XYqQX+eeHzf8gu6gaQ==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20897,9 +20897,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210809144356", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809144356.tgz", - "integrity": "sha512-TPJkvfkJnI+ocCgdrEAHIqmv+ekyquyJfcginxLL2mVYe0AHKdSj/sO4XdLLHObTPesD3C0Y7w6fCWiyBVNWMA==", + "version": "0.1.0-prerelease.20210809193312", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809193312.tgz", + "integrity": "sha512-C/aS5h1hYQLrwQl2gt2CHpcuoPMpYnplNybUvQh+/Ew5ojD3vv/NS0QwKCGy6Y+R5PsZ34gk2+QM1BZWonv8+w==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20950,14 +20950,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210809095031", + "scratch-blocks": "0.1.0-prerelease.20210809161304", "scratch-l10n": "3.14.20210809031602", "scratch-paint": "0.2.0-prerelease.20210809090942", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210809125956", + "scratch-vm": "0.2.0-prerelease.20210809181637", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21654,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210809125956", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210809125956.tgz", - "integrity": "sha512-QAShSWpnYIiqSdzI3rMCl7dFplU/FO9sl0Mg6yvAF+hUQb9yBen1pe0YAZXs5N3dmue7Ej3ifdl6yyRzKYCexA==", + "version": "0.2.0-prerelease.20210809181637", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210809181637.tgz", + "integrity": "sha512-0GP8oPTZWMmLtNOLt3pNgci+u5p9w/f1WwzeKt3Q9UIWn2JeIh6A8UW2eZJrDZvhWSwRm+pJayZjHdhUIar8xg==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index cfa5d6ea8..009eb8863 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210809144356", + "scratch-gui": "0.1.0-prerelease.20210809193312", "scratch-l10n": "3.14.20210809031602", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 0ed92dd8af03d004d41239152d7980e15cc63de2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 Aug 2021 00:02:23 +0000 Subject: [PATCH 24/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210809232623 --- package-lock.json | 28 ++++++++++++++-------------- package.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6258bc0f5..8480bc770 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,9 +20885,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210809161304", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210809161304.tgz", - "integrity": "sha512-u2FCSezDF5yCZ4GFRK40Zh767zVuX5YboPVdXz1uQomg0jN8iYmx71m7lSX+sR4WyQT8XYqQX+eeHzf8gu6gaQ==", + "version": "0.1.0-prerelease.20210809195341", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210809195341.tgz", + "integrity": "sha512-jmOHiHGuU9voSmgxDT7mYUUP5fijDKXlom75Fm7Zrb3LwWBVd3O48PDsUQnSSFuQFv+7IAofNfqio97TNEMw0g==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20897,9 +20897,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210809193312", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809193312.tgz", - "integrity": "sha512-C/aS5h1hYQLrwQl2gt2CHpcuoPMpYnplNybUvQh+/Ew5ojD3vv/NS0QwKCGy6Y+R5PsZ34gk2+QM1BZWonv8+w==", + "version": "0.1.0-prerelease.20210809232623", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809232623.tgz", + "integrity": "sha512-PifjOH1xuyvj33Ssdh6xhlRq83CvrpQ97eLmFtKhO1MjOTKkTGDQfWEUNKXYK04SdcTl2atu1MN2KuZd9+/5Kg==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20950,14 +20950,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210809161304", + "scratch-blocks": "0.1.0-prerelease.20210809195341", "scratch-l10n": "3.14.20210809031602", "scratch-paint": "0.2.0-prerelease.20210809090942", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210809181637", + "scratch-vm": "0.2.0-prerelease.20210809211806", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21120,9 +21120,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.799", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz", - "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw==", + "version": "1.3.800", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.800.tgz", + "integrity": "sha512-qagikPjZJSDWP85uWoxs32oK/xk/y3MhDZELfKRCWI7pBc0ZFlmjnXb+3+aNMaiqboeDJJa0v7CJd5cO1HKwEQ==", "dev": true }, "has-flag": { @@ -21654,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210809181637", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210809181637.tgz", - "integrity": "sha512-0GP8oPTZWMmLtNOLt3pNgci+u5p9w/f1WwzeKt3Q9UIWn2JeIh6A8UW2eZJrDZvhWSwRm+pJayZjHdhUIar8xg==", + "version": "0.2.0-prerelease.20210809211806", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210809211806.tgz", + "integrity": "sha512-BJkrzV7h9+8kzPmaNODXTzrxp/P9D5BZeO9HIxHIDWytC1c6og1CbFQ7aeATLpPFv9+c54MhYXRPTok9NnoB5w==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 009eb8863..81204cd69 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210809193312", + "scratch-gui": "0.1.0-prerelease.20210809232623", "scratch-l10n": "3.14.20210809031602", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From bb53c6cb7a8a16f1d961803c40e16bee308e10d4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 Aug 2021 04:04:24 +0000 Subject: [PATCH 25/32] chore(deps): update dependency scratch-l10n to v3.14.20210810031545 --- package-lock.json | 38 ++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8480bc770..ca9145974 100644 --- a/package-lock.json +++ b/package-lock.json @@ -504,9 +504,9 @@ } }, "electron-to-chromium": { - "version": "1.3.799", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz", - "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw==", + "version": "1.3.800", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.800.tgz", + "integrity": "sha512-qagikPjZJSDWP85uWoxs32oK/xk/y3MhDZELfKRCWI7pBc0ZFlmjnXb+3+aNMaiqboeDJJa0v7CJd5cO1HKwEQ==", "dev": true }, "semver": { @@ -20894,6 +20894,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20210809031602" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20210809031602", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210809031602.tgz", + "integrity": "sha512-qZr1AR2i2Mqhpw9iwFjFhlXfPiy4dHOYMt9RE1AU+CosZlOsRA5rC0/eUa+DMcMXX7oUDNpJ+tIjuV8ZJMpCSw==", + "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-gui": { @@ -21320,6 +21334,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20210809031602", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210809031602.tgz", + "integrity": "sha512-qZr1AR2i2Mqhpw9iwFjFhlXfPiy4dHOYMt9RE1AU+CosZlOsRA5rC0/eUa+DMcMXX7oUDNpJ+tIjuV8ZJMpCSw==", + "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21386,9 +21412,9 @@ } }, "scratch-l10n": { - "version": "3.14.20210809031602", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210809031602.tgz", - "integrity": "sha512-qZr1AR2i2Mqhpw9iwFjFhlXfPiy4dHOYMt9RE1AU+CosZlOsRA5rC0/eUa+DMcMXX7oUDNpJ+tIjuV8ZJMpCSw==", + "version": "3.14.20210810031545", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210810031545.tgz", + "integrity": "sha512-V5SRV5w7CqMXoiMrZwwlm6swBbIsWFC6SlvQcHvzLnelb/YGKFDN6V0BnYdPmxaxPTpqVJ7uw65MmpJLeEZxMQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 81204cd69..dc6762ae6 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210809232623", - "scratch-l10n": "3.14.20210809031602", + "scratch-l10n": "3.14.20210810031545", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From 20f2bcbf504926961ebfb6bca6ca9094ae1a2688 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 Aug 2021 09:16:00 +0000 Subject: [PATCH 26/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210810085415 --- package-lock.json | 60 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/package-lock.json b/package-lock.json index ca9145974..3a9af9ca8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20885,35 +20885,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210809195341", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210809195341.tgz", - "integrity": "sha512-jmOHiHGuU9voSmgxDT7mYUUP5fijDKXlom75Fm7Zrb3LwWBVd3O48PDsUQnSSFuQFv+7IAofNfqio97TNEMw0g==", + "version": "0.1.0-prerelease.20210810070650", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210810070650.tgz", + "integrity": "sha512-cTAlhM5J8oO4gF1ovu9SsrASt4ur2XiC+XETnyzNlr7N32h7M5kaW+DdPu40ZWurNuqYe2JT1ZDljXUGWLc0UA==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20210809031602" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20210809031602", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210809031602.tgz", - "integrity": "sha512-qZr1AR2i2Mqhpw9iwFjFhlXfPiy4dHOYMt9RE1AU+CosZlOsRA5rC0/eUa+DMcMXX7oUDNpJ+tIjuV8ZJMpCSw==", - "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": "3.14.20210810031545" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210809232623", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210809232623.tgz", - "integrity": "sha512-PifjOH1xuyvj33Ssdh6xhlRq83CvrpQ97eLmFtKhO1MjOTKkTGDQfWEUNKXYK04SdcTl2atu1MN2KuZd9+/5Kg==", + "version": "0.1.0-prerelease.20210810085415", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210810085415.tgz", + "integrity": "sha512-EHiGPlyWRh9GVdYCJ0cwekvZVPMrpxEaWxor1yY/3/NjPasY8lMta+SX9MsO6Ekc249bf12Om+mohLy1PqHviw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20964,14 +20950,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210809195341", - "scratch-l10n": "3.14.20210809031602", - "scratch-paint": "0.2.0-prerelease.20210809090942", + "scratch-blocks": "0.1.0-prerelease.20210810070650", + "scratch-l10n": "3.14.20210810031545", + "scratch-paint": "0.2.0-prerelease.20210810050111", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210809211806", + "scratch-vm": "0.2.0-prerelease.20210810051657", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21334,18 +21320,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20210809031602", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210809031602.tgz", - "integrity": "sha512-qZr1AR2i2Mqhpw9iwFjFhlXfPiy4dHOYMt9RE1AU+CosZlOsRA5rC0/eUa+DMcMXX7oUDNpJ+tIjuV8ZJMpCSw==", - "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21424,9 +21398,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210809090942", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210809090942.tgz", - "integrity": "sha512-vf86SQWS40dszI19BSSXKu5EXScnpkFi/ZDhFHnuJNjub9LXQaSh39hFVoQ76WqfC/NelBaJ4ucOruq/LLRKBg==", + "version": "0.2.0-prerelease.20210810050111", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210810050111.tgz", + "integrity": "sha512-+tHAW/s8s82O6r1JT9+e2f/nX8nedGaRIvNbJq3EwumBZUAq6O0waeX2K4+7NItGE6jioShb653wM3eCoP/lAw==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21680,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210809211806", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210809211806.tgz", - "integrity": "sha512-BJkrzV7h9+8kzPmaNODXTzrxp/P9D5BZeO9HIxHIDWytC1c6og1CbFQ7aeATLpPFv9+c54MhYXRPTok9NnoB5w==", + "version": "0.2.0-prerelease.20210810051657", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210810051657.tgz", + "integrity": "sha512-EG/FqJtEzhSuyUius6BvBR+nfKnrs5aNqh8jqtAzNABP0tpXFlfG9K+FimkDOHM3UVcIuqyiwder7Gizl5EW5w==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index dc6762ae6..4a3b16df9 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210809232623", + "scratch-gui": "0.1.0-prerelease.20210810085415", "scratch-l10n": "3.14.20210810031545", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From de3c55b712d19476188af34dbe0e7d78fb6f924c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 10 Aug 2021 12:14:36 +0000 Subject: [PATCH 27/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210810104439 --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a9af9ca8..81dcce684 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20897,9 +20897,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210810085415", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210810085415.tgz", - "integrity": "sha512-EHiGPlyWRh9GVdYCJ0cwekvZVPMrpxEaWxor1yY/3/NjPasY8lMta+SX9MsO6Ekc249bf12Om+mohLy1PqHviw==", + "version": "0.1.0-prerelease.20210810104439", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210810104439.tgz", + "integrity": "sha512-K49pJkj5aEdwJ+dMBr08++p1OJqztmC/QC1MCF8Xz/fRniBQ9qqMzcSM36uyzAfbltRcGbM8TpMT4M6mDGeM9Q==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -20957,7 +20957,7 @@ "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210810051657", + "scratch-vm": "0.2.0-prerelease.20210810085945", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21120,9 +21120,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.800", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.800.tgz", - "integrity": "sha512-qagikPjZJSDWP85uWoxs32oK/xk/y3MhDZELfKRCWI7pBc0ZFlmjnXb+3+aNMaiqboeDJJa0v7CJd5cO1HKwEQ==", + "version": "1.3.801", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.801.tgz", + "integrity": "sha512-xapG8ekC+IAHtJrGBMQSImNuN+dm+zl7UP1YbhvTkwQn8zf/yYuoxfTSAEiJ9VDD+kjvXaAhNDPSxJ+VImtAJA==", "dev": true }, "has-flag": { @@ -21654,9 +21654,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210810051657", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210810051657.tgz", - "integrity": "sha512-EG/FqJtEzhSuyUius6BvBR+nfKnrs5aNqh8jqtAzNABP0tpXFlfG9K+FimkDOHM3UVcIuqyiwder7Gizl5EW5w==", + "version": "0.2.0-prerelease.20210810085945", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210810085945.tgz", + "integrity": "sha512-wlmCZsNqNZvTrEQ05gjsQAFBnDpr/DagPjy/PeT1AFakmDKriilzUfoBaJkon6qNEbYYuK52lGMyCl1ivf0r4A==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index 4a3b16df9..d47681115 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210810085415", + "scratch-gui": "0.1.0-prerelease.20210810104439", "scratch-l10n": "3.14.20210810031545", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", From 2d42c205ada924d3e2b2c6c5381f07309a42493c Mon Sep 17 00:00:00 2001 From: rschamp Date: Tue, 10 Aug 2021 09:18:04 -0400 Subject: [PATCH 28/32] Content updates, resolves #5902 --- src/views/sec/l10n.json | 3 ++- src/views/sec/sec.jsx | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/views/sec/l10n.json b/src/views/sec/l10n.json index c74fcabea..ce79cbe77 100644 --- a/src/views/sec/l10n.json +++ b/src/views/sec/l10n.json @@ -51,5 +51,6 @@ "sec.partnerOrg3": "{partnerOrg3Listing} - IL, USA", "sec.partnerOrg4": "{partnerOrg4Listing} - New Orleans, LA, USA", "sec.partnerOrg5": "{partnerOrg5Listing} - Brazil", - "sec.partnerOrg6": "{partnerOrg6Listing} - San Francisco, CA, USA" + "sec.partnerOrg6": "{partnerOrg6Listing} - San Francisco, CA, USA", + "sec.partnerOrg7": "{partnerOrg7Listing} - UK" } \ No newline at end of file diff --git a/src/views/sec/sec.jsx b/src/views/sec/sec.jsx index f91a2570b..d836c976a 100644 --- a/src/views/sec/sec.jsx +++ b/src/views/sec/sec.jsx @@ -402,7 +402,7 @@ const EducationCollaborative = () => ( values={{ org23Listing: ( @@ -814,6 +814,22 @@ const EducationCollaborative = () => ( }} />

+

+ + Micro:bit Educational Foundation + + ) + }} + /> +

From e3d802e625ff6e82428747132ca8d4245fa377a6 Mon Sep 17 00:00:00 2001 From: rschamp Date: Tue, 10 Aug 2021 09:18:48 -0400 Subject: [PATCH 29/32] Remove /sec, redirect to version on sip site --- src/routes.json | 14 +- src/views/sec/l10n.json | 56 --- src/views/sec/sec.jsx | 843 ---------------------------------------- src/views/sec/sec.scss | 124 ------ 4 files changed, 6 insertions(+), 1031 deletions(-) delete mode 100644 src/views/sec/l10n.json delete mode 100644 src/views/sec/sec.jsx delete mode 100644 src/views/sec/sec.scss diff --git a/src/routes.json b/src/routes.json index 6f7b86e4e..4c462e277 100644 --- a/src/routes.json +++ b/src/routes.json @@ -253,14 +253,6 @@ "view": "search/search", "title": "Search" }, - { - "name": "sec", - "pattern": "^/sec/?(\\?.*)?$", - "routeAlias": "/sec/?", - "view": "sec/sec", - "title": "Scratch Education Collaborative", - "viewportWidth": "device-width" - }, { "name": "splash", "pattern": "^/?$", @@ -475,6 +467,12 @@ "routeAlias": "/search", "redirect": "/search/projects" }, + { + "name": "sec-redirect", + "pattern": "^/sec/?$", + "routeAlias": "/sec", + "redirect": "https://sip.scratch.mit.edu/sec" + }, { "name": "splash-redirect", "pattern": "^///?$", diff --git a/src/views/sec/l10n.json b/src/views/sec/l10n.json deleted file mode 100644 index ce79cbe77..000000000 --- a/src/views/sec/l10n.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "sec.title": "Scratch Education Collaborative (SEC)", - "sec.intro": "Participating Orgs", - "sec.applyNow": "Apply now!", - "sec.applyBanner": "Applications are now closed. The deadline for applying to the SEC for 2021 was March 1st.", - "sec.projectsTitle": "Participating Orgs", - "sec.yearRange": "2021-2022", - "sec.org1": "{org1Listing} - AK, USA", - "sec.org2": "{org2Listing} - AR, USA", - "sec.org3": "{org3Listing} - UT, USA", - "sec.org4": "{org4Listing} - TX, USA", - "sec.org5": "{org5Listing} - MS, USA", - "sec.org6": "{org6Listing} - Santa Bárbara, Brazil", - "sec.org7": "{org7Listing} - Sydney, Australia", - "sec.org8": "{org8Listing} - Memphis, TN, USA", - "sec.org9": "{org9Listing} - NYC, NY, USA", - "sec.org10": "{org10Listing} - Jos, Nigeria", - "sec.org11": "{org11Listing} - Baltimore, MD, USA", - "sec.org12": "{org12Listing} - Johannesburg, South Africa", - "sec.org13": "{org13Listing} - Hayward, CA, USA", - "sec.org14": "{org14Listing} - Humble, TX, USA", - "sec.org15": "{org15Listing} - Guildford, UK", - "sec.org16": "{org16Listing} - México City, MX", - "sec.org17": "{org17Listing} - Montréal, Canada", - "sec.org18": "{org18Listing} - Clark County School District, NV, USA", - "sec.org19": "{org19Listing} - Othello School District, WA, USA", - "sec.org20": "{org20Listing} - Uganda", - "sec.org21": "{org21Listing} - NYC, NY, USA", - "sec.org22": "{org22Listing} - USA", - "sec.org23": "{org23Listing} - FL, USA", - "sec.org24": "{org24Listing} - NYC, NY, USA", - "sec.org25": "{org25Listing} - NYC, NY, USA", - "sec.org26": "{org26Listing} - Nigeria", - "sec.org27": "{org27Listing} - Princeton, NJ, USA", - "sec.org28": "{org28Listing} - Bengaluru, India", - "sec.org29": "{org29Listing} - Johannesburg, South Africa", - "sec.org30": "{org30Listing} - Barcelona, Spain", - "sec.org31": "{org31Listing} - Phnom Penh, Cambodia", - "sec.org32": "{org32Listing} - Nairobi, Kenya", - "sec.org33": "{org33Listing} - Nairobi, Kenya", - "sec.org34": "{org34Listing} - Johannesburg, South Africa", - "sec.org35": "{org35Listing} - Chicago Public Schools, IL, USA", - "sec.org36": "{org36Listing} - Lagos, Nigeria", - "sec.org37": "{org37Listing} - Girona, Spain", - "sec.org38": "{org38Listing} - Halifax, Nova Scotia", - "sec.org39": "{org39Listing} - USA", - "sec.org40": "{org40Listing} - Owerri, Nigeria & Nairobi, Kenya", - "sec.partnerOrgsTitle": "Partner Orgs", - "sec.partnerOrg1": "{partnerOrg1Listing} - Cambridge, UK", - "sec.partnerOrg2": "{partnerOrg2Listing} (Formerly {partnerOrg2FormerName}) - Stanford, CA, USA", - "sec.partnerOrg3": "{partnerOrg3Listing} - IL, USA", - "sec.partnerOrg4": "{partnerOrg4Listing} - New Orleans, LA, USA", - "sec.partnerOrg5": "{partnerOrg5Listing} - Brazil", - "sec.partnerOrg6": "{partnerOrg6Listing} - San Francisco, CA, USA", - "sec.partnerOrg7": "{partnerOrg7Listing} - UK" -} \ No newline at end of file diff --git a/src/views/sec/sec.jsx b/src/views/sec/sec.jsx deleted file mode 100644 index d836c976a..000000000 --- a/src/views/sec/sec.jsx +++ /dev/null @@ -1,843 +0,0 @@ -const FormattedMessage = require('react-intl').FormattedMessage; -const React = require('react'); - -const FlexRow = require('../../components/flex-row/flex-row.jsx'); -const TitleBanner = require('../../components/title-banner/title-banner.jsx'); - -const render = require('../../lib/render.jsx'); -const Page = require('../../components/page/www/page.jsx'); - -require('./sec.scss'); - -const EducationCollaborative = () => ( -
- -
- -
-

- -

-

- | -

-
- - -
- -
-
-

A

-

- - Alaska Native Science & Engineering Program - - ) - }} - /> -

-

- - Arkansas Regional Innovation Hub - - ) - }} - /> -

-

B

-

- - BootUp PD - - ) - }} - /> -

-

- - Bridges to Science - - ) - }} - /> -

-

C

-

- - Center for Cyber Education at Mississippi State University - - ) - }} - /> -

-

- - Creative Community Learning Brasil Space Action Partners - / Projeto Social Ação Parceiros - - ) - }} - /> -

-

- - Code Club Australia - - ) - }} - /> -

-

- - CodeCrew - - ) - }} - /> -

-

D

-

- - Deaf Kids Code - - ) - }} - /> -

-

- - Deaf Technology Foundation - - ) - }} - /> -

-

- - Digital Harbor Foundation - - ) - }} - /> -

-

F

-

- - Faculty of Education Team at University of Johannesburg - - ) - }} - /> -

-

H

-

- - Hayward Unified School District - - ) - }} - /> -

-

- - Humble Independent School District (ISD) - - ) - }} - /> -

-

I

-

- - iamtheCODE - - ) - }} - /> -

-

- - ILCE Instituto Latino Americano de la Comunicación Educativa - - ) - }} - /> -

-

K

-

- - Kids Code Jeunesse - - ) - }} - /> -

-

L

-

- - Lomie G. Heard Elementary School - - ) - }} - /> -

-

- - Lutacaga Elementary - - ) - }} - /> -

-

M

-

- - Makerere Innovation Society - - ) - }} - /> -

-

- - Mouse - - ) - }} - /> -

-

N

-

- - National Society of Black Engineers - - ) - }} - /> -

-

- - NEFSTEM Center, University of North Florida - - ) - }} - /> -

-

- - New York City Department of Education - CSforAllNYC - - ) - }} - /> -

-

- - New York Hall of Science - - ) - }} - /> -

-

O

-

- - Odyssey Educational Foundation - - ) - }} - /> -

-

P

-

- - Play Pattern - - ) - }} - /> -

-

Q

-

- - Quest Alliance - - ) - }} - /> -

-

S

-

- - Schoolnet South Africa - - ) - }} - /> -

-

- - Sistema THEAD - - ) - }} - /> -

-

- - Sisters of Code - - ) - }} - /> -

-

- - STEAMLabs Africa - - ) - }} - /> -

-

- - STEM Impact Center Kenya - - ) - }} - /> -

-

- - Streetlight Schools - - ) - }} - /> -

-

T

-

- - Tanner Elementary - - ) - }} - /> -

-

- - Teachathon Foundation - - ) - }} - /> -

-

U

-

- - UdiGitalEdu - - ) - }} - /> -

-

- - Ulnooweg - Digital Mi'kmaq - - ) - }} - /> -

-

W

-

- - WeTeach_CS, Center for Cyber Education at University of Texas Austin - - ) - }} - /> -

-

Y

-

- - Youth for Technology Foundation - - ) - }} - /> -

- -
- -
- -
- -
-

-

- | -

-
- - -
- -
-
-

- - Raspberry Pi Foundation - - ) - }} - /> -

-

- - Stanford d. School - - ), - partnerOrg2FormerName: ( - 'School of Intercultural Computing' - ) - }} - /> -

-

- - Chicago Public Schools - - ) - }} - /> -

-

- - STEM Nola - - ) - }} - /> -

-

- - Brazilian Creative Learning Network (BCLN) - - ) - }} - /> -

-

- - The Tinkering Studio - - ) - }} - /> -

-

- - Micro:bit Educational Foundation - - ) - }} - /> -

-
-
-
-
-

-
-
-
-); - -render(, document.getElementById('app')); diff --git a/src/views/sec/sec.scss b/src/views/sec/sec.scss deleted file mode 100644 index b8dc70402..000000000 --- a/src/views/sec/sec.scss +++ /dev/null @@ -1,124 +0,0 @@ -@import "../../colors"; -@import "../../frameless"; - -$sec-spot: $ui-blue; - -#view { - padding: 0; -} - -.education-collaborative { - .title-banner { - &.masthead { - background-color: $sec-spot; - padding: 50px 0 0 0; - margin: 0; - - .masthead-info { - align-items: center; - justify-content: space-between; - - @media #{$intermediate} { - justify-content: end; - } - - .long { - padding-bottom: 2rem; - } - - h1 { - margin: 0 0 1rem 0; - text-align: left; - color: $ui-white; - } - p { - margin: 0; - text-align: left; - color: $ui-white; - max-width: $cols6; - font-size: 1.65em; - } - - .title-banner-button { - background-color: $ui-white; - color: $ui-blue; - font-size: 1rem; - padding: 0.75rem 1rem; - img { - margin-right: 1rem; - height: 1.2rem; - vertical-align: middle; - } - - a { - color: $ui-white; - } - - span { - vertical-align: middle; - } - } - - .title-banner-img { - width: $cols4; - } - - .sec-apply-buttons { - margin-top: 2rem; - li { - border: 2px solid $ui-white; - padding: 16px; - font-size: 16px; - font-weight: 500; - } - } - } - } - } - - section { - margin-bottom: 3rem; - - p, ul { - max-width: $cols8; - } - } - - .band { - background: $ui-light-primary; - padding: 0.5rem 0; - margin-bottom: 0; - - h4.applyBanner { - color: $ui-blue; - } - } - .sec-faq { - margin-top: 3rem; - dl { - dt { - margin-bottom: .25rem; - font-size: 1.1rem; - } - - dd { - margin-bottom: 1.25rem; - margin-left: 0; - max-width: $cols8; - text-align: left; - } - } - } -} - - - -@media #{$intermediate, $medium, $small} { - #view { - text-align: left; - } -} - - - - From 5edb223ec18d721a83e73982864544f3e15fc567 Mon Sep 17 00:00:00 2001 From: Chris Garrity Date: Tue, 10 Aug 2021 11:16:56 -0400 Subject: [PATCH 30/32] Fix tx-push script for conference 2021 page Fixes #5912 : handling of the conference 2021 translation updates. Testing: * run `./bin/tx-push-www`: * output shows what would run with the --execute flag. * look for `tx-push-src` wtih resource name 'conference-index-2021-l10njson', for the conference 2021 view. DO NOT RUN THE SCRIPT WITH `--execute` Steps to land this PR: 1. rename the resource on transifex: `conference-2021-index-l10njson` to `conference-index-2021-l10njson` so that we don't lose any current translations. 2. merge the PR. Nightly update-translations job will execute the script. 3. rename or remove [conference-2021-index-l10njson](https://github.com/LLK/scratch-l10n/tree/master/www/scratch-website.conference-2021-index-l10njson) in scratch-l10n. --- bin/tx-push-www | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tx-push-www b/bin/tx-push-www index 0e7a55760..c87f3a6f2 100755 --- a/bin/tx-push-www +++ b/bin/tx-push-www @@ -31,7 +31,7 @@ if (args[0] === '--execute') { const overrides = { 'src/views/teachers/faq/l10n.json': 'teacher-faq-l10njson', 'src/views/teachers/landing/l10n.json': 'educator-landing-l10njson', - 'src/views/conference/2020/index/l10n.json': 'conference-index-2020-l10njson', + 'src/views/conference/2021/index/l10n.json': 'conference-index-2021-l10njson', 'src/views/conference/2019/index/l10n.json': 'conference-index-2019-l10njson', 'src/views/conference/2017/index/l10n.json': 'conference-index-2017-l10njson' }; From d57561e40f693e7019d4cb8b2c6c99b4e82cedf6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Aug 2021 03:38:23 +0000 Subject: [PATCH 31/32] chore(deps): update dependency scratch-l10n to v3.14.20210811031521 --- package-lock.json | 38 ++++++++++++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44c406e90..04f49e136 100644 --- a/package-lock.json +++ b/package-lock.json @@ -504,9 +504,9 @@ } }, "electron-to-chromium": { - "version": "1.3.800", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.800.tgz", - "integrity": "sha512-qagikPjZJSDWP85uWoxs32oK/xk/y3MhDZELfKRCWI7pBc0ZFlmjnXb+3+aNMaiqboeDJJa0v7CJd5cO1HKwEQ==", + "version": "1.3.802", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz", + "integrity": "sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg==", "dev": true }, "semver": { @@ -20986,6 +20986,20 @@ "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", "scratch-l10n": "3.14.20210810031545" + }, + "dependencies": { + "scratch-l10n": { + "version": "3.14.20210810031545", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210810031545.tgz", + "integrity": "sha512-V5SRV5w7CqMXoiMrZwwlm6swBbIsWFC6SlvQcHvzLnelb/YGKFDN6V0BnYdPmxaxPTpqVJ7uw65MmpJLeEZxMQ==", + "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-gui": { @@ -21412,6 +21426,18 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, + "scratch-l10n": { + "version": "3.14.20210810031545", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210810031545.tgz", + "integrity": "sha512-V5SRV5w7CqMXoiMrZwwlm6swBbIsWFC6SlvQcHvzLnelb/YGKFDN6V0BnYdPmxaxPTpqVJ7uw65MmpJLeEZxMQ==", + "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21478,9 +21504,9 @@ } }, "scratch-l10n": { - "version": "3.14.20210810031545", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210810031545.tgz", - "integrity": "sha512-V5SRV5w7CqMXoiMrZwwlm6swBbIsWFC6SlvQcHvzLnelb/YGKFDN6V0BnYdPmxaxPTpqVJ7uw65MmpJLeEZxMQ==", + "version": "3.14.20210811031521", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210811031521.tgz", + "integrity": "sha512-3MFVheuqNm1pOYHrvV/zT3K89SiClwwAEkj/loAeJ6a5mwfblPLWe0PeRq1cuRvxQQuGh2Nrrl/WT8oaDkG9xQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", diff --git a/package.json b/package.json index 69b5a7eae..c627c866d 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "redux-thunk": "2.0.1", "sass-loader": "6.0.6", "scratch-gui": "0.1.0-prerelease.20210810104439", - "scratch-l10n": "3.14.20210810031545", + "scratch-l10n": "3.14.20210811031521", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0", "style-loader": "0.12.3", From f4ba24c4261c1017b0c4e2c9df4ff0458eb51488 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 11 Aug 2021 14:14:28 +0000 Subject: [PATCH 32/32] chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20210811131219 --- package-lock.json | 66 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 21 insertions(+), 47 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04f49e136..edbcbaff7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20977,35 +20977,21 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210810070650", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210810070650.tgz", - "integrity": "sha512-cTAlhM5J8oO4gF1ovu9SsrASt4ur2XiC+XETnyzNlr7N32h7M5kaW+DdPu40ZWurNuqYe2JT1ZDljXUGWLc0UA==", + "version": "0.1.0-prerelease.20210811082835", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210811082835.tgz", + "integrity": "sha512-Rw9S72of8SMAv7Qz6ZVKLePLHx4m/rmWNcJ65hTFVWGv21SvBp7RSmqCcyHDvQzKOHjIxQMSgc+fW2qStSQDAA==", "dev": true, "requires": { "exports-loader": "0.6.3", "google-closure-library": "20190301.0.0", "imports-loader": "0.6.5", - "scratch-l10n": "3.14.20210810031545" - }, - "dependencies": { - "scratch-l10n": { - "version": "3.14.20210810031545", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210810031545.tgz", - "integrity": "sha512-V5SRV5w7CqMXoiMrZwwlm6swBbIsWFC6SlvQcHvzLnelb/YGKFDN6V0BnYdPmxaxPTpqVJ7uw65MmpJLeEZxMQ==", - "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": "3.14.20210811031521" } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210810104439", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210810104439.tgz", - "integrity": "sha512-K49pJkj5aEdwJ+dMBr08++p1OJqztmC/QC1MCF8Xz/fRniBQ9qqMzcSM36uyzAfbltRcGbM8TpMT4M6mDGeM9Q==", + "version": "0.1.0-prerelease.20210811131219", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210811131219.tgz", + "integrity": "sha512-1BDkhRNmFbm0KIs9e0Z8WBF9hUcHv1+SKRDDOJ8WRaZEgG15TLFaBm9jeYQLhXbdZ/LNm19OxMgicI6syuO2+A==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -21056,14 +21042,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210810070650", - "scratch-l10n": "3.14.20210810031545", - "scratch-paint": "0.2.0-prerelease.20210810050111", + "scratch-blocks": "0.1.0-prerelease.20210811082835", + "scratch-l10n": "3.14.20210811031521", + "scratch-paint": "0.2.0-prerelease.20210811051056", "scratch-render": "0.1.0-prerelease.20210325231800", "scratch-render-fonts": "1.0.0-prerelease.20210401210003", "scratch-storage": "1.3.5", "scratch-svg-renderer": "0.2.0-prerelease.20210727023023", - "scratch-vm": "0.2.0-prerelease.20210810085945", + "scratch-vm": "0.2.0-prerelease.20210811102104", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21226,9 +21212,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.801", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.801.tgz", - "integrity": "sha512-xapG8ekC+IAHtJrGBMQSImNuN+dm+zl7UP1YbhvTkwQn8zf/yYuoxfTSAEiJ9VDD+kjvXaAhNDPSxJ+VImtAJA==", + "version": "1.3.802", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.802.tgz", + "integrity": "sha512-dXB0SGSypfm3iEDxrb5n/IVKeX4uuTnFHdve7v+yKJqNpEP0D4mjFJ8e1znmSR+OOVlVC+kDO6f2kAkTFXvJBg==", "dev": true }, "has-flag": { @@ -21426,18 +21412,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.14.20210810031545", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.14.20210810031545.tgz", - "integrity": "sha512-V5SRV5w7CqMXoiMrZwwlm6swBbIsWFC6SlvQcHvzLnelb/YGKFDN6V0BnYdPmxaxPTpqVJ7uw65MmpJLeEZxMQ==", - "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-storage": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.5.tgz", @@ -21516,9 +21490,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210810050111", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210810050111.tgz", - "integrity": "sha512-+tHAW/s8s82O6r1JT9+e2f/nX8nedGaRIvNbJq3EwumBZUAq6O0waeX2K4+7NItGE6jioShb653wM3eCoP/lAw==", + "version": "0.2.0-prerelease.20210811051056", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210811051056.tgz", + "integrity": "sha512-l8AH7p7Y6EZEaTI+txbU6+bYhWpCyz8gAQKt0lib2gQaQCP7CM2cC0hgHUbtrhsUrpuUI4asVKHr5b+R8GK/0w==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21772,9 +21746,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210810085945", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210810085945.tgz", - "integrity": "sha512-wlmCZsNqNZvTrEQ05gjsQAFBnDpr/DagPjy/PeT1AFakmDKriilzUfoBaJkon6qNEbYYuK52lGMyCl1ivf0r4A==", + "version": "0.2.0-prerelease.20210811102104", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210811102104.tgz", + "integrity": "sha512-VUQoYg5byWlqdCuDeZ7gGDhyaSZa6SNVMHuHef+5g9z/sB7ezNJvSYTyTGqiRv3ygGItbXZ0/5CFF8/B+Xc73A==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", diff --git a/package.json b/package.json index c627c866d..b5aa58973 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "redux-mock-store": "1.5.4", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210810104439", + "scratch-gui": "0.1.0-prerelease.20210811131219", "scratch-l10n": "3.14.20210811031521", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0",