pxt-core 7.5.2 → 7.5.5

package/built/cli.js

@@ -186,6 +186,9 @@ class FileGithubDb {
             return p;
         });
     }
+    latestVersionAsync(repopath, config) {
+        return this.db.latestVersionAsync(repopath, config);
+    }
     loadConfigAsync(repopath, tag) {
         return this.loadAsync(repopath, tag, "pxt", (r, t) => this.db.loadConfigAsync(r, t));
     }
@@ -202,46 +205,6 @@ function searchAsync(...query) {
         }
     });
 }
-function pkginfoAsync(repopath) {
-    let parsed = pxt.github.parseRepoId(repopath);
-    if (!parsed) {
-        console.log('Unknown repo');
-        return Promise.resolve();
-    }
-    const pkgInfo = (cfg, tag) => {
-        pxt.log(`name: ${cfg.name}`);
-        pxt.log(`description: ${cfg.description}`);
-        if (pxt.appTarget.appTheme)
-            pxt.log(`shareable url: ${pxt.appTarget.appTheme.embedUrl}#pub:gh/${parsed.fullName}${tag ? "#" + tag : ""}`);
-    };
-    return pxt.packagesConfigAsync()
-        .then(config => {
-        const status = pxt.github.repoStatus(parsed, config);
-        pxt.log(`github org: ${parsed.owner}`);
-        if (parsed.tag)
-            pxt.log(`github tag: ${parsed.tag}`);
-        pxt.log(`package status: ${status == pxt.github.GitRepoStatus.Approved ? "approved" : status == pxt.github.GitRepoStatus.Banned ? "banned" : "neutral"}`);
-        if (parsed.tag)
-            return pxt.github.downloadPackageAsync(repopath, config)
-                .then(pkg => {
-                let cfg = JSON.parse(pkg.files[pxt.CONFIG_NAME]);
-                pkgInfo(cfg, parsed.tag);
-                pxt.debug(`size: ${JSON.stringify(pkg.files).length}`);
-            });
-        return pxt.github.pkgConfigAsync(parsed.fullName)
-            .then(cfg => {
-            pkgInfo(cfg);
-            return pxt.github.listRefsAsync(repopath)
-                .then(tags => {
-                pxt.log("tags: " + tags.join(", "));
-                return pxt.github.listRefsAsync(repopath, "heads");
-            })
-                .then(heads => {
-                pxt.log("branches: " + heads.join(", "));
-            });
-        });
-    });
-}
 function pokeRepoAsync(parsed) {
     const repo = parsed.args[0];
     let data = {
@@ -342,7 +305,8 @@ function pxtFileList(pref) {
         .concat(onlyExts(nodeutil.allFiles(pref + "built/web", 1), [".js", ".css"]))
         .concat(nodeutil.allFiles(pref + "built/web/fonts", 1))
         .concat(nodeutil.allFiles(pref + "built/web/vs", 4))
-        .concat(nodeutil.allFiles(pref + "built/web/skillmap", 4));
+        .concat(nodeutil.allFiles(pref + "built/web/skillmap", 4))
+        .concat(nodeutil.allFiles(pref + "built/web/authcode", 4));
 }
 function semverCmp(a, b) {
     let parse = (s) => {
@@ -422,7 +386,8 @@ function ciAsync() {
                     p = p
                         .then(() => buildWebStringsAsync())
                         .then(() => crowdin.execCrowdinAsync("upload", "built/webstrings.json"))
-                        .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"));
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/skillmap-strings.json"))
+                        .then(() => crowdin.execCrowdinAsync("upload", "built/authcode-strings.json"));
                 if (uploadApiStrings)
                     p = p.then(() => crowdin.execCrowdinAsync("upload", "built/strings.json"));
                 if (uploadDocs || uploadApiStrings)
@@ -940,6 +905,7 @@ function uploadCoreAsync(opts) {
             "multiUrl": opts.localDir + "multi.html",
             "asseteditorUrl": opts.localDir + "asseteditor.html",
             "skillmapUrl": opts.localDir + "skillmap.html",
+            "authcodeUrl": opts.localDir + "authcode.html",
             "isStatic": true,
         };
         const targetImagePaths = targetImages.map(k => `${opts.localDir}${path.join('./docs', logos[k])}`);
@@ -985,13 +951,15 @@ function uploadCoreAsync(opts) {
         "workerConfig.js",
         "multi.html",
         "asseteditor.html",
-        "skillmap.html"
+        "skillmap.html",
+        "authcode.html"
     ];
     // expandHtml is manually called on these files before upload
     // runs <!-- @include --> substitutions, fills in locale, etc
     let expandFiles = [
         "index.html",
-        "skillmap.html"
+        "skillmap.html",
+        "authcode.html"
     ];
     nodeutil.mkdirP("built/uploadrepl");
     function encodeURLs(urls) {
@@ -1785,7 +1753,7 @@ async function buildSemanticUIAsync(parsed) {
             ]
         });
     }
-    // Generate react-common css for skillmap
+    // 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({
@@ -1797,6 +1765,17 @@ async function buildSemanticUIAsync(parsed) {
             "--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\\/");
@@ -1890,6 +1869,31 @@ function buildSkillMapAsync(parsed) {
         });
     });
 }
+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`, {}))
+        .then(() => rimrafAsync(`${appRoot}/public/static`, {}))
+        .then(() => {
+        // read pxtarget.json, save into 'pxtTargetBundle' global variable
+        let cfg = readLocalPxTarget();
+        nodeutil.writeFileSync(`${appRoot}/public/blb/target.js`, "// eslint-disable-next-line \n" + targetJsPrefix + JSON.stringify(cfg));
+        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`);
+        return nodeutil.spawnAsync({
+            cmd: os.platform() === "win32" ? "npm.cmd" : "npm",
+            args: ["run-script", "start"],
+            cwd: appRoot,
+            shell: true
+        });
+    });
+}
 function updateDefaultProjects(cfg) {
     let defaultProjects = [
         pxt.BLOCKS_PROJECT_NAME,
@@ -2792,7 +2796,7 @@ function installPackageNameAsync(packageName) {
         return pxt.packagesConfigAsync()
             .then(config => (parsed.tag ? Promise.resolve(parsed.tag) : pxt.github.latestVersionAsync(parsed.slug, config))
             .then(tag => { parsed.tag = tag; })
-            .then(() => pxt.github.pkgConfigAsync(parsed.fullName, parsed.tag))
+            .then(() => pxt.github.pkgConfigAsync(parsed.fullName, parsed.tag, config))
             .then(cfg => mainPkg.loadAsync(true)
             .then(() => {
             let ver = pxt.github.stringifyRepo(parsed);
@@ -6252,6 +6256,17 @@ ${pxt.crowdin.KEY_VARIABLE} - crowdin key
             }
         }
     }, buildSkillMapAsync);
+    p.defineCommand({
+        name: "buildauthcode",
+        aliases: ["authcode"],
+        advanced: true,
+        help: "Serves the authcode webapp",
+        flags: {
+            serve: {
+                description: "Serve the authcode app locally after building (npm start)"
+            }
+        }
+    }, buildAuthcodeAsync);
     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);