pxt-core 12.0.16 → 12.0.18

package/built/cli.js

@@ -349,13 +349,9 @@ async function ciAsync(parsed) {
         tag = tagOverride;
         pxt.log(`overriding tag to ${tag}`);
     }
-    const atok = process.env.NPM_ACCESS_TOKEN;
-    const npmPublish = (intentToPublish || /^v\d+\.\d+\.\d+$/.exec(tag)) && atok;
+    const npmPublish = /^v\d+\.\d+\.\d+$/.exec(tag) && process.env.NPM_PUBLISH;
     if (npmPublish) {
-        let npmrc = path.join(process.env.HOME, ".npmrc");
-        pxt.log(`setting up ${npmrc} for publish`);
-        let cfg = "//registry.npmjs.org/:_authToken=" + atok + "\n";
-        fs.writeFileSync(npmrc, cfg);
+        pxt.log(`npm publish is true`);
     }
     else if (intentToPublish) {
         pxt.log("not publishing, no tag or access token");
@@ -381,12 +377,30 @@ async function ciAsync(parsed) {
     pxt.log(`upload docs: ${uploadDocs}`);
     lintJSONInDirectory(path.resolve("."));
     lintJSONInDirectory(path.resolve("docs"));
-    function npmPublishAsync() {
+    let pkg = readJson("package.json");
+    async function npmPublishAsync() {
         if (!npmPublish)
             return Promise.resolve();
+        let latest;
+        try {
+            const version = await nodeutil.npmLatestVersionAsync(pkg["name"]);
+            latest = pxt.semver.parse(version);
+        }
+        catch (e) {
+            // no latest tag
+        }
+        let distTag;
+        if (latest) {
+            const current = pxt.semver.parse(pkg["version"]);
+            if (pxt.semver.cmp(current, latest) < 0) {
+                distTag = `stable${current.major}.${current.minor}`;
+            }
+        }
+        if (distTag) {
+            return nodeutil.runNpmAsync("publish", "--tag", distTag);
+        }
         return nodeutil.runNpmAsync("publish");
     }
-    let pkg = readJson("package.json");
     if (pkg["name"] == "pxt-core") {
         pxt.log("pxt-core build");
         const isTaggedCommit = await checkIfTaggedCommitAsync();

package/built/nodeutil.d.ts

@@ -23,6 +23,7 @@ export declare function spawnAsync(opts: SpawnOptions): Promise<void>;
 export declare function spawnWithPipeAsync(opts: SpawnOptions): Promise<Buffer>;
 export declare function addCmd(name: string): string;
 export declare function runNpmAsync(...args: string[]): Promise<void>;
+export declare function npmLatestVersionAsync(packageName: string): Promise<string>;
 export interface NpmRegistry {
     _id: string;
     _name: string;

package/built/nodeutil.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringify = exports.lazyRequire = exports.lazyDependencies = exports.getBundledPackagesDocs = exports.resolveMd = exports.lastResolveMdDirs = exports.fileExistsSync = exports.openUrl = exports.writeFileSync = exports.existsDirSync = exports.allFiles = exports.cp = exports.cpR = exports.mkdirP = exports.pathToPtr = exports.getPxtTarget = exports.readPkgConfig = exports.readText = exports.readJson = exports.sanitizePath = exports.timestamp = exports.isBranchProtectedAsync = exports.createPullRequestAsync = exports.gitPushAsync = exports.npmVersionBumpAsync = exports.getLocalTagPointingAtHeadAsync = exports.switchBranchAsync = exports.createBranchAsync = exports.getGitHubOwnerAndRepoAsync = exports.getGitHubUserAsync = exports.getGitHubTokenAsync = exports.getCurrentBranchNameAsync = exports.getDefaultBranchAsync = exports.needsGitCleanAsync = exports.currGitTagAsync = exports.gitInfoAsync = exports.runGitAsync = exports.runNpmAsyncWithCwd = exports.npmRegistryAsync = exports.runNpmAsync = exports.addCmd = exports.spawnWithPipeAsync = exports.spawnAsync = exports.readResAsync = exports.setTargetDir = exports.runCliFinalizersAsync = exports.addCliFinalizer = exports.cliFinalizers = exports.pxtCoreDir = exports.targetDir = void 0;
-exports.matchesAny = void 0;
+exports.lazyRequire = exports.lazyDependencies = exports.getBundledPackagesDocs = exports.resolveMd = exports.lastResolveMdDirs = exports.fileExistsSync = exports.openUrl = exports.writeFileSync = exports.existsDirSync = exports.allFiles = exports.cp = exports.cpR = exports.mkdirP = exports.pathToPtr = exports.getPxtTarget = exports.readPkgConfig = exports.readText = exports.readJson = exports.sanitizePath = exports.timestamp = exports.isBranchProtectedAsync = exports.createPullRequestAsync = exports.gitPushAsync = exports.npmVersionBumpAsync = exports.getLocalTagPointingAtHeadAsync = exports.switchBranchAsync = exports.createBranchAsync = exports.getGitHubOwnerAndRepoAsync = exports.getGitHubUserAsync = exports.getGitHubTokenAsync = exports.getCurrentBranchNameAsync = exports.getDefaultBranchAsync = exports.needsGitCleanAsync = exports.currGitTagAsync = exports.gitInfoAsync = exports.runGitAsync = exports.runNpmAsyncWithCwd = exports.npmRegistryAsync = exports.npmLatestVersionAsync = exports.runNpmAsync = exports.addCmd = exports.spawnWithPipeAsync = exports.spawnAsync = exports.readResAsync = exports.setTargetDir = exports.runCliFinalizersAsync = exports.addCliFinalizer = exports.cliFinalizers = exports.pxtCoreDir = exports.targetDir = void 0;
+exports.matchesAny = exports.stringify = void 0;
 const child_process = require("child_process");
 const fs = require("fs");
 const zlib = require("zlib");
@@ -101,6 +101,15 @@ function runNpmAsync(...args) {
     return runNpmAsyncWithCwd(".", ...args);
 }
 exports.runNpmAsync = runNpmAsync;
+async function npmLatestVersionAsync(packageName) {
+    const output = await spawnWithPipeAsync({
+        cmd: addCmd("npm"),
+        args: ["view", packageName, "dist-tags.latest"],
+        cwd: ".",
+    });
+    return output.toString("utf8").trim();
+}
+exports.npmLatestVersionAsync = npmLatestVersionAsync;
 function npmRegistryAsync(pkg) {
     // TODO: use token if available
     return Util.httpGetJsonAsync(`https://registry.npmjs.org/${pkg}`);

package/built/pxt.js

@@ -97927,7 +97927,7 @@ var pxt;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             language: pxt.appTarget.appTheme.defaultLocale,
             highContrast: false,
-            accessibleBlocks: false,
+            accessibleBlocks: undefined,
             colorThemeIds: {},
             reader: "",
             skillmap: { mapProgress: {}, completedTags: {} },
@@ -162573,13 +162573,9 @@ async function ciAsync(parsed) {
         tag = tagOverride;
         pxt.log(`overriding tag to ${tag}`);
     }
-    const atok = process.env.NPM_ACCESS_TOKEN;
-    const npmPublish = (intentToPublish || /^v\d+\.\d+\.\d+$/.exec(tag)) && atok;
+    const npmPublish = /^v\d+\.\d+\.\d+$/.exec(tag) && process.env.NPM_PUBLISH;
     if (npmPublish) {
-        let npmrc = path.join(process.env.HOME, ".npmrc");
-        pxt.log(`setting up ${npmrc} for publish`);
-        let cfg = "//registry.npmjs.org/:_authToken=" + atok + "\n";
-        fs.writeFileSync(npmrc, cfg);
+        pxt.log(`npm publish is true`);
     }
     else if (intentToPublish) {
         pxt.log("not publishing, no tag or access token");
@@ -162605,12 +162601,30 @@ async function ciAsync(parsed) {
     pxt.log(`upload docs: ${uploadDocs}`);
     lintJSONInDirectory(path.resolve("."));
     lintJSONInDirectory(path.resolve("docs"));
-    function npmPublishAsync() {
+    let pkg = readJson("package.json");
+    async function npmPublishAsync() {
         if (!npmPublish)
             return Promise.resolve();
+        let latest;
+        try {
+            const version = await nodeutil.npmLatestVersionAsync(pkg["name"]);
+            latest = pxt.semver.parse(version);
+        }
+        catch (e) {
+            // no latest tag
+        }
+        let distTag;
+        if (latest) {
+            const current = pxt.semver.parse(pkg["version"]);
+            if (pxt.semver.cmp(current, latest) < 0) {
+                distTag = `stable${current.major}.${current.minor}`;
+            }
+        }
+        if (distTag) {
+            return nodeutil.runNpmAsync("publish", "--tag", distTag);
+        }
         return nodeutil.runNpmAsync("publish");
     }
-    let pkg = readJson("package.json");
     if (pkg["name"] == "pxt-core") {
         pxt.log("pxt-core build");
         const isTaggedCommit = await checkIfTaggedCommitAsync();

package/built/pxtlib.js

@@ -206,7 +206,7 @@ var pxt;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             language: pxt.appTarget.appTheme.defaultLocale,
             highContrast: false,
-            accessibleBlocks: false,
+            accessibleBlocks: undefined,
             colorThemeIds: {},
             reader: "",
             skillmap: { mapProgress: {}, completedTags: {} },