pxt-core 7.4.12 → 7.4.16

package/built/cli.js

@@ -765,7 +765,7 @@ function uploadToGitRepoAsync(opts, uplReqs) {
     if (U.startsWith(label, tid + "/"))
         label = label.slice(tid.length + 1);
     if (!/^v\d/.test(label)) {
-        console.log('label is not a version; skipping release upload');
+        console.log(`label "${label}" is not a version; skipping release upload`);
         return Promise.resolve();
     }
     let repoUrl = process.env["PXT_RELEASE_REPO"];
@@ -1743,7 +1743,9 @@ async function buildSemanticUIAsync(parsed) {
         "theme/foo/bar",
         "theme",
         "node_modules/pxt-core/react-common/styles",
-        "react-common/styles"
+        "react-common/styles",
+        "node_modules/@fortawesome",
+        "node_modules/pxt-core/node_modules/@fortawesome" // for locally linked dev environment
     ].join(":");
     // Build semantic css
     await nodeutil.spawnAsync({
@@ -1789,6 +1791,14 @@ async function buildSemanticUIAsync(parsed) {
             "--include-path=" + lessIncludePaths
         ]
     });
+    let fontAwesomeSource = "node_modules/@fortawesome/fontawesome-free/webfonts/";
+    if (!fs.existsSync(fontAwesomeSource)) {
+        fontAwesomeSource = "node_modules/pxt-core/" + fontAwesomeSource;
+    }
+    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");
     // Run postcss with autoprefixer and rtlcss
     pxt.debug("running postcss");
     const postcss = require('postcss');
@@ -1818,13 +1828,19 @@ async function buildSemanticUIAsync(parsed) {
             .process(processed.css, { from: `built/web/${cssFile}`, to: `built/web/rtl${cssFile}` });
         await writeFileAsync(`built/web/rtl${cssFile}`, processedRtl.css, "utf8");
     }
+    if (!isPxtCore) {
+        // This is just to support the local skillmap serve for development
+        nodeutil.cp("built/web/react-common-skillmap.css", "node_modules/pxt-core/skillmap/public/blb");
+        nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/skillmap/public/blb");
+    }
 }
-async function linkFontAsync(font, semCss) {
-    const fontFile = await readFileAsync("node_modules/semantic-ui-less/themes/default/assets/fonts/" + font + ".woff");
+async function linkFontAsync(font, semCss, sourceDir = "node_modules/semantic-ui-less/themes/default/assets/fonts/", refDir = "fonts\\/") {
+    const fontFile = await readFileAsync(sourceDir + font + ".woff");
     const url = "url(data:application/font-woff;charset=utf-8;base64,"
         + fontFile.toString("base64") + ") format('woff')";
-    const r = new RegExp(`src:.*url\\("fonts\/${font}\\.woff.*`, "g");
-    semCss = semCss.replace('src: url("fonts/' + font + '.eot");', "")
+    const r = new RegExp(`src:.*url\\((?:"|')${refDir + font}\\.woff.*`, "g");
+    semCss = semCss.replace('src: url("' + refDir + font + '.eot");', "")
+        .replace('src: url(' + refDir + font + '.eot);', "")
         .replace(r, "src: " + url + ";");
     return semCss;
 }
@@ -1837,6 +1853,7 @@ function buildWebStringsAsync() {
 function buildSkillMapAsync(parsed) {
     // local serve
     const skillmapRoot = "node_modules/pxt-core/skillmap";
+    const reactScriptsConfigRoot = `${skillmapRoot}/node_modules/react-scripts/config`;
     const docsPath = parsed.flags["docs"];
     return rimrafAsync(`${skillmapRoot}/public/blb`, {})
         .then(() => rimrafAsync(`${skillmapRoot}/build/assets`, {}))
@@ -1852,6 +1869,12 @@ function buildSkillMapAsync(parsed) {
         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}`);

package/built/nodeutil.d.ts

@@ -42,7 +42,7 @@ export declare function getPxtTarget(): pxt.TargetBundle;
 export declare function pathToPtr(path: string): string;
 export declare function mkdirP(thePath: string): void;
 export declare function cpR(src: string, dst: string, maxDepth?: number): void;
-export declare function cp(srcFile: string, destDirectory: string): void;
+export declare function cp(srcFile: string, destDirectory: string, destName?: string): void;
 export declare function allFiles(top: string, maxDepth?: number, allowMissing?: boolean, includeDirs?: boolean, ignoredFileMarker?: string): string[];
 export declare function existsDirSync(name: string): boolean;
 export declare function writeFileSync(p: string, data: any, options?: {

package/built/nodeutil.js

@@ -328,9 +328,9 @@ function cpR(src, dst, maxDepth = 8) {
     }
 }
 exports.cpR = cpR;
-function cp(srcFile, destDirectory) {
+function cp(srcFile, destDirectory, destName) {
     mkdirP(destDirectory);
-    let dest = path.resolve(destDirectory, path.basename(srcFile));
+    let dest = path.resolve(destDirectory, destName || path.basename(srcFile));
     let buf = fs.readFileSync(path.resolve(srcFile));
     fs.writeFileSync(dest, buf);
 }

package/built/pxt.js

@@ -99899,6 +99899,7 @@ var ts;
                 "bn": { englishName: "Bengali", localizedName: "বাংলা" },
                 "ca": { englishName: "Catalan", localizedName: "Català" },
                 "cs": { englishName: "Czech", localizedName: "Čeština" },
+                "cy": { englishName: "Welsh", localizedName: "Cymraeg" },
                 "da": { englishName: "Danish", localizedName: "Dansk" },
                 "de": { englishName: "German", localizedName: "Deutsch" },
                 "el": { englishName: "Greek", localizedName: "Ελληνικά" },
@@ -156715,7 +156716,7 @@ function uploadToGitRepoAsync(opts, uplReqs) {
     if (U.startsWith(label, tid + "/"))
         label = label.slice(tid.length + 1);
     if (!/^v\d/.test(label)) {
-        console.log('label is not a version; skipping release upload');
+        console.log(`label "${label}" is not a version; skipping release upload`);
         return Promise.resolve();
     }
     let repoUrl = process.env["PXT_RELEASE_REPO"];
@@ -157693,7 +157694,9 @@ async function buildSemanticUIAsync(parsed) {
         "theme/foo/bar",
         "theme",
         "node_modules/pxt-core/react-common/styles",
-        "react-common/styles"
+        "react-common/styles",
+        "node_modules/@fortawesome",
+        "node_modules/pxt-core/node_modules/@fortawesome" // for locally linked dev environment
     ].join(":");
     // Build semantic css
     await nodeutil.spawnAsync({
@@ -157739,6 +157742,14 @@ async function buildSemanticUIAsync(parsed) {
             "--include-path=" + lessIncludePaths
         ]
     });
+    let fontAwesomeSource = "node_modules/@fortawesome/fontawesome-free/webfonts/";
+    if (!fs.existsSync(fontAwesomeSource)) {
+        fontAwesomeSource = "node_modules/pxt-core/" + fontAwesomeSource;
+    }
+    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");
     // Run postcss with autoprefixer and rtlcss
     pxt.debug("running postcss");
     const postcss = require('postcss');
@@ -157768,13 +157779,19 @@ async function buildSemanticUIAsync(parsed) {
             .process(processed.css, { from: `built/web/${cssFile}`, to: `built/web/rtl${cssFile}` });
         await writeFileAsync(`built/web/rtl${cssFile}`, processedRtl.css, "utf8");
     }
+    if (!isPxtCore) {
+        // This is just to support the local skillmap serve for development
+        nodeutil.cp("built/web/react-common-skillmap.css", "node_modules/pxt-core/skillmap/public/blb");
+        nodeutil.cp("built/web/semantic.css", "node_modules/pxt-core/skillmap/public/blb");
+    }
 }
-async function linkFontAsync(font, semCss) {
-    const fontFile = await readFileAsync("node_modules/semantic-ui-less/themes/default/assets/fonts/" + font + ".woff");
+async function linkFontAsync(font, semCss, sourceDir = "node_modules/semantic-ui-less/themes/default/assets/fonts/", refDir = "fonts\\/") {
+    const fontFile = await readFileAsync(sourceDir + font + ".woff");
     const url = "url(data:application/font-woff;charset=utf-8;base64,"
         + fontFile.toString("base64") + ") format('woff')";
-    const r = new RegExp(`src:.*url\\("fonts\/${font}\\.woff.*`, "g");
-    semCss = semCss.replace('src: url("fonts/' + font + '.eot");', "")
+    const r = new RegExp(`src:.*url\\((?:"|')${refDir + font}\\.woff.*`, "g");
+    semCss = semCss.replace('src: url("' + refDir + font + '.eot");', "")
+        .replace('src: url(' + refDir + font + '.eot);', "")
         .replace(r, "src: " + url + ";");
     return semCss;
 }
@@ -157787,6 +157804,7 @@ function buildWebStringsAsync() {
 function buildSkillMapAsync(parsed) {
     // local serve
     const skillmapRoot = "node_modules/pxt-core/skillmap";
+    const reactScriptsConfigRoot = `${skillmapRoot}/node_modules/react-scripts/config`;
     const docsPath = parsed.flags["docs"];
     return rimrafAsync(`${skillmapRoot}/public/blb`, {})
         .then(() => rimrafAsync(`${skillmapRoot}/build/assets`, {}))
@@ -157802,6 +157820,12 @@ function buildSkillMapAsync(parsed) {
         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}`);