Merge pull request #9017 from MiroslavDionisiev/revert-scratch-storage-version

fix: revert previous version of scratch-storage

package-lock.json

@@ -23,7 +23,7 @@
         "react-twitter-embed": "3.0.3",
         "react-use": "17.5.1",
         "scratch-parser": "6.0.0",
-        "scratch-storage": "4.0.21"
+        "scratch-storage": "2.3.284"
       },
       "devDependencies": {
         "@babel/cli": "7.26.4",
@@ -4742,7 +4742,6 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "ajv": "^6.9.1"
@@ -7573,10 +7572,9 @@
       }
     },
     "node_modules/cross-fetch": {
-      "version": "4.0.0",
+      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==",
+      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-      "license": "MIT",
       "dependencies": {
         "node-fetch": "^2.6.12"
       }
@@ -22300,16 +22298,6 @@
       "hasInstallScript": true,
       "license": "MIT"
     },
-    "node_modules/scratch-gui/node_modules/cross-fetch": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-fetch": "^2.6.12"
-      }
-    },
     "node_modules/scratch-gui/node_modules/decode-uri-component": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
@@ -22458,23 +22446,6 @@
         "react": "^16.0.0"
       }
     },
-    "node_modules/scratch-gui/node_modules/scratch-storage": {
-      "version": "2.3.284",
-      "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-2.3.284.tgz",
-      "integrity": "sha512-GlMSCQtP3O+Sd8504Q7P19OKB92i5v5k5oHBgaBoYCksxSLK3477Zw6c5wKRPa6314sqrmo/EAGxW3QZeoc9Yw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0",
-        "arraybuffer-loader": "^1.0.3",
-        "base64-js": "^1.3.0",
-        "cross-fetch": "^3.1.5",
-        "fastestsmallesttextencoderdecoder": "^1.0.7",
-        "js-md5": "^0.7.3",
-        "minilog": "^3.1.0",
-        "worker-loader": "^2.0.0"
-      }
-    },
     "node_modules/scratch-l10n": {
       "version": "5.0.29",
       "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-5.0.29.tgz",
@@ -22641,18 +22612,18 @@
       }
     },
     "node_modules/scratch-storage": {
-      "version": "4.0.21",
+      "version": "2.3.284",
-      "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-4.0.21.tgz",
+      "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-2.3.284.tgz",
-      "integrity": "sha512-viT7JNTMV7MXRtDomT3fE//vZHVu4fbRgwqi7QOAsl+QFc3BhyJ6tYI3bAE5we1mcgQi5/2k45apLI2G3/Ek+g==",
+      "integrity": "sha512-GlMSCQtP3O+Sd8504Q7P19OKB92i5v5k5oHBgaBoYCksxSLK3477Zw6c5wKRPa6314sqrmo/EAGxW3QZeoc9Yw==",
-      "license": "AGPL-3.0-only",
       "dependencies": {
         "@babel/runtime": "^7.21.0",
         "arraybuffer-loader": "^1.0.3",
         "base64-js": "^1.3.0",
-        "cross-fetch": "^4.0.0",
+        "cross-fetch": "^3.1.5",
         "fastestsmallesttextencoderdecoder": "^1.0.7",
         "js-md5": "^0.7.3",
-        "minilog": "^3.1.0"
+        "minilog": "^3.1.0",
+        "worker-loader": "^2.0.0"
       }
     },
     "node_modules/scratch-storage/node_modules/microee": {
@@ -22744,16 +22715,6 @@
         "web-worker": "^1.3.0"
       }
     },
-    "node_modules/scratch-vm/node_modules/cross-fetch": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz",
-      "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-fetch": "^2.6.12"
-      }
-    },
     "node_modules/scratch-vm/node_modules/immutable": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
@@ -22781,23 +22742,6 @@
         "microee": "0.0.6"
       }
     },
-    "node_modules/scratch-vm/node_modules/scratch-storage": {
-      "version": "2.3.284",
-      "resolved": "https://registry.npmjs.org/scratch-storage/-/scratch-storage-2.3.284.tgz",
-      "integrity": "sha512-GlMSCQtP3O+Sd8504Q7P19OKB92i5v5k5oHBgaBoYCksxSLK3477Zw6c5wKRPa6314sqrmo/EAGxW3QZeoc9Yw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/runtime": "^7.21.0",
-        "arraybuffer-loader": "^1.0.3",
-        "base64-js": "^1.3.0",
-        "cross-fetch": "^3.1.5",
-        "fastestsmallesttextencoderdecoder": "^1.0.7",
-        "js-md5": "^0.7.3",
-        "minilog": "^3.1.0",
-        "worker-loader": "^2.0.0"
-      }
-    },
     "node_modules/screenfull": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/screenfull/-/screenfull-5.2.0.tgz",
@@ -28523,7 +28467,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-2.0.0.tgz",
       "integrity": "sha512-tnvNp4K3KQOpfRnD20m8xltE3eWh89Ye+5oj7wXEEHKac1P4oZ6p9oTj8/8ExqoSBnk9nu5Pr4nKfQ1hn2APJw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "loader-utils": "^1.0.0",
@@ -28540,7 +28483,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
       "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
@@ -28553,7 +28495,6 @@
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
       "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
@@ -28568,7 +28509,6 @@
       "version": "0.4.7",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz",
       "integrity": "sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.1.0",

package.json

@@ -58,7 +58,7 @@
     "react-twitter-embed": "3.0.3",
     "react-use": "17.5.1",
     "scratch-parser": "6.0.0",
-    "scratch-storage": "4.0.21"
+    "scratch-storage": "2.3.284"
   },
   "devDependencies": {
     "@babel/cli": "7.26.4",

src/lib/storage.js

@@ -1,4 +1,4 @@
-import {ScratchStorage} from 'scratch-storage';
+import ScratchStorage from 'scratch-storage';
 
 const PROJECT_HOST = process.env.PROJECT_HOST || 'https://projects.scratch.mit.edu';