pxt-core 9.1.3 → 9.1.6

package/built/cli.js

@@ -1567,7 +1567,7 @@ function getGalleryUrl(props) {
     return typeof props === "string" ? props : props.url;
 }
 function replaceStaticImagesInJsonBlob(cfg, staticAssetHandler) {
-    return pxt.replaceStringsInJsonBlob(cfg, /^\.?\/static\/.+\.(png|gif|jpeg|jpg|svg|mp4)$/i, staticAssetHandler);
+    return pxt.replaceStringsInJsonBlob(cfg, /^\.?\/static\/.+\.(png|gif|jpeg|jpg|svg|mp4|ico)$/i, staticAssetHandler);
 }
 function saveThemeJson(cfg, localDir, packaged) {
     var _a, _b, _c;
@@ -2077,7 +2077,7 @@ async function buildTargetCoreAsync(options = {}) {
     if (pxt.appTarget.cacheusedblocksdirs)
         cfg.tutorialInfo = await internalCacheUsedBlocksAsync();
     await forEachBundledPkgAsync(async (pkg, dirname) => {
-        var _a, _b;
+        var _a, _b, _c;
         pxt.log(`building bundled ${dirname}`);
         let isPrj = /prj$/.test(dirname);
         const isHw = /hw---/.test(dirname);
@@ -2111,12 +2111,12 @@ async function buildTargetCoreAsync(options = {}) {
             }
         }
         // For the projects, we need to save the base HEX file to the offline HEX cache
-        if (isPrj && pxt.appTarget.compile && pxt.appTarget.compile.hasHex) {
+        if (isPrj && ((_a = pxt.appTarget.compile) === null || _a === void 0 ? void 0 : _a.hasHex)) {
             if (!pkgOptions) {
                 pxt.debug(`Failed to extract native image for project ${dirname}`);
                 return;
             }
-            const hexFileExtInfo = [pkgOptions.extinfo, ...(((_a = pkgOptions.otherMultiVariants) === null || _a === void 0 ? void 0 : _a.map(el => el.extinfo)) || [])];
+            const hexFileExtInfo = [pkgOptions.extinfo, ...(((_b = pkgOptions.otherMultiVariants) === null || _b === void 0 ? void 0 : _b.map(el => el.extinfo)) || [])];
             for (const extinfo of hexFileExtInfo) {
                 // Place the base HEX image in the hex cache if necessary
                 let sha = extinfo.sha;
@@ -2137,24 +2137,25 @@ async function buildTargetCoreAsync(options = {}) {
             // We want to cache a hex file for each of the native packages in case they are added to a project.
             // This won't cover the whole matrix, but handles the common case of projects that add one extra
             // extension in the offline app.
-            const allDeps = pkg.sortedDeps(true).map(dep => path.resolve(path.join(dirname, dep.verArgument())))
+            const allDeps = pkg.sortedDeps(true)
+                .map(dep => path.resolve(path.join(dirname, dep.verArgument())))
                 .map(dep => path.resolve(dep).replace(/---.*/, "")); // keep path format (/ vs \\) consistent, trim --- suffix to avoid duplicate imports.
             const config = nodeutil.readPkgConfig(dirname);
             const host = pkg.host();
             const pkgsToBuildWith = packageDirs.filter(dirname => !allDeps.some(el => el.indexOf(dirname.replace(/---.*/, "")) !== -1));
-            pxt.log(`Dependencies of pkg: ${allDeps}`);
-            pxt.log(`Attemping to bundle necessary hexfiles to compile with: ${pkgsToBuildWith}`);
+            pxt.log(`Dependencies of base pkgs: ${allDeps.map(el => path.basename(el)).join(", ")}`);
             for (const extraPackage of pkgsToBuildWith) {
+                const extraPathBaseName = path.basename(extraPackage);
                 process.chdir(path.join(rootDir, dirname));
-                const deps = Object.assign(Object.assign({}, config.dependencies), { extra: "file:" + path.relative(path.resolve("."), extraPackage) });
+                const deps = Object.assign(Object.assign({}, config.dependencies), { [extraPathBaseName]: "file:" + path.relative(path.resolve("."), extraPackage) });
                 host.fileOverrides["pxt.json"] = JSON.stringify(Object.assign(Object.assign({}, config), { dependencies: deps }));
-                pxt.log(`Building hex cache for ${pkg.config.name} with dependencies:`);
+                pxt.log(`Building hex cache for ${extraPathBaseName} with dependencies:`);
                 console.dir(deps);
                 mainPkg = new pxt.MainPackage(host);
                 try {
                     const extraRes = await testForBuildTargetAsync(true, null);
                     if (extraRes) {
-                        const hexFileExtInfo = [extraRes.options.extinfo, ...(((_b = extraRes.options.otherMultiVariants) === null || _b === void 0 ? void 0 : _b.map(el => el.extinfo)) || [])];
+                        const hexFileExtInfo = [extraRes.options.extinfo, ...(((_c = extraRes.options.otherMultiVariants) === null || _c === void 0 ? void 0 : _c.map(el => el.extinfo)) || [])];
                         for (const extinfo of hexFileExtInfo) {
                             // Place the base HEX image in the hex cache if necessary
                             let sha = extinfo.sha;
@@ -2165,7 +2166,7 @@ async function buildTargetCoreAsync(options = {}) {
                             }
                             else {
                                 nodeutil.writeFileSync(hexFile, hex.join(os.EOL));
-                                pxt.debug(`created native image in offline cache for project ${dirname}: ${hexFile}`);
+                                pxt.log(`created native image in offline cache for project ${dirname}: ${hexFile}`);
                             }
                         }
                     }

package/built/pxt.js

@@ -162219,7 +162219,7 @@ function getGalleryUrl(props) {
     return typeof props === "string" ? props : props.url;
 }
 function replaceStaticImagesInJsonBlob(cfg, staticAssetHandler) {
-    return pxt.replaceStringsInJsonBlob(cfg, /^\.?\/static\/.+\.(png|gif|jpeg|jpg|svg|mp4)$/i, staticAssetHandler);
+    return pxt.replaceStringsInJsonBlob(cfg, /^\.?\/static\/.+\.(png|gif|jpeg|jpg|svg|mp4|ico)$/i, staticAssetHandler);
 }
 function saveThemeJson(cfg, localDir, packaged) {
     var _a, _b, _c;
@@ -162729,7 +162729,7 @@ async function buildTargetCoreAsync(options = {}) {
     if (pxt.appTarget.cacheusedblocksdirs)
         cfg.tutorialInfo = await internalCacheUsedBlocksAsync();
     await forEachBundledPkgAsync(async (pkg, dirname) => {
-        var _a, _b;
+        var _a, _b, _c;
         pxt.log(`building bundled ${dirname}`);
         let isPrj = /prj$/.test(dirname);
         const isHw = /hw---/.test(dirname);
@@ -162763,12 +162763,12 @@ async function buildTargetCoreAsync(options = {}) {
             }
         }
         // For the projects, we need to save the base HEX file to the offline HEX cache
-        if (isPrj && pxt.appTarget.compile && pxt.appTarget.compile.hasHex) {
+        if (isPrj && ((_a = pxt.appTarget.compile) === null || _a === void 0 ? void 0 : _a.hasHex)) {
             if (!pkgOptions) {
                 pxt.debug(`Failed to extract native image for project ${dirname}`);
                 return;
             }
-            const hexFileExtInfo = [pkgOptions.extinfo, ...(((_a = pkgOptions.otherMultiVariants) === null || _a === void 0 ? void 0 : _a.map(el => el.extinfo)) || [])];
+            const hexFileExtInfo = [pkgOptions.extinfo, ...(((_b = pkgOptions.otherMultiVariants) === null || _b === void 0 ? void 0 : _b.map(el => el.extinfo)) || [])];
             for (const extinfo of hexFileExtInfo) {
                 // Place the base HEX image in the hex cache if necessary
                 let sha = extinfo.sha;
@@ -162789,24 +162789,25 @@ async function buildTargetCoreAsync(options = {}) {
             // We want to cache a hex file for each of the native packages in case they are added to a project.
             // This won't cover the whole matrix, but handles the common case of projects that add one extra
             // extension in the offline app.
-            const allDeps = pkg.sortedDeps(true).map(dep => path.resolve(path.join(dirname, dep.verArgument())))
+            const allDeps = pkg.sortedDeps(true)
+                .map(dep => path.resolve(path.join(dirname, dep.verArgument())))
                 .map(dep => path.resolve(dep).replace(/---.*/, "")); // keep path format (/ vs \\) consistent, trim --- suffix to avoid duplicate imports.
             const config = nodeutil.readPkgConfig(dirname);
             const host = pkg.host();
             const pkgsToBuildWith = packageDirs.filter(dirname => !allDeps.some(el => el.indexOf(dirname.replace(/---.*/, "")) !== -1));
-            pxt.log(`Dependencies of pkg: ${allDeps}`);
-            pxt.log(`Attemping to bundle necessary hexfiles to compile with: ${pkgsToBuildWith}`);
+            pxt.log(`Dependencies of base pkgs: ${allDeps.map(el => path.basename(el)).join(", ")}`);
             for (const extraPackage of pkgsToBuildWith) {
+                const extraPathBaseName = path.basename(extraPackage);
                 process.chdir(path.join(rootDir, dirname));
-                const deps = Object.assign(Object.assign({}, config.dependencies), { extra: "file:" + path.relative(path.resolve("."), extraPackage) });
+                const deps = Object.assign(Object.assign({}, config.dependencies), { [extraPathBaseName]: "file:" + path.relative(path.resolve("."), extraPackage) });
                 host.fileOverrides["pxt.json"] = JSON.stringify(Object.assign(Object.assign({}, config), { dependencies: deps }));
-                pxt.log(`Building hex cache for ${pkg.config.name} with dependencies:`);
+                pxt.log(`Building hex cache for ${extraPathBaseName} with dependencies:`);
                 console.dir(deps);
                 mainPkg = new pxt.MainPackage(host);
                 try {
                     const extraRes = await testForBuildTargetAsync(true, null);
                     if (extraRes) {
-                        const hexFileExtInfo = [extraRes.options.extinfo, ...(((_b = extraRes.options.otherMultiVariants) === null || _b === void 0 ? void 0 : _b.map(el => el.extinfo)) || [])];
+                        const hexFileExtInfo = [extraRes.options.extinfo, ...(((_c = extraRes.options.otherMultiVariants) === null || _c === void 0 ? void 0 : _c.map(el => el.extinfo)) || [])];
                         for (const extinfo of hexFileExtInfo) {
                             // Place the base HEX image in the hex cache if necessary
                             let sha = extinfo.sha;
@@ -162817,7 +162818,7 @@ async function buildTargetCoreAsync(options = {}) {
                             }
                             else {
                                 nodeutil.writeFileSync(hexFile, hex.join(os.EOL));
-                                pxt.debug(`created native image in offline cache for project ${dirname}: ${hexFile}`);
+                                pxt.log(`created native image in offline cache for project ${dirname}: ${hexFile}`);
                             }
                         }
                     }

package/built/pxtblockly.js

@@ -13666,11 +13666,11 @@ var pxtblockly;
                 }
                 promptAndRenameKind(ws, Object.assign(Object.assign({}, this.opts), { toRename }), lf("Rename '{0}':", oldName), newName => {
                     // Update the values of all existing field instances
-                    const allFields = pxtblockly.getAllFields(ws, field => field instanceof FieldKind);
+                    const allFields = pxtblockly.getAllFields(ws, field => field instanceof FieldKind
+                        && field.getValue() === oldName
+                        && field.opts.name === this.opts.name);
                     for (const field of allFields) {
-                        if (field.ref.getValue() === oldName) {
-                            field.ref.setValue(newName);
-                        }
+                        field.ref.setValue(newName);
                     }
                 });
             }
@@ -13682,7 +13682,9 @@ var pxtblockly;
                     Blockly.alert(lf("The built-in {0} '{1}' cannot be deleted.", this.opts.memberName, varName));
                     return;
                 }
-                const uses = pxtblockly.getAllFields(ws, field => field instanceof FieldKind && field.getValue() === varName);
+                const uses = pxtblockly.getAllFields(ws, field => field instanceof FieldKind
+                    && field.getValue() === varName
+                    && field.opts.name === this.opts.name);
                 if (uses.length > 1) {
                     Blockly.confirm(lf("Delete {0} uses of the \"{1}\" {2}?", uses.length, varName, this.opts.memberName), response => {
                         if (!response)

package/built/pxtblocks.js

@@ -10104,11 +10104,11 @@ var pxtblockly;
                 }
                 promptAndRenameKind(ws, Object.assign(Object.assign({}, this.opts), { toRename }), lf("Rename '{0}':", oldName), newName => {
                     // Update the values of all existing field instances
-                    const allFields = pxtblockly.getAllFields(ws, field => field instanceof FieldKind);
+                    const allFields = pxtblockly.getAllFields(ws, field => field instanceof FieldKind
+                        && field.getValue() === oldName
+                        && field.opts.name === this.opts.name);
                     for (const field of allFields) {
-                        if (field.ref.getValue() === oldName) {
-                            field.ref.setValue(newName);
-                        }
+                        field.ref.setValue(newName);
                     }
                 });
             }
@@ -10120,7 +10120,9 @@ var pxtblockly;
                     Blockly.alert(lf("The built-in {0} '{1}' cannot be deleted.", this.opts.memberName, varName));
                     return;
                 }
-                const uses = pxtblockly.getAllFields(ws, field => field instanceof FieldKind && field.getValue() === varName);
+                const uses = pxtblockly.getAllFields(ws, field => field instanceof FieldKind
+                    && field.getValue() === varName
+                    && field.opts.name === this.opts.name);
                 if (uses.length > 1) {
                     Blockly.confirm(lf("Delete {0} uses of the \"{1}\" {2}?", uses.length, varName, this.opts.memberName), response => {
                         if (!response)