pxt-core 9.1.6 → 9.1.7

package/README.md

@@ -93,6 +93,13 @@ If you are working on the CLI exclusively,
 gulp watchCli
 ```
 
+If you don't need to build the suite of associated webapps (skillmap, multiplayer, etc.), you can skip them and speed up your build a bit:
+
+```
+gulp --no-webapps
+```
+
+
 ### Icons
 
 There are a number of custom icons (to use in addition

package/built/cli.js

@@ -307,7 +307,8 @@ function pxtFileList(pref) {
         .concat(nodeutil.allFiles(pref + "built/web/vs", { maxDepth: 4 }))
         .concat(nodeutil.allFiles(pref + "built/web/skillmap", { maxDepth: 4 }))
         .concat(nodeutil.allFiles(pref + "built/web/authcode", { maxDepth: 4 }))
-        .concat(nodeutil.allFiles(pref + "built/web/multiplayer", { maxDepth: 4 }));
+        .concat(nodeutil.allFiles(pref + "built/web/multiplayer", { maxDepth: 4 }))
+        .concat(nodeutil.allFiles(pref + "built/web/kiosk", { maxDepth: 4 }));
 }
 function semverCmp(a, b) {
     let parse = (s) => {
@@ -390,7 +391,8 @@ function ciAsync() {
                         .then(() => crowdin.execCrowdinAsync("upload", "built/webstrings.json"))
                         .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"))
                         .then(() => crowdin.execCrowdinAsync("upload", "built/authcode-strings.json"))
-                        .then(() => crowdin.execCrowdinAsync("upload", "built/multiplayer-strings.json"));
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/multiplayer-strings.json"))
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/kiosk-strings.json"));
                 if (uploadApiStrings)
                     p = p.then(() => crowdin.execCrowdinAsync("upload", "built/strings.json"));
                 if (uploadDocs || uploadApiStrings)
@@ -919,6 +921,7 @@ function uploadCoreAsync(opts) {
             "skillmapUrl": opts.localDir + "skillmap.html",
             "authcodeUrl": opts.localDir + "authcode.html",
             "multiplayerUrl": opts.localDir + "multiplayer.html",
+            "kioskUrl": opts.localDir + "kiosk.html",
             "isStatic": true,
         };
         const targetImageLocalPaths = targetImagePaths.map(k => `${opts.localDir}${path.join('./docs', k)}`);
@@ -968,6 +971,7 @@ function uploadCoreAsync(opts) {
         "skillmap.html",
         "authcode.html",
         "multiplayer.html",
+        "kiosk.html",
     ];
     // expandHtml is manually called on these files before upload
     // runs <!-- @include --> substitutions, fills in locale, etc
@@ -976,6 +980,7 @@ function uploadCoreAsync(opts) {
         "skillmap.html",
         "authcode.html",
         "multiplayer.html",
+        "kiosk.html",
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -1780,7 +1785,7 @@ async function buildSemanticUIAsync(parsed) {
         appCss = await linkFontAsync("fa-regular-400", appCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
         await writeFileAsync(`built/web/react-common-${app}.css`, appCss, "utf8");
     }
-    // Generate react-common css for skillmap, authcode, and multiplayer
+    // Generate react-common css for skillmap, authcode, and multiplayer (but not kiosk yet)
     await Promise.all([
         generateReactCommonCss("skillmap"),
         generateReactCommonCss("authcode"),
@@ -1805,7 +1810,13 @@ async function buildSemanticUIAsync(parsed) {
         autoprefixer: { browsers: browserList, add: true }
     });
     const rtlcss = require("rtlcss");
-    const files = ["semantic.css", "blockly.css", "react-common-skillmap.css", "react-common-authcode.css", "react-common-multiplayer.css"];
+    const files = [
+        "semantic.css",
+        "blockly.css",
+        "react-common-skillmap.css",
+        "react-common-authcode.css",
+        "react-common-multiplayer.css"
+    ];
     for (const cssFile of files) {
         const css = await readFileAsync(`built/web/${cssFile}`, "utf8");
         const processed = await postcss([cssnano])

package/built/pxt.js

@@ -102467,11 +102467,11 @@ var pxt;
         }
         BrowserUtils.isSkillmapEditor = isSkillmapEditor;
         function isTabletSize() {
-            return (window === null || window === void 0 ? void 0 : window.innerWidth) < pxt.BREAKPOINT_TABLET;
+            return (window === null || window === void 0 ? void 0 : window.innerWidth) <= pxt.BREAKPOINT_TABLET;
         }
         BrowserUtils.isTabletSize = isTabletSize;
         function isComputerSize() {
-            return (window === null || window === void 0 ? void 0 : window.innerWidth) >= pxt.BREAKPOINT_TABLET;
+            return (window === null || window === void 0 ? void 0 : window.innerWidth) > pxt.BREAKPOINT_TABLET;
         }
         BrowserUtils.isComputerSize = isComputerSize;
         function noSharedLocalStorage() {
@@ -122704,7 +122704,7 @@ var pxt;
             const domainCheck = `(?:(?:https:\/\/)?(?:${domains.join('|')})\/)`;
             const versionRefCheck = "(?:v[0-9]+\/)";
             const oembedCheck = "api\/oembed\\?url=.*%2F([^&#]*)&.*";
-            const sharePageCheck = "([a-z0-9\\-_]+)(?:[#?&].*)?";
+            const sharePageCheck = "\/?([a-z0-9\\-_]+)(?:[#?&].*)?";
             const scriptIdCheck = `^${domainCheck}?${versionRefCheck}?(?:(?:${oembedCheck})|(?:${sharePageCheck}))$`;
             const m = new RegExp(scriptIdCheck, 'i').exec(uri.trim());
             const scriptid = (m === null || m === void 0 ? void 0 : m[1] /** oembed res **/) || (m === null || m === void 0 ? void 0 : m[2]) /** share page res **/;
@@ -160959,7 +160959,8 @@ function pxtFileList(pref) {
         .concat(nodeutil.allFiles(pref + "built/web/vs", { maxDepth: 4 }))
         .concat(nodeutil.allFiles(pref + "built/web/skillmap", { maxDepth: 4 }))
         .concat(nodeutil.allFiles(pref + "built/web/authcode", { maxDepth: 4 }))
-        .concat(nodeutil.allFiles(pref + "built/web/multiplayer", { maxDepth: 4 }));
+        .concat(nodeutil.allFiles(pref + "built/web/multiplayer", { maxDepth: 4 }))
+        .concat(nodeutil.allFiles(pref + "built/web/kiosk", { maxDepth: 4 }));
 }
 function semverCmp(a, b) {
     let parse = (s) => {
@@ -161042,7 +161043,8 @@ function ciAsync() {
                         .then(() => crowdin.execCrowdinAsync("upload", "built/webstrings.json"))
                         .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"))
                         .then(() => crowdin.execCrowdinAsync("upload", "built/authcode-strings.json"))
-                        .then(() => crowdin.execCrowdinAsync("upload", "built/multiplayer-strings.json"));
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/multiplayer-strings.json"))
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/kiosk-strings.json"));
                 if (uploadApiStrings)
                     p = p.then(() => crowdin.execCrowdinAsync("upload", "built/strings.json"));
                 if (uploadDocs || uploadApiStrings)
@@ -161571,6 +161573,7 @@ function uploadCoreAsync(opts) {
             "skillmapUrl": opts.localDir + "skillmap.html",
             "authcodeUrl": opts.localDir + "authcode.html",
             "multiplayerUrl": opts.localDir + "multiplayer.html",
+            "kioskUrl": opts.localDir + "kiosk.html",
             "isStatic": true,
         };
         const targetImageLocalPaths = targetImagePaths.map(k => `${opts.localDir}${path.join('./docs', k)}`);
@@ -161620,6 +161623,7 @@ function uploadCoreAsync(opts) {
         "skillmap.html",
         "authcode.html",
         "multiplayer.html",
+        "kiosk.html",
     ];
     // expandHtml is manually called on these files before upload
     // runs <!-- @include --> substitutions, fills in locale, etc
@@ -161628,6 +161632,7 @@ function uploadCoreAsync(opts) {
         "skillmap.html",
         "authcode.html",
         "multiplayer.html",
+        "kiosk.html",
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -162432,7 +162437,7 @@ async function buildSemanticUIAsync(parsed) {
         appCss = await linkFontAsync("fa-regular-400", appCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
         await writeFileAsync(`built/web/react-common-${app}.css`, appCss, "utf8");
     }
-    // Generate react-common css for skillmap, authcode, and multiplayer
+    // Generate react-common css for skillmap, authcode, and multiplayer (but not kiosk yet)
     await Promise.all([
         generateReactCommonCss("skillmap"),
         generateReactCommonCss("authcode"),
@@ -162457,7 +162462,13 @@ async function buildSemanticUIAsync(parsed) {
         autoprefixer: { browsers: browserList, add: true }
     });
     const rtlcss = require("rtlcss");
-    const files = ["semantic.css", "blockly.css", "react-common-skillmap.css", "react-common-authcode.css", "react-common-multiplayer.css"];
+    const files = [
+        "semantic.css",
+        "blockly.css",
+        "react-common-skillmap.css",
+        "react-common-authcode.css",
+        "react-common-multiplayer.css"
+    ];
     for (const cssFile of files) {
         const css = await readFileAsync(`built/web/${cssFile}`, "utf8");
         const processed = await postcss([cssnano])

package/built/pxtlib.d.ts

@@ -556,6 +556,7 @@ declare namespace pxt {
         skillmapUrl?: string;
         authcodeUrl?: string;
         multiplayerUrl?: string;
+        kioskUrl?: string;
         isStatic?: boolean;
         verprefix?: string;
     }

package/built/pxtlib.js

@@ -4781,11 +4781,11 @@ var pxt;
         }
         BrowserUtils.isSkillmapEditor = isSkillmapEditor;
         function isTabletSize() {
-            return (window === null || window === void 0 ? void 0 : window.innerWidth) < pxt.BREAKPOINT_TABLET;
+            return (window === null || window === void 0 ? void 0 : window.innerWidth) <= pxt.BREAKPOINT_TABLET;
         }
         BrowserUtils.isTabletSize = isTabletSize;
         function isComputerSize() {
-            return (window === null || window === void 0 ? void 0 : window.innerWidth) >= pxt.BREAKPOINT_TABLET;
+            return (window === null || window === void 0 ? void 0 : window.innerWidth) > pxt.BREAKPOINT_TABLET;
         }
         BrowserUtils.isComputerSize = isComputerSize;
         function noSharedLocalStorage() {
@@ -25018,7 +25018,7 @@ var pxt;
             const domainCheck = `(?:(?:https:\/\/)?(?:${domains.join('|')})\/)`;
             const versionRefCheck = "(?:v[0-9]+\/)";
             const oembedCheck = "api\/oembed\\?url=.*%2F([^&#]*)&.*";
-            const sharePageCheck = "([a-z0-9\\-_]+)(?:[#?&].*)?";
+            const sharePageCheck = "\/?([a-z0-9\\-_]+)(?:[#?&].*)?";
             const scriptIdCheck = `^${domainCheck}?${versionRefCheck}?(?:(?:${oembedCheck})|(?:${sharePageCheck}))$`;
             const m = new RegExp(scriptIdCheck, 'i').exec(uri.trim());
             const scriptid = (m === null || m === void 0 ? void 0 : m[1] /** oembed res **/) || (m === null || m === void 0 ? void 0 : m[2]) /** share page res **/;

package/built/server.js

@@ -22,6 +22,10 @@ let docsDir = "";
 let packagedDir = "";
 let localHexCacheDir = path.join("built", "hexcache");
 let serveOptions;
+const webappNames = [
+    "kiosk"
+    // TODO: Add other webapp names here: "multiplayer", "skillmap", "authcode"
+];
 function setupDocfilesdirs() {
     docfilesdirs = [
         "docfiles",
@@ -775,7 +779,7 @@ function certificateTestAsync() {
 }
 // use http://localhost:3232/45912-50568-62072-42379 for testing
 function scriptPageTestAsync(id) {
-    return Cloud.privateGetAsync(id)
+    return Cloud.privateGetAsync(pxt.Cloud.parseScriptId(id))
         .then((info) => {
         // if running against old cloud, infer 'thumb' field
         // can be removed after new cloud deployment
@@ -931,7 +935,8 @@ function serveAsync(options) {
                 error(404, "File missing: " + filename);
             }
         };
-        let pathname = decodeURI(url.parse(req.url).pathname);
+        let uri = url.parse(req.url);
+        let pathname = decodeURI(uri.pathname);
         const opts = querystring.parse(url.parse(req.url).query);
         const htmlParams = {};
         if (opts["lang"] || opts["forcelang"])
@@ -950,6 +955,43 @@ function serveAsync(options) {
         if (elts.some(s => s[0] == ".")) {
             return error(400, "Bad path :-(\n");
         }
+        // Strip leading version number
+        if (elts.length && /^v\d+/.test(elts[0])) {
+            elts.shift();
+        }
+        // Rebuild pathname without leading version number
+        pathname = "/" + elts.join("/");
+        const expandWebappHtml = (appname, html) => {
+            // Expand templates
+            html = expandHtml(html);
+            // Rewrite application resource references
+            html = html.replace(/src="(\/static\/js\/[^"]*)"/, (m, f) => `src="/${appname}${f}"`);
+            html = html.replace(/src="(\/static\/css\/[^"]*)"/, (m, f) => `src="/${appname}${f}"`);
+            return html;
+        };
+        const serveWebappFile = (webappName, webappPath) => {
+            const webappUri = url.parse(`http://localhost:3000/${webappPath}${uri.search || ""}`);
+            http.get(webappUri, r => {
+                let body = "";
+                r.on("data", (chunk) => {
+                    body += chunk;
+                });
+                r.on("end", () => {
+                    if (!webappPath || webappPath === "index.html") {
+                        body = expandWebappHtml(webappName, body);
+                    }
+                    res.writeHead(200);
+                    res.write(body);
+                    res.end();
+                });
+            });
+        };
+        const webappIdx = webappNames.findIndex(s => new RegExp(`^-{0,3}${s}$`).test(elts[0] || ''));
+        if (webappIdx >= 0) {
+            const webappName = webappNames[webappIdx];
+            const webappPath = pathname.split("/").slice(2).join('/'); // remove /<webappName>/ from path
+            return serveWebappFile(webappName, webappPath);
+        }
         if (elts[0] == "api") {
             if (elts[1] == "streams") {
                 let trg = Cloud.apiRoot + req.url.slice(5);
@@ -1063,9 +1105,10 @@ function serveAsync(options) {
             sendFile(path.join(publicDir, 'codeembed.html'));
             return;
         }
-        if (/^\/(\d\d\d\d[\d-]+)$/.test(pathname)) {
-            scriptPageTestAsync(pathname.slice(1))
-                .then(sendHtml);
+        if (!!pxt.Cloud.parseScriptId(pathname)) {
+            scriptPageTestAsync(pathname)
+                .then(sendHtml)
+                .catch(() => error(404, "Script not found"));
             return;
         }
         if (/^\/(pkg|package)\/.*$/.test(pathname)) {