pxt-core 11.3.2 → 11.3.4

package/built/pxt.js

@@ -107970,8 +107970,9 @@ var pxt;
                     });
                 });
             }
-            async loadTutorialMarkdown(repoPath, tag) {
-                const tutorialResponse = (await downloadMarkdownTutorialInfoAsync(repoPath, tag)).resp;
+            async loadTutorialMarkdown(repopath, tag) {
+                repopath = normalizeTutorialPath(repopath);
+                const tutorialResponse = (await downloadMarkdownTutorialInfoAsync(repopath, tag)).resp;
                 const repo = tutorialResponse.markdown;
                 pxt.Util.assert(typeof repo === "object");
                 await this.cacheReposAsync(tutorialResponse);
@@ -108945,6 +108946,33 @@ var pxt;
             }));
         }
         github.getPagesStatusAsync = getPagesStatusAsync;
+        function normalizeTutorialPath(repopath) {
+            // repopath will be one of these three formats:
+            //     1. owner/repo/path/to/file
+            //     2. github:owner/repo/path/to/file
+            //     3. https://github.com/owner/repo/path/to/file
+            //
+            // That third format is not a valid URL (a proper github URL will have /blob/branchname/
+            // in it after the repo) but we used to support it so maintain backwards compatibility
+            if (/^github\:/i.test(repopath)) {
+                repopath = repopath.slice(7);
+            }
+            if (/^https?\:/i.test(repopath)) {
+                const parsed = new URL(repopath);
+                // remove the leading slash
+                repopath = parsed.pathname.slice(1);
+                // check if this is an actual link to a file in github, for example:
+                //     Mojang/EducationContent/blob/master/computing/unit-2/lesson-1.md
+                //
+                // Note the "/blob/master/" which is not present in example 3 above
+                const fullURLMatch = /^((?:[^\/]+\/){2})blob\/[^\/]+\/(.*)\.md$/.exec(repopath);
+                if (fullURLMatch) {
+                    repopath = fullURLMatch[1] + fullURLMatch[2];
+                }
+            }
+            return repopath;
+        }
+        github.normalizeTutorialPath = normalizeTutorialPath;
     })(github = pxt.github || (pxt.github = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -122554,7 +122582,7 @@ var pxt;
         function useCdnApi() {
             return pxt.webConfig && !pxt.webConfig.isStatic
                 && !pxt.BrowserUtils.isLocalHost() && !!pxt.webConfig.cdnUrl
-                && !/nocdn=1/i.test(window.location.href);
+                && (typeof window === "undefined" || !/nocdn=1/i.test(window.location.href));
         }
         Cloud.useCdnApi = useCdnApi;
         function cdnApiUrl(url) {

package/built/pxtlib.d.ts

@@ -1330,7 +1330,7 @@ declare namespace pxt.github {
         latestVersionAsync(repopath: string, config: PackagesConfig): Promise<string>;
         loadPackageAsync(repopath: string, tag: string): Promise<CachedPackage>;
         private githubLoadPackageAsync;
-        loadTutorialMarkdown(repoPath: string, tag?: string): Promise<GHTutorialRepoInfo>;
+        loadTutorialMarkdown(repopath: string, tag?: string): Promise<GHTutorialRepoInfo>;
         cacheReposAsync(resp: GHTutorialResponse): Promise<void>;
         private cacheRepo;
         private cacheLatestVersion;
@@ -1467,6 +1467,7 @@ declare namespace pxt.github {
         };
     }
     function getPagesStatusAsync(repoPath: string): Promise<GitHubPagesStatus>;
+    function normalizeTutorialPath(repopath: string): string;
 }
 declare namespace pxt {
     const REFCNT_FLASH = "0xfffe";

package/built/pxtlib.js

@@ -10284,8 +10284,9 @@ var pxt;
                     });
                 });
             }
-            async loadTutorialMarkdown(repoPath, tag) {
-                const tutorialResponse = (await downloadMarkdownTutorialInfoAsync(repoPath, tag)).resp;
+            async loadTutorialMarkdown(repopath, tag) {
+                repopath = normalizeTutorialPath(repopath);
+                const tutorialResponse = (await downloadMarkdownTutorialInfoAsync(repopath, tag)).resp;
                 const repo = tutorialResponse.markdown;
                 pxt.Util.assert(typeof repo === "object");
                 await this.cacheReposAsync(tutorialResponse);
@@ -11259,6 +11260,33 @@ var pxt;
             }));
         }
         github.getPagesStatusAsync = getPagesStatusAsync;
+        function normalizeTutorialPath(repopath) {
+            // repopath will be one of these three formats:
+            //     1. owner/repo/path/to/file
+            //     2. github:owner/repo/path/to/file
+            //     3. https://github.com/owner/repo/path/to/file
+            //
+            // That third format is not a valid URL (a proper github URL will have /blob/branchname/
+            // in it after the repo) but we used to support it so maintain backwards compatibility
+            if (/^github\:/i.test(repopath)) {
+                repopath = repopath.slice(7);
+            }
+            if (/^https?\:/i.test(repopath)) {
+                const parsed = new URL(repopath);
+                // remove the leading slash
+                repopath = parsed.pathname.slice(1);
+                // check if this is an actual link to a file in github, for example:
+                //     Mojang/EducationContent/blob/master/computing/unit-2/lesson-1.md
+                //
+                // Note the "/blob/master/" which is not present in example 3 above
+                const fullURLMatch = /^((?:[^\/]+\/){2})blob\/[^\/]+\/(.*)\.md$/.exec(repopath);
+                if (fullURLMatch) {
+                    repopath = fullURLMatch[1] + fullURLMatch[2];
+                }
+            }
+            return repopath;
+        }
+        github.normalizeTutorialPath = normalizeTutorialPath;
     })(github = pxt.github || (pxt.github = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -24868,7 +24896,7 @@ var pxt;
         function useCdnApi() {
             return pxt.webConfig && !pxt.webConfig.isStatic
                 && !pxt.BrowserUtils.isLocalHost() && !!pxt.webConfig.cdnUrl
-                && !/nocdn=1/i.test(window.location.href);
+                && (typeof window === "undefined" || !/nocdn=1/i.test(window.location.href));
         }
         Cloud.useCdnApi = useCdnApi;
         function cdnApiUrl(url) {