pxt-core 8.4.2 → 8.4.4

package/built/backendutils.js

@@ -710,6 +710,7 @@ var pxt;
                     const url = new URL(`https://${endpointName}.streaming.media.azure.net/${videoID}/manifest(format=mpd-time-csf).mpd`);
                     if (startTime) {
                         url.hash = `t=${startTime}`;
+                        url.searchParams.append("startTime", startTime);
                     }
                     if (endTime) {
                         url.searchParams.append("endTime", endTime);

package/built/cli.js

@@ -306,7 +306,8 @@ function pxtFileList(pref) {
         .concat(nodeutil.allFiles(pref + "built/web/fonts", { maxDepth: 1 }))
         .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/authcode", { maxDepth: 4 }))
+        .concat(nodeutil.allFiles(pref + "built/web/multiplayer", { maxDepth: 4 }));
 }
 function semverCmp(a, b) {
     let parse = (s) => {
@@ -387,7 +388,8 @@ function ciAsync() {
                         .then(() => buildWebStringsAsync())
                         .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/authcode-strings.json"))
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/multiplayer-strings.json"));
                 if (uploadApiStrings)
                     p = p.then(() => crowdin.execCrowdinAsync("upload", "built/strings.json"));
                 if (uploadDocs || uploadApiStrings)
@@ -906,6 +908,7 @@ function uploadCoreAsync(opts) {
             "asseteditorUrl": opts.localDir + "asseteditor.html",
             "skillmapUrl": opts.localDir + "skillmap.html",
             "authcodeUrl": opts.localDir + "authcode.html",
+            "multiplayerUrl": opts.localDir + "multiplayer.html",
             "isStatic": true,
         };
         const targetImagePaths = targetImages.map(k => `${opts.localDir}${path.join('./docs', logos[k])}`);
@@ -952,14 +955,16 @@ function uploadCoreAsync(opts) {
         "multi.html",
         "asseteditor.html",
         "skillmap.html",
-        "authcode.html"
+        "authcode.html",
+        "multiplayer.html",
     ];
     // expandHtml is manually called on these files before upload
     // runs <!-- @include --> substitutions, fills in locale, etc
     let expandFiles = [
         "index.html",
         "skillmap.html",
-        "authcode.html"
+        "authcode.html",
+        "multiplayer.html",
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -1753,33 +1758,29 @@ async function buildSemanticUIAsync(parsed) {
             ]
         });
     }
-    // Generate react-common css for skillmap and authcode
-    const skillmapFile = isPxtCore ? "react-common/styles/react-common-skillmap-core.less" :
-        "node_modules/pxt-core/react-common/styles/react-common-skillmap.less";
-    await nodeutil.spawnAsync({
-        cmd: "node",
-        args: [
-            lessCPath,
-            skillmapFile,
-            "built/web/react-common-skillmap.css",
-            "--include-path=" + lessIncludePaths
-        ]
-    });
-    const authcodeFile = isPxtCore ? "react-common/styles/react-common-authcode-core.less" :
-        "node_modules/pxt-core/react-common/styles/react-common-authcode.less";
-    await nodeutil.spawnAsync({
-        cmd: "node",
-        args: [
-            lessCPath,
-            authcodeFile,
-            "built/web/react-common-authcode.css",
-            "--include-path=" + lessIncludePaths
-        ]
-    });
-    let skillmapCss = await readFileAsync(`built/web/react-common-skillmap.css`, "utf8");
-    skillmapCss = await linkFontAsync("fa-solid-900", skillmapCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
-    skillmapCss = await linkFontAsync("fa-regular-400", skillmapCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
-    await writeFileAsync(`built/web/react-common-skillmap.css`, skillmapCss, "utf8");
+    async function generateReactCommonCss(app) {
+        const appFile = isPxtCore ? `react-common/styles/react-common-${app}-core.less` :
+            `node_modules/pxt-core/react-common/styles/react-common-${app}.less`;
+        await nodeutil.spawnAsync({
+            cmd: "node",
+            args: [
+                lessCPath,
+                appFile,
+                `built/web/react-common-${app}.css`,
+                "--include-path=" + lessIncludePaths
+            ]
+        });
+        let appCss = await readFileAsync(`built/web/react-common-${app}.css`, "utf8");
+        appCss = await linkFontAsync("fa-solid-900", appCss, fontAwesomeSource, "\\.\\.\\/webfonts\\/");
+        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
+    await Promise.all([
+        generateReactCommonCss("skillmap"),
+        generateReactCommonCss("authcode"),
+        generateReactCommonCss("multiplayer")
+    ]);
     // Run postcss with autoprefixer and rtlcss
     pxt.debug("running postcss");
     const postcss = require('postcss');
@@ -1799,7 +1800,7 @@ async function buildSemanticUIAsync(parsed) {
         autoprefixer: { browsers: browserList, add: true }
     });
     const rtlcss = require("rtlcss");
-    const files = ["semantic.css", "blockly.css", "react-common-skillmap.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])
@@ -1810,9 +1811,13 @@ async function buildSemanticUIAsync(parsed) {
         await writeFileAsync(`built/web/rtl${cssFile}`, processedRtl.css, "utf8");
     }
     if (!isPxtCore) {
-        // This is just to support the local skillmap serve for development
+        // This is just to support the local skillmap/cra-app serve for development
         nodeutil.cp("built/web/react-common-skillmap.css", "node_modules/pxt-core/skillmap/public/blb");
+        nodeutil.cp("built/web/react-common-authcode.css", "node_modules/pxt-core/authcode/public/blb");
+        nodeutil.cp("built/web/react-common-multiplayer.css", "node_modules/pxt-core/multiplayer/public/blb");
         nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/skillmap/public/blb");
+        nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/authcode/public/blb");
+        nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/multiplayer/public/blb");
     }
 }
 async function linkFontAsync(font, semCss, sourceDir = "node_modules/semantic-ui-less/themes/default/assets/fonts/", refDir = "fonts\\/") {
@@ -1831,47 +1836,13 @@ function buildWebStringsAsync() {
     nodeutil.writeFileSync("built/webstrings.json", nodeutil.stringify(webstringsJson()));
     return Promise.resolve();
 }
-function buildSkillMapAsync(parsed) {
+function buildReactAppAsync(app, parsed, opts) {
+    opts = opts || {
+        copyAssets: true
+    };
     // local serve
-    const skillmapRoot = "node_modules/pxt-core/skillmap";
-    const reactScriptsConfigRoot = `${skillmapRoot}/node_modules/react-scripts/config`;
+    const appRoot = `node_modules/pxt-core/${app}`;
     const docsPath = parsed.flags["docs"];
-    return rimrafAsync(`${skillmapRoot}/public/blb`, {})
-        .then(() => rimrafAsync(`${skillmapRoot}/build/assets`, {}))
-        .then(() => rimrafAsync(`${skillmapRoot}/public/docs`, {}))
-        .then(() => rimrafAsync(`${skillmapRoot}/public/static`, {}))
-        .then(() => {
-        // read pxtarget.json, save into 'pxtTargetBundle' global variable
-        let cfg = readLocalPxTarget();
-        nodeutil.writeFileSync(`${skillmapRoot}/public/blb/target.js`, "// eslint-disable-next-line \n" + targetJsPrefix + JSON.stringify(cfg));
-        nodeutil.cp("node_modules/pxt-core/built/pxtlib.js", `${skillmapRoot}/public/blb`);
-        nodeutil.cp("built/web/semantic.css", `${skillmapRoot}/public/blb`);
-        nodeutil.cp("node_modules/pxt-core/built/web/icons.css", `${skillmapRoot}/public/blb`);
-        nodeutil.cp("node_modules/pxt-core/built/web/react-common-skillmap.css", `${skillmapRoot}/public/blb`);
-        // copy 'assets' over from docs/static
-        nodeutil.cpR("docs/static/skillmap/assets", `${skillmapRoot}/public/assets`);
-        // copy default react-scripts webpack config into a webpack.config.base file if necessary
-        if (!fs.existsSync(`${reactScriptsConfigRoot}/webpack.config.base.js`)) {
-            nodeutil.cp(`${reactScriptsConfigRoot}/webpack.config.js`, reactScriptsConfigRoot, "webpack.config.base.js");
-        }
-        // wrap the config in our webpack.config.override for build customization
-        nodeutil.cp(`${skillmapRoot}/webpack.config.override.js`, reactScriptsConfigRoot, "webpack.config.js");
-        if (docsPath) {
-            // copy docs over from specified path
-            nodeutil.cpR(`docs/${docsPath}`, `${skillmapRoot}/public/docs/${docsPath}`);
-            nodeutil.cpR(`docs/static/${docsPath}`, `${skillmapRoot}/public/static/${docsPath}`);
-        }
-        return nodeutil.spawnAsync({
-            cmd: os.platform() === "win32" ? "npm.cmd" : "npm",
-            args: ["run-script", "start"],
-            cwd: skillmapRoot,
-            shell: true
-        });
-    });
-}
-function buildAuthcodeAsync(parsed) {
-    // local serve
-    const appRoot = "node_modules/pxt-core/authcode";
     return rimrafAsync(`${appRoot}/public/blb`, {})
         .then(() => rimrafAsync(`${appRoot}/build/assets`, {}))
         .then(() => rimrafAsync(`${appRoot}/public/docs`, {}))
@@ -1883,9 +1854,16 @@ function buildAuthcodeAsync(parsed) {
         nodeutil.cp("node_modules/pxt-core/built/pxtlib.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`);
-        nodeutil.cp("node_modules/pxt-core/built/web/react-common-authcode.css", `${appRoot}/public/blb`);
-        // copy 'assets' over from docs/static
-        nodeutil.cpR("docs/static/authcode/assets", `${appRoot}/public/assets`);
+        nodeutil.cp(`node_modules/pxt-core/built/web/react-common-${app}.css`, `${appRoot}/public/blb`);
+        if (opts.copyAssets) {
+            // copy 'assets' over from docs/static
+            nodeutil.cpR(`docs/static/${app}/assets`, `${appRoot}/public/assets`);
+        }
+        if (docsPath) {
+            // copy docs over from specified path
+            nodeutil.cpR(`docs/${docsPath}`, `${appRoot}/public/docs/${docsPath}`);
+            nodeutil.cpR(`docs/static/${docsPath}`, `${appRoot}/public/static/${docsPath}`);
+        }
         return nodeutil.spawnAsync({
             cmd: os.platform() === "win32" ? "npm.cmd" : "npm",
             args: ["run-script", "start"],
@@ -1894,6 +1872,15 @@ function buildAuthcodeAsync(parsed) {
         });
     });
 }
+function buildSkillMapAsync(parsed) {
+    return buildReactAppAsync("skillmap", parsed);
+}
+function buildAuthcodeAsync(parsed) {
+    return buildReactAppAsync("authcode", parsed, { copyAssets: false });
+}
+function buildMultiplayerAsync(parsed) {
+    return buildReactAppAsync("multiplayer", parsed, { copyAssets: false });
+}
 function updateDefaultProjects(cfg) {
     let defaultProjects = [
         pxt.BLOCKS_PROJECT_NAME,
@@ -6285,9 +6272,30 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
         flags: {
             serve: {
                 description: "Serve the authcode app locally after building (npm start)"
+            },
+            docs: {
+                description: "Path to local docs folder to copy into authcode",
+                type: "string",
+                argument: "docs"
             }
         }
     }, buildAuthcodeAsync);
+    p.defineCommand({
+        name: "buildmultiplayer",
+        aliases: ["multiplayer", "mp"],
+        advanced: true,
+        help: "Serves the multiplayer webapp",
+        flags: {
+            serve: {
+                description: "Serve the multiplayer app locally after building (npm start)"
+            },
+            docs: {
+                description: "Path to local docs folder to copy into multiplayer",
+                type: "string",
+                argument: "docs"
+            }
+        }
+    }, buildMultiplayerAsync);
     advancedCommand("augmentdocs", "test markdown docs replacements", augmnetDocsAsync, "<temlate.md> <doc.md>");
     advancedCommand("crowdin", "upload, download, clean, stats files to/from crowdin", pc => crowdin.execCrowdinAsync.apply(undefined, pc.args), "<cmd> <path> [output]");
     advancedCommand("hidlist", "list HID devices", hid.listAsync);