Merge branch 'master' of https://github.com/microsoft/pxt into tball/settingSizeConfig

Author: tballmsft

cli/cli.ts

@@ -1946,6 +1946,18 @@ ${gcards.map(gcard => `[${gcard.name}](${gcard.url})`).join(',\n')}
                 targetStrings[`{id:hardware-description}${opt.description}`] = opt.description;
         }
     }
+
+    const themeFiles = getThemeFilePaths();
+    for(const themePath of themeFiles) {
+        if (nodeutil.fileExistsSync(themePath)) {
+            const theme = nodeutil.readJson(themePath);
+            const name = theme["name"];
+            if (name) {
+                targetStrings[`{id:color-theme-name}${name}`] = name;
+            }
+        }
+    }
+
     // extract strings from editor
     ["editor", "fieldeditors", "cmds"]
         .filter(d => nodeutil.existsDirSync(d))
@@ -2284,22 +2296,26 @@ function updateTOC(cfg: pxt.TargetBundle) {
     }
 }
 
-function updateColorThemes(cfg: pxt.TargetBundle) {
-    pxt.log("Loading color themes...");
-
+function getThemeFilePaths() {
     const sharedThemeFiles = fs.existsSync("node_modules/pxt-core/theme/color-themes")
-        ? nodeutil
-              .allFiles("node_modules/pxt-core/theme/color-themes", { maxDepth: 1, includeDirs: false })
-              .filter((f) => /\.json$/i.test(f))
-        : [];
+    ? nodeutil
+          .allFiles("node_modules/pxt-core/theme/color-themes", { maxDepth: 1, includeDirs: false })
+          .filter((f) => /\.json$/i.test(f))
+    : [];
+
     const targetThemeFiles = fs.existsSync("theme/color-themes")
         ? nodeutil
             .allFiles("theme/color-themes", { maxDepth: 1, includeDirs: false })
             .filter((f) => /\.json$/i.test(f))
         : [];
 
     // Target takes precedence, so include those at the end (will overwrite shared themes)
-    const themeFiles = sharedThemeFiles.concat(targetThemeFiles);
+    return sharedThemeFiles.concat(targetThemeFiles);
+}
+
+function updateColorThemes(cfg: pxt.TargetBundle) {
+    pxt.log("Loading color themes...");
+    const themeFiles = getThemeFilePaths();
 
     for (const themeFile of themeFiles) {
         const themeFileDir = path.dirname(themeFile);

docs/blog.md

@@ -1,5 +1,13 @@
 # Microsoft MakeCode Blog
 
+## [MakeCode Arcade 2025 Update](/blog/arcade/update-mar-2025)
+
+March 24th, 2025 by [Jaqster](https://github.com/jaqster)
+
+Wow, I can't believe it's been 2 years since we shipped an update to MakeCode Arcade! We had over 800 open issues and many pending features...
+
+**[Continue reading this blog post](/blog/arcade/update-mar-2025)**
+
 ## [Display shield extension/simulator for the micro:bit](/blog/microbit/display-shield)
 
 February 3, 2025 by [Thomas Ball](https://github.com/thomasjball)

docs/blog/SUMMARY.md

@@ -1,6 +1,7 @@
 # Microsoft MakeCode Blog
 
 * [Blog](/blog)
+    * [MakeCode Arcade 2025 Update](/blog/arcade/update-mar-2025)
     * [Display shield extension/simulator for the micro:bit](/blog/microbit/display-shield)
     * [MakeCode Code Evaluation Tool Beta](/blog/tools/code-eval-tool)
     * [MakeCode for the micro:bit 2024 Update](/blog/microbit/2024-update)

docs/blog/arcade/update-mar-2025.md

@@ -0,0 +1,94 @@
+# MakeCode Arcade 2025 Update
+
+**Posted on March 24th, 2025 by [Jaqster](https://github.com/jaqster)**
+
+Wow, I can't believe it's been 2 years since we shipped an update to MakeCode Arcade! We had over 800 open issues and many pending features pushing at the Beta gate to get out. This release felt so good to ship! We hope you enjoy some of these new goodies!
+
+Note – we know it's the middle of the school year for many, so if you would like to continue using the existing version, you can bookmark https://arcade.makecode.com/v1.12. 
+
+## Blockly update
+
+In line with our other editors, Arcade was upgraded to the latest version of the Blockly library. The MakeCode blocks visual programming interface is built on [Google 
+Blockly](https://developers.google.com/blockly). You shouldn't notice any big visual differences in the MakeCode blocks, but by upgrading we are now able to access all the latest Blockly plugins and features, including support for future work around accessible blocks. If you're interested in learning more about our work on the "Great Blockly Upgrade", watch this talk from the [Blockly Summit](https://youtu.be/SoXN61lSL9U).
+
+## Version history
+
+Version history comes to Arcade finally!
+
+>_"Noooo!!! I just made a change that deleted all my code!!! Please help me!"_
+
+These posts on our forum always made us very sad 😞. So, we decided to do something about it. The Version History feature (affectionately called the ‘MakeCode Time Machine') supports 5-minute snapshots of code so users can restore and save copies of previous versions of their projects. Open the **Settings** menu and select Version History to see this view.
+
+![Version history](/static/blog/arcade/update-mar-2025/version-history.gif)
+
+## Themes and Accessibility improvements
+
+Orange isn't for everyone. And although I love the original Arcade orange color scheme, it isn't the most accessible in terms of color contrast for visually impaired users. So, we've added support for themes – now users can select from among 4 different color themes including a high contrast theme to help improve accessibility and add a touch of personalization! To set your theme, click on the **Settings** menu and select Theme.
+
+![Theme selection](/static/blog/arcade/update-mar-2025/themes.png)
+
+As part of our theming overhaul, some of you may have noticed that we also updated the Arcade font family to a more accessible/readable font.
+
+![New fonts](/static/blog/arcade/update-mar-2025/fonts.png)
+
+And, we've improved the color contrast for nested blocks of the same color with a lighter border to make them more readable.
+
+### Old nested block borders
+ 
+![Older nested blocks](/static/blog/arcade/update-mar-2025/old-nested.png)
+
+### New nested block borders
+
+![Newer nested blocks](/static/blog/arcade/update-mar-2025/new-nested.png)
+
+In addition to that, we also improved the accessibility of our tutorials for color blind and vision impaired users by changing the block name color highlighting to include the icon and improve color contrast readability.
+
+![tutorial updates](/static/blog/arcade/update-mar-2025/tutorial-updates.png)
+
+## Editor Tour
+
+There is a lot going on in the Arcade code editor, and it can be overwhelming for newbies. We released an interface tour that automatically starts for new users when they create their first project, or it can be started from the **Help** menu. This feature is helpful to set context and orient people before they start coding.
+
+![MakeCode editor tour](/static/blog/arcade/update-mar-2025/tour.gif)
+
+## Support for more languages
+
+We are so happy to see MakeCode Arcade going global! We have support for 5 new languages in this release – Arabic, Dutch, Irish, Italian and Korean! Big, big **THANK YOU** to all the volunteers who have helped localize MakeCode and bring coding to students around the world. If you would like to help translate or proofread translations, learn how to get involved at https://makecode.com/translate. 
+
+![Editor languages](/static/blog/arcade/update-mar-2025/editor-languages.png)
+
+## Blocks Copy/Paste
+
+This feature is a real delighter for me. Now, you can copy chunks of code across projects! Simply right-click on a block in one project and select Copy (or Ctrl-C on keyboard), open another project, right-click on the Workspace and select Paste (or Ctrl-V).
+
+![Blocks copy/paste feature](/static/blog/arcade/update-mar-2025/copy-paste.gif)
+
+## Animations go mainstream
+
+With the popularity of the animation blocks, we've decided to pull them out of the Advanced section of the Toolbox and make them more discoverable for users.
+
+![Animation toolbox category](/static/blog/arcade/update-mar-2025/toolbox.png)
+
+## Keyboard input
+
+This was a request of many of the AP CS Principles teachers who are using Arcade to teach user input and output. Now, for users on a computer, the [Ask for String] and [Ask for Number] blocks will use the system keyboard input by default, instead of the game controller input making it much easier to enter long responses. If you download your game onto a handheld Arcade device, or click on the on-screen game controls, then the input will revert to using the game controller buttons.
+
+![Keyboard directed input](/static/blog/arcade/update-mar-2025/keyboard-input.gif)
+
+## Open in Visual Studio Code Online
+
+We shipped the [MakeCode Arcade extension for VS Code]( https://makecode.com/blog/arcade/vscode-extension) a couple years ago, and have seen positive feedback from folks using it. Now, we're excited to release support for MakeCode Arcade in Visual Studio Code for the web. This makes it even easier to move projects from MakeCode to VS Code because everything's in the browser.
+
+![MakeCode in VSCode](/static/blog/arcade/update-mar-2025/vs-code-web.gif)
+
+## Feedback
+
+Thank you to everyone who has logged bugs, submitted PR's, translated and suggested new features! Any new bugs you find in this release, please log them in [GitHub](https://github.com/Microsoft/pxt-arcade/issues)
+
+Any other questions, comments, suggestions, and feedback – please join the discussion at the
+[MakeCode Forum](https://forum.makecode.com).
+
+Happy Making and Coding!
+
+<br/>
+The MakeCode Team

docs/csp.md

@@ -26,6 +26,17 @@ Some additional features of the Microsoft MakeCode curriculum include:
 
 Microsoft is recognized by the College Board as an endorsed provider of curriculum and professional development for AP® Computer Science Principles (AP CSP). Using an Endorsed Provider affords schools access to resources including an AP CSP syllabus pre-approved by the College Board’s AP Course Audit, and officially recognized professional development that prepares teachers to teach AP CSP. This endorsement affirms only that components of Microsoft's offerings are aligned to all the AP Curriculum Framework standards and the AP CSP assessment.
 
+### ~ reminder
+
+#### Professional Development Workshops - 2025
+
+We will be offering free online training this summer to help prepare Educators to teach the AP CS Principles with Microsoft MakeCode course for the 2025-2026 academic year. These professional development workshops will focus on the course's Big Ideas, Learning Objectives and Essential Knowledge skills. Additionally, participants will gain familiarity with the Microsoft MakeCode Arcade programming interface, and understand how the curriculum prepares students for the AP Exam and Create Performance Task. By attending the training and using the MakeCode curriculum, Educators will be prepared with a syllabus, pacing plan, lesson plan, PowerPoint presentations, student handouts and resources for every day of the course. Register for one of the sessions below. Each session has limited capacity:
+
+* [Workshop 1](https://events.teams.microsoft.com/event/1118b9b2-723c-4eeb-a694-28aa35b8dc09@74ce1499-dbf1-452c-a18f-ed42467a4990): June 16th - 20th
+* [Workshop 2](https://events.teams.microsoft.com/event/20af7ced-66e3-4b1b-80c6-994d008cbf2f@74ce1499-dbf1-452c-a18f-ed42467a4990): July 14th - 18th
+
+### ~
+
 ## Course Overview 
 
 Technical Requirements: Students will need access to a computer with an internet connection.