pxt-core 7.5.4 → 7.5.5

package/built/cli.js

@@ -186,6 +186,9 @@ class FileGithubDb {
             return p;
         });
     }
+    latestVersionAsync(repopath, config) {
+        return this.db.latestVersionAsync(repopath, config);
+    }
     loadConfigAsync(repopath, tag) {
         return this.loadAsync(repopath, tag, "pxt", (r, t) => this.db.loadConfigAsync(r, t));
     }
@@ -202,46 +205,6 @@ function searchAsync(...query) {
         }
     });
 }
-function pkginfoAsync(repopath) {
-    let parsed = pxt.github.parseRepoId(repopath);
-    if (!parsed) {
-        console.log('Unknown repo');
-        return Promise.resolve();
-    }
-    const pkgInfo = (cfg, tag) => {
-        pxt.log(`name: ${cfg.name}`);
-        pxt.log(`description: ${cfg.description}`);
-        if (pxt.appTarget.appTheme)
-            pxt.log(`shareable url: ${pxt.appTarget.appTheme.embedUrl}#pub:gh/${parsed.fullName}${tag ? "#" + tag : ""}`);
-    };
-    return pxt.packagesConfigAsync()
-        .then(config => {
-        const status = pxt.github.repoStatus(parsed, config);
-        pxt.log(`github org: ${parsed.owner}`);
-        if (parsed.tag)
-            pxt.log(`github tag: ${parsed.tag}`);
-        pxt.log(`package status: ${status == pxt.github.GitRepoStatus.Approved ? "approved" : status == pxt.github.GitRepoStatus.Banned ? "banned" : "neutral"}`);
-        if (parsed.tag)
-            return pxt.github.downloadPackageAsync(repopath, config)
-                .then(pkg => {
-                let cfg = JSON.parse(pkg.files[pxt.CONFIG_NAME]);
-                pkgInfo(cfg, parsed.tag);
-                pxt.debug(`size: ${JSON.stringify(pkg.files).length}`);
-            });
-        return pxt.github.pkgConfigAsync(parsed.fullName)
-            .then(cfg => {
-            pkgInfo(cfg);
-            return pxt.github.listRefsAsync(repopath)
-                .then(tags => {
-                pxt.log("tags: " + tags.join(", "));
-                return pxt.github.listRefsAsync(repopath, "heads");
-            })
-                .then(heads => {
-                pxt.log("branches: " + heads.join(", "));
-            });
-        });
-    });
-}
 function pokeRepoAsync(parsed) {
     const repo = parsed.args[0];
     let data = {
@@ -2833,7 +2796,7 @@ function installPackageNameAsync(packageName) {
         return pxt.packagesConfigAsync()
             .then(config => (parsed.tag ? Promise.resolve(parsed.tag) : pxt.github.latestVersionAsync(parsed.slug, config))
             .then(tag => { parsed.tag = tag; })
-            .then(() => pxt.github.pkgConfigAsync(parsed.fullName, parsed.tag))
+            .then(() => pxt.github.pkgConfigAsync(parsed.fullName, parsed.tag, config))
             .then(cfg => mainPkg.loadAsync(true)
             .then(() => {
             let ver = pxt.github.stringifyRepo(parsed);

package/built/pxt.js

@@ -107535,6 +107535,7 @@ var pxt;
         github.isOrgAsync = isOrgAsync;
         class MemoryGithubDb {
             constructor() {
+                this.latestVersions = {};
                 this.configs = {};
                 this.packages = {};
             }
@@ -107557,8 +107558,10 @@ var pxt;
                 return pxt.U.clone(cfg);
             }
             async loadConfigAsync(repopath, tag) {
-                if (!tag)
+                if (!tag) {
+                    pxt.debug(`dep: default to master branch`);
                     tag = "master";
+                }
                 // cache lookup
                 const key = `${repopath}/${tag}`;
                 let res = this.configs[key];
@@ -107581,9 +107584,19 @@ var pxt;
                 const cfg = await downloadTextAsync(repopath, tag, pxt.CONFIG_NAME);
                 return this.cacheConfig(key, cfg);
             }
+            async latestVersionAsync(repopath, config) {
+                let resolved = this.latestVersions[repopath];
+                if (!resolved) {
+                    pxt.debug(`dep: resolve latest version of ${repopath}`);
+                    this.latestVersions[repopath] = resolved = await pxt.github.latestVersionAsync(repopath, config, true, false);
+                }
+                return resolved;
+            }
             async loadPackageAsync(repopath, tag) {
-                if (!tag)
+                if (!tag) {
+                    pxt.debug(`load pkg: default to master branch`);
                     tag = "master";
+                }
                 // try using github proxy first
                 if (hasProxy()) {
                     try {
@@ -107899,34 +107912,38 @@ var pxt;
                 .then(resolveRefAsync, e => ghGetJsonAsync(`https://api.github.com/repos/${parsed.slug}/git/refs/heads/${tag}`)
                 .then(resolveRefAsync));
         }
-        function pkgConfigAsync(repopath, tag = "master") {
-            return github.db.loadConfigAsync(repopath, tag);
+        async function pkgConfigAsync(repopath, tag, config) {
+            if (!tag)
+                tag = await github.db.latestVersionAsync(repopath, config);
+            return await github.db.loadConfigAsync(repopath, tag);
         }
         github.pkgConfigAsync = pkgConfigAsync;
-        function downloadPackageAsync(repoWithTag, config) {
+        async function downloadPackageAsync(repoWithTag, config) {
             const p = parseRepoId(repoWithTag);
             if (!p) {
                 pxt.log('Unknown GitHub syntax');
-                return Promise.resolve(undefined);
+                return undefined;
             }
             if (isRepoBanned(p, config)) {
                 pxt.tickEvent("github.download.banned");
                 pxt.log('Github repo is banned');
-                return Promise.resolve(undefined);
+                return undefined;
             }
-            return github.db.loadPackageAsync(p.fullName, p.tag)
-                .then(cached => {
-                const dv = upgradedDisablesVariants(config, repoWithTag);
-                if (dv) {
-                    const cfg = pxt.Package.parseAndValidConfig(cached.files[pxt.CONFIG_NAME]);
-                    if (cfg) {
-                        pxt.log(`auto-disable ${dv.join(",")} due to targetconfig entry for ${repoWithTag}`);
-                        cfg.disablesVariants = dv;
-                        cached.files[pxt.CONFIG_NAME] = pxt.Package.stringifyConfig(cfg);
-                    }
+            // always try to upgrade unbound versions
+            if (!p.tag) {
+                p.tag = await github.db.latestVersionAsync(p.slug, config);
+            }
+            const cached = await github.db.loadPackageAsync(p.fullName, p.tag);
+            const dv = upgradedDisablesVariants(config, repoWithTag);
+            if (dv) {
+                const cfg = pxt.Package.parseAndValidConfig(cached.files[pxt.CONFIG_NAME]);
+                if (cfg) {
+                    pxt.log(`auto-disable ${dv.join(",")} due to targetconfig entry for ${repoWithTag}`);
+                    cfg.disablesVariants = dv;
+                    cached.files[pxt.CONFIG_NAME] = pxt.Package.stringifyConfig(cfg);
                 }
-                return cached;
-            });
+            }
+            return cached;
         }
         github.downloadPackageAsync = downloadPackageAsync;
         async function downloadLatestPackageAsync(repo) {
@@ -107936,7 +107953,7 @@ var pxt;
             const repoWithTag = `${repo.fullName}#${tag}`;
             await pxt.github.downloadPackageAsync(repoWithTag, packageConfig);
             // return config
-            const config = await pkgConfigAsync(repo.fullName, tag);
+            const config = await pkgConfigAsync(repo.fullName, tag, packageConfig);
             const version = `github:${repoWithTag}`;
             return { version, config };
         }
@@ -108266,14 +108283,15 @@ var pxt;
         }
         github.isGithubId = isGithubId;
         function stringifyRepo(p) {
-            return p ? "github:" + p.fullName.toLowerCase() + "#" + (p.tag || "master") : undefined;
+            return p ? "github:" + p.fullName.toLowerCase() + (p.tag ? `#${p.tag}` : '') : undefined;
         }
         github.stringifyRepo = stringifyRepo;
-        function normalizeRepoId(id) {
+        function normalizeRepoId(id, defaultTag) {
             const gid = parseRepoId(id);
             if (!gid)
                 return undefined;
-            gid.tag = gid.tag || "master";
+            if (!gid.tag && defaultTag)
+                gid.tag = defaultTag;
             return stringifyRepo(gid);
         }
         github.normalizeRepoId = normalizeRepoId;
@@ -111415,22 +111433,20 @@ var pxt;
                 && json.dependencies && Object.keys(json.dependencies).every(k => typeof json.dependencies[k] === "string")
                 && json;
         }
-        static getConfigAsync(pkgTargetVersion, id, fullVers) {
-            return Promise.resolve().then(() => {
-                if (pxt.github.isGithubId(fullVers)) {
-                    const repoInfo = pxt.github.parseRepoId(fullVers);
-                    return pxt.packagesConfigAsync()
-                        .then(config => pxt.github.repoAsync(repoInfo.fullName, config)) // Make sure repo exists and is whitelisted
-                        .then(gitRepo => gitRepo ? pxt.github.pkgConfigAsync(repoInfo.fullName, repoInfo.tag) : null);
-                }
-                else {
-                    // If it's not from GH, assume it's a bundled package
-                    // TODO: Add logic for shared packages if we enable that
-                    const updatedRef = pxt.patching.upgradePackageReference(pkgTargetVersion, id, fullVers);
-                    const bundledPkg = pxt.appTarget.bundledpkgs[updatedRef];
-                    return JSON.parse(bundledPkg[pxt.CONFIG_NAME]);
-                }
-            });
+        static async getConfigAsync(pkgTargetVersion, id, fullVers) {
+            if (pxt.github.isGithubId(fullVers)) {
+                const repoInfo = pxt.github.parseRepoId(fullVers);
+                const packagesConfig = await pxt.packagesConfigAsync();
+                const gitRepo = await pxt.github.repoAsync(repoInfo.fullName, packagesConfig); // Make sure repo exists and is whitelisted
+                return gitRepo ? await pxt.github.pkgConfigAsync(repoInfo.fullName, repoInfo.tag, packagesConfig) : null;
+            }
+            else {
+                // If it's not from GH, assume it's a bundled package
+                // TODO: Add logic for shared packages if we enable that
+                const updatedRef = pxt.patching.upgradePackageReference(pkgTargetVersion, id, fullVers);
+                const bundledPkg = pxt.appTarget.bundledpkgs[updatedRef];
+                return JSON.parse(bundledPkg[pxt.CONFIG_NAME]);
+            }
         }
         static corePackages() {
             const pkgs = pxt.appTarget.bundledpkgs;
@@ -120924,6 +120940,9 @@ var pxt;
                 });
             });
         }
+        latestVersionAsync(repopath, config) {
+            return this.db.latestVersionAsync(repopath, config);
+        }
         loadConfigAsync(repopath, tag) {
             return this.loadAsync(repopath, tag, "pxt", (r, t) => this.db.loadConfigAsync(r, t));
         }
@@ -156267,6 +156286,9 @@ class FileGithubDb {
             return p;
         });
     }
+    latestVersionAsync(repopath, config) {
+        return this.db.latestVersionAsync(repopath, config);
+    }
     loadConfigAsync(repopath, tag) {
         return this.loadAsync(repopath, tag, "pxt", (r, t) => this.db.loadConfigAsync(r, t));
     }
@@ -156283,46 +156305,6 @@ function searchAsync(...query) {
         }
     });
 }
-function pkginfoAsync(repopath) {
-    let parsed = pxt.github.parseRepoId(repopath);
-    if (!parsed) {
-        console.log('Unknown repo');
-        return Promise.resolve();
-    }
-    const pkgInfo = (cfg, tag) => {
-        pxt.log(`name: ${cfg.name}`);
-        pxt.log(`description: ${cfg.description}`);
-        if (pxt.appTarget.appTheme)
-            pxt.log(`shareable url: ${pxt.appTarget.appTheme.embedUrl}#pub:gh/${parsed.fullName}${tag ? "#" + tag : ""}`);
-    };
-    return pxt.packagesConfigAsync()
-        .then(config => {
-        const status = pxt.github.repoStatus(parsed, config);
-        pxt.log(`github org: ${parsed.owner}`);
-        if (parsed.tag)
-            pxt.log(`github tag: ${parsed.tag}`);
-        pxt.log(`package status: ${status == pxt.github.GitRepoStatus.Approved ? "approved" : status == pxt.github.GitRepoStatus.Banned ? "banned" : "neutral"}`);
-        if (parsed.tag)
-            return pxt.github.downloadPackageAsync(repopath, config)
-                .then(pkg => {
-                let cfg = JSON.parse(pkg.files[pxt.CONFIG_NAME]);
-                pkgInfo(cfg, parsed.tag);
-                pxt.debug(`size: ${JSON.stringify(pkg.files).length}`);
-            });
-        return pxt.github.pkgConfigAsync(parsed.fullName)
-            .then(cfg => {
-            pkgInfo(cfg);
-            return pxt.github.listRefsAsync(repopath)
-                .then(tags => {
-                pxt.log("tags: " + tags.join(", "));
-                return pxt.github.listRefsAsync(repopath, "heads");
-            })
-                .then(heads => {
-                pxt.log("branches: " + heads.join(", "));
-            });
-        });
-    });
-}
 function pokeRepoAsync(parsed) {
     const repo = parsed.args[0];
     let data = {
@@ -158914,7 +158896,7 @@ function installPackageNameAsync(packageName) {
         return pxt.packagesConfigAsync()
             .then(config => (parsed.tag ? Promise.resolve(parsed.tag) : pxt.github.latestVersionAsync(parsed.slug, config))
             .then(tag => { parsed.tag = tag; })
-            .then(() => pxt.github.pkgConfigAsync(parsed.fullName, parsed.tag))
+            .then(() => pxt.github.pkgConfigAsync(parsed.fullName, parsed.tag, config))
             .then(cfg => mainPkg.loadAsync(true)
             .then(() => {
             let ver = pxt.github.stringifyRepo(parsed);

package/built/pxtblockly.js

@@ -9041,10 +9041,13 @@ var pxt;
                         }
                     }
                     xmlList[xmlList.length - 1].setAttribute('gap', '24');
-                    if (Blockly.Blocks['variables_set']) {
-                        let gap = Blockly.Blocks['variables_change'] ? 8 : 24;
+                    if (Blockly.Blocks['variables_change'] || Blockly.Blocks['variables_set']) {
+                        xmlList.unshift(createFlyoutGroupLabel("Your Variables"));
+                    }
+                    if (Blockly.Blocks['variables_change']) {
+                        let gap = Blockly.Blocks['variables_get'] ? 20 : 8;
                         let blockText = '<xml>' +
-                            '<block type="variables_set" gap="' + gap + '">' +
+                            '<block type="variables_change" gap="' + gap + '">' +
                             Blockly.Variables.generateVariableFieldXmlString(mostRecentVariable) +
                             '</block>' +
                             '</xml>';
@@ -9057,16 +9060,16 @@ var pxt;
                             value.appendChild(shadow);
                             let field = goog.dom.createDom('field');
                             field.setAttribute('name', 'NUM');
-                            field.appendChild(document.createTextNode("0"));
+                            field.appendChild(document.createTextNode("1"));
                             shadow.appendChild(field);
                             block.appendChild(value);
                         }
-                        xmlList.push(block);
+                        xmlList.unshift(block);
                     }
-                    if (Blockly.Blocks['variables_change']) {
-                        let gap = Blockly.Blocks['variables_get'] ? 20 : 8;
+                    if (Blockly.Blocks['variables_set']) {
+                        let gap = Blockly.Blocks['variables_change'] ? 8 : 24;
                         let blockText = '<xml>' +
-                            '<block type="variables_change" gap="' + gap + '">' +
+                            '<block type="variables_set" gap="' + gap + '">' +
                             Blockly.Variables.generateVariableFieldXmlString(mostRecentVariable) +
                             '</block>' +
                             '</xml>';
@@ -9079,11 +9082,11 @@ var pxt;
                             value.appendChild(shadow);
                             let field = goog.dom.createDom('field');
                             field.setAttribute('name', 'NUM');
-                            field.appendChild(document.createTextNode("1"));
+                            field.appendChild(document.createTextNode("0"));
                             shadow.appendChild(field);
                             block.appendChild(value);
                         }
-                        xmlList.push(block);
+                        xmlList.unshift(block);
                     }
                 }
                 return xmlList;
@@ -9475,6 +9478,8 @@ var pxt;
                 const elems = oldFlyout(workspace);
                 if (elems.length > 1) {
                     let returnBlock = mkReturnStatementBlock();
+                    // Add divider
+                    elems.splice(1, 0, createFlyoutGroupLabel("Your Functions"));
                     // Insert after the "make a function" button
                     elems.splice(1, 0, returnBlock);
                 }

package/built/pxtblocks.js

@@ -5479,10 +5479,13 @@ var pxt;
                         }
                     }
                     xmlList[xmlList.length - 1].setAttribute('gap', '24');
-                    if (Blockly.Blocks['variables_set']) {
-                        let gap = Blockly.Blocks['variables_change'] ? 8 : 24;
+                    if (Blockly.Blocks['variables_change'] || Blockly.Blocks['variables_set']) {
+                        xmlList.unshift(createFlyoutGroupLabel("Your Variables"));
+                    }
+                    if (Blockly.Blocks['variables_change']) {
+                        let gap = Blockly.Blocks['variables_get'] ? 20 : 8;
                         let blockText = '<xml>' +
-                            '<block type="variables_set" gap="' + gap + '">' +
+                            '<block type="variables_change" gap="' + gap + '">' +
                             Blockly.Variables.generateVariableFieldXmlString(mostRecentVariable) +
                             '</block>' +
                             '</xml>';
@@ -5495,16 +5498,16 @@ var pxt;
                             value.appendChild(shadow);
                             let field = goog.dom.createDom('field');
                             field.setAttribute('name', 'NUM');
-                            field.appendChild(document.createTextNode("0"));
+                            field.appendChild(document.createTextNode("1"));
                             shadow.appendChild(field);
                             block.appendChild(value);
                         }
-                        xmlList.push(block);
+                        xmlList.unshift(block);
                     }
-                    if (Blockly.Blocks['variables_change']) {
-                        let gap = Blockly.Blocks['variables_get'] ? 20 : 8;
+                    if (Blockly.Blocks['variables_set']) {
+                        let gap = Blockly.Blocks['variables_change'] ? 8 : 24;
                         let blockText = '<xml>' +
-                            '<block type="variables_change" gap="' + gap + '">' +
+                            '<block type="variables_set" gap="' + gap + '">' +
                             Blockly.Variables.generateVariableFieldXmlString(mostRecentVariable) +
                             '</block>' +
                             '</xml>';
@@ -5517,11 +5520,11 @@ var pxt;
                             value.appendChild(shadow);
                             let field = goog.dom.createDom('field');
                             field.setAttribute('name', 'NUM');
-                            field.appendChild(document.createTextNode("1"));
+                            field.appendChild(document.createTextNode("0"));
                             shadow.appendChild(field);
                             block.appendChild(value);
                         }
-                        xmlList.push(block);
+                        xmlList.unshift(block);
                     }
                 }
                 return xmlList;
@@ -5913,6 +5916,8 @@ var pxt;
                 const elems = oldFlyout(workspace);
                 if (elems.length > 1) {
                     let returnBlock = mkReturnStatementBlock();
+                    // Add divider
+                    elems.splice(1, 0, createFlyoutGroupLabel("Your Functions"));
                     // Insert after the "make a function" button
                     elems.splice(1, 0, returnBlock);
                 }

package/built/pxtcompiler.js

@@ -32,6 +32,9 @@ var pxt;
                 });
             });
         }
+        latestVersionAsync(repopath, config) {
+            return this.db.latestVersionAsync(repopath, config);
+        }
         loadConfigAsync(repopath, tag) {
             return this.loadAsync(repopath, tag, "pxt", (r, t) => this.db.loadConfigAsync(r, t));
         }

package/built/pxtlib.d.ts

@@ -1217,16 +1217,19 @@ declare namespace pxt.github {
         files: Map<string>;
     }
     interface IGithubDb {
+        latestVersionAsync(repopath: string, config: PackagesConfig): Promise<string>;
         loadConfigAsync(repopath: string, tag: string): Promise<pxt.PackageConfig>;
         loadPackageAsync(repopath: string, tag: string): Promise<CachedPackage>;
     }
     function isOrgAsync(owner: string): Promise<boolean>;
     class MemoryGithubDb implements IGithubDb {
+        private latestVersions;
         private configs;
         private packages;
         private proxyWithCdnLoadPackageAsync;
         private cacheConfig;
         loadConfigAsync(repopath: string, tag: string): Promise<pxt.PackageConfig>;
+        latestVersionAsync(repopath: string, config: PackagesConfig): Promise<string>;
         loadPackageAsync(repopath: string, tag: string): Promise<CachedPackage>;
         private githubLoadPackageAsync;
     }
@@ -1262,7 +1265,7 @@ declare namespace pxt.github {
     function forkRepoAsync(repopath: string, commitid: string, pref?: string): Promise<string>;
     function listRefsAsync(repopath: string, namespace?: string, useProxy?: boolean, noCache?: boolean): Promise<string[]>;
     function listRefsExtAsync(repopath: string, namespace?: string, useProxy?: boolean, noCache?: boolean): Promise<RefsResult>;
-    function pkgConfigAsync(repopath: string, tag?: string): Promise<PackageConfig>;
+    function pkgConfigAsync(repopath: string, tag: string, config: pxt.PackagesConfig): Promise<PackageConfig>;
     function downloadPackageAsync(repoWithTag: string, config: pxt.PackagesConfig): Promise<CachedPackage>;
     function downloadLatestPackageAsync(repo: ParsedRepo): Promise<{
         version: string;
@@ -1313,7 +1316,7 @@ declare namespace pxt.github {
     function toGithubDependencyPath(path: string, tag?: string): string;
     function isGithubId(id: string): boolean;
     function stringifyRepo(p: ParsedRepo): string;
-    function normalizeRepoId(id: string): string;
+    function normalizeRepoId(id: string, defaultTag?: string): string;
     function join(...parts: string[]): string;
     function upgradedPackageReference(cfg: PackagesConfig, id: string): string;
     function upgradedPackageId(cfg: PackagesConfig, id: string): string;

package/built/pxtlib.js

@@ -9849,6 +9849,7 @@ var pxt;
         github.isOrgAsync = isOrgAsync;
         class MemoryGithubDb {
             constructor() {
+                this.latestVersions = {};
                 this.configs = {};
                 this.packages = {};
             }
@@ -9871,8 +9872,10 @@ var pxt;
                 return pxt.U.clone(cfg);
             }
             async loadConfigAsync(repopath, tag) {
-                if (!tag)
+                if (!tag) {
+                    pxt.debug(`dep: default to master branch`);
                     tag = "master";
+                }
                 // cache lookup
                 const key = `${repopath}/${tag}`;
                 let res = this.configs[key];
@@ -9895,9 +9898,19 @@ var pxt;
                 const cfg = await downloadTextAsync(repopath, tag, pxt.CONFIG_NAME);
                 return this.cacheConfig(key, cfg);
             }
+            async latestVersionAsync(repopath, config) {
+                let resolved = this.latestVersions[repopath];
+                if (!resolved) {
+                    pxt.debug(`dep: resolve latest version of ${repopath}`);
+                    this.latestVersions[repopath] = resolved = await pxt.github.latestVersionAsync(repopath, config, true, false);
+                }
+                return resolved;
+            }
             async loadPackageAsync(repopath, tag) {
-                if (!tag)
+                if (!tag) {
+                    pxt.debug(`load pkg: default to master branch`);
                     tag = "master";
+                }
                 // try using github proxy first
                 if (hasProxy()) {
                     try {
@@ -10213,34 +10226,38 @@ var pxt;
                 .then(resolveRefAsync, e => ghGetJsonAsync(`https://api.github.com/repos/${parsed.slug}/git/refs/heads/${tag}`)
                 .then(resolveRefAsync));
         }
-        function pkgConfigAsync(repopath, tag = "master") {
-            return github.db.loadConfigAsync(repopath, tag);
+        async function pkgConfigAsync(repopath, tag, config) {
+            if (!tag)
+                tag = await github.db.latestVersionAsync(repopath, config);
+            return await github.db.loadConfigAsync(repopath, tag);
         }
         github.pkgConfigAsync = pkgConfigAsync;
-        function downloadPackageAsync(repoWithTag, config) {
+        async function downloadPackageAsync(repoWithTag, config) {
             const p = parseRepoId(repoWithTag);
             if (!p) {
                 pxt.log('Unknown GitHub syntax');
-                return Promise.resolve(undefined);
+                return undefined;
             }
             if (isRepoBanned(p, config)) {
                 pxt.tickEvent("github.download.banned");
                 pxt.log('Github repo is banned');
-                return Promise.resolve(undefined);
+                return undefined;
             }
-            return github.db.loadPackageAsync(p.fullName, p.tag)
-                .then(cached => {
-                const dv = upgradedDisablesVariants(config, repoWithTag);
-                if (dv) {
-                    const cfg = pxt.Package.parseAndValidConfig(cached.files[pxt.CONFIG_NAME]);
-                    if (cfg) {
-                        pxt.log(`auto-disable ${dv.join(",")} due to targetconfig entry for ${repoWithTag}`);
-                        cfg.disablesVariants = dv;
-                        cached.files[pxt.CONFIG_NAME] = pxt.Package.stringifyConfig(cfg);
-                    }
+            // always try to upgrade unbound versions
+            if (!p.tag) {
+                p.tag = await github.db.latestVersionAsync(p.slug, config);
+            }
+            const cached = await github.db.loadPackageAsync(p.fullName, p.tag);
+            const dv = upgradedDisablesVariants(config, repoWithTag);
+            if (dv) {
+                const cfg = pxt.Package.parseAndValidConfig(cached.files[pxt.CONFIG_NAME]);
+                if (cfg) {
+                    pxt.log(`auto-disable ${dv.join(",")} due to targetconfig entry for ${repoWithTag}`);
+                    cfg.disablesVariants = dv;
+                    cached.files[pxt.CONFIG_NAME] = pxt.Package.stringifyConfig(cfg);
                 }
-                return cached;
-            });
+            }
+            return cached;
         }
         github.downloadPackageAsync = downloadPackageAsync;
         async function downloadLatestPackageAsync(repo) {
@@ -10250,7 +10267,7 @@ var pxt;
             const repoWithTag = `${repo.fullName}#${tag}`;
             await pxt.github.downloadPackageAsync(repoWithTag, packageConfig);
             // return config
-            const config = await pkgConfigAsync(repo.fullName, tag);
+            const config = await pkgConfigAsync(repo.fullName, tag, packageConfig);
             const version = `github:${repoWithTag}`;
             return { version, config };
         }
@@ -10580,14 +10597,15 @@ var pxt;
         }
         github.isGithubId = isGithubId;
         function stringifyRepo(p) {
-            return p ? "github:" + p.fullName.toLowerCase() + "#" + (p.tag || "master") : undefined;
+            return p ? "github:" + p.fullName.toLowerCase() + (p.tag ? `#${p.tag}` : '') : undefined;
         }
         github.stringifyRepo = stringifyRepo;
-        function normalizeRepoId(id) {
+        function normalizeRepoId(id, defaultTag) {
             const gid = parseRepoId(id);
             if (!gid)
                 return undefined;
-            gid.tag = gid.tag || "master";
+            if (!gid.tag && defaultTag)
+                gid.tag = defaultTag;
             return stringifyRepo(gid);
         }
         github.normalizeRepoId = normalizeRepoId;
@@ -13729,22 +13747,20 @@ var pxt;
                 && json.dependencies && Object.keys(json.dependencies).every(k => typeof json.dependencies[k] === "string")
                 && json;
         }
-        static getConfigAsync(pkgTargetVersion, id, fullVers) {
-            return Promise.resolve().then(() => {
-                if (pxt.github.isGithubId(fullVers)) {
-                    const repoInfo = pxt.github.parseRepoId(fullVers);
-                    return pxt.packagesConfigAsync()
-                        .then(config => pxt.github.repoAsync(repoInfo.fullName, config)) // Make sure repo exists and is whitelisted
-                        .then(gitRepo => gitRepo ? pxt.github.pkgConfigAsync(repoInfo.fullName, repoInfo.tag) : null);
-                }
-                else {
-                    // If it's not from GH, assume it's a bundled package
-                    // TODO: Add logic for shared packages if we enable that
-                    const updatedRef = pxt.patching.upgradePackageReference(pkgTargetVersion, id, fullVers);
-                    const bundledPkg = pxt.appTarget.bundledpkgs[updatedRef];
-                    return JSON.parse(bundledPkg[pxt.CONFIG_NAME]);
-                }
-            });
+        static async getConfigAsync(pkgTargetVersion, id, fullVers) {
+            if (pxt.github.isGithubId(fullVers)) {
+                const repoInfo = pxt.github.parseRepoId(fullVers);
+                const packagesConfig = await pxt.packagesConfigAsync();
+                const gitRepo = await pxt.github.repoAsync(repoInfo.fullName, packagesConfig); // Make sure repo exists and is whitelisted
+                return gitRepo ? await pxt.github.pkgConfigAsync(repoInfo.fullName, repoInfo.tag, packagesConfig) : null;
+            }
+            else {
+                // If it's not from GH, assume it's a bundled package
+                // TODO: Add logic for shared packages if we enable that
+                const updatedRef = pxt.patching.upgradePackageReference(pkgTargetVersion, id, fullVers);
+                const bundledPkg = pxt.appTarget.bundledpkgs[updatedRef];
+                return JSON.parse(bundledPkg[pxt.CONFIG_NAME]);
+            }
         }
         static corePackages() {
             const pkgs = pxt.appTarget.bundledpkgs;