pxt-core 12.2.24 → 12.2.26

package/built/backendutils.js

@@ -1071,7 +1071,7 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
                 }
                 return r;
             }
-            html = html.replace(/<h(\d)[^>]+>\s*([~@])?\s*(.*?)<\/h\d>/g, (full, lvl, tp, body) => {
+            html = html.replace(/<h(\d)[^>]*>\s*([~@])?\s*(.*?)<\/h\d>/g, (full, lvl, tp, body) => {
                 let m = /^(\w+)\s+(.*)/.exec(body);
                 let cmd = m ? m[1] : body;
                 let args = m ? m[2] : "";

package/built/cli.js

@@ -36,11 +36,12 @@ pxt.docs.requireDOMSanitizer = () => {
     const sanitizeHtml = require("sanitize-html");
     const defaults = sanitizeHtml.defaults || {};
     const baseAllowedAttrs = defaults.allowedAttributes || {};
+    const allowedTags = defaults.allowedTags || [];
     const mergeClassAttribute = (tag, ...otherAttributes) => {
         const existing = baseAllowedAttrs[tag] || [];
         return Array.from(new Set([...existing, "class", ...otherAttributes]));
     };
-    const options = Object.assign(Object.assign({}, defaults), { allowedAttributes: Object.assign(Object.assign({}, baseAllowedAttrs), { code: mergeClassAttribute("code"), pre: mergeClassAttribute("pre"), div: mergeClassAttribute("div", "data-youtube", "title") }) });
+    const options = Object.assign(Object.assign({}, defaults), { allowedTags: [...allowedTags, "img"], allowedAttributes: Object.assign(Object.assign({}, baseAllowedAttrs), { code: mergeClassAttribute("code"), pre: mergeClassAttribute("pre"), div: mergeClassAttribute("div", "data-youtube", "title") }) });
     return (html) => sanitizeHtml(html, options);
 };
 let forceCloudBuild = process.env["KS_FORCE_CLOUD"] !== "no";
@@ -390,12 +391,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

@@ -107281,7 +107281,7 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
                 }
                 return r;
             }
-            html = html.replace(/<h(\d)[^>]+>\s*([~@])?\s*(.*?)<\/h\d>/g, (full, lvl, tp, body) => {
+            html = html.replace(/<h(\d)[^>]*>\s*([~@])?\s*(.*?)<\/h\d>/g, (full, lvl, tp, body) => {
                 let m = /^(\w+)\s+(.*)/.exec(body);
                 let cmd = m ? m[1] : body;
                 let args = m ? m[2] : "";
@@ -163226,11 +163226,12 @@ pxt.docs.requireDOMSanitizer = () => {
     const sanitizeHtml = require("sanitize-html");
     const defaults = sanitizeHtml.defaults || {};
     const baseAllowedAttrs = defaults.allowedAttributes || {};
+    const allowedTags = defaults.allowedTags || [];
     const mergeClassAttribute = (tag, ...otherAttributes) => {
         const existing = baseAllowedAttrs[tag] || [];
         return Array.from(new Set([...existing, "class", ...otherAttributes]));
     };
-    const options = Object.assign(Object.assign({}, defaults), { allowedAttributes: Object.assign(Object.assign({}, baseAllowedAttrs), { code: mergeClassAttribute("code"), pre: mergeClassAttribute("pre"), div: mergeClassAttribute("div", "data-youtube", "title") }) });
+    const options = Object.assign(Object.assign({}, defaults), { allowedTags: [...allowedTags, "img"], allowedAttributes: Object.assign(Object.assign({}, baseAllowedAttrs), { code: mergeClassAttribute("code"), pre: mergeClassAttribute("pre"), div: mergeClassAttribute("div", "data-youtube", "title") }) });
     return (html) => sanitizeHtml(html, options);
 };
 let forceCloudBuild = process.env["KS_FORCE_CLOUD"] !== "no";
@@ -163580,12 +163581,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

@@ -9560,7 +9560,7 @@ ${opts.repo.name.replace(/^pxt-/, '')}=github:${opts.repo.fullName}#${opts.repo.
                 }
                 return r;
             }
-            html = html.replace(/<h(\d)[^>]+>\s*([~@])?\s*(.*?)<\/h\d>/g, (full, lvl, tp, body) => {
+            html = html.replace(/<h(\d)[^>]*>\s*([~@])?\s*(.*?)<\/h\d>/g, (full, lvl, tp, body) => {
                 let m = /^(\w+)\s+(.*)/.exec(body);
                 let cmd = m ? m[1] : body;
                 let args = m ? m[2] : "";