Merge branch 'develop' into release/2021-01-27

This commit is contained in:
picklesrus 2021-01-28 11:09:33 -05:00 committed by GitHub
commit 18df0c54d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 20 deletions

36
package-lock.json generated
View file

@ -20537,9 +20537,9 @@
}
},
"scratch-gui": {
"version": "0.1.0-prerelease.20210127220606",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210127220606.tgz",
"integrity": "sha512-aegiXDwzFGyJ1xmaQBBs60XvF2x9oYv9OVtPRRPVa/UwMzcVHfa1K+rdnjWfmoLdPU7WFx5Me8KlnwldeWTMvA==",
"version": "0.1.0-prerelease.20210128034946",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20210128034946.tgz",
"integrity": "sha512-vpPHsgnQlm7pbxaEpZJAG5e0ODo9nrnfBlSdfsBkP5xqYbrURT23J+cjCPhwBlUJi5KEktBvKd4BG4zlmIAyPw==",
"dev": true,
"requires": {
"arraybuffer-loader": "^1.0.6",
@ -20591,12 +20591,12 @@
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344",
"scratch-blocks": "0.1.0-prerelease.20210127214247",
"scratch-l10n": "3.11.20210127031556",
"scratch-paint": "0.2.0-prerelease.20210125040836",
"scratch-l10n": "3.11.20210128031514",
"scratch-paint": "0.2.0-prerelease.20210127052251",
"scratch-render": "0.1.0-prerelease.20210115005247",
"scratch-storage": "1.3.3",
"scratch-svg-renderer": "0.2.0-prerelease.20210114214521",
"scratch-vm": "0.2.0-prerelease.20210126041803",
"scratch-vm": "0.2.0-prerelease.20210128022252",
"startaudiocontext": "1.2.1",
"style-loader": "^0.23.0",
"text-encoding": "0.7.0",
@ -20858,9 +20858,9 @@
"dev": true
},
"electron-to-chromium": {
"version": "1.3.646",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.646.tgz",
"integrity": "sha512-P+3q8ugIPezulqoBYaLoUsF0fT4YNpe+zEDmdDUDnHZUAeSbBjMbis+JjJp9duU8BdfWV3VXf27NTBcwhRTsAQ==",
"version": "1.3.647",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.647.tgz",
"integrity": "sha512-Or2Nu8TjkmSywY9hk85K/Y6il28hchlonITz30fkC87qvSNupQl29O12BzDDDTnUFlo6kEIFL2QGSpkZDMxH8g==",
"dev": true
},
"file-loader": {
@ -21276,9 +21276,9 @@
}
},
"scratch-l10n": {
"version": "3.11.20210127031556",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210127031556.tgz",
"integrity": "sha512-L/dcuJkZf+jQImoVWx10eNA4Xkx6t2NuBPXRWqKwBtcSFoVAJTINszVMeQKxey8kXGwuIh2+ssFp1erkfO3GdQ==",
"version": "3.11.20210128031514",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.11.20210128031514.tgz",
"integrity": "sha512-phBEq3cBpajzkCJtVz+mN4poDJNElHtvMygiVO7KShLSjwsWIjE0XJpbaIbKVFAneB/FkSLs0cYuBW2JqUJDWg==",
"dev": true,
"requires": {
"@babel/cli": "^7.1.2",
@ -21288,9 +21288,9 @@
}
},
"scratch-paint": {
"version": "0.2.0-prerelease.20210125040836",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210125040836.tgz",
"integrity": "sha512-UQOznZr8B+yiahaWZodD+GY4zXPFCPtsMnuo+yuZAUaE82ZgrjhgWTnfi4LyXsCgoq58c3yX5jnMk5QFQHLxGw==",
"version": "0.2.0-prerelease.20210127052251",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20210127052251.tgz",
"integrity": "sha512-SuiinprrgnLlvTq7EAkBrT8hcBk8WGDytCPyfnUqXN+/qfT2tDUMbZA5PZjMq5YQF27VCtaUjhEhoLJ7zNVbcA==",
"dev": true,
"requires": {
"@scratch/paper": "0.11.20200728195508",
@ -21516,9 +21516,9 @@
"dev": true
},
"scratch-vm": {
"version": "0.2.0-prerelease.20210126041803",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210126041803.tgz",
"integrity": "sha512-gtJeHTesTzMUBZ2XQTXABPi6QlB3ea6ITHIYCLVPAhYJt/RMD54OAiBqqkdv5vXhJYZUo7UynY6dpo9i4PrEwg==",
"version": "0.2.0-prerelease.20210128022252",
"resolved": "https://registry.npmjs.org/scratch-vm/-/scratch-vm-0.2.0-prerelease.20210128022252.tgz",
"integrity": "sha512-7qYou42IQ/OCttSLu2xmu5WT6aamCCbbmt2htFFW925gBjDfRCV9lyrHDnapa9npolhschn7/lsIs/T3Q/XmJg==",
"dev": true,
"requires": {
"@vernier/godirect": "1.5.0",

View file

@ -129,8 +129,8 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20210127220606",
"scratch-l10n": "^3.11.20210127031556",
"scratch-gui": "0.1.0-prerelease.20210128034946",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
"source-map-support": "0.3.2",