Dependa my bot

.github/workflows/node.js.yml

@@ -18,9 +18,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      with:
+        persist-credentials: false
     - name: Install Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
       with:
         node-version: 20
         cache: npm

package.json

@@ -33,9 +33,10 @@
   },
   "dependencies": {
     "@microbit/microbit-universal-hex": "0.2.2",
+    "@turbowarp/jszip": "^3.11.1",
     "@turbowarp/nanolog": "^0.2.0",
     "@turbowarp/scratch-l10n": "^3.1001.0-202401241456-994097a5",
-    "@turbowarp/scratch-storage": "^0.0.202403251715",
+    "@turbowarp/scratch-storage": "^0.0.202502192258",
     "@turbowarp/scratch-svg-renderer": "^1.0.0-202312242305-12c360b",
     "@turbowarp/startaudiocontext": "^1.0.0",
     "arraybuffer-loader": "^1.0.6",
@@ -104,8 +105,8 @@
     "react-dom": "^16.0.0"
   },
   "devDependencies": {
-    "@babel/cli": "7.14.8",
-    "@babel/core": "7.14.8",
+    "@babel/cli": "^7.26.4",
+    "@babel/core": "^7.26.9",
     "@babel/plugin-proposal-object-rest-spread": "7.14.7",
     "@babel/plugin-syntax-dynamic-import": "7.2.0",
     "@babel/plugin-transform-async-to-generator": "7.14.5",
@@ -126,7 +127,7 @@
     "file-loader": "6.2.0",
     "gh-pages": "3.2.3",
     "html-webpack-plugin": "^4.2.0",
-    "jest": "21.2.1",
+    "jest": "^29.7.0",
     "jest-junit": "7.0.0",
     "mkdirp": "1.0.3",
     "raf": "3.4.1",

src/addons/addons/debugger/module.js

@@ -101,6 +101,13 @@ export const setPaused = (_paused) => {
   if (didChange) {
     paused = _paused;
     eventTarget.dispatchEvent(new CustomEvent("change"));
+
+    // TW: events for extensions
+    if (paused) {
+      vm.runtime.emit("RUNTIME_PAUSED");
+    } else {
+      vm.runtime.emit("RUNTIME_UNPAUSED");
+    }
   }
 
   // Don't check didChange as new threads could've started that we need to pause.

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

@@ -207,7 +207,7 @@ export class BlockInputEnum extends BlockInput {
     this.values = [];
     for (let i = 0; i < options.length; i++) {
       if (typeof options[i][1] === "string" && BlockInputEnum.INVALID_VALUES.indexOf(options[i][1]) === -1) {
-        this.values.push({ value: options[i][1], string: options[i][0].replaceAll(String.fromCharCode(160), " ") });
+        this.values.push({ value: options[i][1], string: options[i][0].replace(/\u00a0/g, " ") });
       }
     }
     this.isRound = isRound;

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

@@ -1072,7 +1072,7 @@ class QueryInfo {
     /** @type {WorkspaceQuerier} */
     this.querier = querier;
     /** @type {string} The query */
-    this.str = query.replaceAll(String.fromCharCode(160), " ");
+    this.str = query.replace(/\u00a0/g, " ");
     /** @type {string} A lowercase version of the query. Used for case insensitive comparisons. */
     this.lowercase = this.str.toLowerCase();
     /** @type {number} A unique identifier for this query */

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

@@ -37,7 +37,7 @@ export function modifiedCreateAllInputs(connectionMap) {
   }
 
   // remove all traces of %l at the earliest possible time
-  this.procCode_ = this.procCode_.replaceAll("%l ", "");
+  this.procCode_ = this.procCode_.replace(/%l /g, "");
 }
 
 //https://github.com/scratchfoundation/scratch-blocks/blob/f210e042988b91bcdc2abeca7a2d85e178edadb2/blocks_vertical/procedures.js#L565

src/addons/generated/upstream-meta.json

@@ -1 +1 @@
-{"commit":"0d357b5"}
+{"commit":"2b49ae3"}

src/addons/settings/translations.json

@@ -171,6 +171,32 @@
         "title": "הגדרות תוסף",
         "unsupported": "חלק מהתוספות אינן נגישות בדפדפן שלך:"
     },
+    "hu": {
+        "addonFeedback": "Visszajelzés a kiegészítőkről",
+        "confirmResetAll": "Biztos szeretnéd az összes kiegészítő-beállítást visszaállítani az alapértelmezett értékére?",
+        "credits": "Stáblista:",
+        "dirty": "A beállítások alkalmazásához töltsd újra az oldalakat.",
+        "dirtyButton": "Újratöltés most",
+        "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?",
+        "export": "Beállítások exportálása",
+        "groupDanger": "Veszélyes ({number})",
+        "groupNew": "Új ({number})",
+        "groupOthers": "Többi ({number})",
+        "import": "Beállítások importálása",
+        "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.",
+        "noResults": "Nincsenek találatok.",
+        "presets": "Elmentett beállítások",
+        "reset": "Visszaállítás",
+        "resetAll": "Összes visszaállítása",
+        "search": "Keresés",
+        "tagBeta": "Béta",
+        "tagDanger": "Veszélyes",
+        "tagNew": "Új!",
+        "tagRecommended": "Javasolt",
+        "tagTheme": "Téma",
+        "title": "Kiegészítő-beállítások",
+        "unsupported": "Néhány kiegészítő nem érhető el ebben a böngészőben."
+    },
     "it": {
         "addonFeedback": "Feedback sull'Addon",
         "confirmResetAll": "Sei sicuro di voler riportare tutte le impostazioni dell'addon al loro stato iniziale?",
@@ -270,7 +296,7 @@
         "tagRecommended": "추천",
         "tagTheme": "테마",
         "title": "애드온 설정",
-        "unsupported": "몇몇 애드온은 다음 브라우저에서 사용할 수 없습니다 :"
+        "unsupported": "몇몇 애드온은 다음의 브라우저에서 사용할 수 없습니다 :"
     },
     "lt": {
         "addonFeedback": "Įskiepių atsiliepimas",

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

@@ -47,8 +47,26 @@
 .body {
     background: $ui-modal-background;
     padding: 1.5rem 2.25rem;
-    text-align: center;
     display: flex;
     flex-direction: column;
     gap: 0.25rem;
 }
+
+.title {
+    text-align: center;
+}
+
+.desktop-settings-outer {
+    display: flex;
+    justify-content: center;
+}
+
+.desktop-settings-inner {
+    font: inherit;
+    font-weight: bold;
+    padding: 0.75rem 1rem;
+    border-radius: 0.25rem;
+    border: 1px solid $ui-black-transparent;
+    background-color: $looks-secondary;
+    color: white;
+}

src/components/browser-modal/browser-modal.jsx

@@ -8,28 +8,34 @@ import {
     isNewFunctionSupported,
     findIncompatibleUserscripts
 } from '../../lib/tw-environment-support-prober.js';
+import {APP_NAME} from '../../lib/brand.js';
 
 import styles from './browser-modal.css';
 import unhappyBrowser from './unsupported-browser.svg';
 
 const messages = defineMessages({
-    label: {
+    browserNotSupported: {
         id: 'gui.unsupportedBrowser.label',
         defaultMessage: 'Browser is not supported',
         description: ''
+    },
+    systemNotSupported: {
+        id: 'tw.browserModal.desktopTitle',
+        defaultMessage: 'System is not supported',
+        description: 'Title of error message in desktop app when system does not support required API, such as WebGL'
     }
 });
 
 const noop = () => {};
 
 const BrowserModal = ({intl, ...props}) => {
-    const label = messages.label;
+    const title = props.onClickDesktopSettings ? messages.systemNotSupported : messages.browserNotSupported;
     const incompatibleUserscripts = findIncompatibleUserscripts();
     return (
         <ReactModal
             isOpen
             className={styles.modalContent}
-            contentLabel={intl.formatMessage({...messages.label})}
+            contentLabel={intl.formatMessage(title)}
             overlayClassName={styles.modalOverlay}
             onRequestClose={noop}
         >
@@ -42,8 +48,8 @@ const BrowserModal = ({intl, ...props}) => {
                 </Box>
 
                 <Box className={styles.body}>
-                    <h2>
-                        <FormattedMessage {...label} />
+                    <h2 className={styles.title}>
+                        <FormattedMessage {...title} />
                     </h2>
 
                     {/* eslint-disable max-len */}
@@ -68,49 +74,50 @@ const BrowserModal = ({intl, ...props}) => {
                         <React.Fragment>
                             <p>
                                 <FormattedMessage
-                                    defaultMessage="Your browser {webGlLink} which is needed for this site to run. Try updating your browser and graphics drivers or restarting your computer."
-                                    description="WebGL missing message. {webGLLink} is a link with the text 'does not support WebGL' from Scratch's translations"
-                                    id="tw.webglModal.description"
+                                    defaultMessage="{APP_NAME} requires WebGL, however your computer does not seem to support it. This is often a temporary error that can be fixed by restarting your computer."
+                                    description="Error message when browser does not support WebGL."
+                                    id="tw.browserModal.webgl1"
                                     values={{
-                                        webGlLink: (
-                                            <a href="https://get.webgl.org/">
-                                                <FormattedMessage
-                                                    defaultMessage="does not support WebGL"
-                                                    description="link part of your browser does not support WebGL message"
-                                                    id="gui.webglModal.webgllink"
-                                                />
-                                            </a>
-                                        )
-                                    }}
-                                />
-                            </p>
-                            <p>
-                                <FormattedMessage
-                                    defaultMessage="Make sure you're using a recent version of Google Chrome, Mozilla Firefox, Microsoft Edge, or Apple Safari."
-                                    description="A message that appears in the browser not supported modal"
-                                    id="tw.browserModal.desc"
-                                />
-                            </p>
-                            <p>
-                                <FormattedMessage
-                                    defaultMessage="On Apple devices, you must disable {lockdownMode}."
-                                    description="Part of the browser not supported message. Lockdown Mode refers to https://support.apple.com/en-us/HT212650"
-                                    id="tw.lockdownMode"
-                                    values={{
-                                        lockdownMode: (
-                                            <a href="https://support.apple.com/en-us/HT212650">
-                                                <FormattedMessage
-                                                    defaultMessage="Lockdown Mode"
-                                                    description="Links to an Apple support page about Lockdown Mode: https://support.apple.com/en-us/HT212650 Try to translate this the same as Apple."
-                                                    id="tw.lockdownMode2"
-                                                />
-                                            </a>
-                                        )
+                                        APP_NAME
                                     }}
                                 />
                             </p>
+
+                            {props.onClickDesktopSettings ? (
+                                <React.Fragment>
+                                    <p>
+                                        <FormattedMessage
+                                            defaultMessage={'You can also try toggling the "graphics acceleration" option in desktop settings:'}
+                                            description="Error message when browser does not support WebGL (desktop app version). Consider seeing how Chrome translates 'graphics acceleration' into your language."
+                                            id="tw.browserModal.webglDesktop"
+                                        />
+                                    </p>
+                                    <div className={styles.desktopSettingsOuter}>
+                                        <button
+                                            onClick={props.onClickDesktopSettings}
+                                            className={styles.desktopSettingsInner}
+                                        >
+                                            <FormattedMessage
+                                                defaultMessage="Open Desktop Settings"
+                                                description="Button in unsupported system modal to open desktop settings"
+                                                id="tw.browserModal.desktopSettings"
+                                            />
+                                        </button>
+                                    </div>
+                                </React.Fragment>
+                            ) : (
+                                <p>
+                                    <FormattedMessage
+                                        defaultMessage={'Use a recent version of Chrome, Firefox, or Safari, and ensure your graphics drivers are up to date. You can also try toggling the "graphics acceleration" or "hardware acceleration" option in your browser\'s settings.'}
+                                        description="Error message when browser does not support WebGL (browser version). Chrome calls it graphics acceleration and Firefox calls it hardware acceleration; consider seeing how they actually translate these"
+                                        id="tw.browserModal.webglBrowser"
+                                    />
+                                </p>
+                            )}
                         </React.Fragment>
                     )}
+
+                    {/* eslint-enable max-len */}
                 </Box>
             </div>
         </ReactModal>
@@ -119,7 +126,8 @@ const BrowserModal = ({intl, ...props}) => {
 
 BrowserModal.propTypes = {
     intl: intlShape.isRequired,
-    isRtl: PropTypes.bool
+    isRtl: PropTypes.bool,
+    onClickDesktopSettings: PropTypes.func
 };
 
 const WrappedBrowserModal = injectIntl(BrowserModal);

src/components/custom-procedures/custom-procedures.css

@@ -124,7 +124,6 @@
     border-radius: 50%;
     width: 35px;
     height: 35px;
-    transition: all 0.2s;
 }
 
 .color-picker::-moz-color-swatch {

src/components/gui/gui.jsx

@@ -258,7 +258,10 @@ const GUIComponent = props => {
                     />
                 ) : null}
                 {isBrowserSupported() ? null : (
-                    <BrowserModal isRtl={isRtl} />
+                    <BrowserModal
+                        isRtl={isRtl}
+                        onClickDesktopSettings={onClickDesktopSettings}
+                    />
                 )}
                 {tipsLibraryVisible ? (
                     <TipsLibrary />

src/components/loader/loader.jsx

@@ -84,7 +84,7 @@ class LoaderComponent extends React.Component {
             this.messageEl.textContent = this.props.intl.formatMessage(messages.projectData);
         } else {
             this.barInnerEl.style.width = `${finished / total * 100}%`;
-            const message = this.props.isRemote ? messages.downloadingAssets : messages.loadingAssets
+            const message = this.props.isRemote ? messages.downloadingAssets : messages.loadingAssets;
             this.messageEl.textContent = this.props.intl.formatMessage(message, {
                 complete: finished,
                 total

src/components/menu-bar/menu-bar.jsx

@@ -337,9 +337,14 @@ class MenuBar extends React.Component {
     }
     handleKeyPress (event) {
         const modifier = bowser.mac ? event.metaKey : event.ctrlKey;
-        if (modifier && event.key.toLowerCase() === 's') {
-            this.props.handleSaveProject();
-            event.preventDefault();
+        if (modifier) {
+            if (event.key.toLowerCase() === 's') {
+                this.props.handleSaveProject();
+                event.preventDefault();    
+            } else if (event.key.toLowerCase() === 'o') {
+                event.preventDefault();    
+                this.props.onStartSelectingFileUpload();
+            }
         }
     }
     getSaveToComputerHandler (downloadProjectCallback) {
@@ -547,7 +552,10 @@ class MenuBar extends React.Component {
                                 this.handleClickDesktopSettings
                             }
                             // eslint-disable-next-line react/jsx-no-bind
-                            onOpenCustomSettings={this.props.onClickAddonSettings.bind(null, 'editor-theme3')}
+                            onOpenCustomSettings={
+                                this.props.onClickAddonSettings &&
+                                this.props.onClickAddonSettings.bind(null, 'editor-theme3')
+                            }
                             onRequestClose={this.props.onRequestCloseSettings}
                             onRequestOpen={this.props.onClickSettings}
                             settingsMenuOpen={this.props.settingsMenuOpen}