Merge branch 'develop' into spork

Author: cwillisf

package-lock.json

@@ -93,12 +93,12 @@
     "react-tooltip": "4.5.1",
     "react-virtualized": "9.22.6",
     "redux-throttle": "0.1.1",
-    "scratch-audio": "2.0.85",
+    "scratch-audio": "2.0.86",
     "scratch-blocks": "2.0.0-spork.4",
-    "scratch-l10n": "5.0.151",
-    "scratch-paint": "3.0.162",
-    "scratch-render-fonts": "1.0.169",
-    "scratch-storage": "4.0.67",
+    "scratch-l10n": "5.0.152",
+    "scratch-paint": "3.0.164",
+    "scratch-render-fonts": "1.0.170",
+    "scratch-storage": "4.0.70",
     "startaudiocontext": "1.2.1",
     "style-loader": "4.0.0",
     "to-style": "1.3.3",

packages/scratch-gui/package.json

@@ -53,12 +53,11 @@ const ProjectSaverHOC = function (WrappedComponent) {
             ]);
         }
         componentWillMount () {
-            if (typeof window === 'object') {
+            if (!this.props.noBeforeUnloadHandler && 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);
             }
-
             // Allow the GUI consumer to pass in a function to receive a trigger
             // for triggering thumbnail or whole project saves.
             // These functions are called with null on unmount to prevent stale references.
@@ -343,6 +342,7 @@ const ProjectSaverHOC = function (WrappedComponent) {
                 onUpdatedProject,
                 onUpdateProjectData,
                 onUpdateProjectThumbnail,
+                noBeforeUnloadHandler,
                 reduxProjectId,
                 reduxProjectTitle,
                 setAutoSaveTimeoutId: setAutoSaveTimeoutIdProp,
@@ -395,6 +395,7 @@ const ProjectSaverHOC = function (WrappedComponent) {
         onUpdateProjectData: PropTypes.func,
         onUpdateProjectThumbnail: PropTypes.func,
         onUpdatedProject: PropTypes.func,
+        noBeforeUnloadHandler: PropTypes.bool.required,
         projectChanged: PropTypes.bool,
         reduxProjectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
         reduxProjectTitle: PropTypes.string,
@@ -406,7 +407,8 @@ const ProjectSaverHOC = function (WrappedComponent) {
         autoSaveIntervalSecs: 600, // 10 minutes = 600 seconds
         onRemixing: () => {},
         onSetProjectThumbnailer: () => {},
-        onSetProjectSaver: () => {}
+        onSetProjectSaver: () => {},
+        noBeforeUnloadHandler: false
     };
     const mapStateToProps = (state, ownProps) => {
         const loadingState = state.scratchGui.projectState.loadingState;

packages/scratch-gui/src/lib/project-saver-hoc.jsx

@@ -75,9 +75,9 @@
     "jsdoc": "3.6.11",
     "json": "9.0.6",
     "playwright-chromium": "1.50.1",
-    "scratch-render-fonts": "1.0.169",
+    "scratch-render-fonts": "1.0.170",
     "scratch-semantic-release-config": "3.0.0",
-    "scratch-storage": "4.0.67",
+    "scratch-storage": "4.0.70",
     "scratch-webpack-configuration": "3.0.0",
     "semantic-release": "19.0.5",
     "tap": "16.3.10",

packages/scratch-render/package.json

@@ -61,7 +61,7 @@
     "json": "9.0.6",
     "mkdirp": "2.1.6",
     "rimraf": "3.0.2",
-    "scratch-render-fonts": "1.0.169",
+    "scratch-render-fonts": "1.0.170",
     "scratch-semantic-release-config": "3.0.0",
     "scratch-webpack-configuration": "3.0.0",
     "semantic-release": "19.0.5",

packages/scratch-svg-renderer/package.json

@@ -64,10 +64,10 @@
     "immutable": "3.8.2",
     "jszip": "3.10.1",
     "minilog": "3.1.0",
-    "scratch-audio": "2.0.85",
+    "scratch-audio": "2.0.86",
     "scratch-parser": "6.0.0",
     "scratch-sb1-converter": "2.0.76",
-    "scratch-storage": "4.0.67",
+    "scratch-storage": "4.0.70",
     "scratch-translate-extension-languages": "1.0.7",
     "text-encoding": "0.7.0",
     "uuid": "8.3.2",
@@ -93,8 +93,8 @@
     "json": "^9.0.4",
     "pngjs": "3.4.0",
     "scratch-blocks": "2.0.0-spork.4",
-    "scratch-l10n": "5.0.151",
-    "scratch-render-fonts": "1.0.169",
+    "scratch-l10n": "5.0.152",
+    "scratch-render-fonts": "1.0.170",
     "scratch-semantic-release-config": "3.0.0",
     "scratch-webpack-configuration": "3.0.0",
     "script-loader": "0.7.2",