pxt-core 7.4.14 → 7.4.15

package/built/cli.js

@@ -1831,6 +1831,7 @@ async function buildSemanticUIAsync(parsed) {
     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, sourceDir = "node_modules/semantic-ui-less/themes/default/assets/fonts/", refDir = "fonts\\/") {
@@ -1852,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`, {}))
@@ -1867,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: "Ελληνικά" },
@@ -157781,6 +157782,7 @@ async function buildSemanticUIAsync(parsed) {
     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, sourceDir = "node_modules/semantic-ui-less/themes/default/assets/fonts/", refDir = "fonts\\/") {
@@ -157802,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`, {}))
@@ -157817,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}`);

package/built/pxtblockly.js

@@ -6952,7 +6952,7 @@ var pxt;
             layout.serializeSvgString = serializeSvgString;
             function cleanUpBlocklySvg(svg) {
                 pxt.BrowserUtils.removeClass(svg, "blocklySvg");
-                pxt.BrowserUtils.addClass(svg, "blocklyPreview pxt-renderer");
+                pxt.BrowserUtils.addClass(svg, "blocklyPreview pxt-renderer classic-theme");
                 // Remove background elements
                 pxt.U.toArray(svg.querySelectorAll('.blocklyMainBackground,.blocklyScrollbarBackground'))
                     .forEach(el => { if (el)
@@ -13085,7 +13085,6 @@ var pxtblockly;
         }
         initView() {
             super.initView();
-            this.initVariables();
         }
         onItemSelected_(menu, menuItem) {
             const value = menuItem.getValue();
@@ -13103,6 +13102,10 @@ var pxtblockly;
                 this.getOptions();
             return super.doClassValidation_(value);
         }
+        getOptions(opt_useCache) {
+            this.initVariables();
+            return super.getOptions(opt_useCache);
+        }
         initVariables() {
             if (this.sourceBlock_ && this.sourceBlock_.workspace) {
                 const ws = this.sourceBlock_.workspace;

package/built/pxtblocks.d.ts

@@ -776,6 +776,7 @@ declare namespace pxtblockly {
         initView(): void;
         onItemSelected_(menu: Blockly.Menu, menuItem: Blockly.MenuItem): void;
         doClassValidation_(value: any): string;
+        getOptions(opt_useCache?: boolean): any[][];
         private initVariables;
     }
 }

package/built/pxtblocks.js

@@ -3328,7 +3328,7 @@ var pxt;
             layout.serializeSvgString = serializeSvgString;
             function cleanUpBlocklySvg(svg) {
                 pxt.BrowserUtils.removeClass(svg, "blocklySvg");
-                pxt.BrowserUtils.addClass(svg, "blocklyPreview pxt-renderer");
+                pxt.BrowserUtils.addClass(svg, "blocklyPreview pxt-renderer classic-theme");
                 // Remove background elements
                 pxt.U.toArray(svg.querySelectorAll('.blocklyMainBackground,.blocklyScrollbarBackground'))
                     .forEach(el => { if (el)
@@ -9461,7 +9461,6 @@ var pxtblockly;
         }
         initView() {
             super.initView();
-            this.initVariables();
         }
         onItemSelected_(menu, menuItem) {
             const value = menuItem.getValue();
@@ -9479,6 +9478,10 @@ var pxtblockly;
                 this.getOptions();
             return super.doClassValidation_(value);
         }
+        getOptions(opt_useCache) {
+            this.initVariables();
+            return super.getOptions(opt_useCache);
+        }
         initVariables() {
             if (this.sourceBlock_ && this.sourceBlock_.workspace) {
                 const ws = this.sourceBlock_.workspace;

package/built/pxtlib.js

@@ -2213,6 +2213,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: "Ελληνικά" },