pxt-core 8.2.7 → 8.2.10

package/built/pxtlib.js

@@ -19318,6 +19318,7 @@ var pxt;
                 diffify(steps, activities);
             }
             const assetFiles = parseAssetJson(assetJson);
+            const globalBlockConfig = parseTutorialBlockConfig("global", tutorialmd);
             // strip hidden snippets
             steps.forEach(step => {
                 step.contentMd = stripHiddenSnippets(step.contentMd);
@@ -19337,7 +19338,8 @@ var pxt;
                 jres,
                 assetFiles,
                 customTs,
-                tutorialValidationRules
+                tutorialValidationRules,
+                globalBlockConfig
             };
         }
         tutorial.parseTutorial = parseTutorial;
@@ -19364,6 +19366,8 @@ var pxt;
                 switch (m1) {
                     case "block":
                     case "blocks":
+                    case "blockconfig.local":
+                    case "blockconfig.global":
                     case "requiredTutorialBlock":
                     case "filterblocks":
                         if (!checkTutorialEditor(pxt.BLOCKS_PROJECT_NAME))
@@ -19516,6 +19520,7 @@ ${code}
             markdown.replace(stepRegex, function (match, flags, step) {
                 step = step.trim();
                 let { header, hint, requiredBlocks } = parseTutorialHint(step, metadata && metadata.explicitHints, metadata.tutorialCodeValidation);
+                const blockConfig = parseTutorialBlockConfig("local", step);
                 // if title is not hidden ("{TITLE HERE}"), strip flags
                 const title = !flags.match(/^\{.*\}$/)
                     ? flags.replace(/@(fullscreen|unplugged|showdialog|showhint|tutorialCompleted|resetDiff)/gi, "").trim()
@@ -19523,7 +19528,8 @@ ${code}
                 let info = {
                     title,
                     contentMd: step,
-                    headerContentMd: header
+                    headerContentMd: header,
+                    localBlockConfig: blockConfig
                 };
                 if (/@(fullscreen|unplugged|showdialog|showhint)/i.test(flags))
                     info.showHint = true;
@@ -19578,6 +19584,18 @@ ${code}
             }
             return { header, hint, requiredBlocks };
         }
+        function parseTutorialBlockConfig(scope, content) {
+            let blockConfig = {
+                md: "",
+                blocks: [],
+            };
+            const regex = new RegExp(`\`\`\`\\s*blockconfig\\.${scope}\\s*\\n([\\s\\S]*?)\\n\`\`\``, "gmi");
+            content.replace(regex, (m0, m1) => {
+                blockConfig.md += `${m1}\n`;
+                return "";
+            });
+            return blockConfig;
+        }
         function categorizingValidationRules(listOfRules, title) {
             const ruleNames = Object.keys(listOfRules);
             for (let i = 0; i < ruleNames.length; i++) {
@@ -19593,7 +19611,7 @@ ${code}
         function stripHiddenSnippets(str) {
             if (!str)
                 return str;
-            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts)\s*\n([\s\S]*?)\n```/gmi;
+            const hiddenSnippetRegex = /```(filterblocks|package|ghost|config|template|jres|assetjson|customts|blockconfig\.local|blockconfig\.global)\s*\n([\s\S]*?)\n```/gmi;
             return str.replace(hiddenSnippetRegex, '').trim();
         }
         /*
@@ -19675,7 +19693,8 @@ ${code}
                 jres: tutorialInfo.jres,
                 assetFiles: tutorialInfo.assetFiles,
                 customTs: tutorialInfo.customTs,
-                tutorialValidationRules: tutorialInfo.tutorialValidationRules
+                tutorialValidationRules: tutorialInfo.tutorialValidationRules,
+                globalBlockConfig: tutorialInfo.globalBlockConfig
             };
             return { options: tutorialOptions, editor: tutorialInfo.editor };
         }

package/built/pxtrunner.js

@@ -1319,6 +1319,18 @@ var pxt;
                 c = c.parent();
             c.remove();
         }
+        function renderBlockConfig(options) {
+            function render(scope) {
+                $(`code.lang-blockconfig.${scope}`).each((i, c) => {
+                    let $c = $(c);
+                    if (options.snippetReplaceParent)
+                        $c = $c.parent();
+                    $c.remove();
+                });
+            }
+            render("local");
+            render("global");
+        }
         function renderSims(options) {
             if (!options.simulatorClass)
                 return;
@@ -1359,6 +1371,7 @@ var pxt;
             readAssetJson(options);
             renderQueue = [];
             renderGhost(options);
+            renderBlockConfig(options);
             renderSims(options);
             renderTypeScript(options);
             renderDirectPython(options);

package/built/pxtsim.js

@@ -5695,19 +5695,16 @@ var pxsim;
             if (Runtime.messagePosted)
                 Runtime.messagePosted(data);
         }
-        static postScreenshotAsync(opts) {
+        static async postScreenshotAsync(opts) {
             const b = pxsim.runtime && pxsim.runtime.board;
-            const p = b
-                ? b.screenshotAsync().catch(e => {
-                    console.debug(`screenshot failed`);
-                    return undefined;
-                })
-                : Promise.resolve(undefined);
-            return p.then(img => Runtime.postMessage({
+            if (!b)
+                return undefined;
+            const img = await b.screenshotAsync();
+            Runtime.postMessage({
                 type: "screenshot",
                 data: img,
                 delay: opts && opts.delay
-            }));
+            });
         }
         static requestToggleRecording() {
             const r = pxsim.runtime;