pxt-core 13.1.3 → 13.1.5

package/built/cli.js

@@ -5582,6 +5582,19 @@ function readBlocksprjConfig() {
     const config = nodeutil.readJson(configPath);
     return config;
 }
+function mergeCorePackage(corePackage, dependencies = {}) {
+    for (const dep of Object.keys(dependencies)) {
+        const verSpec = dependencies[dep];
+        if (pxt.appTarget.bundledpkgs[dep] && (verSpec === "*" || verSpec.startsWith("file:"))) {
+            const bundled = pxt.appTarget.bundledpkgs[dep];
+            const config = pxt.U.jsonTryParse(bundled[pxt.CONFIG_NAME]);
+            if (config === null || config === void 0 ? void 0 : config.core) {
+                return dependencies;
+            }
+        }
+    }
+    return pxt.tutorial.mergeTutorialDependencies(corePackage.dependencies, dependencies);
+}
 function checkFileSize(files) {
     if (!pxt.appTarget.cloud)
         return 0;
@@ -5826,7 +5839,7 @@ function internalCheckDocsAsync(compileSnippets, re, fix, pycheck) {
                                     continue;
                                 }
                                 const tutorial = pxt.tutorial.parseTutorial(tutorialMd);
-                                const pkgs = pxt.tutorial.mergeTutorialDependencies(blocksprjConfig.dependencies, pxt.gallery.parsePackagesFromMarkdown(tutorialMd) || {});
+                                const pkgs = mergeCorePackage(blocksprjConfig, pxt.gallery.parsePackagesFromMarkdown(tutorialMd) || {});
                                 let extraFiles = null;
                                 if (tutorial.jres) {
                                     extraFiles = {
@@ -5877,7 +5890,7 @@ function internalCheckDocsAsync(compileSnippets, re, fix, pycheck) {
                                     continue;
                                 }
                                 const prj = pxt.gallery.parseExampleMarkdown(card.name, exMd);
-                                const pkgs = pxt.tutorial.mergeTutorialDependencies(blocksprjConfig.dependencies, prj.dependencies);
+                                const pkgs = mergeCorePackage(blocksprjConfig, prj.dependencies);
                                 let extraFiles = undefined;
                                 if (prj.filesOverride[pxt.TILEMAP_CODE] && prj.filesOverride[pxt.TILEMAP_JRES]) {
                                     extraFiles = {
@@ -5962,7 +5975,7 @@ function internalCacheUsedBlocksAsync() {
         }
         const tutorial = pxt.tutorial.parseTutorial(md);
         const tutorialDeps = pxt.gallery.parsePackagesFromMarkdown(md) || {};
-        const pkgs = pxt.tutorial.mergeTutorialDependencies(blocksprjConfig.dependencies, tutorialDeps);
+        const pkgs = mergeCorePackage(blocksprjConfig, tutorialDeps);
         tutorial.pkgs = pkgs;
         tutorial.path = path;
         const hash = pxt.BrowserUtils.getTutorialCodeHash(tutorial.code);
@@ -6098,7 +6111,7 @@ function getCodeSnippets(fileName, md, baseConfig) {
         }
         return acc;
     }, {});
-    const pkgs = pxt.tutorial.mergeTutorialDependencies(baseConfig.dependencies, tutorialDeps);
+    const pkgs = mergeCorePackage(baseConfig, tutorialDeps);
     const pkgName = fileName.replace(/\\/g, '-').replace(/.md$/i, '');
     return codeSnippets.map((snip, i) => {
         return {

package/built/pxt.js

@@ -120947,6 +120947,8 @@ ${code}
         tutorial_1.shouldFilterProject = shouldFilterProject;
         function mergeTutorialDependencies(projectDependencies, tutorialDependencies) {
             const merged = Object.assign({}, projectDependencies);
+            if (!tutorialDependencies)
+                return merged;
             for (const dep of Object.keys(tutorialDependencies)) {
                 const ver = tutorialDependencies[dep];
                 if (ver.toLowerCase() === "remove") {
@@ -169743,6 +169745,19 @@ function readBlocksprjConfig() {
     const config = nodeutil.readJson(configPath);
     return config;
 }
+function mergeCorePackage(corePackage, dependencies = {}) {
+    for (const dep of Object.keys(dependencies)) {
+        const verSpec = dependencies[dep];
+        if (pxt.appTarget.bundledpkgs[dep] && (verSpec === "*" || verSpec.startsWith("file:"))) {
+            const bundled = pxt.appTarget.bundledpkgs[dep];
+            const config = pxt.U.jsonTryParse(bundled[pxt.CONFIG_NAME]);
+            if (config === null || config === void 0 ? void 0 : config.core) {
+                return dependencies;
+            }
+        }
+    }
+    return pxt.tutorial.mergeTutorialDependencies(corePackage.dependencies, dependencies);
+}
 function checkFileSize(files) {
     if (!pxt.appTarget.cloud)
         return 0;
@@ -169987,7 +170002,7 @@ function internalCheckDocsAsync(compileSnippets, re, fix, pycheck) {
                                     continue;
                                 }
                                 const tutorial = pxt.tutorial.parseTutorial(tutorialMd);
-                                const pkgs = pxt.tutorial.mergeTutorialDependencies(blocksprjConfig.dependencies, pxt.gallery.parsePackagesFromMarkdown(tutorialMd) || {});
+                                const pkgs = mergeCorePackage(blocksprjConfig, pxt.gallery.parsePackagesFromMarkdown(tutorialMd) || {});
                                 let extraFiles = null;
                                 if (tutorial.jres) {
                                     extraFiles = {
@@ -170038,7 +170053,7 @@ function internalCheckDocsAsync(compileSnippets, re, fix, pycheck) {
                                     continue;
                                 }
                                 const prj = pxt.gallery.parseExampleMarkdown(card.name, exMd);
-                                const pkgs = pxt.tutorial.mergeTutorialDependencies(blocksprjConfig.dependencies, prj.dependencies);
+                                const pkgs = mergeCorePackage(blocksprjConfig, prj.dependencies);
                                 let extraFiles = undefined;
                                 if (prj.filesOverride[pxt.TILEMAP_CODE] && prj.filesOverride[pxt.TILEMAP_JRES]) {
                                     extraFiles = {
@@ -170123,7 +170138,7 @@ function internalCacheUsedBlocksAsync() {
         }
         const tutorial = pxt.tutorial.parseTutorial(md);
         const tutorialDeps = pxt.gallery.parsePackagesFromMarkdown(md) || {};
-        const pkgs = pxt.tutorial.mergeTutorialDependencies(blocksprjConfig.dependencies, tutorialDeps);
+        const pkgs = mergeCorePackage(blocksprjConfig, tutorialDeps);
         tutorial.pkgs = pkgs;
         tutorial.path = path;
         const hash = pxt.BrowserUtils.getTutorialCodeHash(tutorial.code);
@@ -170259,7 +170274,7 @@ function getCodeSnippets(fileName, md, baseConfig) {
         }
         return acc;
     }, {});
-    const pkgs = pxt.tutorial.mergeTutorialDependencies(baseConfig.dependencies, tutorialDeps);
+    const pkgs = mergeCorePackage(baseConfig, tutorialDeps);
     const pkgName = fileName.replace(/\\/g, '-').replace(/.md$/i, '');
     return codeSnippets.map((snip, i) => {
         return {

package/built/pxtlib.js

@@ -23226,6 +23226,8 @@ ${code}
         tutorial_1.shouldFilterProject = shouldFilterProject;
         function mergeTutorialDependencies(projectDependencies, tutorialDependencies) {
             const merged = Object.assign({}, projectDependencies);
+            if (!tutorialDependencies)
+                return merged;
             for (const dep of Object.keys(tutorialDependencies)) {
                 const ver = tutorialDependencies[dep];
                 if (ver.toLowerCase() === "remove") {

package/built/react-common/components/controls/Modal.d.ts

@@ -14,12 +14,12 @@ export interface ModalAction {
 export interface ModalProps extends ContainerProps {
     title: string;
     leftIcon?: string;
-    helpUrl?: string;
     ariaDescribedBy?: string;
     actions?: ModalAction[];
     onClose?: () => void;
     fullscreen?: boolean;
     parentElement?: Element;
     hideDismissButton?: boolean;
+    rightHeader?: React.ReactNode;
 }
 export declare const Modal: (props: ModalProps) => React.ReactPortal;