Merge pull request #336 from smalruby/revert-use-scratch-fetch

Revert use scratch fetch

Author: takaokouji

package-lock.json

@@ -95,7 +95,7 @@
     "scratch-paint": "2.1.21",
     "scratch-render": "0.1.0-prerelease.20230913153807",
     "scratch-render-fonts": "1.0.0-prerelease.20221102164332",
-    "scratch-storage": "2.2.1",
+    "scratch-storage": "2.1.0",
     "scratch-svg-renderer": "0.2.0-prerelease.20230710144521",
     "scratch-vm": "github:smalruby/scratch-vm#develop",
     "startaudiocontext": "1.2.1",
@@ -123,6 +123,7 @@
     "babel-eslint": "10.1.0",
     "babel-loader": "8.3.0",
     "chromedriver": "117.0.3",
+    "cross-fetch": "3.1.5",
     "dedent": "^0.7.0",
     "enzyme": "3.10.0",
     "enzyme-adapter-react-16": "1.15.7",

package.json

@@ -42,31 +42,15 @@ import systemPreferencesHOC from '../lib/system-preferences-hoc.jsx';
 import GUIComponent from '../components/gui/gui.jsx';
 import {setIsScratchDesktop} from '../lib/isScratchDesktop.js';
 
-const {RequestMetadata, setMetadata, unsetMetadata} = storage.scratchFetch;
-
-const setProjectIdMetadata = projectId => {
-    // If project ID is '0' or zero, it's not a real project ID. In that case, remove the project ID metadata.
-    // Same if it's null undefined.
-    if (projectId && projectId !== '0') {
-        setMetadata(RequestMetadata.ProjectId, projectId);
-    } else {
-        unsetMetadata(RequestMetadata.ProjectId);
-    }
-};
-
 class GUI extends React.Component {
     componentDidMount () {
         setIsScratchDesktop(this.props.isScratchDesktop);
         this.props.onStorageInit(storage);
         this.props.onVmInit(this.props.vm);
-        setProjectIdMetadata(this.props.projectId);
     }
     componentDidUpdate (prevProps) {
-        if (this.props.projectId !== prevProps.projectId) {
-            if (this.props.projectId !== null) {
-                this.props.onUpdateProjectId(this.props.projectId);
-            }
-            setProjectIdMetadata(this.props.projectId);
+        if (this.props.projectId !== prevProps.projectId && this.props.projectId !== null) {
+            this.props.onUpdateProjectId(this.props.projectId);
         }
         if (this.props.isShowingProject && !prevProps.isShowingProject) {
             // this only notifies container when a project changes from not yet loaded to loaded