Merge branch 'master' into dev/jwunderl/copilot-server-request

Author: jwunderl

.vscode/launch.json

@@ -219,6 +219,29 @@
 			"sourceMaps": false,
 			"outFiles": []
 		},
+		{
+			"name": "pxt serve (core)",
+			"type": "node",
+			"request": "launch",
+			"program": "${workspaceRoot}/built/pxt.js",
+			"stopOnEntry": false,
+			"args": [
+				"serve",
+				"--rebundle",
+				"--noauth"
+			],
+			"cwd": "${workspaceRoot}",
+			"runtimeExecutable": null,
+			"runtimeArgs": [
+				"--nolazy"
+			],
+			"env": {
+				"NODE_ENV": "development"
+			},
+			"console": "integratedTerminal",
+			"sourceMaps": false,
+			"outFiles": []
+		},
 		{
 			"name": "pxt serve (bedrock)",
 			"type": "node",

.vscode/settings.json

@@ -27,5 +27,6 @@
         "*.variables": "less",
         "*.jres": "json"
     },
-    "git.ignoreLimitWarning": true
+    "git.ignoreLimitWarning": true,
+    "js/ts.tsdk.path": "node_modules/typescript/lib"
 }

ThirdPartyNotice

@@ -882,6 +882,7 @@ General Public License.
 864. @fortawesome/fontawesome-free 5.15.4 (https://www.npmjs.com/package/@fortawesome/fontawesome-free/v/5.15.4)
 865. @blockly/plugin-workspace-search 4.0.10 (https://www.npmjs.com/package/@blockly/plugin-workspace-search/v/4.0.10)
 866. @blockly/keyboard-navigation 1.0.0-beta.0 (https://www.npmjs.com/package/@blockly/keyboard-navigation/v/1.0.0-beta.0)
+867. Qix-/color-convert 5c106a633b5cd2de554d9c287ad31f9eeca7a271 (https://github.com/Qix-/color-convert)
 
 
 
@@ -28361,14 +28362,14 @@ The copyright in this software is being made available under the BSD License, in
 
 **Copyright (c) 2015, Dash Industry Forum.
 **All rights reserved.**
- 
+
 * Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the  documentation and/or other materials provided with the distribution.
 * Neither the name of the Dash Industry Forum nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 **THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.**
- 
+
 =========================================
 END OF dashjs 4.4.0 NOTICES AND INFORMATION
 
@@ -28955,3 +28956,30 @@ END OF @blockly/plugin-workspace-search 4.0.10 NOTICES AND INFORMATION
    limitations under the License.
 =========================================
 END OF @blockly/keyboard-navigation 1.0.0-beta.0 NOTICES AND INFORMATION
+
+
+%% Qix-/color-convert 5c106a633b5cd2de554d9c287ad31f9eeca7a271 NOTICES AND INFORMATION BEGIN HERE
+=========================================
+Copyright (c) 2011-2016 Heather Arthur <fayearthur@gmail.com>.
+Copyright (c) 2016-2021 Josh Junon <josh@junon.me>.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+=========================================
+END OF Qix-/color-convert 5c106a633b5cd2de554d9c287ad31f9eeca7a271 NOTICES AND INFORMATION

cli/cli.ts

@@ -41,6 +41,7 @@ pxt.docs.requireDOMSanitizer = () => {
     const sanitizeHtml = require("sanitize-html");
     const defaults = sanitizeHtml.defaults || {};
     const baseAllowedAttrs = defaults.allowedAttributes || {};
+    const allowedTags = defaults.allowedTags || [];
 
     const mergeClassAttribute = (tag: string, ...otherAttributes: string[]) => {
         const existing: string[] = baseAllowedAttrs[tag] || [];
@@ -49,6 +50,7 @@ pxt.docs.requireDOMSanitizer = () => {
 
     const options = {
         ...defaults,
+        allowedTags: [...allowedTags, "img"],
         allowedAttributes: {
             ...baseAllowedAttrs,
             code: mergeClassAttribute("code"),
@@ -467,13 +469,38 @@ async function ciAsync(parsed?: commandParser.ParsedCommand) {
 
     lintJSONInDirectory(path.resolve("."));
     lintJSONInDirectory(path.resolve("docs"));
+    let pkg = readJson("package.json")
 
-    function npmPublishAsync() {
+    async function npmPublishAsync() {
         if (!npmPublish) return Promise.resolve();
+
+        let latest: pxt.semver.Version;
+
+        try {
+            const version = await nodeutil.npmLatestVersionAsync(pkg["name"]);
+            latest = pxt.semver.parse(version);
+        }
+        catch (e) {
+            // no latest tag
+        }
+
+        let distTag: string;
+
+        if (latest) {
+            const current = pxt.semver.parse(pkg["version"]);
+
+            if (pxt.semver.cmp(current, latest) < 0) {
+                distTag = `stable${current.major}.${current.minor}`;
+            }
+        }
+
+        if (distTag) {
+            return nodeutil.runNpmAsync("publish", "--tag", distTag);
+        }
+
         return nodeutil.runNpmAsync("publish");
     }
 
-    let pkg = readJson("package.json")
     if (pkg["name"] == "pxt-core") {
         pxt.log("pxt-core build");
 

cli/nodeutil.ts

@@ -114,6 +114,16 @@ export function runNpmAsync(...args: string[]) {
     return runNpmAsyncWithCwd(".", ...args);
 }
 
+export async function npmLatestVersionAsync(packageName: string) {
+    const output = await spawnWithPipeAsync({
+        cmd: addCmd("npm"),
+        args: ["view", packageName, "dist-tags.latest"],
+        cwd: ".",
+    });
+
+    return output.toString("utf8").trim()
+}
+
 export interface NpmRegistry {
     _id: string;
     _name: string;

common-docs/javascript/generics.md

@@ -131,7 +131,7 @@ function identity<T>(arg: T): T {
     return arg;
 }
 
-let myIdentity: <U>(arg: U) => U = identity;
+let myIdentity: <V>(arg: V) => V = identity;
 ```
 
 We can also write the generic type as a call signature of an object literal type:

common-docs/share.md

@@ -56,6 +56,16 @@ By default, all shared projects in MakeCode can be copied and edited. There is n
 
 ![Edit shared project button](/static/share/edit-shared-project.png)
 
+## Asset Packs #asset-packs
+
+Certain editors (such as [MakeCode Arcade](https://arcade.makecode.com)) can include resource files inside of projects. The resources, or _assets_, might contain byte respresentations of images, animations, sounds, tilemaps, etc. An **Asset Pack** is a resource only project where just the assets are shared and no code is loaded from the shared project.
+
+If this feature is supported by your editor, you can set a project as an asset pack by going to the **Settings** (⚙️) menu and selecting 'Project Settings'. Enable the 'Import as asset pack' setting. Watch this video to see how it's done:
+
+https://youtu.be/CjLYl5KJiSk
+
+See the [Asset Packs](https://makecode.com/extensions/asset-packs) page to learn more.
+
 ## Report Abuse
 
 All MakeCode shared projects pass through Microsoft standard scanning for security and safety compliance. In addition, the "Report Abuse" option is available on any shared project if you deem the contents of the project not appropriate (contains unsafe content or includes personally identifiable information). For these types of projects, the MakeCode Team will remove the project from our databases. 

docfiles/offline-app-head.html

@@ -530,17 +530,15 @@
             let recommendedButton = null;
 
             if (isMac) {
-                if (isAppleSilicon) {
-                    recommendedButton = $("#download-macarm64");
-                } else {
-                    recommendedButton = $("#download-mac64");
-                }
+                // Do not recommend a Mac binary because architecture detection is unreliable across browsers
+                recommendedButton = null;
             } else if (isWindows) {
-                if (false && isWindowsARM) {
-                    recommendedButton = $("#download-winarm64");
-                } else {
-                    recommendedButton = $("#download-win64");
-                }
+                // if (false && isWindowsARM) {
+                //     recommendedButton = $("#download-winarm64");
+                // } else {
+                //     recommendedButton = $("#download-win64");
+                // }
+                recommendedButton = null;
             }
 
             // Mark the recommended download

docs/blog.md

@@ -1,5 +1,21 @@
 # Microsoft MakeCode Blog
 
+## [Summer 2026 – MakeCode Professional Development](/blog/csp/summer-pd-2026)
+
+April 6th, 2026 by [Jaqster](https://github.com/jaqster)
+
+Planning your summer schedule? Make sure to register for some of these FREE MakeCode Professional Development opportunities.
+
+**[Continue reading this blog post](/blog/csp/summer-pd-2026)**
+
+## [MakeCode Arcade 2026 Update](/blog/arcade/update-feb-2026)
+
+February 13th, 2026 by [Jaqster](https://github.com/jaqster)
+
+Today we are pleased to release our 2026 MakeCode Arcade updates!
+
+**[Continue reading this blog post](/blog/arcade/update-feb-2026)**
+
 ## [Interview with MakeCode Arcade Game Maker](/blog/arcade/code-ninjas)
 
 December 19, 2025 by [Jaqster](https://github.com/jaqster)

docs/blog/SUMMARY.md

@@ -1,6 +1,8 @@
 # Microsoft MakeCode Blog
 
 * [Blog](/blog)
+    * [Summer 2026 – MakeCode Professional Development](/blog/csp/summer-pd-2026)
+    * [MakeCode Arcade 2026 Update](/blog/arcade/update-feb-2026)
     * [Interview with MakeCode Arcade Game Maker](/blog/arcade/code-ninjas)
     * [Computer Science Education Week 2025](/blog/csed-week/csed-week-2025)
     * [MakeCode Minecraft 2025 Update](/blog/minecraft/2025-release)