pxt-core 10.1.3 → 10.1.4

package/built/cli.js

@@ -2682,6 +2682,7 @@ class SnippetHost {
 class Host {
     constructor() {
         this.fileOverrides = {};
+        this.queue = new pxt.Util.PromiseQueue();
     }
     resolve(module, filename) {
         //pxt.debug(`resolving ${module.level}:${module.id} -- ${filename} in ${path.resolve(".")}`)
@@ -2813,9 +2814,19 @@ class Host {
         if (useCompileServiceDocker) {
             return build.compileWithLocalCompileService(extInfo);
         }
-        setBuildEngine();
-        return build.buildHexAsync(build.thisBuild, mainPkg, extInfo, forceBuild)
-            .then(() => build.thisBuild.patchHexInfo(extInfo));
+        return this.queue.enqueue("getHexInfoAsync", async () => {
+            const prevVariant = pxt.appTargetVariant;
+            if (extInfo.appVariant && extInfo.appVariant !== prevVariant) {
+                pxt.setAppTargetVariant(extInfo.appVariant, { temporary: true });
+            }
+            setBuildEngine();
+            await build.buildHexAsync(build.thisBuild, mainPkg, extInfo, forceBuild);
+            const res = build.thisBuild.patchHexInfo(extInfo);
+            if (extInfo.appVariant && extInfo.appVariant !== prevVariant) {
+                pxt.setAppTargetVariant(prevVariant);
+            }
+            return res;
+        });
     }
     cacheStoreAsync(id, val) {
         mkHomeDirs();

package/built/prepYotta.js

@@ -4,8 +4,8 @@
 const os = require("os");
 const path = require("path");
 const fs = require("fs");
-const token = process.env["GH_ACCESS_TOKEN"];
-if (process.env["GH_ACCESS_TOKEN"]) {
+const token = process.env["GITHUB_ACCESS_TOKEN"];
+if (process.env["GITHUB_ACCESS_TOKEN"]) {
     console.log("Writing .netrc and .yotta/config.json");
     const home = os.homedir();
     const yottaDir = path.join(home, ".yotta");

package/built/pxt.js

@@ -103853,6 +103853,7 @@ var pxt;
         commands.notifyProjectCompiled = undefined;
         commands.notifyProjectSaved = undefined;
         commands.onDownloadButtonClick = undefined;
+        commands.getDefaultProjectName = undefined;
     })(commands = pxt.commands || (pxt.commands = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -114013,6 +114014,7 @@ var pxt;
                         pxt.setAppTargetVariant(prevVariant, { temporary: true });
                     }
                 }
+                einfo.appVariant = variant;
                 const inf = target.isNative ? await this.host().getHexInfoAsync(einfo) : null;
                 einfo = pxt.U.flatClone(einfo);
                 if (!target.keepCppFiles) {
@@ -163455,6 +163457,7 @@ class SnippetHost {
 class Host {
     constructor() {
         this.fileOverrides = {};
+        this.queue = new pxt.Util.PromiseQueue();
     }
     resolve(module, filename) {
         //pxt.debug(`resolving ${module.level}:${module.id} -- ${filename} in ${path.resolve(".")}`)
@@ -163586,9 +163589,19 @@ class Host {
         if (useCompileServiceDocker) {
             return build.compileWithLocalCompileService(extInfo);
         }
-        setBuildEngine();
-        return build.buildHexAsync(build.thisBuild, mainPkg, extInfo, forceBuild)
-            .then(() => build.thisBuild.patchHexInfo(extInfo));
+        return this.queue.enqueue("getHexInfoAsync", async () => {
+            const prevVariant = pxt.appTargetVariant;
+            if (extInfo.appVariant && extInfo.appVariant !== prevVariant) {
+                pxt.setAppTargetVariant(extInfo.appVariant, { temporary: true });
+            }
+            setBuildEngine();
+            await build.buildHexAsync(build.thisBuild, mainPkg, extInfo, forceBuild);
+            const res = build.thisBuild.patchHexInfo(extInfo);
+            if (extInfo.appVariant && extInfo.appVariant !== prevVariant) {
+                pxt.setAppTargetVariant(prevVariant);
+            }
+            return res;
+        });
     }
     cacheStoreAsync(id, val) {
         mkHomeDirs();

package/built/pxtlib.d.ts

@@ -975,6 +975,7 @@ declare namespace pxt.commands {
     let notifyProjectCompiled: (headerId: string, compileResult: pxtc.CompileResult) => void;
     let notifyProjectSaved: (header: pxt.workspace.Header) => void;
     let onDownloadButtonClick: () => Promise<void>;
+    let getDefaultProjectName: () => string;
 }
 declare namespace pxt {
     function getWhiteContrastingBackground(color: string): string;

package/built/pxtlib.js

@@ -6167,6 +6167,7 @@ var pxt;
         commands.notifyProjectCompiled = undefined;
         commands.notifyProjectSaved = undefined;
         commands.onDownloadButtonClick = undefined;
+        commands.getDefaultProjectName = undefined;
     })(commands = pxt.commands || (pxt.commands = {}));
 })(pxt || (pxt = {}));
 var pxt;
@@ -16327,6 +16328,7 @@ var pxt;
                         pxt.setAppTargetVariant(prevVariant, { temporary: true });
                     }
                 }
+                einfo.appVariant = variant;
                 const inf = target.isNative ? await this.host().getHexInfoAsync(einfo) : null;
                 einfo = pxt.U.flatClone(einfo);
                 if (!target.keepCppFiles) {