pxt-core 7.5.36 → 7.5.39

package/built/pxt.js

@@ -108315,7 +108315,9 @@ var pxt;
             const parsed = parseRepoId(id);
             if (!parsed)
                 return null;
-            return pxt.U.lookup(cfg.upgrades, parsed.fullName.toLowerCase());
+            // lookup base repo for upgrade rules 
+            // (since nested repoes share the same version number)
+            return pxt.U.lookup(cfg.upgrades, parsed.slug.toLowerCase());
         }
         function upgradedDisablesVariants(cfg, id) {
             const upgr = upgradeRule(cfg, id);
@@ -111676,7 +111678,7 @@ var pxt;
                                 // if newversion does not have tag, it's ok
                                 // note: we are upgrade major versions as well
                                 || (ghNew.tag && pxt.semver.strcmp(ghCurrent.tag, ghNew.tag) < 0)) {
-                                const conflict = new pxt.cpp.PkgConflictError(lf("version mismatch for extension {0} (installed: {1}, installing: {2})", depPkg.id, depPkg._verspec, version));
+                                const conflict = new pxt.cpp.PkgConflictError(lf("version mismatch for extension {0} (added: {1}, adding: {2})", depPkg.id, depPkg._verspec, version));
                                 conflict.pkg0 = depPkg;
                                 conflict.isVersionConflict = true;
                                 conflicts.push(conflict);
@@ -111709,7 +111711,7 @@ var pxt;
                 conflicts.forEach((c) => {
                     additionalConflicts.push.apply(additionalConflicts, allAncestors(c.pkg0).map((anc) => {
                         const confl = new pxt.cpp.PkgConflictError(c.isVersionConflict ?
-                            lf("a dependency of {0} has a version mismatch with extension {1} (installed: {1}, installing: {2})", anc.id, pkgCfg.name, c.pkg0._verspec, version) :
+                            lf("a dependency of {0} has a version mismatch with extension {1} (added: {1}, adding: {2})", anc.id, pkgCfg.name, c.pkg0._verspec, version) :
                             lf("conflict on yotta setting {0} between extensions {1} and {2}", c.settingName, pkgCfg.name, c.pkg0.id));
                         confl.pkg0 = anc;
                         return confl;
@@ -152916,7 +152918,6 @@ var pxsim;
             }
         }
         createFrame(url) {
-            var _a;
             const wrapper = document.createElement("div");
             wrapper.className = `simframe ui embed`;
             const frame = document.createElement('iframe');
@@ -152931,7 +152932,6 @@ var pxsim;
             frame.frameBorder = "0";
             frame.dataset['runid'] = this.runId;
             frame.dataset['origin'] = new URL(furl).origin || "*";
-            frame.dataset['hidesimbuttons'] = ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.hideSimButtons) ? "true" : "false";
             wrapper.appendChild(frame);
             const i = document.createElement("i");
             i.className = "videoplay xicon icon";
@@ -153167,7 +153167,8 @@ var pxsim;
             msg.frameCounter = ++this.frameCounter;
             msg.options = {
                 theme: this.themes[this.nextFrameId++ % this.themes.length],
-                mpRole: (_b = (_a = /[\&\?]mp=(server|client)/i.exec(window.location.href)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.toLowerCase()
+                mpRole: (_b = (_a = /[\&\?]mp=(server|client)/i.exec(window.location.href)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.toLowerCase(),
+                hideSimButtons: /hidesimbuttons(?:[:=])1/i.test(window.location.href)
             };
             msg.id = `${msg.options.theme}-${this.nextId()}`;
             frame.dataset['runid'] = this.runId;
@@ -155115,7 +155116,7 @@ var pxsim;
                     soundQueue.push({
                         notes,
                         onFinished: resolve,
-                        onCancelled: reject
+                        onCancelled: resolve
                     });
                 });
                 if (!playing) {

package/built/pxtlib.js

@@ -10629,7 +10629,9 @@ var pxt;
             const parsed = parseRepoId(id);
             if (!parsed)
                 return null;
-            return pxt.U.lookup(cfg.upgrades, parsed.fullName.toLowerCase());
+            // lookup base repo for upgrade rules 
+            // (since nested repoes share the same version number)
+            return pxt.U.lookup(cfg.upgrades, parsed.slug.toLowerCase());
         }
         function upgradedDisablesVariants(cfg, id) {
             const upgr = upgradeRule(cfg, id);
@@ -13990,7 +13992,7 @@ var pxt;
                                 // if newversion does not have tag, it's ok
                                 // note: we are upgrade major versions as well
                                 || (ghNew.tag && pxt.semver.strcmp(ghCurrent.tag, ghNew.tag) < 0)) {
-                                const conflict = new pxt.cpp.PkgConflictError(lf("version mismatch for extension {0} (installed: {1}, installing: {2})", depPkg.id, depPkg._verspec, version));
+                                const conflict = new pxt.cpp.PkgConflictError(lf("version mismatch for extension {0} (added: {1}, adding: {2})", depPkg.id, depPkg._verspec, version));
                                 conflict.pkg0 = depPkg;
                                 conflict.isVersionConflict = true;
                                 conflicts.push(conflict);
@@ -14023,7 +14025,7 @@ var pxt;
                 conflicts.forEach((c) => {
                     additionalConflicts.push.apply(additionalConflicts, allAncestors(c.pkg0).map((anc) => {
                         const confl = new pxt.cpp.PkgConflictError(c.isVersionConflict ?
-                            lf("a dependency of {0} has a version mismatch with extension {1} (installed: {1}, installing: {2})", anc.id, pkgCfg.name, c.pkg0._verspec, version) :
+                            lf("a dependency of {0} has a version mismatch with extension {1} (added: {1}, adding: {2})", anc.id, pkgCfg.name, c.pkg0._verspec, version) :
                             lf("conflict on yotta setting {0} between extensions {1} and {2}", c.settingName, pkgCfg.name, c.pkg0.id));
                         confl.pkg0 = anc;
                         return confl;

package/built/pxtrunner.d.ts

@@ -91,7 +91,6 @@ declare namespace pxt.runner {
         id?: string;
         code?: string;
         assets?: string;
-        hideSimButtons?: boolean;
         highContrast?: boolean;
         light?: boolean;
         fullScreen?: boolean;

package/built/pxtrunner.js

@@ -1749,8 +1749,7 @@ var pxt;
                 highContrast: simOptions.highContrast,
                 storedState: storedState,
                 light: simOptions.light,
-                single: simOptions.single,
-                hideSimButtons: simOptions.hideSimButtons
+                single: simOptions.single
             };
             if (pxt.appTarget.simulator && !simOptions.fullScreen)
                 runOptions.aspectRatio = parts.length && pxt.appTarget.simulator.partsAspectRatio

package/built/pxtsim.d.ts

@@ -1267,7 +1267,6 @@ declare namespace pxsim {
         ipc?: boolean;
         dependencies?: Map<string>;
         single?: boolean;
-        hideSimButtons?: boolean;
     }
     interface HwDebugger {
         postMessage: (msg: pxsim.SimulatorMessage) => void;

package/built/pxtsim.js

@@ -6294,7 +6294,6 @@ var pxsim;
             }
         }
         createFrame(url) {
-            var _a;
             const wrapper = document.createElement("div");
             wrapper.className = `simframe ui embed`;
             const frame = document.createElement('iframe');
@@ -6309,7 +6308,6 @@ var pxsim;
             frame.frameBorder = "0";
             frame.dataset['runid'] = this.runId;
             frame.dataset['origin'] = new URL(furl).origin || "*";
-            frame.dataset['hidesimbuttons'] = ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.hideSimButtons) ? "true" : "false";
             wrapper.appendChild(frame);
             const i = document.createElement("i");
             i.className = "videoplay xicon icon";
@@ -6545,7 +6543,8 @@ var pxsim;
             msg.frameCounter = ++this.frameCounter;
             msg.options = {
                 theme: this.themes[this.nextFrameId++ % this.themes.length],
-                mpRole: (_b = (_a = /[\&\?]mp=(server|client)/i.exec(window.location.href)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.toLowerCase()
+                mpRole: (_b = (_a = /[\&\?]mp=(server|client)/i.exec(window.location.href)) === null || _a === void 0 ? void 0 : _a[1]) === null || _b === void 0 ? void 0 : _b.toLowerCase(),
+                hideSimButtons: /hidesimbuttons(?:[:=])1/i.test(window.location.href)
             };
             msg.id = `${msg.options.theme}-${this.nextId()}`;
             frame.dataset['runid'] = this.runId;
@@ -8493,7 +8492,7 @@ var pxsim;
                     soundQueue.push({
                         notes,
                         onFinished: resolve,
-                        onCancelled: reject
+                        onCancelled: resolve
                     });
                 });
                 if (!playing) {