ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: prepare for color theme beta release

Browse Source 
BREAKING CHANGE: use purple as accent color across the editor
This commit is contained in:
Andy O'Neill committed 2023-05-09 13:04:47 -04:00
1 parent 40e2080580
commit cfab4a2c9e
7 files changed
+50 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.circleci/config.yml
+6
View File
@@ -225,6 +225,7 @@ workflows:
ignore:
- master
- develop
- beta
- /^hotfix\/.*/
push-translations:
triggers:
@@ -254,6 +255,7 @@ workflows:
ignore:
- master
- develop
- beta
- /^hotfix\/.*/
build-test-deploy:
jobs:
@@ -265,6 +267,7 @@ workflows:
only:
- master
- develop
- beta
- /^hotfix\/.*/
- lint:
context:
@@ -296,6 +299,7 @@ workflows:
only:
- master
- develop
- beta
- /^hotfix\/.*/
- store_dist:
context:
@@ -307,6 +311,7 @@ workflows:
only:
- master
- develop
- beta
- /^hotfix\/.*/
- deploy-npm:
context:
@@ -322,6 +327,7 @@ workflows:
only:
- master
- develop
- beta
- /^hotfix\/.*/
- deploy-gh-pages:
context:
package-lock.json
Generated
+14 -14
View File
@@ -58,9 +58,9 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20221123180128",
"scratch-blocks": "0.1.0-prerelease.20230507065123",
"scratch-blocks": "0.2.0-prerelease.20230509131059",
"scratch-l10n": "3.15.20230507032520",
"scratch-paint": "1.1.54",
"scratch-paint": "1.2.0-beta.1",
"scratch-render": "0.1.0-prerelease.20230318150639",
"scratch-render-fonts": "1.0.0-prerelease.20221102164332",
"scratch-storage": "2.2.1",
@@ -25876,9 +25876,9 @@
}
},
"node_modules/scratch-blocks": {
"version": "0.1.0-prerelease.20230507065123",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230507065123.tgz",
"integrity": "sha512-ESFkBv3EyyjXQbfgnbOXMCkLtlTzR1K+mPUANobSWim/evedSowx3l6uuqGVumEbo/9K2ullKyXQo7LDZDrvOw==",
"version": "0.2.0-prerelease.20230509131059",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230509131059.tgz",
"integrity": "sha512-TPrMjmXhOh3AwlLJu3ggkMUwfHsUN8Y0tk7NnrLM02R0qtr32pgOHttBobXDya7R4Pu+HyfGSuxwtuJftb0MsQ==",
"dependencies": {
"exports-loader": "0.7.0",
"google-closure-library": "20190301.0.0",
@@ -25904,9 +25904,9 @@
}
},
"node_modules/scratch-paint": {
"version": "1.1.54",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.54.tgz",
"integrity": "sha512-23fylk1yn74TEpthDX1wGpnVGLRDNuQALhTD+Hrq5b0yfWDW1U+Ane6MuA6zOR2noFRcby357rvCdKNXU9p6zQ==",
"version": "1.2.0-beta.1",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.2.0-beta.1.tgz",
"integrity": "sha512-YyVBRv5+ahJA02N0KKjalHUyJXKZOvQmpq658gswePsyU/GkcHByJCRQjd0iYWN8nJZlDEZrOExLuh+noTHjuA==",
"dependencies": {
"@scratch/paper": "0.11.20200728195508",
"classnames": "2.2.5",
@@ -51464,9 +51464,9 @@
}
},
"scratch-blocks": {
"version": "0.1.0-prerelease.20230507065123",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.1.0-prerelease.20230507065123.tgz",
"integrity": "sha512-ESFkBv3EyyjXQbfgnbOXMCkLtlTzR1K+mPUANobSWim/evedSowx3l6uuqGVumEbo/9K2ullKyXQo7LDZDrvOw==",
"version": "0.2.0-prerelease.20230509131059",
"resolved": "https://registry.npmjs.org/scratch-blocks/-/scratch-blocks-0.2.0-prerelease.20230509131059.tgz",
"integrity": "sha512-TPrMjmXhOh3AwlLJu3ggkMUwfHsUN8Y0tk7NnrLM02R0qtr32pgOHttBobXDya7R4Pu+HyfGSuxwtuJftb0MsQ==",
"requires": {
"exports-loader": "0.7.0",
"google-closure-library": "20190301.0.0",
@@ -51488,9 +51488,9 @@
}
},
"scratch-paint": {
"version": "1.1.54",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.1.54.tgz",
"integrity": "sha512-23fylk1yn74TEpthDX1wGpnVGLRDNuQALhTD+Hrq5b0yfWDW1U+Ane6MuA6zOR2noFRcby357rvCdKNXU9p6zQ==",
"version": "1.2.0-beta.1",
"resolved": "https://registry.npmjs.org/scratch-paint/-/scratch-paint-1.2.0-beta.1.tgz",
"integrity": "sha512-YyVBRv5+ahJA02N0KKjalHUyJXKZOvQmpq658gswePsyU/GkcHByJCRQjd0iYWN8nJZlDEZrOExLuh+noTHjuA==",
"requires": {
"@scratch/paper": "0.11.20200728195508",
"classnames": "2.2.5",
package.json
+2 -2
View File
@@ -81,9 +81,9 @@
"redux": "3.7.2",
"redux-throttle": "0.1.1",
"scratch-audio": "0.1.0-prerelease.20221123180128",
"scratch-blocks": "0.1.0-prerelease.20230507065123",
"scratch-blocks": "0.2.0-prerelease.20230509131059",
"scratch-l10n": "3.15.20230507032520",
"scratch-paint": "1.1.54",
"scratch-paint": "1.2.0-beta.1",
"scratch-render": "0.1.0-prerelease.20230318150639",
"scratch-render-fonts": "1.0.0-prerelease.20221102164332",
"scratch-storage": "2.2.1",
release.config.js
+5
View File
@@ -8,6 +8,11 @@ module.exports = {
{
name: 'hotfix/REPLACE', // replace with actual hotfix branch name
channel: 'hotfix'
},
{
name: 'beta',
channel: 'beta',
prerelease: true
}
]
};
src/components/gui/gui.jsx
+1 -2
View File
@@ -307,11 +307,10 @@ const GUIComponent = props => {
<TabPanel className={tabClassNames.tabPanel}>
<Box className={styles.blocksWrapper}>
<Blocks
key={blocksId}
key={`${blocksId}/${theme}`}
canUseCloud={canUseCloud}
grow={1}
isVisible={blocksTabVisible}
key={theme}
options={{
media: `${basePath}static/${themeMap[theme].blocksMediaFolder}/`
}}
src/lib/themes/index.js
+3 -3
View File
@@ -40,20 +40,20 @@ const messages = defineMessages({
const themeMap = {
[DEFAULT_THEME]: {
blocksMediaFolder: 'blocks-media',
blocksMediaFolder: 'blocks-media/default',
colors: defaultColors,
extensions: {},
label: messages[DEFAULT_THEME],
icon: defaultIcon
},
[DARK_THEME]: {
blocksMediaFolder: 'blocks-media',
blocksMediaFolder: 'blocks-media/default',
colors: mergeWithDefaults(darkModeBlockColors),
extensions: darkModeExtensions,
label: messages[DARK_THEME]
},
[HIGH_CONTRAST_THEME]: {
blocksMediaFolder: 'blocks-media-high-contrast',
blocksMediaFolder: 'blocks-media/high-contrast',
colors: mergeWithDefaults(highContrastBlockColors),
extensions: highContrastExtensions,
label: messages[HIGH_CONTRAST_THEME],
webpack.config.js
+19 -26
View File
@@ -88,7 +88,25 @@ const base = {
})
]
},
plugins: []
plugins: [
new CopyWebpackPlugin({
patterns: [
{
from: 'node_modules/scratch-blocks/media',
to: 'static/blocks-media/default'
},
{
from: 'node_modules/scratch-blocks/media',
to: 'static/blocks-media/high-contrast'
},
{
from: 'src/lib/themes/high-contrast/blocks-media',
to: 'static/blocks-media/high-contrast',
force: true
}
]
})
]
};
if (!process.env.CI) {
@@ -167,23 +185,6 @@ module.exports = [
}
]
}),
new CopyWebpackPlugin({
patterns: [
{
from: 'node_modules/scratch-blocks/media',
to: 'static/blocks-media'
},
{
from: 'node_modules/scratch-blocks/media',
to: 'static/blocks-media-high-contrast'
},
{
from: 'src/lib/themes/high-contrast/blocks-media',
to: 'static/blocks-media-high-contrast',
force: true
}
]
}),
new CopyWebpackPlugin({
patterns: [
{
@@ -235,14 +236,6 @@ module.exports = [
])
},
plugins: base.plugins.concat([
new CopyWebpackPlugin({
patterns: [
{
from: 'node_modules/scratch-blocks/media',
to: 'static/blocks-media'
}
]
}),
new CopyWebpackPlugin({
patterns: [
{