pxt-core 13.0.3 → 13.0.4

package/built/backendutils.d.ts

@@ -131,6 +131,7 @@ declare namespace pxt.docs {
         parse?: (src: string, options?: any) => string;
     }
     export function htmlQuote(s: string): string;
+    export function normalizeStaticMarkdown(markdown: string): string;
     export function html2Quote(s: string): string;
     export interface BreadcrumbEntry {
         name: string;

package/built/backendutils.js

@@ -509,6 +509,35 @@ var pxt;
             return s;
         }
         docs.htmlQuote = htmlQuote;
+        function normalizeStaticMarkdown(markdown) {
+            const lines = markdown.split(/\r?\n/);
+            let codeFenceMarker = "";
+            for (let i = 0; i < lines.length; i++) {
+                const fenceMatch = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(lines[i]);
+                if (fenceMatch) {
+                    const marker = fenceMatch[1];
+                    const trailingText = fenceMatch[2];
+                    const closesCodeFence = !!codeFenceMarker
+                        && marker[0] === codeFenceMarker[0]
+                        && marker.length >= codeFenceMarker.length
+                        && !trailingText.trim();
+                    if (closesCodeFence) {
+                        codeFenceMarker = "";
+                    }
+                    else if (!codeFenceMarker) {
+                        codeFenceMarker = marker;
+                    }
+                    continue;
+                }
+                if (!codeFenceMarker && /^ {0,3}<br\s*\/?>\s*$/i.test(lines[i])) {
+                    // Marked treats a standalone break as inline content, which can extend a
+                    // preceding table or keep the following Markdown in the same paragraph.
+                    lines[i] = "\n<p><br/></p>\n";
+                }
+            }
+            return lines.join("\n");
+        }
+        docs.normalizeStaticMarkdown = normalizeStaticMarkdown;
         // the input already should be HTML-quoted but we want to make sure, and also quote quotes
         function html2Quote(s) {
             if (!s)

package/built/cli.js

@@ -41,7 +41,7 @@ pxt.docs.requireDOMSanitizer = () => {
         const existing = baseAllowedAttrs[tag] || [];
         return Array.from(new Set([...existing, "class", ...otherAttributes]));
     };
-    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") }) });
+    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"), img: mergeClassAttribute("img") }) });
     return (html) => sanitizeHtml(html, options);
 };
 let forceCloudBuild = process.env["KS_FORCE_CLOUD"] !== "no";
@@ -2653,7 +2653,7 @@ function renderDocs(builtPackaged, localDir) {
                     nodeutil.writeFileSync(outputFile, patchedMd, { encoding: "utf8" });
                     html = pxt.docs.renderMarkdown({
                         template: docsTemplate,
-                        markdown: patchedMd,
+                        markdown: pxt.docs.normalizeStaticMarkdown(patchedMd),
                         theme: pxt.appTarget.appTheme,
                         filepath: path.join("docs", pathUnderDocs),
                     });

package/built/pxt.js

@@ -106820,6 +106820,35 @@ var pxt;
             return s;
         }
         docs.htmlQuote = htmlQuote;
+        function normalizeStaticMarkdown(markdown) {
+            const lines = markdown.split(/\r?\n/);
+            let codeFenceMarker = "";
+            for (let i = 0; i < lines.length; i++) {
+                const fenceMatch = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(lines[i]);
+                if (fenceMatch) {
+                    const marker = fenceMatch[1];
+                    const trailingText = fenceMatch[2];
+                    const closesCodeFence = !!codeFenceMarker
+                        && marker[0] === codeFenceMarker[0]
+                        && marker.length >= codeFenceMarker.length
+                        && !trailingText.trim();
+                    if (closesCodeFence) {
+                        codeFenceMarker = "";
+                    }
+                    else if (!codeFenceMarker) {
+                        codeFenceMarker = marker;
+                    }
+                    continue;
+                }
+                if (!codeFenceMarker && /^ {0,3}<br\s*\/?>\s*$/i.test(lines[i])) {
+                    // Marked treats a standalone break as inline content, which can extend a
+                    // preceding table or keep the following Markdown in the same paragraph.
+                    lines[i] = "\n<p><br/></p>\n";
+                }
+            }
+            return lines.join("\n");
+        }
+        docs.normalizeStaticMarkdown = normalizeStaticMarkdown;
         // the input already should be HTML-quoted but we want to make sure, and also quote quotes
         function html2Quote(s) {
             if (!s)
@@ -164202,7 +164231,7 @@ pxt.docs.requireDOMSanitizer = () => {
         const existing = baseAllowedAttrs[tag] || [];
         return Array.from(new Set([...existing, "class", ...otherAttributes]));
     };
-    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") }) });
+    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"), img: mergeClassAttribute("img") }) });
     return (html) => sanitizeHtml(html, options);
 };
 let forceCloudBuild = process.env["KS_FORCE_CLOUD"] !== "no";
@@ -166814,7 +166843,7 @@ function renderDocs(builtPackaged, localDir) {
                     nodeutil.writeFileSync(outputFile, patchedMd, { encoding: "utf8" });
                     html = pxt.docs.renderMarkdown({
                         template: docsTemplate,
-                        markdown: patchedMd,
+                        markdown: pxt.docs.normalizeStaticMarkdown(patchedMd),
                         theme: pxt.appTarget.appTheme,
                         filepath: path.join("docs", pathUnderDocs),
                     });

package/built/pxtblocks/fields/field_colour.d.ts

@@ -80,6 +80,7 @@ export declare class FieldColorNumber extends FieldGridDropdown implements Field
      * @returns Height and width.
      */
     getSize(): Blockly.utils.Size;
+    getScaledBBox(): Blockly.utils.Rect;
     /**
      * Updates the colour of the block to reflect whether this is a full
      * block field or not.

package/built/pxtlib.d.ts

@@ -1267,6 +1267,7 @@ declare namespace pxt.docs {
         parse?: (src: string, options?: any) => string;
     }
     export function htmlQuote(s: string): string;
+    export function normalizeStaticMarkdown(markdown: string): string;
     export function html2Quote(s: string): string;
     export interface BreadcrumbEntry {
         name: string;

package/built/pxtlib.js

@@ -9099,6 +9099,35 @@ var pxt;
             return s;
         }
         docs.htmlQuote = htmlQuote;
+        function normalizeStaticMarkdown(markdown) {
+            const lines = markdown.split(/\r?\n/);
+            let codeFenceMarker = "";
+            for (let i = 0; i < lines.length; i++) {
+                const fenceMatch = /^ {0,3}(`{3,}|~{3,})(.*)$/.exec(lines[i]);
+                if (fenceMatch) {
+                    const marker = fenceMatch[1];
+                    const trailingText = fenceMatch[2];
+                    const closesCodeFence = !!codeFenceMarker
+                        && marker[0] === codeFenceMarker[0]
+                        && marker.length >= codeFenceMarker.length
+                        && !trailingText.trim();
+                    if (closesCodeFence) {
+                        codeFenceMarker = "";
+                    }
+                    else if (!codeFenceMarker) {
+                        codeFenceMarker = marker;
+                    }
+                    continue;
+                }
+                if (!codeFenceMarker && /^ {0,3}<br\s*\/?>\s*$/i.test(lines[i])) {
+                    // Marked treats a standalone break as inline content, which can extend a
+                    // preceding table or keep the following Markdown in the same paragraph.
+                    lines[i] = "\n<p><br/></p>\n";
+                }
+            }
+            return lines.join("\n");
+        }
+        docs.normalizeStaticMarkdown = normalizeStaticMarkdown;
         // the input already should be HTML-quoted but we want to make sure, and also quote quotes
         function html2Quote(s) {
             if (!s)