pxt-core 11.3.65 → 11.3.68

package/built/cli.js

@@ -350,13 +350,9 @@ async function ciAsync() {
     if (!buildInfo.branch)
         buildInfo.branch = "local";
     const { tag, branch, pullRequest } = buildInfo;
-    const atok = process.env.NPM_ACCESS_TOKEN;
-    const npmPublish = /^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}`);
-        let cfg = "//registry.npmjs.org/:_authToken=" + atok + "\n";
-        fs.writeFileSync(npmrc, cfg);
+        pxt.log(`npm publish is true`);
     }
     process.env["PXT_ENV"] = "production";
     const latest = branch == "master" ? "latest" : "git-" + branch;
@@ -379,12 +375,30 @@ async function ciAsync() {
     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,6 +1,6 @@
 "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.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.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.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;
 const child_process = require("child_process");
 const fs = require("fs");
 const zlib = require("zlib");
@@ -100,6 +100,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

@@ -112015,6 +112015,7 @@ var pxt;
         let currentValue = null;
         let listStack = [];
         let currentIndent = 0;
+        let currentCodeBlock = null;
         for (const line of lines) {
             if (!line.trim()) {
                 if (currentValue) {
@@ -112022,6 +112023,33 @@ var pxt;
                 }
                 continue;
             }
+            if (line.startsWith("```")) {
+                if (currentCodeBlock) {
+                    if (currentSection) {
+                        if (!currentSection.codeBlocks) {
+                            currentSection.codeBlocks = [currentCodeBlock];
+                        }
+                        else {
+                            currentSection.codeBlocks.push(currentCodeBlock);
+                        }
+                    }
+                    currentCodeBlock = null;
+                    continue;
+                }
+                else {
+                    const match = /^```([a-zA-Z_\-]*)$/.exec(line);
+                    if (match) {
+                        currentCodeBlock = {
+                            content: "",
+                            languageCode: match[1]
+                        };
+                        continue;
+                    }
+                }
+            }
+            else if (currentCodeBlock) {
+                currentCodeBlock.content += line + "\n";
+            }
             if (line.startsWith("#")) {
                 const headerMatch = /^(#+)\s*(.+)$/.exec(line);
                 if (headerMatch) {
@@ -117775,7 +117803,7 @@ var pxt;
             this.nextID = 0;
             this.nextInternalID = 0;
             this.committedState = {
-                revision: 0,
+                revision: TilemapProject.nextRevision++,
                 tilemaps: new AssetCollection(),
                 tiles: new AssetCollection(),
                 animations: new AssetCollection(),
@@ -117783,7 +117811,7 @@ var pxt;
                 songs: new AssetCollection(),
             };
             this.state = {
-                revision: this.nextID++,
+                revision: TilemapProject.nextRevision++,
                 tilemaps: new AssetCollection(),
                 tiles: new AssetCollection(),
                 animations: new AssetCollection(),
@@ -117791,7 +117819,7 @@ var pxt;
                 songs: new AssetCollection(),
             };
             this.gallery = {
-                revision: 0,
+                revision: TilemapProject.nextRevision++,
                 tilemaps: new AssetCollection(),
                 tiles: new AssetCollection(),
                 animations: new AssetCollection(),
@@ -118600,7 +118628,7 @@ var pxt;
         }
         onChange() {
             this.needsRebuild = true;
-            this.state.revision = this.nextID++;
+            this.state.revision = TilemapProject.nextRevision++;
         }
         readImages(allJRes, isProjectFile = false) {
             const assets = [];
@@ -118640,6 +118668,7 @@ var pxt;
             }
         }
     }
+    TilemapProject.nextRevision = 0;
     pxt.TilemapProject = TilemapProject;
     function getTilemaps(allJRes) {
         const res = [];
@@ -161710,13 +161739,9 @@ async function ciAsync() {
     if (!buildInfo.branch)
         buildInfo.branch = "local";
     const { tag, branch, pullRequest } = buildInfo;
-    const atok = process.env.NPM_ACCESS_TOKEN;
-    const npmPublish = /^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}`);
-        let cfg = "//registry.npmjs.org/:_authToken=" + atok + "\n";
-        fs.writeFileSync(npmrc, cfg);
+        pxt.log(`npm publish is true`);
     }
     process.env["PXT_ENV"] = "production";
     const latest = branch == "master" ? "latest" : "git-" + branch;
@@ -161739,12 +161764,30 @@ async function ciAsync() {
     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/pxtblocks/fields/field_tileset.d.ts

@@ -13,9 +13,11 @@ export declare type TilesetDropdownOption = [ImageJSON, string, pxt.Tile];
 export declare class FieldTileset extends FieldImages implements FieldCustom {
     protected selectedOption_: TilesetDropdownOption;
     protected static referencedTiles: TilesetDropdownOption[];
+    protected static cachedPalette: string;
     protected static cachedRevision: number;
-    protected static cachedWorkspaceId: string;
+    protected static bitmapCache: Map<string, string>;
     protected static getReferencedTiles(workspace: Blockly.Workspace): TilesetDropdownOption[];
+    static getTileImage(t: pxt.Tile): string;
     isFieldCustom_: boolean;
     protected selected: pxt.Tile;
     protected blocksInfo: pxtc.BlocksInfo;

package/built/pxtlib.d.ts

@@ -1951,6 +1951,11 @@ declare namespace pxt {
         header: string;
         attributes: pxt.Map<string>;
         listAttributes?: pxt.Map<MarkdownList>;
+        codeBlocks?: MarkdownCodeBlock[];
+    }
+    interface MarkdownCodeBlock {
+        content: string;
+        languageCode?: string;
     }
     interface MarkdownList {
         key: string;
@@ -2986,6 +2991,7 @@ declare namespace pxt {
     }
     export class TilemapProject {
         needsRebuild: boolean;
+        protected static nextRevision: number;
         protected extensionTileSets: TileSetCollection[];
         protected state: AssetSnapshot;
         protected committedState: AssetSnapshot;

package/built/pxtlib.js

@@ -14329,6 +14329,7 @@ var pxt;
         let currentValue = null;
         let listStack = [];
         let currentIndent = 0;
+        let currentCodeBlock = null;
         for (const line of lines) {
             if (!line.trim()) {
                 if (currentValue) {
@@ -14336,6 +14337,33 @@ var pxt;
                 }
                 continue;
             }
+            if (line.startsWith("```")) {
+                if (currentCodeBlock) {
+                    if (currentSection) {
+                        if (!currentSection.codeBlocks) {
+                            currentSection.codeBlocks = [currentCodeBlock];
+                        }
+                        else {
+                            currentSection.codeBlocks.push(currentCodeBlock);
+                        }
+                    }
+                    currentCodeBlock = null;
+                    continue;
+                }
+                else {
+                    const match = /^```([a-zA-Z_\-]*)$/.exec(line);
+                    if (match) {
+                        currentCodeBlock = {
+                            content: "",
+                            languageCode: match[1]
+                        };
+                        continue;
+                    }
+                }
+            }
+            else if (currentCodeBlock) {
+                currentCodeBlock.content += line + "\n";
+            }
             if (line.startsWith("#")) {
                 const headerMatch = /^(#+)\s*(.+)$/.exec(line);
                 if (headerMatch) {
@@ -20089,7 +20117,7 @@ var pxt;
             this.nextID = 0;
             this.nextInternalID = 0;
             this.committedState = {
-                revision: 0,
+                revision: TilemapProject.nextRevision++,
                 tilemaps: new AssetCollection(),
                 tiles: new AssetCollection(),
                 animations: new AssetCollection(),
@@ -20097,7 +20125,7 @@ var pxt;
                 songs: new AssetCollection(),
             };
             this.state = {
-                revision: this.nextID++,
+                revision: TilemapProject.nextRevision++,
                 tilemaps: new AssetCollection(),
                 tiles: new AssetCollection(),
                 animations: new AssetCollection(),
@@ -20105,7 +20133,7 @@ var pxt;
                 songs: new AssetCollection(),
             };
             this.gallery = {
-                revision: 0,
+                revision: TilemapProject.nextRevision++,
                 tilemaps: new AssetCollection(),
                 tiles: new AssetCollection(),
                 animations: new AssetCollection(),
@@ -20914,7 +20942,7 @@ var pxt;
         }
         onChange() {
             this.needsRebuild = true;
-            this.state.revision = this.nextID++;
+            this.state.revision = TilemapProject.nextRevision++;
         }
         readImages(allJRes, isProjectFile = false) {
             const assets = [];
@@ -20954,6 +20982,7 @@ var pxt;
             }
         }
     }
+    TilemapProject.nextRevision = 0;
     pxt.TilemapProject = TilemapProject;
     function getTilemaps(allJRes) {
         const res = [];