From 2c51cdb8f08adfc3b4726b65872e74f21c1cb5a2 Mon Sep 17 00:00:00 2001
From: Muffin <muffin@mailbox.org>
Date: Wed, 9 Aug 2023 20:17:47 -0500
Subject: [PATCH 1/3] projects.scratch.mit.edu -> scratch-projects.scratch.org

---
 node-api-docs/README.md        | 2 +-
 node-api-docs/demo.js          | 2 +-
 scaffolding-api-docs/README.md | 2 +-
 src/packager/load-project.js   | 2 +-
 static/example.html            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/node-api-docs/README.md b/node-api-docs/README.md
index f0c7f46f..969c6722 100644
--- a/node-api-docs/README.md
+++ b/node-api-docs/README.md
@@ -64,7 +64,7 @@ const fetch = require('cross-fetch').default; // or whatever your favorite HTTP
 const id = '437419376';
 const projectMetadata = await (await fetch(`https://trampoline.turbowarp.org/api/projects/${id}`)).json();
 const token = projectMetadata.project_token;
-const projectData = await (await fetch(`https://projects.scratch.mit.edu/${id}?token=${token}`)).arrayBuffer();
+const projectData = await (await fetch(`https://scratch-projects.scratch.org/${id}?token=${token}`)).arrayBuffer();
 ```
 
 Now you have to tell the packager to load the project. The packager will parse it, do some analysis, and download any needed assets if the input was just a project.json. This must be done once for every project. The result of this processes can be reused as many times as you want.
diff --git a/node-api-docs/demo.js b/node-api-docs/demo.js
index b6d2a413..30affeaa 100644
--- a/node-api-docs/demo.js
+++ b/node-api-docs/demo.js
@@ -11,7 +11,7 @@ const run = async () => {
   const id = '437419376';
   const projectMetadata = await (await fetch(`https://trampoline.turbowarp.org/api/projects/${id}`)).json();
   const token = projectMetadata.project_token;
-  const projectData = await (await fetch(`https://projects.scratch.mit.edu/${id}?token=${token}`)).arrayBuffer();
+  const projectData = await (await fetch(`https://scratch-projects.scratch.org/${id}?token=${token}`)).arrayBuffer();
 
   const progressCallback = (type, a, b) => {
     console.log('Progress', type, a, b);
diff --git a/scaffolding-api-docs/README.md b/scaffolding-api-docs/README.md
index b25b81cd..85a6462b 100644
--- a/scaffolding-api-docs/README.md
+++ b/scaffolding-api-docs/README.md
@@ -165,7 +165,7 @@ Downloading shared Scratch projects can be done manually with something like thi
 const id = '437419376';
 const projectMetadata = await (await fetch(`https://trampoline.turbowarp.org/api/projects/${id}`)).json();
 const token = projectMetadata.project_token;
-const projectData = await (await fetch(`https://projects.scratch.mit.edu/${id}?token=${token}`)).arrayBuffer();
+const projectData = await (await fetch(`https://scratch-projects.scratch.org/${id}?token=${token}`)).arrayBuffer();
 ```
 
 ### Configure cloud variables
diff --git a/src/packager/load-project.js b/src/packager/load-project.js
index 18725e51..aae9724f 100644
--- a/src/packager/load-project.js
+++ b/src/packager/load-project.js
@@ -41,7 +41,7 @@ const fromURL = async (url, progressCallback) => {
 
 const fromID = (id, token, progressCallback) => {
   const tokenPart = token ? `?token=${token}` : '';
-  const url = `https://projects.scratch.mit.edu/${id}${tokenPart}`;
+  const url = `https://scratch-projects.scratch.org/${id}${tokenPart}`;
   return fromURL(url, progressCallback);
 };
 
diff --git a/static/example.html b/static/example.html
index 6c8d325e..f61d6df2 100644
--- a/static/example.html
+++ b/static/example.html
@@ -138,7 +138,7 @@ <h1>Error</h1>
       const {storage, vm} = scaffolding;
       storage.addWebStore(
         [storage.AssetType.Project],
-        (asset) => `https://projects.scratch.mit.edu/${asset.assetId}`
+        (asset) => `https://scratch-projects.scratch.org/${asset.assetId}`
       );
       storage.addWebStore(
         [storage.AssetType.ImageVector, storage.AssetType.ImageBitmap, storage.AssetType.Sound],

From 6c359510bb07206b5b38cf0c8cc723103689c27e Mon Sep 17 00:00:00 2001
From: Muffin <muffin@mailbox.org>
Date: Wed, 9 Aug 2023 20:18:16 -0500
Subject: [PATCH 2/3] assets.scratch.mit.edu -> scratch-assets.scratch.org

---
 scaffolding-api-docs/README.md | 2 +-
 static/example.html            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scaffolding-api-docs/README.md b/scaffolding-api-docs/README.md
index 85a6462b..58c991f3 100644
--- a/scaffolding-api-docs/README.md
+++ b/scaffolding-api-docs/README.md
@@ -155,7 +155,7 @@ You have to manually configure scratch-storage to know where to fetch files from
 const storage = scaffolding.storage;
 storage.addWebStore(
   [storage.AssetType.ImageVector, storage.AssetType.ImageBitmap, storage.AssetType.Sound],
-  (asset) => `https://assets.scratch.mit.edu/internalapi/asset/${asset.assetId}.${asset.dataFormat}/get/`
+  (asset) => `https://scratch-assets.scratch.org/internalapi/asset/${asset.assetId}.${asset.dataFormat}/get/`
 );
 ```
 
diff --git a/static/example.html b/static/example.html
index f61d6df2..dc7cff03 100644
--- a/static/example.html
+++ b/static/example.html
@@ -142,7 +142,7 @@ <h1>Error</h1>
       );
       storage.addWebStore(
         [storage.AssetType.ImageVector, storage.AssetType.ImageBitmap, storage.AssetType.Sound],
-        (asset) => `https://assets.scratch.mit.edu/internalapi/asset/${asset.assetId}.${asset.dataFormat}/get/`
+        (asset) => `https://scratch-assets.scratch.org/internalapi/asset/${asset.assetId}.${asset.dataFormat}/get/`
       );
       const setProgress = (progress) => {
         loadingInner.style.width = `${progress * 100}%`;

From f38a147ca05aacca74982c9a63dd95f684060937 Mon Sep 17 00:00:00 2001
From: Muffin <muffin@mailbox.org>
Date: Wed, 9 Aug 2023 20:20:32 -0500
Subject: [PATCH 3/3] scratch.mit.edu -> scratch.org

---
 scaffolding-api-docs/README.md | 4 ++--
 src/p4/SelectProject.svelte    | 2 +-
 src/packager/brand.js          | 2 +-
 src/packager/packager.js       | 4 ++--
 test/p4/url-utils.test.js      | 1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scaffolding-api-docs/README.md b/scaffolding-api-docs/README.md
index 58c991f3..d7ce6bbf 100644
--- a/scaffolding-api-docs/README.md
+++ b/scaffolding-api-docs/README.md
@@ -149,7 +149,7 @@ Scaffolding will automatically resize the project player to fit inside the space
 
 ### Tell it where to fetch projects and assets from
 
-You have to manually configure scratch-storage to know where to fetch files from. If you want to load projects from scratch.mit.edu, you would do:
+You have to manually configure scratch-storage to know where to fetch files from. If you want to load projects from scratch.org, you would do:
 
 ```js
 const storage = scaffolding.storage;
@@ -231,7 +231,7 @@ This returns a Promise that resolves when the project has finished loading or re
 
 The project is not automatically started when loadProject completes.
 
-If you configured scratch-storage to load projects from scratch.mit.edu, you can use:
+If you configured scratch-storage to load projects from scratch.org, you can use:
 
 ```js
 scaffolding.storage.load(Scaffolding.Storage.AssetType.Project, "PROJECT ID HERE eg. 104")
diff --git a/src/p4/SelectProject.svelte b/src/p4/SelectProject.svelte
index 61d6d7ad..13686dfa 100644
--- a/src/p4/SelectProject.svelte
+++ b/src/p4/SelectProject.svelte
@@ -65,7 +65,7 @@
   // just incase some non-number string was stored from older versions
   $projectId = extractProjectId($projectId);
 
-  const getDisplayedProjectURL = () => `https://scratch.mit.edu/projects/${$projectId}`;
+  const getDisplayedProjectURL = () => `https://scratch.org/projects/${$projectId}`;
 
   const submitOnEnter = (e) => {
     if (e.key === 'Enter') {
diff --git a/src/packager/brand.js b/src/packager/brand.js
index 31cea47f..4e8dbe29 100644
--- a/src/packager/brand.js
+++ b/src/packager/brand.js
@@ -49,7 +49,7 @@ limitations under the License.`,
   SOURCE_CODE: 'https://github.com/TurboWarp/packager',
   FEEDBACK_PRIMARY: {
     name: 'Scratch',
-    link: 'https://scratch.mit.edu/users/GarboMuffin/#comments'
+    link: 'https://scratch.org/users/GarboMuffin/#comments'
   },
   FEEDBACK_SECONDARY: {
     name: 'GitHub',
diff --git a/src/packager/packager.js b/src/packager/packager.js
index 0ce4ac8f..9c984be4 100644
--- a/src/packager/packager.js
+++ b/src/packager/packager.js
@@ -46,7 +46,7 @@ const SELF_LICENSE = {
 
 const SCRATCH_LICENSE = {
   title: 'Scratch',
-  homepage: 'https://scratch.mit.edu/',
+  homepage: 'https://scratch.org/',
   license: `Copyright (c) 2016, Massachusetts Institute of Technology
 All rights reserved.
 
@@ -91,7 +91,7 @@ const COPYRIGHT_HEADER = `/*!
 Parts of this script are from the ${APP_NAME} <${WEBSITE}>, licensed as follows:
 ${SELF_LICENSE.license}
 
-Parts of this script are from Scratch <https://scratch.mit.edu/>, licensed as follows:
+Parts of this script are from Scratch <https://scratch.org/>, licensed as follows:
 ${SCRATCH_LICENSE.license}
 */\n`;
 
diff --git a/test/p4/url-utils.test.js b/test/p4/url-utils.test.js
index 74c13295..ce953491 100644
--- a/test/p4/url-utils.test.js
+++ b/test/p4/url-utils.test.js
@@ -2,6 +2,7 @@ import {extractProjectId, getTitleFromURL, isValidURL} from '../../src/p4/url-ut
 
 test('extractProjectId', () => {
   expect(extractProjectId('https://scratch.mit.edu/projects/104')).toBe('104');
+  expect(extractProjectId('https://scratch.org/projects/104')).toBe('104');
 });
 
 test('getTitleFromURL', () => {