scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-28 01:56:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'develop' into release/2020-11-19

Browse source
This commit is contained in:
picklesrus 2020-11-20 09:20:56 -05:00 committed by GitHub
commit 94094abebe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
package-lock.json generated
View file

@ -183,9 +183,9 @@
} }
}, },
"debug": { "debug": {
"version": "4.3.0", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"ms": "2.1.2" "ms": "2.1.2"
@ -517,9 +517,9 @@
} }
}, },
"debug": { "debug": {
"version": "4.3.0", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"ms": "2.1.2" "ms": "2.1.2"
@ -756,9 +756,9 @@
} }
}, },
"debug": { "debug": {
"version": "4.3.0", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"ms": "2.1.2" "ms": "2.1.2"
@ -1003,9 +1003,9 @@
} }
}, },
"debug": { "debug": {
"version": "4.3.0", "version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg==", "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"ms": "2.1.2" "ms": "2.1.2"
@ -20433,9 +20433,9 @@
} }
}, },
"scratch-blocks": { "scratch-blocks": {
"version": "0.1.0-prerelease.20201118034504", "version": "0.1.0-prerelease.20201119044258",
"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.20201119044258.tgz",
"integrity": "sha512-SNWmZVgF2iRGYmCrIBQT/kU+olrJ7WbEhL/DQ61B2TI6+ImJVcmn8GToSyw48RrO0Wu2DKvuWcNx2uF3Gp4lIg==", "integrity": "sha512-XL5ALMZLlD9clGybJErI/NzQU30XOMQxcPPHk0FbR1E0MMLIEGo9Mh4Sik6kpT1jHVlg1XCye84b5qyppDkI3w==",
"dev": true, "dev": true,
"requires": { "requires": {
"exports-loader": "0.6.3", "exports-loader": "0.6.3",
@ -20443,9 +20443,10 @@
} }
}, },
"scratch-gui": { "scratch-gui": {
"version": "0.1.0-prerelease.20201118213531", "version": "0.1.0-prerelease.20201120033059",
"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.20201120033059.tgz",
"integrity": "sha512-1JJw71UeSq/U4asfLuiuNI50CyNjaNaxUqdqLQk5umdD/WpRQauaK2k7pKRp8Cmxsp6ig4m6led9lCPTv7l2eA==", "integrity": "sha512-TqK0X8LoKS8/6LXq6rzc35LYUZUqqijjkNipioy2I+p/FXxfbWQKlI0FCincRehkiPuv/xOc34jLZz7t8UgE4g==",
"dev": true, "dev": true,
"requires": { "requires": {
"arraybuffer-loader": "^1.0.6", "arraybuffer-loader": "^1.0.6",
@ -20496,8 +20497,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.20201119044258",
"scratch-l10n": "3.10.20201118031039", "scratch-l10n": "3.10.20201120030852",
"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",
@ -20764,9 +20765,9 @@
"dev": true "dev": true
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.601", "version": "1.3.603",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.601.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz",
"integrity": "sha512-ctRyXD9y0mZu8pgeNwBUhLP3Guyr5YuqkfLKYmpTwYx7o9JtCEJme9JVX4xBXPr5ZNvr/iBXUvHLFEVJQThATg==", "integrity": "sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==",
"dev": true "dev": true
}, },
"file-loader": { "file-loader": {
@ -21181,6 +21182,18 @@
} }
} }
}, },
"scratch-l10n": {
"version": "3.10.20201120030852",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.10.20201120030852.tgz",
"integrity": "sha512-heC5L2zc7D+W2jn92itaZVLxpkS64Q8ItR24PAYiAWgFp173lH3nPFpZMgbMCbRND8Ww1bY7iqrEG2u6uPcJMQ==",
"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-paint": { "scratch-paint": {
"version": "0.2.0-prerelease.20201020103914", "version": "0.2.0-prerelease.20201020103914",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20201020103914.tgz", "resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-0.2.0-prerelease.20201020103914.tgz",

2
package.json
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.20201120033059",
"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",