scratchfoundation · cwillisf · Sep 18, 2025 · Sep 19, 2025 · Sep 19, 2025 · Sep 20, 2025
@@ -16,6 +16,7 @@
   "author": "Scratch Foundation",
   "workspaces": [
     "packages/task-herder",
+    "packages/scratch-storage",
     "packages/scratch-svg-renderer",
     "packages/scratch-render",
     "packages/scratch-vm",
@@ -43,6 +44,7 @@
     "globals": "16.5.0",
     "husky": "8.0.3",
     "npm": "10.9.4",
+    "sort-package-json": "3.6.1",
     "ts-node": "10.9.2"
   }
 }
@@ -113,6 +113,7 @@
     "@microbit/microbit-universal-hex": "0.2.2",
     "@radix-ui/react-context-menu": "2.2.16",
     "@scratch/scratch-render": "12.6.1",
+    "@scratch/scratch-storage": "12.6.1",
     "@scratch/scratch-svg-renderer": "12.6.1",
     "@scratch/scratch-vm": "12.6.1",
     "@tensorflow-models/face-detection": "1.0.3",
@@ -170,7 +171,6 @@
     "scratch-l10n": "6.1.60",
     "scratch-paint": "4.1.50",
     "scratch-render-fonts": "1.0.252",
-    "scratch-storage": "6.1.3",
     "startaudiocontext": "1.2.1",
     "style-loader": "4.0.0",
     "text-encoding": "0.7.0",

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import {ScratchStorage} from 'scratch-storage';
+import {ScratchStorage} from '@scratch/scratch-storage';
 
 export type GUIConfigFactory = () => GUIConfig;
 export type ProjectId = string | number;

@@ -14,7 +14,7 @@ export {setAppElement} from 'react-modal';
 export * from './gui-config';
 export * from './exported-reducers';
 
-export * from 'scratch-storage';
+export * from '@scratch/scratch-storage';
 
 export {default as buildDefaultProject} from './lib/default-project';
 

@@ -1,4 +1,4 @@
-import {ScratchStorage, Asset} from 'scratch-storage';
+import {ScratchStorage, Asset} from '@scratch/scratch-storage';
 
 import defaultProject from './default-project';
 import {GUIStorage, TranslatorFunction} from '../gui-config';

@@ -87,12 +87,12 @@ const baseConfig = new ScratchWebpackConfigBuilder(
                 noErrorOnMissing: true
             },
             {
-                context: '../../node_modules/scratch-storage/dist/web',
+                context: '../../node_modules/@scratch/scratch-storage/dist/web',
                 from: 'chunks/fetch-worker.*.{js,js.map}',
                 noErrorOnMissing: true
             },
             {
-                context: '../../node_modules/scratch-storage/dist/web',
+                context: '../../node_modules/@scratch/scratch-storage/dist/web',
                 from: 'chunks/vendors-*.{js,js.map}',
                 noErrorOnMissing: true
             },

@@ -67,6 +67,7 @@
     "@babel/core": "7.28.6",
     "@babel/polyfill": "7.12.1",
     "@babel/preset-env": "7.28.6",
+    "@scratch/scratch-storage": "12.6.1",
     "@scratch/scratch-vm": "12.6.1",
     "babel-loader": "9.2.1",
     "copy-webpack-plugin": "6.4.1",
@@ -79,7 +80,6 @@
     "playwright-chromium": "1.58.1",
     "scratch-render-fonts": "1.0.252",
     "scratch-semantic-release-config": "4.0.1",
-    "scratch-storage": "6.1.3",
     "scratch-webpack-configuration": "3.1.1",
     "semantic-release": "25.0.3",
     "tap": "21.5.0",

@@ -1,6 +1,6 @@
 <body>
     <script src="../../../../node_modules/@scratch/scratch-vm/dist/web/scratch-vm.js"></script>
-    <script src="../../node_modules/scratch-storage/dist/web/scratch-storage.js"></script>
+    <script src="../../node_modules/@scratch/scratch-storage/dist/web/scratch-storage.js"></script>
     <script src="../../../../node_modules/@scratch/scratch-svg-renderer/dist/web/scratch-svg-renderer.js"></script>
     <script src="../helper/page-util.js"></script>
     <!-- note: this uses the BUILT version of scratch-render!  make sure to npm run build -->

@@ -1,6 +1,6 @@
 <body>
     <script src="../../../../node_modules/@scratch/scratch-vm/dist/web/scratch-vm.js"></script>
-    <script src="../../../../node_modules/scratch-storage/dist/web/scratch-storage.js"></script>
+    <script src="../../../../node_modules/@scratch/scratch-storage/dist/web/scratch-storage.js"></script>
     <script src="../../../../node_modules/@scratch/scratch-svg-renderer/dist/web/scratch-svg-renderer.js"></script>
     <script src="../helper/page-util.js"></script>
     <!-- note: this uses the BUILT version of scratch-render!  make sure to npm run build -->

@@ -0,0 +1,7 @@
+# See https://scratch.mit.edu/faq
+Chrome >= 63
+Edge >= 15
+Firefox >= 57
+Safari >= 11
+Android >= 63
+iOS >= 11
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.json,*.json5]
+indent_style = space
+indent_size = 2
+
+[*.{js}]
+indent_style = space
@@ -0,0 +1,29 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly specify line endings for as many files as possible.
+# People who (for example) rsync between Windows and Linux need this.
+
+# File types which we know are binary
+*.png binary
+*.wav binary
+
+# Prefer LF for most file types
+*.js text eol=lf
+*.js.map text eol=lf
+*.json text eol=lf
+*.json5 text eol=lf
+*.md text eol=lf
+*.svg text eol=lf
+*.yml text eol=lf
+
+# Prefer LF for these files
+.editorconfig text eol=lf
+.eslintignore text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+.npmignore text eol=lf
+LICENSE text eol=lf
+TRADEMARK text eol=lf
+
+# Use CRLF for Windows-specific file types
@@ -0,0 +1 @@
+@scratchfoundation/scratch-engineering
@@ -0,0 +1,66 @@
+## Contributing
+The development of Scratch is an ongoing process, and we love to have people in the Scratch and open source communities help us along the way.
+
+### Ways to Help
+
+* **Documenting bugs**
+  * If you've identified a bug in Scratch you should first check to see if it's been filed as an issue, if not you can file one.  Make sure you follow the issue template.
+  * It's important that we can consistently reproduce issues. When writing an issue, be sure to follow our [reproduction step guidelines](https://github.com/LLK/scratch-gui/wiki/Writing-good-repro-steps).
+    * Some issues are marked "Needs Repro". Adding a comment with good reproduction steps to those issues is a great way to help.
+  * If you don't have an issue in mind already, you can look through the [Bugs & Glitches forum.](https://scratch.mit.edu/discuss/3/) Look for users reporting problems, reproduce the problem yourself, and file new issues following our guidelines. 
+
+* **Fixing bugs**
+  * You can request to fix a bug in a comment on the issue if you at mention the repo coordinator, who for this repo is @cwillisf.
+    * If the issue is marked "Help Wanted" you can go ahead and start working on it!
+  * **We will only accept Pull Requests for bugs that have an issue filed that has a priority label** 
+    * If you're interested in fixing a bug with no issue, file the issue first and wait for it to have a priority added to it.
+
+  * We are not looking for Pull Requests ("PR") for every issue and may deny a PR if it doesn't fit our criteria.
+    * We are far more likely to accept a PR if it is for an issue marked with Help Wanted.
+    * We will not accept PRs for issues marked with "Needs Discussion" or "Needs Design."
+    * Wait until the Repo Coordinator assigns the issue to you before you begin work or submit a PR.
+
+### Learning Git and Github
+
+If you want to work on fixing issues, you should be familiar with Git and Github.
+
+* [Learn Git branching](https://learngitbranching.js.org/) includes an introduction to basic git commands and useful branching features.
+* Here's a general introduction to [contributing to an open source project](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github).
+
+**Important:** we follow the [Github Flow process](https://guides.github.com/introduction/flow/) as our development process.
+
+### How to Fix Bugs
+1. Identify which Github issue you are working on. Leave a comment on the issue to let us (and other contributors) know you're working on it.
+2. Make sure you have a fork of this repo (see [Github's forking a repo](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) for details)
+3. Switch to the `develop` branch, and pull down the latest changes from upstream
+4. Run the code, and reproduce the problem
+5. Create your branch from the `develop` branch
+6. Make code changes to fix the problem
+7. Run `npm test` to make sure that your changes pass our tests
+8. Commit your changes
+9. Push your branch to your fork
+10. Create your pull request
+    1. Make sure to follow the template in the PR description
+    1. Remember to check the “[Allow edits from maintainers](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)” box
+
+When submitting pull requests keep in mind:
+* please be patient -- it can take a while to find time to review them
+* try to change the least amount of code necessary to fix the bug
+* the code can't be radically changed without significant coordination with the Scratch Team, so these types of changes should be avoided
+* if you find yourself changing a substantial amount of code or considering radical changes, please ask for clarification -- we may have envisioned a different approach, or underestimated the amount of effort
+
+### Suggestions
+![Block sketch](https://user-images.githubusercontent.com/3431616/77192550-1dcebe00-6ab3-11ea-9606-8ecd8500c958.png)
+
+Please note: **_we are unlikely to accept PRs with new features that haven't been thought through and discussed as a group_**.
+
+Why? Because we have a strong belief in the value of keeping things simple for new users. It's been said that the Scratch Team spends about one hour of design discussion for every pixel in Scratch. To learn more about our design philosophy, see [the Scratch Developers page](https://scratch.mit.edu/developers), or [this paper](http://web.media.mit.edu/~mres/papers/Scratch-CACM-final.pdf).
+
+We welcome suggestions! If you want to suggest a feature, please post in our [suggestions forum](https://scratch.mit.edu/discuss/1/). Your suggestion will be helped if you include a mockup design; this can be simple, even hand-drawn.
+
+### Other resources
+Beyond this repo, there are also some other resources that you might want to take a look at:
+* [Community Guidelines](https://github.com/LLK/scratch-www/wiki/Community-Guidelines) (we find it important to maintain a constructive and welcoming community, just like on Scratch)
+* [Open Source forum](https://scratch.mit.edu/discuss/49/) on Scratch
+* [Suggestions forum](https://scratch.mit.edu/discuss/1/) on Scratch
+* [Bugs & Glitches forum](https://scratch.mit.edu/discuss/3/) on Scratch
@@ -0,0 +1,15 @@
+### Expected Behavior
+
+_Please describe what should happen_
+
+### Actual Behavior
+
+_Describe what actually happens_
+
+### Steps to Reproduce
+
+_Explain what someone needs to do in order to see what's described in *Actual behavior* above_
+
+### Operating System and Browser
+
+_e.g. Mac OS 10.11.6 Safari 10.0_
@@ -0,0 +1,15 @@
+### Resolves
+
+_What Github issue does this resolve (please include link)?_
+
+### Proposed Changes
+
+_Describe what this Pull Request does_
+
+### Reason for Changes
+
+_Explain why these changes should be made_
+
+### Test Coverage
+
+_Please show how you have added tests to cover your changes_
@@ -0,0 +1,58 @@
+name: CI/CD
+
+on:
+    workflow_dispatch: # Allows you to run this workflow manually from the Actions tab
+    push: # Runs whenever a commit is pushed to the repository
+
+concurrency:
+    group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
+    cancel-in-progress: true
+
+permissions:
+    contents: write # publish a GitHub release
+    pages: write # deploy to GitHub Pages
+    issues: write # comment on released issues
+    pull-requests: write # comment on released pull requests
+
+jobs:
+    ci-cd:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+            - uses: wagoid/commitlint-github-action@5ce82f5d814d4010519d15f0552aec4f17a1e1fe # v5
+              if: github.event_name == 'pull_request'
+
+            - uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
+              with:
+                  cache: "npm"
+                  node-version-file: ".nvmrc"
+
+            - name: Info
+              run: |
+                  cat <<EOF
+                  Node version: $(node --version)
+                  NPM version: $(npm --version)
+                  GitHub ref: ${{ github.ref }}
+                  GitHub head ref: ${{ github.head_ref }}
+                  EOF
+
+            - run: npm ci
+
+            - name: Pre-build tests
+              run: |
+                  npm run clean
+                  npm run test
+
+            - name: Build
+              run: npm run build
+
+            - name: Post-build tests
+              run: npm run test:build
+
+            - name: Semantic release (configured to run dry if branch is other than 'develop')
+              env:
+                  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  npx --no -- semantic-release
@@ -0,0 +1,12 @@
+name: Lint commit messages
+on: [pull_request]
+
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.sha }}"
+
+jobs:
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: wagoid/commitlint-github-action@5ce82f5d814d4010519d15f0552aec4f17a1e1fe # v5
@@ -0,0 +1,31 @@
+name: "Signature Assistant"
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened,closed,synchronize]
+
+permissions:
+  actions: write
+  contents: read
+  pull-requests: write
+  statuses: write
+
+jobs:
+  CLA-Assistant:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "CLA Assistant"
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        uses: contributor-assistant/github-action@ca4a40a7d1004f18d9960b404b97e5f30a505a08 # v2.6.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # the below token should have repo scope and must be manually added by you in the repository's secrets
+          PERSONAL_ACCESS_TOKEN: ${{ secrets.GHA_AGREEMENTS_PAT }}
+        with:
+          remote-organization-name: 'scratchfoundation'
+          remote-repository-name: 'scratch-agreements'
+          path-to-signatures: 'signatures/version1/cla.json'
+          path-to-document: 'https://github.com/scratchfoundation/scratch-agreements/blob/main/CLA.md'
+          branch: 'main'
+          allowlist: semantic-release-bot,*[bot]
@@ -0,0 +1,16 @@
+# Mac OS
+.DS_Store
+
+# NPM
+/node_modules
+npm-*
+
+# Testing
+/.nyc_output
+/coverage
+
+# IDEA
+/.idea
+
+# Build
+/dist
@@ -0,0 +1 @@
+24