Skip to content
This repository was archived by the owner on Aug 27, 2025. It is now read-only.

Commit 41a4778

Browse files
authored
Merge pull request #1 from Nitro-Bolt/develop
Dependa my bot
2 parents 3d2138b + 5d5085a commit 41a4778

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+15142
-9551
lines changed

.github/workflows/node.js.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ jobs:
1818
build:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
22+
with:
23+
persist-credentials: false
2224
- name: Install Node.js
23-
uses: actions/setup-node@v4
25+
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
2426
with:
2527
node-version: 20
2628
cache: npm

package-lock.json

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

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@
3333
},
3434
"dependencies": {
3535
"@microbit/microbit-universal-hex": "0.2.2",
36+
"@turbowarp/jszip": "^3.11.1",
3637
"@turbowarp/nanolog": "^0.2.0",
3738
"@turbowarp/scratch-l10n": "^3.1001.0-202401241456-994097a5",
38-
"@turbowarp/scratch-storage": "^0.0.202403251715",
39+
"@turbowarp/scratch-storage": "^0.0.202502192258",
3940
"@turbowarp/scratch-svg-renderer": "^1.0.0-202312242305-12c360b",
4041
"@turbowarp/startaudiocontext": "^1.0.0",
4142
"arraybuffer-loader": "^1.0.6",
@@ -104,8 +105,8 @@
104105
"react-dom": "^16.0.0"
105106
},
106107
"devDependencies": {
107-
"@babel/cli": "7.14.8",
108-
"@babel/core": "7.14.8",
108+
"@babel/cli": "^7.26.4",
109+
"@babel/core": "^7.26.9",
109110
"@babel/plugin-proposal-object-rest-spread": "7.14.7",
110111
"@babel/plugin-syntax-dynamic-import": "7.2.0",
111112
"@babel/plugin-transform-async-to-generator": "7.14.5",
@@ -126,7 +127,7 @@
126127
"file-loader": "6.2.0",
127128
"gh-pages": "3.2.3",
128129
"html-webpack-plugin": "^4.2.0",
129-
"jest": "21.2.1",
130+
"jest": "^29.7.0",
130131
"jest-junit": "7.0.0",
131132
"mkdirp": "1.0.3",
132133
"raf": "3.4.1",

src/addons/addons/debugger/module.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ export const setPaused = (_paused) => {
101101
if (didChange) {
102102
paused = _paused;
103103
eventTarget.dispatchEvent(new CustomEvent("change"));
104+
105+
// TW: events for extensions
106+
if (paused) {
107+
vm.runtime.emit("RUNTIME_PAUSED");
108+
} else {
109+
vm.runtime.emit("RUNTIME_UNPAUSED");
110+
}
104111
}
105112

106113
// Don't check didChange as new threads could've started that we need to pause.

src/addons/addons/middle-click-popup/BlockTypeInfo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ export class BlockInputEnum extends BlockInput {
207207
this.values = [];
208208
for (let i = 0; i < options.length; i++) {
209209
if (typeof options[i][1] === "string" && BlockInputEnum.INVALID_VALUES.indexOf(options[i][1]) === -1) {
210-
this.values.push({ value: options[i][1], string: options[i][0].replaceAll(String.fromCharCode(160), " ") });
210+
this.values.push({ value: options[i][1], string: options[i][0].replace(/\u00a0/g, " ") });
211211
}
212212
}
213213
this.isRound = isRound;

src/addons/addons/middle-click-popup/WorkspaceQuerier.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ class QueryInfo {
10721072
/** @type {WorkspaceQuerier} */
10731073
this.querier = querier;
10741074
/** @type {string} The query */
1075-
this.str = query.replaceAll(String.fromCharCode(160), " ");
1075+
this.str = query.replace(/\u00a0/g, " ");
10761076
/** @type {string} A lowercase version of the query. Used for case insensitive comparisons. */
10771077
this.lowercase = this.str.toLowerCase();
10781078
/** @type {number} A unique identifier for this query */

src/addons/addons/reorder-custom-inputs/modified-funcs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export function modifiedCreateAllInputs(connectionMap) {
3737
}
3838

3939
// remove all traces of %l at the earliest possible time
40-
this.procCode_ = this.procCode_.replaceAll("%l ", "");
40+
this.procCode_ = this.procCode_.replace(/%l /g, "");
4141
}
4242

4343
//https://github.com/scratchfoundation/scratch-blocks/blob/f210e042988b91bcdc2abeca7a2d85e178edadb2/blocks_vertical/procedures.js#L565
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"commit":"0d357b5"}
1+
{"commit":"2b49ae3"}

src/addons/settings/translations.json

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,32 @@
171171
"title": "הגדרות תוסף",
172172
"unsupported": "חלק מהתוספות אינן נגישות בדפדפן שלך:"
173173
},
174+
"hu": {
175+
"addonFeedback": "Visszajelzés a kiegészítőkről",
176+
"confirmResetAll": "Biztos szeretnéd az összes kiegészítő-beállítást visszaállítani az alapértelmezett értékére?",
177+
"credits": "Stáblista:",
178+
"dirty": "A beállítások alkalmazásához töltsd újra az oldalakat.",
179+
"dirtyButton": "Újratöltés most",
180+
"enableDangerous": "Ez a kiegészítő veszélyes és szándékosan ELTÁVOLÍTHAT funkciókat. A legtöbb felhasználónak NEM érdemes bekapcsolnia ezt a kiegészítőt. Biztos, hogy bekapcsolod?",
181+
"export": "Beállítások exportálása",
182+
"groupDanger": "Veszélyes ({number})",
183+
"groupNew": "Új ({number})",
184+
"groupOthers": "Többi ({number})",
185+
"import": "Beállítások importálása",
186+
"noCompiler": "Ez a kiegészítő csak akkor működik, amikor a fordítóprogram ki van kapcsolva a Haladó -> Fordítóprogram kikapcsolása menüponttal vagy a \"Fordítóprogram kikapcsolása a szerkesztőben\" kiegészítővel.",
187+
"noResults": "Nincsenek találatok.",
188+
"presets": "Elmentett beállítások",
189+
"reset": "Visszaállítás",
190+
"resetAll": "Összes visszaállítása",
191+
"search": "Keresés",
192+
"tagBeta": "Béta",
193+
"tagDanger": "Veszélyes",
194+
"tagNew": "Új!",
195+
"tagRecommended": "Javasolt",
196+
"tagTheme": "Téma",
197+
"title": "Kiegészítő-beállítások",
198+
"unsupported": "Néhány kiegészítő nem érhető el ebben a böngészőben."
199+
},
174200
"it": {
175201
"addonFeedback": "Feedback sull'Addon",
176202
"confirmResetAll": "Sei sicuro di voler riportare tutte le impostazioni dell'addon al loro stato iniziale?",
@@ -270,7 +296,7 @@
270296
"tagRecommended": "추천",
271297
"tagTheme": "테마",
272298
"title": "애드온 설정",
273-
"unsupported": "몇몇 애드온은 다음 브라우저에서 사용할 수 없습니다 :"
299+
"unsupported": "몇몇 애드온은 다음의 브라우저에서 사용할 수 없습니다 :"
274300
},
275301
"lt": {
276302
"addonFeedback": "Įskiepių atsiliepimas",

src/components/browser-modal/browser-modal.css

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,26 @@
4747
.body {
4848
background: $ui-modal-background;
4949
padding: 1.5rem 2.25rem;
50-
text-align: center;
5150
display: flex;
5251
flex-direction: column;
5352
gap: 0.25rem;
5453
}
54+
55+
.title {
56+
text-align: center;
57+
}
58+
59+
.desktop-settings-outer {
60+
display: flex;
61+
justify-content: center;
62+
}
63+
64+
.desktop-settings-inner {
65+
font: inherit;
66+
font-weight: bold;
67+
padding: 0.75rem 1rem;
68+
border-radius: 0.25rem;
69+
border: 1px solid $ui-black-transparent;
70+
background-color: $looks-secondary;
71+
color: white;
72+
}

0 commit comments

Comments
 (0)