Merge branch 'develop' into release/2020-12-02

This commit is contained in:
Karishma Chadha 2020-12-04 09:32:10 -05:00 committed by GitHub
commit 878965d00d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 30 deletions

46
package-lock.json generated
View file

@ -4609,9 +4609,9 @@
"dev": true "dev": true
}, },
"caniuse-lite": { "caniuse-lite": {
"version": "1.0.30001164", "version": "1.0.30001165",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001164.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz",
"integrity": "sha512-G+A/tkf4bu0dSp9+duNiXc7bGds35DioCyC6vgK2m/rjA4Krpy5WeZgZyfH2f0wj2kI6yAWWucyap6oOwmY1mg==", "integrity": "sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==",
"dev": true "dev": true
}, },
"canvas-fit": { "canvas-fit": {
@ -20623,9 +20623,9 @@
} }
}, },
"scratch-blocks": { "scratch-blocks": {
"version": "0.1.0-prerelease.20201118034504", "version": "0.1.0-prerelease.20201204065617",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201118034504.tgz", "resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20201204065617.tgz",
"integrity": "sha512-SNWmZVgF2iRGYmCrIBQT/kU+olrJ7WbEhL/DQ61B2TI6+ImJVcmn8GToSyw48RrO0Wu2DKvuWcNx2uF3Gp4lIg==", "integrity": "sha512-8dG9scDjpbC2iHTL1p3WPmKBjqNFfZsfMezASxCXADXFit0Z7O3P1ZgE9RqkHh2cfvdmJ8mo7igN6xEZ/2qv5Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"exports-loader": "0.6.3", "exports-loader": "0.6.3",
@ -20633,9 +20633,9 @@
} }
}, },
"scratch-gui": { "scratch-gui": {
"version": "0.1.0-prerelease.20201118213531", "version": "0.1.0-prerelease.20201204090129",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201118213531.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20201204090129.tgz",
"integrity": "sha512-1JJw71UeSq/U4asfLuiuNI50CyNjaNaxUqdqLQk5umdD/WpRQauaK2k7pKRp8Cmxsp6ig4m6led9lCPTv7l2eA==", "integrity": "sha512-OAxSrHpKCZ+TPHM8dCyArNQEc7/14B+IgQKSHuVrruTEraEiGhlarjj+sEnOoS1y0piu8iq2DOrkv4HjVQWEQA==",
"dev": true, "dev": true,
"requires": { "requires": {
"arraybuffer-loader": "^1.0.6", "arraybuffer-loader": "^1.0.6",
@ -20686,8 +20686,8 @@
"redux": "3.7.2", "redux": "3.7.2",
"redux-throttle": "0.1.1", "redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20200528195344", "scratch-audio": "0.1.0-prerelease.20200528195344",
"scratch-blocks": "0.1.0-prerelease.20201118034504", "scratch-blocks": "0.1.0-prerelease.20201204065617",
"scratch-l10n": "3.10.20201118031039", "scratch-l10n": "3.10.20201204031520",
"scratch-paint": "0.2.0-prerelease.20201020103914", "scratch-paint": "0.2.0-prerelease.20201020103914",
"scratch-render": "0.1.0-prerelease.20201113223804", "scratch-render": "0.1.0-prerelease.20201113223804",
"scratch-storage": "1.3.3", "scratch-storage": "1.3.3",
@ -20871,9 +20871,9 @@
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.614", "version": "1.3.615",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.614.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.615.tgz",
"integrity": "sha512-JMDl46mg4G+n6q/hAJkwy9eMTj5FJjsE+8f/irAGRMLM4yeRVbMuRrdZrbbGGOrGVcZc4vJPjUpEUWNb/fA6hg==", "integrity": "sha512-fNYTQXoUhNc6RmHDlGN4dgcLURSBIqQCN7ls6MuQ741+NJyLNRz8DxAC+pZpOKfRs6cfY0lv2kWdy8Oxf9j4+A==",
"dev": true "dev": true
}, },
"file-loader": { "file-loader": {
@ -21109,18 +21109,6 @@
"integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
"dev": true "dev": true
}, },
"scratch-l10n": {
"version": "3.10.20201118031039",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201118031039.tgz",
"integrity": "sha512-cXoUM/TJd0wks/QrX6h2uBZ82Elr721l9Fuo9XmwFmeXuP+AKroi3d8whWu4QvrUatH0u8bbNGlLGxbaLl5HPg==",
"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": { "scratch-storage": {
"version": "1.3.3", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz", "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-1.3.3.tgz",
@ -21188,9 +21176,9 @@
} }
}, },
"scratch-l10n": { "scratch-l10n": {
"version": "3.10.20201203031604", "version": "3.10.20201204031520",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201203031604.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201204031520.tgz",
"integrity": "sha512-0v82ZFhc25KX710H0rizehCh19/WGd7BpzOWlR+szQ9azMEchTd0OEhi0HXJ+RS5tcIo3fYTz0nJdNaxPrp2iw==", "integrity": "sha512-BqTKgLfNksaAVSM8O5JfoGsTw1ba0sajX88rIfwiPhW+8WDjYm37WyrL/gY52gp6LqZjd2SajYrP/aJQ7tB6qA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",

View file

@ -130,7 +130,7 @@
"redux-mock-store": "^1.2.3", "redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1", "redux-thunk": "2.0.1",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20201118213531", "scratch-gui": "0.1.0-prerelease.20201204090129",
"scratch-l10n": "latest", "scratch-l10n": "latest",
"selenium-webdriver": "3.6.0", "selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0", "slick-carousel": "1.6.0",