Changes to match TW/desktop

These do not make sense in desktop.

.npmignore

@@ -5,9 +5,6 @@
 /node_modules
 npm-*
 
-# Double copies of all the static assets and tutorial gifs
-/src
-
 # Testing
 /.nyc_output
 /coverage

package.json

@@ -2,7 +2,7 @@
   "name": "scratch-gui",
   "version": "0.1.0",
   "description": "GraphicaL User Interface for creating and running Scratch 3.0 projects",
-  "main": "./dist/scratch-gui.js",
+  "main": "./dist/js/scratch-gui.js",
   "scripts": {
     "build": "npm run clean && webpack --colors --bail",
     "clean": "rimraf ./build && mkdirp build && rimraf ./dist && mkdirp dist",

src/addons/loader.js

@@ -1,7 +1,7 @@
 let loaded = false;
 
 const load = () => {
-    import(/* webpackChunkName: "addons" */ './index');
+    // import(/* webpackChunkName: "addons" */ './index');
 };
 
 const loadAddons = () => {

src/components/loader/loader.jsx

@@ -9,8 +9,6 @@ import topBlock from './top-block.svg';
 import middleBlock from './middle-block.svg';
 import bottomBlock from './bottom-block.svg';
 
-import * as progressMonitor from './tw-progress-monitor';
-
 // tw:
 // we make some rather large changes here:
 //  - remove random message, replaced with message dependent on what is actually being loaded
@@ -19,6 +17,9 @@ import * as progressMonitor from './tw-progress-monitor';
 // The way of doing this is extremely unusual and weird compared to how things are typically done for performance.
 // This is because react updates are too performance crippling to handle the progress bar rapidly updating.
 
+// tw:
+// progress bar logic removed entirely as it is unneeded in desktop build
+
 const mainMessages = {
     'gui.loader.headline': (
         <FormattedMessage
@@ -63,41 +64,13 @@ class LoaderComponent extends React.Component {
     constructor (props) {
         super(props);
         this._state = 0;
-        this.progress = 0;
-        this.complete = 0;
-        this.total = 0;
         bindAll(this, [
-            'barInnerRef',
-            'handleProgressChange',
             'messageRef'
         ]);
     }
     componentDidMount () {
-        progressMonitor.setProgressHandler(this.handleProgressChange);
         this.updateMessage();
     }
-    componentDidUpdate () {
-        this.update();
-    }
-    componentWillUnmount () {
-        progressMonitor.setProgressHandler(() => {});
-    }
-    handleProgressChange (state, progress, complete, total) {
-        if (state !== this._state) {
-            this._state = state;
-            this.updateMessage();
-        }
-        this.progress = progress;
-        this.complete = complete;
-        this.total = total;
-        this.update();
-    }
-    update () {
-        this.barInner.style.width = `${this.progress * 100}%`;
-        if (this._state === 2) {
-            this.updateMessage();
-        }
-    }
     updateMessage () {
         if (this._state === 0) {
             this.message.textContent = this.props.intl.formatMessage(messages.generic);
@@ -112,9 +85,6 @@ class LoaderComponent extends React.Component {
             this.message.textContent = this.props.intl.formatMessage(messages.assetsUnknown);
         }
     }
-    barInnerRef (element) {
-        this.barInner = element;
-    }
     messageRef (element) {
         this.message = element;
     }
@@ -149,12 +119,6 @@ class LoaderComponent extends React.Component {
                             ref={this.messageRef}
                         />
                     </div>
-                    <div className={styles.twProgressOuter}>
-                        <div
-                            className={styles.twProgressInner}
-                            ref={this.barInnerRef}
-                        />
-                    </div>
                 </div>
             </div>
         );

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

@@ -225,7 +225,7 @@
 }
 
 .mystuff > a {
-  background-image: url("/images/mystuff.png");
+  /* background-image: url("/images/mystuff.png"); */
 }
 
 .about-icon {

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

@@ -384,7 +384,7 @@ class MenuBar extends React.Component {
             >
                 <div className={styles.mainMenu}>
                     <div className={styles.fileGroup}>
-                        {this.props.onClickLogo ? (
+                        {false && this.props.onClickLogo ? (
                             <div className={classNames(styles.menuBarItem)}>
                                 <img
                                     alt="Scratch"
@@ -552,30 +552,6 @@ class MenuBar extends React.Component {
                                                         </MenuItem>
                                                     </React.Fragment>
                                                 )}
-                                                <MenuItem onClick={this.getSaveToComputerHandler(downloadProject)}>
-                                                    {extended.available ? (
-                                                        <FormattedMessage
-                                                            defaultMessage="{saveToYourComputer} (legacy)"
-                                                            description="Wrapper around 'Save to your computer' when a more modern API is available" // eslint-disable-line max-len
-                                                            id="tw.menuBar.legacyDownloadToComputer"
-                                                            values={{
-                                                                saveToYourComputer: (
-                                                                    <FormattedMessage
-                                                                        defaultMessage="Save to your computer"
-                                                                        description="Menu bar item for downloading a project to your computer" // eslint-disable-line max-len
-                                                                        id="gui.menuBar.downloadToComputer"
-                                                                    />
-                                                                )
-                                                            }}
-                                                        />
-                                                    ) : (
-                                                        <FormattedMessage
-                                                            defaultMessage="Save to your computer"
-                                                            description="Menu bar item for downloading a project to your computer" // eslint-disable-line max-len
-                                                            id="gui.menuBar.downloadToComputer"
-                                                        />
-                                                    )}
-                                                </MenuItem>
                                             </React.Fragment>
                                         )}</SB3Downloader>
                                     </MenuSection>
@@ -830,6 +806,13 @@ class MenuBar extends React.Component {
                                 onRequestClose={this.props.onRequestCloseHelp}
                             >
                                 <MenuSection>
+                                    <MenuItem onClick={this.props.onClickLogo}>
+                                        <FormattedMessage
+                                            defaultMessage="About, credits, license"
+                                            description="Link to about in desktop"
+                                            id="tw.desktop.about"
+                                        />
+                                    </MenuItem>
                                     <MenuItemLink href="https://github.com/TurboWarp">
                                         <FormattedMessage
                                             defaultMessage="Source Code"
@@ -837,18 +820,11 @@ class MenuBar extends React.Component {
                                             id="tw.code"
                                         />
                                     </MenuItemLink>
-                                    <MenuItemLink href="/privacy.html">
+                                    <MenuItemLink href="https://desktop.turbowarp.org">
                                         <FormattedMessage
-                                            defaultMessage="Privacy"
-                                            description="Link to privacy policy"
-                                            id="tw.privacy"
-                                        />
-                                    </MenuItemLink>
-                                    <MenuItemLink href="https://github.com/TurboWarp/scratch-gui/wiki/Embedding">
-                                        <FormattedMessage
-                                            defaultMessage="Embedding"
-                                            description="Menu bar item for embedding link"
-                                            id="tw.menuBar.embed"
+                                            defaultMessage="Website"
+                                            description="Link to website in desktop"
+                                            id="tw.desktop.website"
                                         />
                                     </MenuItemLink>
                                     <MenuItemLink href="https://github.com/TurboWarp/scratch-gui/wiki/TurboWarp-blocks">
@@ -858,13 +834,6 @@ class MenuBar extends React.Component {
                                             id="tw.menuBar.blocks"
                                         />
                                     </MenuItemLink>
-                                    <MenuItemLink href="https://github.com/TurboWarp/scratch-gui/wiki/URL-Parameters">
-                                        <FormattedMessage
-                                            defaultMessage="URL Parameters"
-                                            description="Menu bar item for URL parameters link"
-                                            id="tw.menuBar.parameters"
-                                        />
-                                    </MenuItemLink>
                                     <MenuItemLink href="https://github.com/TurboWarp/translations/blob/master/CONTRIBUTING.md#readme">
                                         <FormattedMessage
                                             defaultMessage="Help Translate TurboWarp"

src/containers/library-item.jsx

@@ -106,7 +106,7 @@ class LibraryItem extends React.PureComponent {
     render () {
         const iconMd5 = this.curIconMd5();
         const iconURL = iconMd5 ?
-            `https://cdn.assets.scratch.mit.edu/internalapi/asset/${iconMd5}/get/` :
+            `library-files/${iconMd5}` :
             this.props.iconRawURL;
         return (
             <LibraryItemComponent

src/containers/monitor.jsx

@@ -167,12 +167,12 @@ class Monitor extends React.Component {
         this.element = monitorElt;
     }
     handleImport () {
-        importCSV().then(rows => {
+        importCSV().then(async rows => {
             const numberOfColumns = rows[0].length;
             let columnNumber = 1;
             if (numberOfColumns > 1) {
                 const msg = this.props.intl.formatMessage(messages.columnPrompt, {numberOfColumns});
-                columnNumber = parseInt(prompt(msg), 10); // eslint-disable-line no-alert
+                columnNumber = parseInt(await prompt(msg), 10); // eslint-disable-line no-alert
             }
             const newListValue = rows.map(row => row[columnNumber - 1])
                 .filter(item => typeof item === 'string'); // CSV importer can leave undefineds

src/containers/tw-change-username.jsx

@@ -20,9 +20,9 @@ class ChangeUsername extends React.Component {
             'changeUsername'
         ]);
     }
-    changeUsername () {
+    async changeUsername () {
         // eslint-disable-next-line no-alert
-        const newUsername = prompt(this.props.intl.formatMessage(messages.usernamePrompt), this.props.username);
+        const newUsername = await prompt(this.props.intl.formatMessage(messages.usernamePrompt), this.props.username);
         if (newUsername === null) {
             return;
         }

src/containers/tw-cloud-toggler.jsx

@@ -4,12 +4,18 @@ import React from 'react';
 import {defineMessages, injectIntl, intlShape} from 'react-intl';
 import {connect} from 'react-redux';
 import {setCloud} from '../reducers/tw';
+import {isScratchDesktop} from '../lib/isScratchDesktop';
 
 const messages = defineMessages({
     cloudUnavailableAlert: {
         defaultMessage: 'Cannot use cloud variables, most likely because you opened the editor.',
         description: 'Message displayed when clicking on the option to toggle cloud variables when cloud variables are not available',
         id: 'tw.menuBar.cloudUnavailableAlert'
+    },
+    offlineEditorAlert: {
+        defaultMessage: 'Cannot use cloud variables in offline editor.',
+        description: 'Message displayed when clicking on the option to toggle cloud variables in offline editor',
+        id: 'tw.menuBar.cloudUnavailableOfflineEditorAlert'
     }
 });
 
@@ -23,7 +29,7 @@ class CloudVariablesToggler extends React.Component {
     toggleCloudVariables () {
         if (!this.props.canUseCloudVariables) {
             // eslint-disable-next-line no-alert
-            alert(this.props.intl.formatMessage(messages.cloudUnavailableAlert));
+            alert(this.props.intl.formatMessage(isScratchDesktop() ? messages.offlineEditorAlert : messages.cloudUnavailableAlert));
             return;
         }
         this.props.onCloudChange(!this.props.enabled);

src/containers/tw-framerate-changer.jsx

@@ -20,10 +20,10 @@ class FramerateChanger extends React.Component {
             'changeFramerate'
         ]);
     }
-    changeFramerate (e) {
+    async changeFramerate (e) {
         if (e && (e.ctrlKey || e.shiftKey)) {
             // eslint-disable-next-line no-alert
-            const newFPS = prompt(this.props.intl.formatMessage(messages.newFramerate), this.props.framerate);
+            const newFPS = await prompt(this.props.intl.formatMessage(messages.newFramerate), this.props.framerate);
             if (newFPS === null) {
                 return;
             }

src/lib/libraries/decks/translate-image.js

@@ -3,7 +3,7 @@
  * Utility functions for handling tutorial images in multiple languages
  */
 
-import {enImages as defaultImages} from './en-steps.js';
+const defaultImages = {};
 
 let savedImages = {};
 let savedLocale = '';

src/lib/project-saver-hoc.jsx

@@ -57,7 +57,7 @@ const ProjectSaverHOC = function (WrappedComponent) {
             if (typeof window === 'object') {
                 // Note: it might be better to use a listener instead of assigning onbeforeunload;
                 // but then it'd be hard to turn this listening off in our tests
-                window.onbeforeunload = e => this.leavePageConfirm(e);
+                // window.onbeforeunload = e => this.leavePageConfirm(e);
             }
 
             // Allow the GUI consumer to pass in a function to receive a trigger

src/lib/tw-editor-warning-hoc.jsx

@@ -41,7 +41,7 @@ const TWEditorWarningHOC = function (WrappedComponent) {
             if (!this.props.isPlayerOnly) {
                 shownWarning = true;
 
-                this.props.onShowWarning();
+                // this.props.onShowWarning();
                 this.props.vm.setCompilerOptions({
                     warpTimer: true
                 });

webpack.config.js

@@ -41,8 +41,8 @@ const base = {
     },
     output: {
         library: 'GUI',
-        filename: process.env.NODE_ENV === 'production' ? 'js/[name].[contenthash].js' : 'js/[name].js',
-        chunkFilename: process.env.NODE_ENV === 'production' ? 'js/[name].[contenthash].js' : 'js/[name].js',
+        filename: process.env.NODE_ENV === 'production' ? 'js/[name].js' : 'js/[name].js',
+        chunkFilename: process.env.NODE_ENV === 'production' ? 'js/[name].js' : 'js/[name].js',
         publicPath: root
     },
     externals: {
@@ -220,7 +220,7 @@ module.exports = [
             output: {
                 libraryTarget: 'umd',
                 path: path.resolve('dist'),
-                publicPath: `${STATIC_PATH}/`
+                // publicPath: `${STATIC_PATH}/`
             },
             externals: {
                 React: 'react',