pxt-core 8.4.18 → 8.4.20

package/built/cli.js

@@ -1856,11 +1856,11 @@ function buildReactAppAsync(app, parsed, opts) {
         else {
             nodeutil.cp("built/target.js", `${appRoot}/public/blb`);
         }
-        if (opts.usePxtEmbed) {
-            nodeutil.cp("node_modules/pxt-core/built/web/pxtembed.js", `${appRoot}/public/blb`);
-        }
-        else {
-            nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);
+        nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);
+        if (opts.includePxtSim) {
+            nodeutil.cp("node_modules/pxt-core/built/pxtsim.js", `${appRoot}/public/blb`);
+            nodeutil.cp("node_modules/pxt-core/built/web/worker.js", `${appRoot}/public/blb`);
+            nodeutil.cp("node_modules/pxt-core/built/web/pxtworker.js", `${appRoot}/public/blb`);
         }
         nodeutil.cp("built/web/semantic.css", `${appRoot}/public/blb`);
         nodeutil.cp("node_modules/pxt-core/built/web/icons.css", `${appRoot}/public/blb`);
@@ -1891,7 +1891,7 @@ function buildAuthcodeAsync(parsed) {
 function buildMultiplayerAsync(parsed) {
     return buildReactAppAsync("multiplayer", parsed, {
         copyAssets: false,
-        usePxtEmbed: true,
+        includePxtSim: true,
         expandedPxtTarget: true
     });
 }

package/built/pxt.js

@@ -154690,25 +154690,13 @@ var pxsim;
             const origin = pxsim.U.isLocalHostDev() ? "*" : frame.dataset["origin"];
             frame.contentWindow.postMessage(msg, origin);
         }
-        createFrame(url) {
-            var _a, _b, _c;
-            const wrapper = document.createElement("div");
-            wrapper.className = `simframe ui embed`;
-            const frame = document.createElement('iframe');
-            frame.id = 'sim-frame-' + this.nextId();
-            frame.title = pxsim.localization.lf("Simulator");
-            frame.allowFullscreen = true;
-            frame.setAttribute('allow', 'autoplay;microphone');
-            frame.setAttribute('sandbox', 'allow-same-origin allow-scripts');
-            frame.className = 'no-select';
-            let furl = url || this.getSimUrl().toString();
+        setRunOptionQueryParams(url) {
+            var _a, _b;
+            const urlObject = new URL(url);
             if ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.hideSimButtons) {
-                const urlObject = new URL(furl);
-                urlObject.searchParams.append("hideSimButtons", "1");
-                furl = urlObject.toString();
+                urlObject.searchParams.set("hideSimButtons", "1");
             }
             if ((_b = this._runOptions) === null || _b === void 0 ? void 0 : _b.queryParameters) {
-                const urlObject = new URL(furl);
                 const parameters = this._runOptions.queryParameters.split("&");
                 for (const param of parameters) {
                     const [a, b] = param.split(/[:=]/);
@@ -154716,14 +154704,27 @@ var pxsim;
                         urlObject.searchParams.set(a, b);
                     }
                 }
-                furl = urlObject.toString();
             }
+            return urlObject.toString();
+        }
+        createFrame(url) {
+            var _a;
+            const wrapper = document.createElement("div");
+            wrapper.className = `simframe ui embed`;
+            const frame = document.createElement('iframe');
+            frame.id = 'sim-frame-' + this.nextId();
+            frame.title = pxsim.localization.lf("Simulator");
+            frame.allowFullscreen = true;
+            frame.setAttribute('allow', 'autoplay;microphone');
+            frame.setAttribute('sandbox', 'allow-same-origin allow-scripts');
+            frame.className = 'no-select';
+            let furl = this.setRunOptionQueryParams(url || this.getSimUrl().toString());
             furl += '#' + frame.id;
             frame.src = furl;
             frame.frameBorder = "0";
             frame.dataset['runid'] = this.runId;
             frame.dataset['origin'] = new URL(furl).origin || "*";
-            if ((_c = this._runOptions) === null || _c === void 0 ? void 0 : _c.autofocus)
+            if ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.autofocus)
                 frame.setAttribute("autofocus", "true");
             wrapper.appendChild(frame);
             const i = document.createElement("i");
@@ -154752,9 +154753,11 @@ var pxsim;
             return wrapper;
         }
         preload(aspectRatio, clearRuntime) {
+            if (clearRuntime) {
+                this._currentRuntime = undefined;
+                this.container.textContent = "";
+            }
             if (!this.simFrames().length) {
-                if (clearRuntime)
-                    this._currentRuntime = undefined;
                 this.container.appendChild(this.createFrame());
                 this.applyAspectRatio(aspectRatio);
                 this.setStarting();
@@ -160855,11 +160858,11 @@ function buildReactAppAsync(app, parsed, opts) {
         else {
             nodeutil.cp("built/target.js", `${appRoot}/public/blb`);
         }
-        if (opts.usePxtEmbed) {
-            nodeutil.cp("node_modules/pxt-core/built/web/pxtembed.js", `${appRoot}/public/blb`);
-        }
-        else {
-            nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);
+        nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${appRoot}/public/blb`);
+        if (opts.includePxtSim) {
+            nodeutil.cp("node_modules/pxt-core/built/pxtsim.js", `${appRoot}/public/blb`);
+            nodeutil.cp("node_modules/pxt-core/built/web/worker.js", `${appRoot}/public/blb`);
+            nodeutil.cp("node_modules/pxt-core/built/web/pxtworker.js", `${appRoot}/public/blb`);
         }
         nodeutil.cp("built/web/semantic.css", `${appRoot}/public/blb`);
         nodeutil.cp("node_modules/pxt-core/built/web/icons.css", `${appRoot}/public/blb`);
@@ -160890,7 +160893,7 @@ function buildAuthcodeAsync(parsed) {
 function buildMultiplayerAsync(parsed) {
     return buildReactAppAsync("multiplayer", parsed, {
         copyAssets: false,
-        usePxtEmbed: true,
+        includePxtSim: true,
         expandedPxtTarget: true
     });
 }

package/built/pxtrunner.js

@@ -1537,6 +1537,8 @@ var pxt;
         function addPackageToConfig(cfg, dep) {
             let m = /^([a-zA-Z0-9_-]+)(=(.+))?$/.exec(dep);
             if (m) {
+                // TODO this line seems bad, patchdependencies is on host not this?
+                // looks like this should be a method in host
                 if (m[3] && this && this.patchDependencies(cfg, m[1], m[3]))
                     return false;
                 cfg.dependencies[m[1]] = m[3] || "*";

package/built/pxtsim.d.ts

@@ -1326,6 +1326,7 @@ declare namespace pxsim {
         private getSimUrl;
         postMessage(msg: pxsim.SimulatorMessage, source?: Window, frameID?: string): void;
         private postMessageCore;
+        private setRunOptionQueryParams;
         private createFrame;
         preload(aspectRatio: number, clearRuntime?: boolean): void;
         stop(unload?: boolean, starting?: boolean): void;

package/built/pxtsim.js

@@ -6326,25 +6326,13 @@ var pxsim;
             const origin = pxsim.U.isLocalHostDev() ? "*" : frame.dataset["origin"];
             frame.contentWindow.postMessage(msg, origin);
         }
-        createFrame(url) {
-            var _a, _b, _c;
-            const wrapper = document.createElement("div");
-            wrapper.className = `simframe ui embed`;
-            const frame = document.createElement('iframe');
-            frame.id = 'sim-frame-' + this.nextId();
-            frame.title = pxsim.localization.lf("Simulator");
-            frame.allowFullscreen = true;
-            frame.setAttribute('allow', 'autoplay;microphone');
-            frame.setAttribute('sandbox', 'allow-same-origin allow-scripts');
-            frame.className = 'no-select';
-            let furl = url || this.getSimUrl().toString();
+        setRunOptionQueryParams(url) {
+            var _a, _b;
+            const urlObject = new URL(url);
             if ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.hideSimButtons) {
-                const urlObject = new URL(furl);
-                urlObject.searchParams.append("hideSimButtons", "1");
-                furl = urlObject.toString();
+                urlObject.searchParams.set("hideSimButtons", "1");
             }
             if ((_b = this._runOptions) === null || _b === void 0 ? void 0 : _b.queryParameters) {
-                const urlObject = new URL(furl);
                 const parameters = this._runOptions.queryParameters.split("&");
                 for (const param of parameters) {
                     const [a, b] = param.split(/[:=]/);
@@ -6352,14 +6340,27 @@ var pxsim;
                         urlObject.searchParams.set(a, b);
                     }
                 }
-                furl = urlObject.toString();
             }
+            return urlObject.toString();
+        }
+        createFrame(url) {
+            var _a;
+            const wrapper = document.createElement("div");
+            wrapper.className = `simframe ui embed`;
+            const frame = document.createElement('iframe');
+            frame.id = 'sim-frame-' + this.nextId();
+            frame.title = pxsim.localization.lf("Simulator");
+            frame.allowFullscreen = true;
+            frame.setAttribute('allow', 'autoplay;microphone');
+            frame.setAttribute('sandbox', 'allow-same-origin allow-scripts');
+            frame.className = 'no-select';
+            let furl = this.setRunOptionQueryParams(url || this.getSimUrl().toString());
             furl += '#' + frame.id;
             frame.src = furl;
             frame.frameBorder = "0";
             frame.dataset['runid'] = this.runId;
             frame.dataset['origin'] = new URL(furl).origin || "*";
-            if ((_c = this._runOptions) === null || _c === void 0 ? void 0 : _c.autofocus)
+            if ((_a = this._runOptions) === null || _a === void 0 ? void 0 : _a.autofocus)
                 frame.setAttribute("autofocus", "true");
             wrapper.appendChild(frame);
             const i = document.createElement("i");
@@ -6388,9 +6389,11 @@ var pxsim;
             return wrapper;
         }
         preload(aspectRatio, clearRuntime) {
+            if (clearRuntime) {
+                this._currentRuntime = undefined;
+                this.container.textContent = "";
+            }
             if (!this.simFrames().length) {
-                if (clearRuntime)
-                    this._currentRuntime = undefined;
                 this.container.appendChild(this.createFrame());
                 this.applyAspectRatio(aspectRatio);
                 this.setStarting();