pxt-core 13.2.2 → 13.2.3

package/built/pxtlib.d.ts

@@ -1543,7 +1543,7 @@ declare namespace pxt.github {
     function createReleaseAsync(repopath: string, tag: string, commitid: string): Promise<void>;
     function createPRFromBranchAsync(repopath: string, baseBranch: string, headBranch: string, title: string, msg?: string): Promise<string>;
     function mergeAsync(repopath: string, base: string, head: string, message?: string): Promise<string>;
-    function getRefAsync(repopath: string, branch: string): Promise<any>;
+    function getRefAsync(repopath: string, branch: string): Promise<string | undefined>;
     function getNewBranchNameAsync(repopath: string, pref?: string): Promise<string>;
     function createNewBranchAsync(repopath: string, branchName: string, commitid: string): Promise<string>;
     function forkRepoAsync(repopath: string, commitid: string, pref?: string): Promise<string>;

package/built/pxtlib.js

@@ -10890,8 +10890,29 @@ var pxt;
             }
             async loadConfigAsync(repopath, tag) {
                 if (!tag) {
-                    pxt.debug(`dep: default to master branch`);
-                    tag = "master";
+                    pxt.debug(`dep: no tag specified, try master and main`);
+                    let res;
+                    let error;
+                    try {
+                        res = await this.loadConfigAsync(repopath, "master");
+                    }
+                    catch (e) {
+                        error = e;
+                        pxt.log(`Error loading default master config for ${repopath}: ${e.message}`);
+                    }
+                    if (res)
+                        return res;
+                    try {
+                        res = await this.loadConfigAsync(repopath, "main");
+                    }
+                    catch (e) {
+                        error = e;
+                        pxt.log(`Error loading default main config for ${repopath}: ${e.message}`);
+                    }
+                    if (res)
+                        return res;
+                    else
+                        throw error;
                 }
                 // cache lookup
                 const key = `${repopath}/${tag}`;
@@ -10925,8 +10946,29 @@ var pxt;
             }
             async loadPackageAsync(repopath, tag, fallbackPackageFiles) {
                 if (!tag) {
-                    pxt.debug(`load pkg: default to master branch`);
-                    tag = "master";
+                    pxt.debug(`load pkg: no tag specified, try master and main`);
+                    let res;
+                    let error;
+                    try {
+                        res = await this.loadPackageAsync(repopath, "master", fallbackPackageFiles);
+                    }
+                    catch (e) {
+                        error = e;
+                        pxt.log(`Error loading default master package for ${repopath}: ${e.message}`);
+                    }
+                    if (res)
+                        return res;
+                    try {
+                        res = await this.loadPackageAsync(repopath, "main", fallbackPackageFiles);
+                    }
+                    catch (e) {
+                        error = e;
+                        pxt.log(`Error loading default main package for ${repopath}: ${e.message}`);
+                    }
+                    if (res)
+                        return res;
+                    else
+                        throw error;
                 }
                 // try using github proxy first
                 if (hasProxy()) {
@@ -11212,16 +11254,27 @@ var pxt;
             });
         }
         github.mergeAsync = mergeAsync;
-        function getRefAsync(repopath, branch) {
-            branch = branch || "master";
-            return ghGetJsonAsync("https://api.github.com/repos/" + repopath + "/git/refs/heads/" + branch)
-                .then(resolveRefAsync)
-                .catch(err => {
-                if (err.statusCode == 404)
+        async function getRefAsync(repopath, branch) {
+            if (!branch) {
+                // try master and main
+                let res = await getRefAsync(repopath, "master");
+                if (!res)
+                    res = await getRefAsync(repopath, "main");
+                return res;
+            }
+            try {
+                const ref = await ghGetJsonAsync("https://api.github.com/repos/" + repopath + "/git/refs/heads/" + branch);
+                return resolveRefAsync(ref);
+            }
+            catch (e) {
+                pxt.debug(`Error fetching ref for ${repopath} branch ${branch}: ${e.message}`);
+                if (e.statusCode === 404) {
                     return undefined;
-                else
-                    Promise.reject(err);
-            });
+                }
+                else {
+                    throw e;
+                }
+            }
         }
         github.getRefAsync = getRefAsync;
         function generateNextRefName(res, pref) {