Skip to content

Commit 34259ae

Browse files
Merge remote-tracking branch 'origin/develop' into UEPR-230
2 parents a5de448 + bd37625 commit 34259ae

File tree

14 files changed

+358
-321
lines changed

14 files changed

+358
-321
lines changed

.github/workflows/publish.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ jobs:
7272
npm version "$NEW_VERSION" --no-git-tag-version
7373
git add package* && git commit -m "chore(release): $NEW_VERSION [skip ci]"
7474
75+
# Install dependencies after the version update so that
76+
# the build outputs refer to the newest version of inner packages
77+
- uses: ./.github/actions/install-dependencies
78+
7579
- name: Build packages
7680
run: npm run build
7781

package-lock.json

Lines changed: 250 additions & 218 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "scratch-editor",
3-
"version": "11.2.0-feature-parity.2",
3+
"version": "11.2.0-svg-sanitization.2",
44
"private": "true",
55
"description": "Scratch editor mono-repository",
66
"author": "Scratch Foundation",

packages/scratch-gui/package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scratch/scratch-gui",
3-
"version": "11.2.0-feature-parity.2",
3+
"version": "11.2.0-svg-sanitization.2",
44
"description": "Graphical User Interface for creating and running Scratch 3.0 projects",
55
"author": "Massachusetts Institute of Technology",
66
"license": "AGPL-3.0-only",
@@ -55,9 +55,9 @@
5555
},
5656
"dependencies": {
5757
"@microbit/microbit-universal-hex": "0.2.2",
58-
"@scratch/scratch-render": "11.2.0-feature-parity.2",
59-
"@scratch/scratch-svg-renderer": "11.2.0-feature-parity.2",
60-
"@scratch/scratch-vm": "11.2.0-feature-parity.2",
58+
"@scratch/scratch-render": "11.2.0-svg-sanitization.2",
59+
"@scratch/scratch-svg-renderer": "11.2.0-svg-sanitization.2",
60+
"@scratch/scratch-vm": "11.2.0-svg-sanitization.2",
6161
"arraybuffer-loader": "1.0.8",
6262
"autoprefixer": "9.8.8",
6363
"balance-text": "3.3.1",
@@ -86,7 +86,7 @@
8686
"lodash.throttle": "4.1.1",
8787
"minilog": "3.1.0",
8888
"omggif": "1.0.10",
89-
"papaparse": "5.5.2",
89+
"papaparse": "5.5.3",
9090
"postcss-import": "12.0.1",
9191
"postcss-loader": "4.3.0",
9292
"postcss-simple-vars": "5.0.2",
@@ -106,12 +106,12 @@
106106
"react-virtualized": "9.22.6",
107107
"react-visibility-sensor": "5.1.1",
108108
"redux-throttle": "0.1.1",
109-
"scratch-audio": "2.0.147",
109+
"scratch-audio": "2.0.156",
110110
"scratch-blocks": "1.1.210",
111-
"scratch-l10n": "5.0.247",
112-
"scratch-paint": "3.0.260",
113-
"scratch-render-fonts": "1.0.195",
114-
"scratch-storage": "4.0.142",
111+
"scratch-l10n": "5.0.260",
112+
"scratch-paint": "3.0.278",
113+
"scratch-render-fonts": "1.0.199",
114+
"scratch-storage": "4.0.153",
115115
"startaudiocontext": "1.2.1",
116116
"style-loader": "4.0.0",
117117
"to-style": "1.3.3",
@@ -127,7 +127,7 @@
127127
},
128128
"devDependencies": {
129129
"@babel/cli": "7.27.2",
130-
"@babel/core": "7.27.1",
130+
"@babel/core": "7.27.4",
131131
"@babel/eslint-parser": "7.27.1",
132132
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
133133
"@babel/plugin-syntax-dynamic-import": "7.8.3",
@@ -169,7 +169,7 @@
169169
"ts-loader": "9.5.2",
170170
"url-loader": "4.1.1",
171171
"web-audio-test-api": "0.5.2",
172-
"webpack": "5.99.8",
172+
"webpack": "5.99.9",
173173
"webpack-cli": "5.1.4",
174174
"webpack-dev-server": "5.2.1",
175175
"yauzl": "2.10.0"

packages/scratch-render/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scratch/scratch-render",
3-
"version": "11.2.0-feature-parity.2",
3+
"version": "11.2.0-svg-sanitization.2",
44
"description": "WebGL Renderer for Scratch 3.0",
55
"author": "Massachusetts Institute of Technology",
66
"license": "AGPL-3.0-only",
@@ -47,7 +47,7 @@
4747
"iOS >= 8"
4848
],
4949
"dependencies": {
50-
"@scratch/scratch-svg-renderer": "11.2.0-feature-parity.2",
50+
"@scratch/scratch-svg-renderer": "11.2.0-svg-sanitization.2",
5151
"grapheme-breaker": "0.3.2",
5252
"hull.js": "0.2.10",
5353
"ify-loader": "1.1.0",
@@ -60,11 +60,11 @@
6060
"scratch-render-fonts": "^1.0.0"
6161
},
6262
"devDependencies": {
63-
"@babel/core": "7.27.1",
63+
"@babel/core": "7.27.4",
6464
"@babel/eslint-parser": "7.27.1",
6565
"@babel/polyfill": "7.12.1",
6666
"@babel/preset-env": "7.27.2",
67-
"@scratch/scratch-vm": "11.2.0-feature-parity.2",
67+
"@scratch/scratch-vm": "11.2.0-svg-sanitization.2",
6868
"babel-loader": "9.2.1",
6969
"copy-webpack-plugin": "6.4.1",
7070
"docdash": "0.4.0",
@@ -75,14 +75,14 @@
7575
"jsdoc": "3.6.11",
7676
"json": "9.0.6",
7777
"playwright-chromium": "1.52.0",
78-
"scratch-render-fonts": "1.0.195",
78+
"scratch-render-fonts": "1.0.199",
7979
"scratch-semantic-release-config": "3.0.0",
80-
"scratch-storage": "4.0.142",
80+
"scratch-storage": "4.0.153",
8181
"scratch-webpack-configuration": "3.0.0",
8282
"semantic-release": "19.0.5",
8383
"tap": "16.3.10",
8484
"terser-webpack-plugin": "5.3.14",
85-
"webpack": "5.99.8",
85+
"webpack": "5.99.9",
8686
"webpack-cli": "5.1.4",
8787
"webpack-dev-server": "5.2.1"
8888
}

packages/scratch-svg-renderer/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@scratch/scratch-svg-renderer",
3-
"version": "11.2.0-feature-parity.2",
3+
"version": "11.2.0-svg-sanitization.2",
44
"description": "SVG renderer for Scratch",
55
"main": "./dist/node/scratch-svg-renderer.js",
66
"browser": "./dist/web/scratch-svg-renderer.js",
@@ -44,12 +44,12 @@
4444
"base64-loader": "1.0.0",
4545
"css-tree": "1.1.3",
4646
"fastestsmallesttextencoderdecoder": "1.0.22",
47-
"isomorphic-dompurify": "2.24.0",
47+
"isomorphic-dompurify": "2.25.0",
4848
"minilog": "3.1.0",
4949
"transformation-matrix": "1.15.3"
5050
},
5151
"devDependencies": {
52-
"@babel/core": "7.27.1",
52+
"@babel/core": "7.27.4",
5353
"@babel/eslint-parser": "7.27.1",
5454
"@babel/preset-env": "7.27.2",
5555
"babel-loader": "9.2.1",
@@ -61,12 +61,12 @@
6161
"json": "9.0.6",
6262
"mkdirp": "2.1.6",
6363
"rimraf": "3.0.2",
64-
"scratch-render-fonts": "1.0.195",
64+
"scratch-render-fonts": "1.0.199",
6565
"scratch-semantic-release-config": "3.0.0",
6666
"scratch-webpack-configuration": "3.0.0",
6767
"semantic-release": "19.0.5",
6868
"tap": "16.3.10",
69-
"webpack": "5.99.8",
69+
"webpack": "5.99.9",
7070
"webpack-cli": "5.1.4",
7171
"webpack-dev-server": "5.2.1",
7272
"xmldom": "0.1.31"
Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading

0 commit comments

Comments
 (0)