pxt-core 11.3.28 → 11.3.30

package/built/cli.js

@@ -2325,6 +2325,7 @@ async function buildTargetCoreAsync(options = {}) {
         delete targetlight.compile.compilerExtension;
     const targetlightjson = nodeutil.stringify(targetlight);
     nodeutil.writeFileSync("built/targetlight.json", targetlightjson);
+    nodeutil.writeFileSync("built/targetlight.js", targetJsPrefix + targetlightjson);
     nodeutil.writeFileSync("built/sim.webmanifest", nodeutil.stringify(webmanifest));
     console.log("target.json built.");
 }

package/built/pxt.js

@@ -97892,7 +97892,7 @@ var pxt;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             language: pxt.appTarget.appTheme.defaultLocale,
             highContrast: false,
-            themeId: pxt.appTarget.appTheme.defaultColorTheme,
+            colorThemeIds: {},
             reader: "",
             skillmap: { mapProgress: {}, completedTags: {} },
             email: false
@@ -101536,14 +101536,16 @@ var pxt;
         // patch cdn url locations
         pxt.appTarget = replaceCdnUrlsInJsonBlob(pxt.appTarget);
         // patch icons in bundled packages
-        Object.keys(pxt.appTarget.bundledpkgs).forEach(pkgid => {
-            const res = pxt.appTarget.bundledpkgs[pkgid];
-            // path config before storing
-            const config = JSON.parse(res[pxt.CONFIG_NAME]);
-            if (config.icon)
-                config.icon = pxt.BrowserUtils.patchCdn(config.icon);
-            res[pxt.CONFIG_NAME] = pxt.Package.stringifyConfig(config);
-        });
+        if (pxt.appTarget.bundledpkgs) {
+            Object.keys(pxt.appTarget.bundledpkgs).forEach(pkgid => {
+                const res = pxt.appTarget.bundledpkgs[pkgid];
+                // path config before storing
+                const config = JSON.parse(res[pxt.CONFIG_NAME]);
+                if (config.icon)
+                    config.icon = pxt.BrowserUtils.patchCdn(config.icon);
+                res[pxt.CONFIG_NAME] = pxt.Package.stringifyConfig(config);
+            });
+        }
         // patch any pre-configured query url appTheme overrides
         if (typeof window !== 'undefined') {
             // Map<AppTarget>
@@ -112034,7 +112036,7 @@ var pxt;
                                 currentSection.attributes[currentKey] = currentValue.trim();
                             }
                         }
-                        currentKey = keyMatch[1].toLowerCase();
+                        currentKey = keyMatch[1].trim().toLowerCase();
                         currentValue = keyMatch[2];
                     }
                     else if (currentKey) {
@@ -163594,6 +163596,7 @@ async function buildTargetCoreAsync(options = {}) {
         delete targetlight.compile.compilerExtension;
     const targetlightjson = nodeutil.stringify(targetlight);
     nodeutil.writeFileSync("built/targetlight.json", targetlightjson);
+    nodeutil.writeFileSync("built/targetlight.js", targetJsPrefix + targetlightjson);
     nodeutil.writeFileSync("built/sim.webmanifest", nodeutil.stringify(webmanifest));
     console.log("target.json built.");
 }

package/built/pxtlib.d.ts

@@ -66,6 +66,12 @@ declare namespace pxt.auth {
     type UserBadgeState = {
         badges: Badge[];
     };
+    /**
+     * Mapping of target id to preferred color theme id.
+     */
+    type ColorThemeIdsState = {
+        [targetId: string]: string;
+    };
     type SetPrefResult = {
         success: boolean;
         res: UserPreferences;
@@ -76,7 +82,7 @@ declare namespace pxt.auth {
     type UserPreferences = {
         language?: string;
         highContrast?: boolean;
-        themeId?: string;
+        colorThemeIds?: ColorThemeIdsState;
         reader?: string;
         skillmap?: UserSkillmapState;
         badges?: UserBadgeState;

package/built/pxtlib.js

@@ -206,7 +206,7 @@ var pxt;
         auth.DEFAULT_USER_PREFERENCES = () => ({
             language: pxt.appTarget.appTheme.defaultLocale,
             highContrast: false,
-            themeId: pxt.appTarget.appTheme.defaultColorTheme,
+            colorThemeIds: {},
             reader: "",
             skillmap: { mapProgress: {}, completedTags: {} },
             email: false
@@ -3850,14 +3850,16 @@ var pxt;
         // patch cdn url locations
         pxt.appTarget = replaceCdnUrlsInJsonBlob(pxt.appTarget);
         // patch icons in bundled packages
-        Object.keys(pxt.appTarget.bundledpkgs).forEach(pkgid => {
-            const res = pxt.appTarget.bundledpkgs[pkgid];
-            // path config before storing
-            const config = JSON.parse(res[pxt.CONFIG_NAME]);
-            if (config.icon)
-                config.icon = pxt.BrowserUtils.patchCdn(config.icon);
-            res[pxt.CONFIG_NAME] = pxt.Package.stringifyConfig(config);
-        });
+        if (pxt.appTarget.bundledpkgs) {
+            Object.keys(pxt.appTarget.bundledpkgs).forEach(pkgid => {
+                const res = pxt.appTarget.bundledpkgs[pkgid];
+                // path config before storing
+                const config = JSON.parse(res[pxt.CONFIG_NAME]);
+                if (config.icon)
+                    config.icon = pxt.BrowserUtils.patchCdn(config.icon);
+                res[pxt.CONFIG_NAME] = pxt.Package.stringifyConfig(config);
+            });
+        }
         // patch any pre-configured query url appTheme overrides
         if (typeof window !== 'undefined') {
             // Map<AppTarget>
@@ -14348,7 +14350,7 @@ var pxt;
                                 currentSection.attributes[currentKey] = currentValue.trim();
                             }
                         }
-                        currentKey = keyMatch[1].toLowerCase();
+                        currentKey = keyMatch[1].trim().toLowerCase();
                         currentValue = keyMatch[2];
                     }
                     else if (currentKey) {

package/built/pxtservices/editorDriver.d.ts

@@ -60,7 +60,7 @@ export declare class EditorDriver extends IframeDriver {
     convertCloudProjectsToLocal(userId: string): Promise<void>;
     requestProjectCloudStatus(headerIds: string[]): Promise<void>;
     precacheTutorial(data: pxt.github.GHTutorialResponse): Promise<void>;
-    setColorTheme(colorThemeId: string): Promise<void>;
+    setColorTheme(colorThemeId: string, savePreference: boolean): Promise<void>;
     addEventListener(event: typeof MessageSentEvent, handler: (ev: pxt.editor.EditorMessage) => void): void;
     addEventListener(event: typeof MessageReceivedEvent, handler: (ev: pxt.editor.EditorMessage) => void): void;
     addEventListener(event: "event", handler: (ev: pxt.editor.EditorMessageEventRequest) => void): void;

package/built/react-common/components/theming/themeManager.d.ts

@@ -7,6 +7,7 @@ export declare class ThemeManager {
     private constructor();
     static getInstance(doc?: Document): ThemeManager;
     getCurrentColorTheme(): Readonly<pxt.ColorThemeInfo>;
+    isKnownTheme(themeId: string): boolean;
     getAllColorThemes(): pxt.ColorThemeInfo[];
     isHighContrast(themeId: string): boolean;
     private performHighContrastWorkaround;