Merge branch 'main' into dev

Author: fisker

.angular-github/workflows/scorecard.yml

@@ -47,6 +47,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: 'Upload to code-scanning'
-        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           sarif_file: results.sarif

MODULE.bazel

@@ -5,14 +5,14 @@ module(
 )
 
 bazel_dep(name = "rules_pkg", version = "1.2.0")
-bazel_dep(name = "rules_nodejs", version = "6.6.2")
-bazel_dep(name = "aspect_rules_ts", version = "3.8.1")
-bazel_dep(name = "aspect_rules_js", version = "2.8.3")
+bazel_dep(name = "rules_nodejs", version = "6.7.3")
+bazel_dep(name = "aspect_rules_ts", version = "3.8.3")
+bazel_dep(name = "aspect_rules_js", version = "2.9.1")
 bazel_dep(name = "aspect_rules_esbuild", version = "0.25.0")
 bazel_dep(name = "aspect_rules_jasmine", version = "2.0.2")
 bazel_dep(name = "aspect_rules_rollup", version = "2.0.1")
 bazel_dep(name = "bazel_skylib", version = "1.9.0")
-bazel_dep(name = "aspect_bazel_lib", version = "2.22.2")
+bazel_dep(name = "aspect_bazel_lib", version = "2.22.5")
 bazel_dep(name = "tar.bzl", version = "0.7.0")
 bazel_dep(name = "yq.bzl", version = "0.3.4")
 bazel_dep(name = "rules_angular")

MODULE.bazel.lock

@@ -1,9 +1,9 @@
 {
   "dependencies": {
-    "@algolia/client-common": "5.46.2",
-    "@algolia/client-search": "5.46.2",
-    "@algolia/requester-browser-xhr": "5.46.2",
-    "@algolia/requester-node-http": "5.46.2",
+    "@algolia/client-common": "5.46.3",
+    "@algolia/client-search": "5.46.3",
+    "@algolia/requester-browser-xhr": "5.46.3",
+    "@algolia/requester-node-http": "5.46.3",
     "@angular/animations": "workspace:*",
     "@angular/aria": "21.2.0-next.0",
     "@angular/build": "21.1.0-rc.0",
@@ -29,9 +29,9 @@
     "@codemirror/lang-sass": "6.0.2",
     "@codemirror/language": "6.12.1",
     "@codemirror/lint": "6.9.2",
-    "@codemirror/search": "6.5.11",
-    "@codemirror/state": "6.5.3",
-    "@codemirror/view": "6.39.9",
+    "@codemirror/search": "6.6.0",
+    "@codemirror/state": "6.5.4",
+    "@codemirror/view": "6.39.11",
     "@lezer/common": "1.5.0",
     "@lezer/css": "1.3.0",
     "@lezer/highlight": "1.2.3",
@@ -42,17 +42,17 @@
     "@marijn/find-cluster-break": "1.0.2",
     "@stackblitz/sdk": "1.11.0",
     "@types/dom-navigation": "1.0.6",
-    "@types/jasmine": "5.1.13",
+    "@types/jasmine": "5.1.15",
     "@types/jsdom": "27.0.0",
-    "@types/node": "24.10.4",
+    "@types/node": "24.10.8",
     "@typescript/vfs": "1.6.2",
     "@webcontainer/api": "1.6.1",
     "@xterm/addon-fit": "0.11.0",
     "@xterm/xterm": "6.0.0",
-    "algoliasearch": "5.46.2",
+    "algoliasearch": "5.46.3",
     "angular-split": "20.0.0",
     "crelt": "1.0.6",
-    "diff": "8.0.2",
+    "diff": "8.0.3",
     "emoji-regex": "10.6.0",
     "fflate": "0.8.2",
     "jasmine-core": "5.13.0",

adev/package.json

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Tokens, Token, RendererThis, TokenizerThis} from 'marked';
-import {loadWorkspaceRelativeFile, anchorTarget} from '../../helpers.mjs';
-import {setInsideLink} from '../../transformations/link.mjs';
+import {RendererThis, Token, TokenizerThis, Tokens} from 'marked';
+import {anchorTarget, loadWorkspaceRelativeFile} from '../../helpers.mjs';
+import {AdevDocsRenderer} from '../../renderer.mjs';
 
 interface DocsCardToken extends Tokens.Generic {
   type: 'docs-card';
@@ -67,11 +67,13 @@ export const docsCardExtension = {
     return undefined;
   },
   renderer(this: RendererThis, token: DocsCardToken) {
-    return token.imgSrc ? getCardWithSvgIllustration(this, token) : getStandardCard(this, token);
+    return token.imgSrc
+      ? getCardWithSvgIllustration(this, token)
+      : getStandardCard(this.parser.renderer as AdevDocsRenderer, token);
   },
 };
 
-function getStandardCard(renderer: RendererThis, token: DocsCardToken) {
+function getStandardCard(renderer: AdevDocsRenderer, token: DocsCardToken) {
   if (token.iconImgSrc && token.href) {
     // We can assume that all icons are svg files since they are custom.
     // We need to read svg content, instead of renering svg with `img`,
@@ -110,13 +112,11 @@ function getStandardCard(renderer: RendererThis, token: DocsCardToken) {
   `;
 }
 
-function parseWithoutCreatingLinks(renderer: RendererThis, token: DocsCardToken) {
-  setInsideLink(true);
-  try {
-    return renderer.parser.parse(token.tokens);
-  } finally {
-    setInsideLink(false);
-  }
+function parseWithoutCreatingLinks(renderer: AdevDocsRenderer, token: DocsCardToken) {
+  renderer.context.disableAutoLinking = true;
+  const parsed = renderer.parser.parse(token.tokens);
+  renderer.context.disableAutoLinking = false;
+  return parsed;
 }
 
 function getCardWithSvgIllustration(renderer: RendererThis, token: DocsCardToken) {

adev/shared-docs/pipeline/shared/marked/extensions/docs-card/docs-card.mts

@@ -31,6 +31,8 @@ export interface RendererContext {
   apiEntries?: Record<string, {moduleName: string; aliases?: string[]}>;
   highlighter: HighlighterGeneric<any, any>;
   headerIds: Map<string, number>;
+  /** In the case we want to disable auto-linking because anchor blocks might be incompatible where some code blocks are being rendered */
+  disableAutoLinking: boolean;
 }
 
 /**

adev/shared-docs/pipeline/shared/marked/renderer.mts

@@ -6,10 +6,10 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {parseMarkdown} from '../../parse.mjs';
-import {resolve} from 'node:path';
 import {readFile} from 'fs/promises';
 import {JSDOM} from 'jsdom';
+import {resolve} from 'node:path';
+import {parseMarkdown} from '../../parse.mjs';
 import {rendererContext} from '../renderer-context.mjs';
 
 describe('markdown to html', () => {
@@ -118,4 +118,17 @@ describe('markdown to html', () => {
 
     expect(h2.firstElementChild!.innerHTML).toBe('Query for the <code>&lt;h1&gt;</code>');
   });
+
+  it('shoud now link symbols in headings', () => {
+    const markdownDocument = JSDOM.fragment(
+      parseMarkdown('## Hello **NEW** `Router` ', rendererContext),
+    );
+    const h2 = markdownDocument.querySelector('h2')!;
+
+    // The anchor element should be to only child, no nested anchor
+    expect(h2.children.length).toBe(1);
+
+    // We ensure that we still style the heading content
+    expect(markdownDocument.querySelector('strong')).toBeDefined();
+  });
 });

adev/shared-docs/pipeline/shared/marked/test/heading/heading.spec.mts

@@ -25,6 +25,7 @@ export const rendererContext: RendererContext = {
     Router: {moduleName: 'angular/router'},
   },
   headerIds: new Map<string, number>(),
+  disableAutoLinking: false,
 };
 
 export async function setHighlighter() {

adev/shared-docs/pipeline/shared/marked/test/renderer-context.mts

@@ -13,7 +13,9 @@ export function headingRender(
   this: AdevDocsRenderer,
   {depth, tokens, text: headingText, raw}: Tokens.Heading,
 ): string {
-  const parsedText = this?.parser.parseInline(tokens);
+  this.context.disableAutoLinking = true;
+  const parsedText = this?.parser.parseInline(tokens, this);
+  this.context.disableAutoLinking = false;
   if (depth === 1) {
     return `
     <header class="docs-header">

adev/shared-docs/pipeline/shared/marked/transformations/heading.mts

@@ -6,20 +6,10 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
+import {Tokens} from 'marked';
 import {anchorTarget} from '../helpers.mjs';
-import {Renderer, Tokens} from 'marked';
 import {AdevDocsRenderer} from '../renderer.mjs';
 
-/**
- * Tracks whether the current renderer is inside a link.
- *
- * This is necessary because nested links are invalid HTML and can cause rendering issues.
- */
-let insideLink = false;
-export function setInsideLink(value: boolean) {
-  insideLink = value;
-}
-
 export function linkRender(this: AdevDocsRenderer, {href, title, tokens}: Tokens.Link) {
   // We have render-time check that we don't create absolute links (which are rendered as external links)
   // in our guides
@@ -40,7 +30,7 @@ export function linkRender(this: AdevDocsRenderer, {href, title, tokens}: Tokens
     );
   }
 
-  if (insideLink) {
+  if (this.context.disableAutoLinking) {
     return this.parser.parseInline(tokens);
   }