Latest Sync

.github/workflows/node.js.yml

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

package.json

@@ -36,7 +36,7 @@
     "@turbowarp/jszip": "^3.11.1",
     "@turbowarp/nanolog": "^0.2.0",
     "@turbowarp/scratch-l10n": "^3.1001.0-202401241456-994097a5",
-    "@turbowarp/scratch-storage": "^0.0.202502192258",
+    "@turbowarp/scratch-storage": "^0.0.202505311821",
     "@turbowarp/scratch-svg-renderer": "^1.0.0-202312242305-12c360b",
     "@turbowarp/startaudiocontext": "^1.0.0",
     "arraybuffer-loader": "^1.0.6",

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

@@ -733,6 +733,8 @@ class TokenTypeBlock extends TokenType {
           strings.push(...blockPart.toLowerCase().split(" "));
         } else if (blockPart.type === BlockInputType.ENUM) {
           for (const enumValue of blockPart.values) {
+            if (this.stringForms.length >= WorkspaceQuerier.MAX_RESULTS) return;
+
             enumerateStringForms(
               partIdx + 1,
               [...strings, ...enumValue.string.toLowerCase().split(" ")],
@@ -749,6 +751,13 @@ class TokenTypeBlock extends TokenType {
     };
 
     enumerateStringForms();
+
+    if (this.stringForms.length >= WorkspaceQuerier.MAX_STRING_FORMS) {
+      console.warn(
+        "Warning: Block '" + this.block.id + "' has too many string forms. Search results may not be very good."
+      );
+      this.stringForms.length = 0;
+    }
   }
 
   /**
@@ -1164,7 +1173,12 @@ export default class WorkspaceQuerier {
   /**
    * The maximum number of tokens to find before giving up.
    */
-  static MAX_TOKENS = 10000;
+  static MAX_TOKENS = 100000;
+
+  /**
+   * The maximum number of string forms a block can have before we give up.
+   */
+  static MAX_STRING_FORMS = 500;
 
   /**
    * Indexes a workspace in preparation for querying it.
@@ -1208,12 +1222,12 @@ export default class WorkspaceQuerier {
       }
       ++query.resultCount;
       if (!limited && query.resultCount >= WorkspaceQuerier.MAX_RESULTS) {
-        console.log("Warning: Workspace query exceeded maximum result count.");
+        console.warn("Warning: Workspace query exceeded maximum result count.");
         limited = true;
       }
 
       if (!query.canCreateMoreTokens()) {
-        console.log("Warning: Workspace query exceeded maximum token count.");
+        console.warn("Warning: Workspace query exceeded maximum token count.");
         limited = true;
         break;
       }

src/addons/generated/upstream-meta.json

@@ -1 +1 @@
-{"commit":"df5f51e"}
+{"commit":"f41d6de"}

src/addons/settings/translations.json

@@ -125,13 +125,16 @@
     },
     "fr": {
         "addonFeedback": "Commentaires sur les addons",
+        "confirmResetAll": "Êtes-vous sûr de vouloir réinitialiser tous les paramètres des addons à leurs valeurs par défaut ?",
         "credits": "Crédits:",
+        "dirty": "Rechargez les onglets pour appliquer les paramètres.",
         "dirtyButton": "Recharger maintenant",
         "enableDangerous": "Cet addon est dangereux et va intentionnellement DÉSACTIVER certaines fonctionnalitées. La plupart des utilisateurs NE DOIVENT PAS activer cet addon. Êtes-vous sûr de vouloir l'activer ?",
         "export": "Exporter les paramètres",
         "groupDanger": "Dangereux ({number})",
         "groupOthers": "Autres ({number})",
         "import": "Importer les paramètres",
+        "noCompiler": "Cet addon ne fonctionne que lorsque le compilateur est désactivé via le menu Avancé > Désactiver le compilateur ou à l'aide de l'addon « Désactiver le compilateur dans l'éditeur ».",
         "noResults": "Aucun résultat.",
         "presets": "Préconfigurations",
         "reset": "Réinitialiser",
@@ -653,12 +656,15 @@
         "addonFeedback": "附加元件回饋",
         "confirmResetAll": "你確定要重設所有附件設定？",
         "credits": "感謝：",
+        "dirty": "重新加載頁面以套用設定",
         "dirtyButton": "重新載入",
+        "enableDangerous": "此插件非常危險，可能會停用功能。大部分使用者不應啟用此插件。你非常確定要開啟他嗎?",
         "export": "匯出設定",
         "groupDanger": "危險（{number}）",
         "groupNew": "全新（{number}）",
         "groupOthers": "其他（{number}）",
         "import": "匯入設定",
+        "noCompiler": "此插件只有在通過\"高級 > 禁用編譯器\"的選項或者使用\"禁用編譯器\"插件才可以正常運行。",
         "noResults": "沒有相符的結果。",
         "presets": "預設",
         "reset": "重設",

src/components/gui/gui.css

@@ -4,10 +4,12 @@
 
 .page-wrapper {
     height: 100%;
+    display: flex;
+    flex-direction: column;
 }
 
 .body-wrapper {
-    height: calc(100% - $menu-bar-height);
+    flex-grow: 1;
     background-color: $ui-primary;
 }
 

src/components/gui/gui.jsx

@@ -37,6 +37,7 @@ import TWRestorePointManager from '../../containers/tw-restore-point-manager.jsx
 import TWFontsModal from '../../containers/tw-fonts-modal.jsx';
 import TWUnknownPlatformModal from '../../containers/tw-unknown-platform-modal.jsx';
 import TWInvalidProjectModal from '../../containers/tw-invalid-project-modal.jsx';
+import TWWindChimeSubmitter from '../../containers/tw-windchime-submitter.jsx';
 
 import {STAGE_SIZE_MODES, FIXED_WIDTH, UNCONSTRAINED_NON_STAGE_WIDTH} from '../../lib/layout-constants';
 import {resolveStageSize} from '../../lib/screen-utils';
@@ -186,6 +187,7 @@ const GUIComponent = props => {
             <React.Fragment>
                 <TWSecurityManager securityManager={securityManager} />
                 <TWRestorePointManager />
+                <TWWindChimeSubmitter isEmbedded={isEmbedded} />
                 {usernameModalVisible && <TWUsernameModal />}
                 {settingsModalVisible && <TWSettingsModal />}
                 {customExtensionModalVisible && <TWCustomExtensionModal />}

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

@@ -32,6 +32,7 @@ import FramerateChanger from '../../containers/tw-framerate-changer.jsx';
 import ChangeUsername from '../../containers/tw-change-username.jsx';
 import CloudVariablesToggler from '../../containers/tw-cloud-toggler.jsx';
 import TWSaveStatus from './tw-save-status.jsx';
+import TWNews from './tw-news.jsx';
 
 import {openTipsLibrary, openSettingsModal, openRestorePointModal} from '../../reducers/modals';
 import {setPlayer} from '../../reducers/mode';
@@ -482,7 +483,7 @@ class MenuBar extends React.Component {
         );
         // Show the About button only if we have a handler for it (like in the desktop app)
         const aboutButton = this.buildAboutMenu(this.props.onClickAbout);
-        return (
+        const menuBar = (
             <Box
                 className={classNames(
                     this.props.className,
@@ -1042,6 +1043,13 @@ class MenuBar extends React.Component {
                 {aboutButton}
             </Box>
         );
+
+        return (
+            <React.Fragment>
+                {menuBar}
+                {/* <TWNews /> */}
+            </React.Fragment>
+        );
     }
 }
 

src/components/menu-bar/tw-news.css

@@ -0,0 +1,26 @@
+@import "../../css/colors.css";
+
+.news {
+    background: $motion-tertiary;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0.375rem 0;
+    gap: 0.5rem;
+}
+
+.text {
+    flex-grow: 1;
+    color: white;
+    text-align: center;
+}
+
+.text a {
+    color: inherit;
+}
+
+.close {
+    flex-shrink: 0;
+    margin-right: 0.5rem;
+}

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

@@ -0,0 +1,67 @@
+import React from 'react';
+import {APP_NAME} from '../../lib/brand';
+import {isScratchDesktop} from '../../lib/isScratchDesktop';
+import CloseButton from '../close-button/close-button.jsx';
+import styles from './tw-news.css';
+
+const LOCAL_STORAGE_KEY = 'tw:closedNews';
+const NEWS_ID = 'android-fraud';
+
+const newsAppliesToUser = () => /android/i.test(navigator.userAgent);
+
+const NewsBody = () => (
+    <div className={styles.text}>
+        {/* eslint-disable-next-line max-len */}
+        {`The Google Play Store app calling itself TurboWarp is illegitimate and outdated. If you were misled into installing it, leave a 1 star review, uninstall it, and report it. An official one will exist eventually.`}
+    </div>
+);
+
+const getIsClosedInLocalStorage = () => {
+    try {
+        return localStorage.getItem(LOCAL_STORAGE_KEY) === NEWS_ID;
+    } catch (e) {
+        return false;
+    }
+};
+
+const markAsClosedInLocalStorage = () => {
+    try {
+        localStorage.setItem(LOCAL_STORAGE_KEY, NEWS_ID);
+    } catch (e) {
+        // ignore
+    }
+};
+
+class TWNews extends React.Component {
+    constructor (props) {
+        super(props);
+        this.state = {
+            closed: getIsClosedInLocalStorage() || !newsAppliesToUser()
+        };
+        this.handleClose = this.handleClose.bind(this);
+    }
+    handleClose () {
+        markAsClosedInLocalStorage();
+        this.setState({
+            closed: true
+        }, () => {
+            window.dispatchEvent(new Event('resize'));
+        });
+    }
+    render () {
+        if (this.state.closed || isScratchDesktop()) {
+            return null;
+        }
+        return (
+            <div className={styles.news}>
+                <NewsBody />
+                <CloseButton
+                    className={styles.close}
+                    onClick={this.handleClose}
+                />
+            </div>
+        );
+    }
+}
+
+export default TWNews;

src/components/monitor/list-monitor-scroller.jsx

@@ -6,6 +6,7 @@ import {FormattedMessage} from 'react-intl';
 
 import styles from './monitor.css';
 import {List} from 'react-virtualized';
+import {safeStringify} from '../../lib/tw-safe-stringify.js';
 
 class ListMonitorScroller extends React.Component {
     constructor (props) {
@@ -71,7 +72,9 @@ class ListMonitorScroller extends React.Component {
                         </div>
 
                     ) : (
-                        <div className={styles.valueInner}>{this.props.values[index]}</div>
+                        <div className={styles.valueInner}>
+                            {safeStringify(this.props.values[index])}
+                        </div>
                     )}
                 </div>
             </div>

src/components/monitor/monitor.jsx

@@ -45,7 +45,7 @@ const MonitorComponent = props => (
         // TW: if export is defined, we always show it, even outside of the editor
         disable={!props.draggable && !props.onExport}
         holdToDisplay={props.mode === 'slider' ? -1 : 1000}
-        id={`monitor-${props.label}`}
+        id={`monitor-${props.id}`}
     >
         <Draggable
             bounds=".monitor-overlay" // Class for monitor container
@@ -75,7 +75,7 @@ const MonitorComponent = props => (
             // positioning conflicts between the monitors `transform: scale` and
             // the context menus `position: fixed`. For more details, see
             // http://meyerweb.com/eric/thoughts/2011/09/12/un-fixing-fixed-elements-with-css-transforms/
-            <ContextMenu id={`monitor-${props.label}`}>
+            <ContextMenu id={`monitor-${props.id}`}>
                 {props.draggable && props.onSetModeToDefault &&
                     <MenuItem onClick={props.onSetModeToDefault}>
                         <FormattedMessage

src/components/tw-invalid-project-modal/invalid-project-modal.jsx

@@ -22,6 +22,14 @@ const formatError = error => {
     return `${message}\n\n---\n\nURL: ${location.href}\nUser-Agent: ${navigator.userAgent}`;
 };
 
+const errorMatches = (error, regex) => regex.test(`${error}`);
+
+const isZipCorruptionWithSignatureIntact = error => (
+    errorMatches(error, /Corrupted zip|uncompressed data size mismatch/)
+);
+
+const isJSONValidationError = error => errorMatches(error, /validationError/);
+
 const InvalidProjectModal = props => (
     <Modal
         className={styles.modalContent}
@@ -47,7 +55,33 @@ const InvalidProjectModal = props => (
                 value={formatError(props.error)}
             />
 
-            {formatError(props.error).includes('validationError') && (
+            {isZipCorruptionWithSignatureIntact(props.error) ? (
+                <p>
+                    <FormattedMessage
+                        // eslint-disable-next-line max-len
+                        defaultMessage="This error often means that the file was corrupted, possibly due to a faulty storage device, power outage, or unplugging a USB drive without ejecting. Try {usingSb3fix} as it can fix this type of error."
+                        // eslint-disable-next-line max-len
+                        description="Part of modal that appears when a project could not be loaded. {usingSb3fix} becomes a link 'using sb3fix to recover your project'. sb3fix refers to https://turbowarp.github.io/sb3fix/"
+                        id="tw.invalidProject.zipCorruption"
+                        values={{
+                            usingSb3fix: (
+                                <a
+                                    href="https://turbowarp.github.io/sb3fix/?platform=turbowarp"
+                                    target="_blank"
+                                    rel="noreferrer"
+                                >
+                                    <FormattedMessage
+                                        defaultMessage="using sb3fix to recover your project"
+                                        // eslint-disable-next-line max-len
+                                        description="Part of modal that appears when a project could not be loaded. Used in context 'Try using sb3fix to recover your project as it can fix this type of error'. sb3fix referes to https://turbowarp.github.io/sb3fix/"
+                                        id="tw.invalidProject.sb3fix"
+                                    />
+                                </a>
+                            )
+                        }}
+                    />
+                </p>
+            ) : isJSONValidationError(props.error) ? (
                 <p>
                     <FormattedMessage
                         // eslint-disable-next-line max-len
@@ -73,7 +107,7 @@ const InvalidProjectModal = props => (
                         }}
                     />
                 </p>
-            )}
+            ) : null}
 
             <p>
                 <FormattedMessage

src/components/tw-security-manager-modal/download.jsx

@@ -54,6 +54,7 @@ const DEFINITELY_EXECUTABLE = [
     'webloc',
     'inetloc',
     'lnk',
+    'shortcut',
 
     // Windows scripting languages
     'bat',

src/containers/extension-library.jsx

@@ -166,6 +166,7 @@ class ExtensionLibrary extends React.PureComponent {
                 const locale = this.props.intl.locale;
                 library.push(
                     ...this.state.gallery
+                        .filter(i => i.extensionId !== 'faceSensing')
                         .map(i => translateGalleryItem(i, locale))
                         .map(toLibraryItem)
                 );