From cdb0600b6804d00c0d1389c80720ff2a9e4de5f7 Mon Sep 17 00:00:00 2001 From: Hassan Sufi Date: Thu, 19 Dec 2024 11:58:43 -0700 Subject: [PATCH 1/3] Start replacing old azureedge CDN --- common-docs/faq.md | 2 +- pxtlib/main.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common-docs/faq.md b/common-docs/faq.md index b1fef5bf3a9..2a852d07681 100644 --- a/common-docs/faq.md +++ b/common-docs/faq.md @@ -9,7 +9,7 @@ Access to certain domains is necessary to allow the web editor to reach all the * @homeurl@ * https://makecode.com * https://trg-@targetid@.userpxt.io -* https://pxt.azureedge.net +* https://cdn.makecode.com * https://api.github.com * https://immersivereaderprod.cognitiveservices.azure.com diff --git a/pxtlib/main.ts b/pxtlib/main.ts index 631f1b6f318..cae33db5792 100644 --- a/pxtlib/main.ts +++ b/pxtlib/main.ts @@ -358,10 +358,10 @@ namespace pxt { typeScriptWorkerJs: string; // /beta---tsworker pxtVersion: string; // "?", pxtRelId: string; // "9e298e8784f1a1d6787428ec491baf1f7a53e8fa", - pxtCdnUrl: string; // "https://pxt.azureedge.net/commit/9e2...e8fa/", - commitCdnUrl: string; // "https://pxt.azureedge.net/commit/9e2...e8fa/", - blobCdnUrl: string; // "https://pxt.azureedge.net/commit/9e2...e8fa/", - cdnUrl: string; // "https://pxt.azureedge.net" + pxtCdnUrl: string; // "https://cdn.makecode.com/commit/9e2...e8fa/", + commitCdnUrl: string; // "https://cdn.makecode.com/commit/9e2...e8fa/", + blobCdnUrl: string; // "https://cdn.makecode.com/commit/9e2...e8fa/", + cdnUrl: string; // "https://cdn.makecode.com" targetUrl: string; // "https://pxt.microbit.org" targetVersion: string; // "?", targetRelId: string; // "9e298e8784f1a1d6787428ec491baf1f7a53e8fa", From 8d0f21241d0fd0ce805dfa7ffed997d113511798 Mon Sep 17 00:00:00 2001 From: Hassan Sufi Date: Thu, 19 Dec 2024 12:12:00 -0700 Subject: [PATCH 2/3] Update CDN url for html files --- docfiles/domains-template.html | 2 +- docs/editors.json | 2 +- docs/github-classroom-redirect.html | 4 ++-- docs/github-explorer.html | 8 ++++---- docs/online-learning.html | 2 +- docs/playground.html | 2 +- docs/screenshot-tool.html | 2 +- docs/tutorial-tool.html | 2 +- webapp/public/asseteditor.html | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docfiles/domains-template.html b/docfiles/domains-template.html index 9777f9d564a..3d6b1804571 100644 --- a/docfiles/domains-template.html +++ b/docfiles/domains-template.html @@ -400,7 +400,7 @@ addRow("@homeurl@") addRow("https://makecode.com"); addRow("https://trg-@targetid@.userpxt.io"); - addRow("https://pxt.azureedge.net"); + addRow("https://cdn.makecode.com"); addRow("https://api.github.com"); addRow("https://immersivereaderprod.cognitiveservices.azure.com"); addRow("https://github.com"); diff --git a/docs/editors.json b/docs/editors.json index 257fba94c2d..b4f18280a25 100644 --- a/docs/editors.json +++ b/docs/editors.json @@ -78,7 +78,7 @@ "name": "Adafruit Circuit Playground Express BETA", "title": "MakeCode for Circuit Playground", "url": "https://makecode.adafruit.com/beta", - "icon": "https://pxt.azureedge.net/blob/1215b9ef46d3e04bc9923a1a333d92db92eb5419/static/logo.square.black.svg", + "icon": "https://cdn.makecode.com/blob/1215b9ef46d3e04bc9923a1a333d92db92eb5419/static/logo.square.black.svg", "styles": { "primary": "#1c1f2b", "menu": "#FB48C7", diff --git a/docs/github-classroom-redirect.html b/docs/github-classroom-redirect.html index 89a7d2b84db..19117ed6a52 100644 --- a/docs/github-classroom-redirect.html +++ b/docs/github-classroom-redirect.html @@ -5,7 +5,7 @@ MakeCode GitHub Classroom Registration + src="https://cdn.makecode.com/blob/795d8506c80a04f5ca26f577a8d6152e2fa3e7a6/doccdn/pxtweb.js"> diff --git a/docs/github-explorer.html b/docs/github-explorer.html index aa85c88d898..1900c062d04 100644 --- a/docs/github-explorer.html +++ b/docs/github-explorer.html @@ -5,7 +5,7 @@ MakeCode GitHub Explorer + src="https://cdn.makecode.com/blob/4d9b3a258759c53e7bc66b6fc554c51e2434437c/doccdn/jquery.js"> + src="https://cdn.makecode.com/blob/fc2f56f46189a2e8be3743a1a5abed3b676f9318/doccdn/semantic.js"> + src="https://cdn.makecode.com/blob/795d8506c80a04f5ca26f577a8d6152e2fa3e7a6/doccdn/pxtweb.js"> diff --git a/docs/online-learning.html b/docs/online-learning.html index 7499aadd647..045fc3f5538 100644 --- a/docs/online-learning.html +++ b/docs/online-learning.html @@ -12,7 +12,7 @@ - + diff --git a/docs/playground.html b/docs/playground.html index 4ba6b69318d..9f5751c506f 100644 --- a/docs/playground.html +++ b/docs/playground.html @@ -4,7 +4,7 @@ - + diff --git a/docs/screenshot-tool.html b/docs/screenshot-tool.html index 88e1d580c62..85d27b7d224 100644 --- a/docs/screenshot-tool.html +++ b/docs/screenshot-tool.html @@ -4,7 +4,7 @@ - + diff --git a/docs/tutorial-tool.html b/docs/tutorial-tool.html index db412552a91..28edea695af 100644 --- a/docs/tutorial-tool.html +++ b/docs/tutorial-tool.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/public/asseteditor.html b/webapp/public/asseteditor.html index 3313125941b..c3de1df8865 100644 --- a/webapp/public/asseteditor.html +++ b/webapp/public/asseteditor.html @@ -25,7 +25,7 @@ var pxtConfig = null; - +