From 24cdd291ca729d2d70686acf5cf11a21ef919118 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Tue, 9 Mar 2021 15:24:45 -0500 Subject: [PATCH 01/16] Add staging route for studio playground --- package-lock.json | 120 +++++++++++++++++++++++++-- package.json | 1 + src/routes-dev.json | 7 ++ src/views/studio/studio-activity.jsx | 15 ++++ src/views/studio/studio-comments.jsx | 15 ++++ src/views/studio/studio-curators.jsx | 16 ++++ src/views/studio/studio-info.jsx | 15 ++++ src/views/studio/studio-projects.jsx | 15 ++++ src/views/studio/studio-tab-nav.jsx | 41 +++++++++ src/views/studio/studio.jsx | 63 ++++++++++++++ webpack.config.js | 2 +- 11 files changed, 304 insertions(+), 6 deletions(-) create mode 100644 src/views/studio/studio-activity.jsx create mode 100644 src/views/studio/studio-comments.jsx create mode 100644 src/views/studio/studio-curators.jsx create mode 100644 src/views/studio/studio-info.jsx create mode 100644 src/views/studio/studio-projects.jsx create mode 100644 src/views/studio/studio-tab-nav.jsx create mode 100644 src/views/studio/studio.jsx diff --git a/package-lock.json b/package-lock.json index 1ee136628..9e586df59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1380,7 +1380,6 @@ "version": "7.13.9", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.9.tgz", "integrity": "sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==", - "dev": true, "requires": { "regenerator-runtime": "^0.13.4" }, @@ -1388,8 +1387,7 @@ "regenerator-runtime": { "version": "0.13.7", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", - "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", - "dev": true + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" } } }, @@ -10928,6 +10926,19 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true }, + "history": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", + "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==", + "requires": { + "@babel/runtime": "^7.1.2", + "loose-envify": "^1.2.0", + "resolve-pathname": "^3.0.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0", + "value-equal": "^1.0.1" + } + }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -14929,6 +14940,15 @@ "dom-walk": "^0.1.0" } }, + "mini-create-react-context": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz", + "integrity": "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==", + "requires": { + "@babel/runtime": "^7.12.1", + "tiny-warning": "^1.0.3" + } + }, "minilog": { "version": "2.0.8", "resolved": "https://registry.npmjs.org/minilog/-/minilog-2.0.8.tgz", @@ -18764,6 +18784,82 @@ "prop-types": "^15.5.7" } }, + "react-router": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz", + "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==", + "requires": { + "@babel/runtime": "^7.1.2", + "history": "^4.9.0", + "hoist-non-react-statics": "^3.1.0", + "loose-envify": "^1.3.1", + "mini-create-react-context": "^0.4.0", + "path-to-regexp": "^1.7.0", + "prop-types": "^15.6.2", + "react-is": "^16.6.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "requires": { + "react-is": "^16.7.0" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "path-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "requires": { + "isarray": "0.0.1" + } + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + } + } + }, + "react-router-dom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz", + "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==", + "requires": { + "@babel/runtime": "^7.1.2", + "history": "^4.9.0", + "loose-envify": "^1.3.1", + "prop-types": "^15.6.2", + "react-router": "5.2.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" + }, + "dependencies": { + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + } + } + }, "react-side-effect": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz", @@ -20018,6 +20114,11 @@ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, + "resolve-pathname": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", + "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" + }, "resolve-protobuf-schema": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz", @@ -25451,6 +25552,11 @@ "integrity": "sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==", "dev": true }, + "tiny-invariant": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz", + "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==" + }, "tiny-sdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/tiny-sdf/-/tiny-sdf-1.0.2.tgz", @@ -25460,8 +25566,7 @@ "tiny-warning": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", - "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==", - "dev": true + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" }, "tinycolor2": { "version": "1.4.2", @@ -26408,6 +26513,11 @@ "integrity": "sha1-uBNbn7E3K94C/dU60dDM1t55j+4=", "dev": true }, + "value-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz", + "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", diff --git a/package.json b/package.json index 5e0d35a20..cd7d01460 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "express-http-proxy": "1.1.0", "lodash.defaults": "4.0.1", "react-helmet": "5.2.0", + "react-router-dom": "^5.2.0", "scratch-parser": "^5.0.0", "scratch-storage": "^0.5.1" }, diff --git a/src/routes-dev.json b/src/routes-dev.json index 4dc57aeaf..5d6755c26 100644 --- a/src/routes-dev.json +++ b/src/routes-dev.json @@ -4,5 +4,12 @@ "pattern": "^/components/?$", "view": "components/components", "title": "Components" + }, + { + "name": "studio", + "pattern": "^/studios-playground/\\d+(/projects|/curators|/activity|/comments)?/?(\\?.*)?$", + "routeAlias": "/studios-playground/?$", + "view": "studio/studio", + "title": "Studio Playground" } ] \ No newline at end of file diff --git a/src/views/studio/studio-activity.jsx b/src/views/studio/studio-activity.jsx new file mode 100644 index 000000000..70fb94aca --- /dev/null +++ b/src/views/studio/studio-activity.jsx @@ -0,0 +1,15 @@ +import React from 'react'; +import {useParams} from 'react-router-dom'; + +const StudioActivity = () => { + const {studioId} = useParams(); + + return ( +
+

Activity

+

Studio {studioId}

+
+ ); +}; + +export default StudioActivity; diff --git a/src/views/studio/studio-comments.jsx b/src/views/studio/studio-comments.jsx new file mode 100644 index 000000000..e4c84d490 --- /dev/null +++ b/src/views/studio/studio-comments.jsx @@ -0,0 +1,15 @@ +import React from 'react'; +import {useParams} from 'react-router-dom'; + +const StudioComments = () => { + const {studioId} = useParams(); + + return ( +
+

Comments

+

Studio {studioId}

+
+ ); +}; + +export default StudioComments; diff --git a/src/views/studio/studio-curators.jsx b/src/views/studio/studio-curators.jsx new file mode 100644 index 000000000..54751a224 --- /dev/null +++ b/src/views/studio/studio-curators.jsx @@ -0,0 +1,16 @@ +import React from 'react'; +import {useParams} from 'react-router-dom'; + +const StudioCurators = () => { + const {studioId} = useParams(); + + return ( +
+

Curators

+

Studio {studioId}

+ +
+ ); +}; + +export default StudioCurators; diff --git a/src/views/studio/studio-info.jsx b/src/views/studio/studio-info.jsx new file mode 100644 index 000000000..01381340b --- /dev/null +++ b/src/views/studio/studio-info.jsx @@ -0,0 +1,15 @@ +import React from 'react'; +import {useParams} from 'react-router-dom'; + +const StudioInfo = () => { + const {studioId} = useParams(); + + return ( +
+

Studio Info

+

Studio {studioId}

+
+ ); +}; + +export default StudioInfo; diff --git a/src/views/studio/studio-projects.jsx b/src/views/studio/studio-projects.jsx new file mode 100644 index 000000000..d4ec0eba5 --- /dev/null +++ b/src/views/studio/studio-projects.jsx @@ -0,0 +1,15 @@ +import React from 'react'; +import {useParams} from 'react-router-dom'; + +const StudioProjects = () => { + const {studioId} = useParams(); + + return ( +
+

Projects

+

Studio {studioId}

+
+ ); +}; + +export default StudioProjects; diff --git a/src/views/studio/studio-tab-nav.jsx b/src/views/studio/studio-tab-nav.jsx new file mode 100644 index 000000000..00e5d9854 --- /dev/null +++ b/src/views/studio/studio-tab-nav.jsx @@ -0,0 +1,41 @@ +import React from 'react'; +import {useRouteMatch, NavLink} from 'react-router-dom'; + +const StudioTabNav = () => { + const match = useRouteMatch(); + + return ( +
+ + Projects + +  |  + + Curators + +  |  + + Comments + +  |  + + Activity + +
+ ); +}; + +export default StudioTabNav; diff --git a/src/views/studio/studio.jsx b/src/views/studio/studio.jsx new file mode 100644 index 000000000..5a1ec7403 --- /dev/null +++ b/src/views/studio/studio.jsx @@ -0,0 +1,63 @@ +import React from 'react'; +import { + BrowserRouter as Router, + Switch, + Route, + Redirect, + useRouteMatch +} from 'react-router-dom'; + +import Page from '../../components/page/www/page.jsx'; +import render from '../../lib/render.jsx'; +import StudioTabNav from './studio-tab-nav.jsx'; +import StudioProjects from './studio-projects.jsx'; +import StudioInfo from './studio-info.jsx'; +import StudioCurators from './studio-curators.jsx'; +import StudioComments from './studio-comments.jsx'; +import StudioActivity from './studio-activity.jsx'; + +const StudioShell = () => { + const match = useRouteMatch(); + + return ( +
+ +
+ +
+ + + + + + + + + + + + {/* We can force /projects back to / this way */} + + + + + + +
+
+ ); +}; + +render( + + + + {/* Use variable studioPath to support /studio-playground/ or future route */} + + + + + + , + document.getElementById('app') +); diff --git a/webpack.config.js b/webpack.config.js index b1880bc1b..fea8669f9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ const autoprefixer = require('autoprefixer'); let routes = require('./src/routes.json'); const templateConfig = require('./src/template-config.js'); // eslint-disable-line global-require -if (process.env.NODE_ENV !== 'production') { +if (process.env.NODE_ENV !== 'production' || process.env.SCRATCH_ENV === 'staging') { routes = routes.concat(require('./src/routes-dev.json')); // eslint-disable-line global-require } From eabab89bd55e71ab369366752990f3aba5dba7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=CC=88=20Bentley?= Date: Wed, 10 Mar 2021 11:13:46 -0500 Subject: [PATCH 02/16] Made changes to conf 2020 page (fixed dependencies) --- src/views/conference/2020/index/index.jsx | 33 +---------------------- src/views/conference/2020/index/l10n.json | 23 +++++----------- 2 files changed, 8 insertions(+), 48 deletions(-) diff --git a/src/views/conference/2020/index/index.jsx b/src/views/conference/2020/index/index.jsx index f380c73e2..60488e266 100644 --- a/src/views/conference/2020/index/index.jsx +++ b/src/views/conference/2020/index/index.jsx @@ -32,9 +32,6 @@ const ConferenceSplash = () => (

- -
-

@@ -62,7 +59,6 @@ const ConferenceSplash = () => ( value={new Date(2021, 6, 24)} year="numeric" /> - @@ -78,43 +74,16 @@ const ConferenceSplash = () => (
- -
- -
-

-
- -

- -
- -
-
- -
-
- - - - }} - /> -

+

- -
-
Date: Wed, 10 Mar 2021 15:09:07 -0500 Subject: [PATCH 03/16] Remove dev routes on staging --- src/routes-dev.json | 2 +- webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes-dev.json b/src/routes-dev.json index 5d6755c26..9e43325fc 100644 --- a/src/routes-dev.json +++ b/src/routes-dev.json @@ -12,4 +12,4 @@ "view": "studio/studio", "title": "Studio Playground" } -] \ No newline at end of file +] diff --git a/webpack.config.js b/webpack.config.js index fea8669f9..b1880bc1b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,7 +14,7 @@ const autoprefixer = require('autoprefixer'); let routes = require('./src/routes.json'); const templateConfig = require('./src/template-config.js'); // eslint-disable-line global-require -if (process.env.NODE_ENV !== 'production' || process.env.SCRATCH_ENV === 'staging') { +if (process.env.NODE_ENV !== 'production') { routes = routes.concat(require('./src/routes-dev.json')); // eslint-disable-line global-require } From 5e4780dbe164ecbb2fea3e1353a45231ea254760 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 03:42:09 +0000 Subject: [PATCH 04/16] Bump scratch-l10n from 3.11.20210310031445 to 3.11.20210311031457 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210310031445 to 3.11.20210311031457. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210310031445...3.11.20210311031457) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 917f42557..5076d313f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21440,9 +21440,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210310031445", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210310031445.tgz", - "integrity": "sha512-h+xUGhPSjfXoIcYncCFAtD3+V8jblsaklV5epuhsu2l5+NTSw6ch4CafPRrzVl2UErIdxUpkRnY+fXRVgodj8w==", + "version": "3.11.20210311031457", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210311031457.tgz", + "integrity": "sha512-70+z2h28sMiqxeWD2PNx7NRUnKBwVBWP5gHI3tKsGUj/Df1vGXBRm1BtOHxSNOhYwHQ+hy93bqg439BgHqIXAA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From 34bd50a50123814710b19685dcabbacae0c66863 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 12 Mar 2021 03:42:24 +0000 Subject: [PATCH 05/16] Bump scratch-l10n from 3.11.20210311031457 to 3.11.20210312031542 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210311031457 to 3.11.20210312031542. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210311031457...3.11.20210312031542) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5076d313f..dfb6e62b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21440,9 +21440,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210311031457", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210311031457.tgz", - "integrity": "sha512-70+z2h28sMiqxeWD2PNx7NRUnKBwVBWP5gHI3tKsGUj/Df1vGXBRm1BtOHxSNOhYwHQ+hy93bqg439BgHqIXAA==", + "version": "3.11.20210312031542", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210312031542.tgz", + "integrity": "sha512-AT1Gc4YOFt7weeTe6eSXw+FALVxVigza8eI3EmZkb/VocP4XMKxlvnJq2zH2wFocUQ1RZ2SiKkLIOHNeKBaPIQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From da64706b0d16d9373288fe00c6015b7bead347f7 Mon Sep 17 00:00:00 2001 From: Sarah Otts Date: Fri, 12 Mar 2021 09:10:25 -0500 Subject: [PATCH 06/16] Remove unused FlexRow --- src/views/conference/2020/index/index.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/conference/2020/index/index.jsx b/src/views/conference/2020/index/index.jsx index 60488e266..6574cd6f4 100644 --- a/src/views/conference/2020/index/index.jsx +++ b/src/views/conference/2020/index/index.jsx @@ -3,7 +3,6 @@ const FormattedMessage = require('react-intl').FormattedMessage; const React = require('react'); const render = require('../../../../lib/render.jsx'); -const FlexRow = require('../../../../components/flex-row/flex-row.jsx'); const Page = require('../../../../components/page/conference/2020/page.jsx'); const TitleBanner = require('../../../../components/title-banner/title-banner.jsx'); From 07d830eae2375d1ae0335c5b64dbe48929d3f812 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 13 Mar 2021 03:40:13 +0000 Subject: [PATCH 07/16] Bump scratch-l10n from 3.11.20210312031542 to 3.11.20210313031534 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210312031542 to 3.11.20210313031534. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210312031542...3.11.20210313031534) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index dfb6e62b7..8af4cd256 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21440,9 +21440,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210312031542", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210312031542.tgz", - "integrity": "sha512-AT1Gc4YOFt7weeTe6eSXw+FALVxVigza8eI3EmZkb/VocP4XMKxlvnJq2zH2wFocUQ1RZ2SiKkLIOHNeKBaPIQ==", + "version": "3.11.20210313031534", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210313031534.tgz", + "integrity": "sha512-43sC6lWal5SQQwy/Yk2YLCGrcpI70JXhhTQm9+t8r6EIS7bqgwjN1UnybkdL9uNT3zls+NPi3GX5tvtyWPynTQ==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From 922b1d46b0cd222afdde93fa5734464839c42e0e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 14 Mar 2021 03:21:05 +0000 Subject: [PATCH 08/16] Bump scratch-l10n from 3.11.20210313031534 to 3.11.20210314031515 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210313031534 to 3.11.20210314031515. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210313031534...3.11.20210314031515) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8af4cd256..1209b37b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21440,9 +21440,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210313031534", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210313031534.tgz", - "integrity": "sha512-43sC6lWal5SQQwy/Yk2YLCGrcpI70JXhhTQm9+t8r6EIS7bqgwjN1UnybkdL9uNT3zls+NPi3GX5tvtyWPynTQ==", + "version": "3.11.20210314031515", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210314031515.tgz", + "integrity": "sha512-Ra3JJxFTOUrRxBS/R+i7my5GqvwT2YP0M+0IFWH5YUpzBXiFtdF7JezhyzMqUsPwvdAQ0/C/xUGtAOuTVjHmtg==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From 97f4bb711b7819cd75b245cde045e051d5d04546 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 03:46:16 +0000 Subject: [PATCH 09/16] Bump scratch-l10n from 3.11.20210314031515 to 3.11.20210315031457 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210314031515 to 3.11.20210315031457. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210314031515...3.11.20210315031457) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1209b37b2..ea07f08c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21440,9 +21440,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210314031515", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210314031515.tgz", - "integrity": "sha512-Ra3JJxFTOUrRxBS/R+i7my5GqvwT2YP0M+0IFWH5YUpzBXiFtdF7JezhyzMqUsPwvdAQ0/C/xUGtAOuTVjHmtg==", + "version": "3.11.20210315031457", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210315031457.tgz", + "integrity": "sha512-V7az70ijBJOkYQvj5Sd0vPjBwQVS2ofalSMNlK0j+sCJDxjn3/vQheEBuky6UcY/BIfzw7XbA8foBOzEvx93GA==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From 51dc30288d8addb407294b333fe9603911a4c53f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 17:20:10 +0000 Subject: [PATCH 10/16] Bump @formatjs/intl-pluralrules from 4.0.11 to 4.0.12 Bumps [@formatjs/intl-pluralrules](https://github.com/formatjs/formatjs) from 4.0.11 to 4.0.12. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-pluralrules@4.0.11...@formatjs/intl-pluralrules@4.0.12) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index f167c8305..ef9dc03ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1461,6 +1461,23 @@ } } }, + "@formatjs/ecma402-abstract": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.3.tgz", + "integrity": "sha512-7ijswObmYXabVy5GvcpKG29jbyJ9rGtFdRBdmdQvoDmMo0PwlOl/L08GtrjA4YWLAZ0j2owb2YrRLGNAvLBk+Q==", + "dev": true, + "requires": { + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } + } + }, "@formatjs/intl-getcanonicallocales": { "version": "1.5.6", "resolved": "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.6.tgz", @@ -1509,24 +1526,15 @@ } }, "@formatjs/intl-pluralrules": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.11.tgz", - "integrity": "sha512-NkQl6eBJKMSMmNCan2gzpErqbw7j1SiHzqAQF3+coAKwB74E89hAGTigvnCKEGpMf+hHysL4+wThx5IJutoT5Q==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/@formatjs/intl-pluralrules/-/intl-pluralrules-4.0.12.tgz", + "integrity": "sha512-jXXsWGQbBMvuhvxuG1AXBMMNMS1ZphSt/rWsGo6bE3KyWmddJnnVokeUD8E2sTtXoCJZoGUQkOxxjFa/gGLyxw==", "dev": true, "requires": { - "@formatjs/ecma402-abstract": "1.6.2", + "@formatjs/ecma402-abstract": "1.6.3", "tslib": "^2.1.0" }, "dependencies": { - "@formatjs/ecma402-abstract": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.2.tgz", - "integrity": "sha512-aLBODrSRhHaL/0WdQ0T2UsGqRbdtRRHqqrs4zwNQoRsGBEtEAvlj/rgr6Uea4PSymVJrbZBoAyECM2Z3Pq4i0g==", - "dev": true, - "requires": { - "tslib": "^2.1.0" - } - }, "tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", From df62420810a90e08c6cdcf3adaa19f6ae16f34ad Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 17:20:19 +0000 Subject: [PATCH 11/16] Bump @formatjs/intl-locale from 2.4.19 to 2.4.20 Bumps [@formatjs/intl-locale](https://github.com/formatjs/formatjs) from 2.4.19 to 2.4.20. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-locale@2.4.19...@formatjs/intl-locale@2.4.20) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index f167c8305..8ea1a3129 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1461,10 +1461,27 @@ } } }, + "@formatjs/ecma402-abstract": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.3.tgz", + "integrity": "sha512-7ijswObmYXabVy5GvcpKG29jbyJ9rGtFdRBdmdQvoDmMo0PwlOl/L08GtrjA4YWLAZ0j2owb2YrRLGNAvLBk+Q==", + "dev": true, + "requires": { + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } + } + }, "@formatjs/intl-getcanonicallocales": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.6.tgz", - "integrity": "sha512-CRnQEuaTsvm3+/6Hxucxb4rN0GY78I2k5BbjvODHsKEWgGIHbTRoOmu6YSbo5dXmxOeOKa3VYTXv3crDKHhQXA==", + "version": "1.5.7", + "resolved": "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.7.tgz", + "integrity": "sha512-raPV3Dw7CBC9kPvKdgxkVGgwzYBsQDDG9qXGWblpj/zR+ZJ6Q2V+Co5jZhrviy6lq3qaM2T1Itc0ibvvil1tBw==", "dev": true, "requires": { "cldr-core": "38", @@ -1480,26 +1497,17 @@ } }, "@formatjs/intl-locale": { - "version": "2.4.19", - "resolved": "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.19.tgz", - "integrity": "sha512-h9TxoSvsu1pNoJHXCdhcQb98hW0b8Plbs3VTR8jDg2nc0/9/XpM0cqhA+j7qMhbLBX3KhTLO86MqQ49pHSjduA==", + "version": "2.4.20", + "resolved": "https://registry.npmjs.org/@formatjs/intl-locale/-/intl-locale-2.4.20.tgz", + "integrity": "sha512-ZrVFxKab+W6jFP6WEYsNW0b7IlGYnCS20fdLN6u0LwPCPYRP5oqHBl0FFVD2+aNnQ1T/21Aol54fCr5LdN/49Q==", "dev": true, "requires": { - "@formatjs/ecma402-abstract": "1.6.2", - "@formatjs/intl-getcanonicallocales": "1.5.6", + "@formatjs/ecma402-abstract": "1.6.3", + "@formatjs/intl-getcanonicallocales": "1.5.7", "cldr-core": "38", "tslib": "^2.1.0" }, "dependencies": { - "@formatjs/ecma402-abstract": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.2.tgz", - "integrity": "sha512-aLBODrSRhHaL/0WdQ0T2UsGqRbdtRRHqqrs4zwNQoRsGBEtEAvlj/rgr6Uea4PSymVJrbZBoAyECM2Z3Pq4i0g==", - "dev": true, - "requires": { - "tslib": "^2.1.0" - } - }, "tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", From 3eb3788f3c99d98b3a8a9c7fce232b9fa414243b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Mar 2021 17:24:53 +0000 Subject: [PATCH 12/16] Bump @formatjs/intl-relativetimeformat from 8.1.2 to 8.1.3 Bumps [@formatjs/intl-relativetimeformat](https://github.com/formatjs/formatjs) from 8.1.2 to 8.1.3. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-relativetimeformat@8.1.2...@formatjs/intl-relativetimeformat@8.1.3) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index f167c8305..66f06cb23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1461,6 +1461,23 @@ } } }, + "@formatjs/ecma402-abstract": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.3.tgz", + "integrity": "sha512-7ijswObmYXabVy5GvcpKG29jbyJ9rGtFdRBdmdQvoDmMo0PwlOl/L08GtrjA4YWLAZ0j2owb2YrRLGNAvLBk+Q==", + "dev": true, + "requires": { + "tslib": "^2.1.0" + }, + "dependencies": { + "tslib": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", + "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==", + "dev": true + } + } + }, "@formatjs/intl-getcanonicallocales": { "version": "1.5.6", "resolved": "https://registry.npmjs.org/@formatjs/intl-getcanonicallocales/-/intl-getcanonicallocales-1.5.6.tgz", @@ -1536,24 +1553,15 @@ } }, "@formatjs/intl-relativetimeformat": { - "version": "8.1.2", - "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.1.2.tgz", - "integrity": "sha512-LZUxbc9GHVGmDc4sqGAXugoxhvZV7EG2lG2c0aKERup2ixvmDMbbEN3iEEr5aKkP7YyGxXxgqDn2dwg7QCPR6Q==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-8.1.3.tgz", + "integrity": "sha512-uUbtr4NRKgHK66bxO98RQlXypfRA5cto6nsFpgwe5wf1SWLBqxcNoo+zdAIftdvHnxPC4QH6oykMf2aYLm+pbA==", "dev": true, "requires": { - "@formatjs/ecma402-abstract": "1.6.2", + "@formatjs/ecma402-abstract": "1.6.3", "tslib": "^2.1.0" }, "dependencies": { - "@formatjs/ecma402-abstract": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-1.6.2.tgz", - "integrity": "sha512-aLBODrSRhHaL/0WdQ0T2UsGqRbdtRRHqqrs4zwNQoRsGBEtEAvlj/rgr6Uea4PSymVJrbZBoAyECM2Z3Pq4i0g==", - "dev": true, - "requires": { - "tslib": "^2.1.0" - } - }, "tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", From f9e4d8af1c41838b1adff86bad377f876737a61e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 16 Mar 2021 03:43:09 +0000 Subject: [PATCH 13/16] Bump scratch-l10n from 3.11.20210315031457 to 3.11.20210316031549 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210315031457 to 3.11.20210316031549. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210315031457...3.11.20210316031549) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cc9346cc3..9bb34a437 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21531,9 +21531,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210315031457", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210315031457.tgz", - "integrity": "sha512-V7az70ijBJOkYQvj5Sd0vPjBwQVS2ofalSMNlK0j+sCJDxjn3/vQheEBuky6UcY/BIfzw7XbA8foBOzEvx93GA==", + "version": "3.11.20210316031549", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210316031549.tgz", + "integrity": "sha512-NFdJB27747kKzpnjDC0m+7HV92pIZr/c01na6ZAdQ79G5NQjVah/QkXoin9nLaiO0KoGzLrnwdjJ5EV5qMwA+w==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From 9e74481db49ff35cadd03c3fcefd5744973fc5a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=CC=88=20Bentley?= Date: Tue, 16 Mar 2021 14:57:04 -0400 Subject: [PATCH 14/16] Changed the date to be only one day, July 22 --- src/views/conference/2020/index/l10n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/conference/2020/index/l10n.json b/src/views/conference/2020/index/l10n.json index aed4293b4..5bef0abdc 100644 --- a/src/views/conference/2020/index/l10n.json +++ b/src/views/conference/2020/index/l10n.json @@ -1,7 +1,7 @@ { "conference-2020.title": "Scratch Around the World:", "conference-2020.subtitle": "An Online Conference", - "conference-2020.dateDesc": "July 22-24, 2021", + "conference-2020.dateDesc": "July 22", "conference-2020.locationDetails": "Online", "conference-2020.date": "When:", From 6b28e1d0409e809ea68c427c4eab9c6102304c14 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 03:35:47 +0000 Subject: [PATCH 15/16] Bump scratch-l10n from 3.11.20210316031549 to 3.11.20210317031517 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210316031549 to 3.11.20210317031517. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210316031549...3.11.20210317031517) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9bb34a437..33ddfdd9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21531,9 +21531,9 @@ } }, "scratch-l10n": { - "version": "3.11.20210316031549", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210316031549.tgz", - "integrity": "sha512-NFdJB27747kKzpnjDC0m+7HV92pIZr/c01na6ZAdQ79G5NQjVah/QkXoin9nLaiO0KoGzLrnwdjJ5EV5qMwA+w==", + "version": "3.11.20210317031517", + "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210317031517.tgz", + "integrity": "sha512-ppVEV8VX1B6+9Zp0kcctqiSSvizO+7URXyK+X2ZbANXY5P37wxWPL2xO3REyghiA51XM54NOdKYzwk1z97NYkw==", "dev": true, "requires": { "@babel/cli": "^7.1.2", From c3231dd2b747350819c6e918f25257a2a06f75c7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Mar 2021 10:48:52 +0000 Subject: [PATCH 16/16] Bump scratch-gui Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20210302213127 to 0.1.0-prerelease.20210317035743. - [Release notes](https://github.com/LLK/scratch-gui/releases) - [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20210302213127...0.1.0-prerelease.20210317035743) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 116 +++++++++++++++++++++------------------------- package.json | 2 +- 2 files changed, 55 insertions(+), 63 deletions(-) diff --git a/package-lock.json b/package-lock.json index 33ddfdd9d..0a1c03993 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8451,6 +8451,16 @@ "flat-cache": "^2.0.1" } }, + "file-loader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz", + "integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==", + "dev": true, + "requires": { + "loader-utils": "^1.0.2", + "schema-utils": "^1.0.0" + } + }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -11610,6 +11620,21 @@ "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==", "dev": true }, + "intl-messageformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz", + "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=", + "dev": true, + "requires": { + "intl-messageformat-parser": "1.4.0" + } + }, + "intl-messageformat-parser": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz", + "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=", + "dev": true + }, "intl-relativeformat": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz", @@ -18741,11 +18766,6 @@ "requires": { "lodash.debounce": "^3.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" } } }, @@ -20973,9 +20993,9 @@ } }, "scratch-blocks": { - "version": "0.1.0-prerelease.20210301035002", - "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210301035002.tgz", - "integrity": "sha512-+OB8MdKQ9q/h/0w6OCkUB6IfExxGdcWmm3iX6YnaqEEQfvSBrghWc9rKXzoz7esPrhgBHvwF+zR0wLjj9qw4Ig==", + "version": "0.1.0-prerelease.20210317033352", + "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20210317033352.tgz", + "integrity": "sha512-K0cplZ5XSbQK5cjg49QQBlM9vlKLpdhIVeCLz/cXPXg/KLc1gpNIvhI4pQl3SiCcIAZP3BGnIdf0YUiyp58zjw==", "dev": true, "requires": { "exports-loader": "0.6.3", @@ -20983,9 +21003,9 @@ } }, "scratch-gui": { - "version": "0.1.0-prerelease.20210302213127", - "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210302213127.tgz", - "integrity": "sha512-qFlIt/bYK2mCCbng6Z4S5uXCVmOfb2uThRa1a7KKJ7+oj4ZQKZmPeeUK2L7eauGJSxzuv+YEAx2QgQECV+PTsA==", + "version": "0.1.0-prerelease.20210317035743", + "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210317035743.tgz", + "integrity": "sha512-r+s7QMVKFu2xqZCZxswdRxtJXwIemaiw9gxVoP5Fx5VVpJGZ6rwkNyDigRDupV8g7rRK7JXBkBAFDQDuH/ReBw==", "dev": true, "requires": { "arraybuffer-loader": "^1.0.6", @@ -21036,13 +21056,14 @@ "redux": "3.7.2", "redux-throttle": "0.1.1", "scratch-audio": "0.1.0-prerelease.20200528195344", - "scratch-blocks": "0.1.0-prerelease.20210301035002", - "scratch-l10n": "3.11.20210301031451", - "scratch-paint": "0.2.0-prerelease.20210301035244", + "scratch-blocks": "0.1.0-prerelease.20210317033352", + "scratch-l10n": "3.11.20210317031517", + "scratch-paint": "0.2.0-prerelease.20210308034725", "scratch-render": "0.1.0-prerelease.20210302210916", + "scratch-render-fonts": "1.0.0-prerelease.20200507182347", "scratch-storage": "1.3.3", "scratch-svg-renderer": "0.2.0-prerelease.20210225205629", - "scratch-vm": "0.2.0-prerelease.20210302185520", + "scratch-vm": "0.2.0-prerelease.20210316111200", "startaudiocontext": "1.2.1", "style-loader": "^0.23.0", "text-encoding": "0.7.0", @@ -21205,21 +21226,11 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.678", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.678.tgz", - "integrity": "sha512-E5ha1pE9+aWWrT2fUD5wdPBWUnYtKnEnloewbtVyrkAs79HvodOiNO4rMR94+hKbxgMFQG4fnPQACOc1cfMfBg==", + "version": "1.3.690", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.690.tgz", + "integrity": "sha512-zPbaSv1c8LUKqQ+scNxJKv01RYFkVVF1xli+b+3Ty8ONujHjAMg+t/COmdZqrtnS1gT+g4hbSodHillymt1Lww==", "dev": true }, - "file-loader": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-2.0.0.tgz", - "integrity": "sha512-YCsBfd1ZGCyonOKLxPiKPdu+8ld9HAaMEvJewzz+b2eTF7uL5Zm/HdBF6FjCrpCMRq25Mi0U1gl4pwn2TlH7hQ==", - "dev": true, - "requires": { - "loader-utils": "^1.0.2", - "schema-utils": "^1.0.0" - } - }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -21245,21 +21256,6 @@ "resolve-from": "^3.0.0" } }, - "intl-messageformat": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-2.2.0.tgz", - "integrity": "sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw=", - "dev": true, - "requires": { - "intl-messageformat-parser": "1.4.0" - } - }, - "intl-messageformat-parser": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz", - "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=", - "dev": true - }, "js-base64": { "version": "2.4.9", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz", @@ -21452,18 +21448,6 @@ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, - "scratch-l10n": { - "version": "3.11.20210301031451", - "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210301031451.tgz", - "integrity": "sha512-lAGy7i42yxd72wwNsb9pPW3tzxl5PBfLXXEKYFDKxsPCTnG3mY6m/qZqYTkpQ8sYycxgFkUvuUmvvWKxP1Bz6A==", - "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.3", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", @@ -21544,9 +21528,9 @@ } }, "scratch-paint": { - "version": "0.2.0-prerelease.20210301035244", - "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210301035244.tgz", - "integrity": "sha512-Br/Wh8TkxJa907VoaDPCw14mTuUMb1SDHGyoHTokJxPmoYTJ4TtDavAMJB0Ge17LWhebyubcR7Pc5qjrOwOpeg==", + "version": "0.2.0-prerelease.20210308034725", + "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210308034725.tgz", + "integrity": "sha512-DBhOVZ1Q7TpCcUJXAUMQACWWOZMFJyBmXvOf11ifP6opiQgjLbSBvUqYySPQckgkj38KDqDED90zAHVFga//eA==", "dev": true, "requires": { "@scratch/paper": "0.11.20200728195508", @@ -21580,6 +21564,15 @@ "requires": { "microee": "0.0.6" } + }, + "scratch-render-fonts": { + "version": "1.0.0-prerelease.20200507182347", + "resolved": "https://registry.npmjs.org/scratch-render-fonts/-/scratch-render-fonts-1.0.0-prerelease.20200507182347.tgz", + "integrity": "sha512-tVt2s7lxsBhme9WKIZTnluMerdJVGEc80QSrDdIIzUvHXGCIYkLh6j7ytwXcyq2UsA34d93op9+I9Bh1SPkQkA==", + "dev": true, + "requires": { + "base64-loader": "1.0.0" + } } } }, @@ -21772,9 +21765,9 @@ "dev": true }, "scratch-vm": { - "version": "0.2.0-prerelease.20210302185520", - "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210302185520.tgz", - "integrity": "sha512-yy7TQtb7I4ulDe3W1IfWGtdNNg7ZpJJRVk0FKbqUWO0COxFpGINP8O8Dsel9AjmuBRdN3JxIFjhz6qIBNeMrAA==", + "version": "0.2.0-prerelease.20210316111200", + "resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210316111200.tgz", + "integrity": "sha512-KUlPZ8z0RZqNd1N2JABFCeYWNsQ1ghlzMZuAcjQ7nt3xpISr7pGv9dwG01WI8PohraUxsGRbzw8jAhTegbB1nw==", "dev": true, "requires": { "@vernier/godirect": "1.5.0", @@ -21789,7 +21782,6 @@ "immutable": "3.8.1", "jszip": "^3.1.5", "minilog": "3.1.0", - "nets": "3.2.0", "scratch-parser": "5.0.0", "scratch-sb1-converter": "0.2.7", "scratch-translate-extension-languages": "0.0.20191118205314", diff --git a/package.json b/package.json index cd7d01460..67a92a302 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "redux-mock-store": "^1.2.3", "redux-thunk": "2.0.1", "sass-loader": "6.0.6", - "scratch-gui": "0.1.0-prerelease.20210302213127", + "scratch-gui": "0.1.0-prerelease.20210317035743", "scratch-l10n": "latest", "selenium-webdriver": "3.6.0", "slick-carousel": "1.6.0",