@mui/internal-code-infra 0.0.4-canary.49 → 0.0.4-canary.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/internal-code-infra",
-  "version": "0.0.4-canary.49",
+  "version": "0.0.4-canary.50",
   "author": "MUI Team",
   "description": "Infra scripts and configs to be used across MUI repos.",
   "license": "MIT",
@@ -191,7 +191,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitSha": "8db9f6d4d2d14e834e3f8fda91d902a583fbf55b",
+  "gitSha": "4c409b3d174cfefb32e4a3fe633f9aa46f53bce3",
   "scripts": {
     "build": "tsgo -p tsconfig.build.json",
     "typescript": "tsgo -noEmit",

package/src/brokenLinksChecker/crawlWorker.mjs

@@ -162,9 +162,14 @@ if (pageData.status < 200 || pageData.status >= 400) {
 
   // HTML validation. Every entry whose path matches contributes to the
   // page's config: each is registered as a synthetic preset and the page's
-  // root config `extends` them in order. html-validate's own resolution then
-  // merges them, so callers can layer path-specific overrides on top of a
-  // baseline entry without re-stating the baseline rules.
+  // root config `extends` `mui:recommended` first, then the matched presets
+  // in order. When override configs do not specify their own `extends`,
+  // they behave as pure rule patches layered on top of `mui:recommended`,
+  // so a later entry can only change the rules it names directly. Override
+  // configs are passed through as-is, though, so an entry that declares its
+  // own `extends` can still pull in additional presets (including
+  // `mui:recommended`) and affect earlier downgrades. html-validate merges
+  // `extends` left to right.
   /** @type {{ pageUrl: string, results: import('html-validate').Result[] } | null} */
   let htmlValidateResults = null;
   if (type === 'text/html' && options.htmlValidate.length > 0) {
@@ -192,7 +197,7 @@ if (pageData.status < 200 || pageData.status >= 400) {
 
       const htmlValidator = new HtmlValidate(
         new StaticConfigLoader([muiHtmlValidateResolver], {
-          extends: Object.keys(overridePresets),
+          extends: ['mui:recommended', ...Object.keys(overridePresets)],
         }),
       );
 

package/src/brokenLinksChecker/index.mjs

@@ -351,7 +351,7 @@ function shouldIgnoreLink(link, ignores) {
  * @property {number} [concurrency] - Number of concurrent page fetches (defaults to 4)
  * @property {string[]} [seedUrls] - Starting URLs for the crawl (defaults to ['/'])
  * @property {IgnoreRule[]} [ignores] - Rules to ignore broken links. Each rule can have path, href, contentType, and/or has properties. All specified properties must match (AND logic). Within a property, multiple values use OR logic.
- * @property {HtmlValidateOption} [htmlValidate] - Enable HTML validation on crawled pages. `false` (default): disabled. `true`: validate with recommended rules. Object: use as html-validate config — `extends` defaults to `['mui:recommended']` when omitted, so most callers only need to set `rules`. Array: per-path config overrides — every entry whose `path` matches the page URL contributes to the merged config (later entries win on conflicting rule keys); an entry without `path` matches every page (use as a baseline and layer more specific overrides on top). If no entry matches, the page is not validated.
+ * @property {HtmlValidateOption} [htmlValidate] - Enable HTML validation on crawled pages. `false` (default): disabled. `true`: validate with recommended rules. Object: use as html-validate config — `mui:recommended` is always applied as the baseline, so most callers only need to set `rules`. Array: per-path config overrides — `mui:recommended` is applied once as the baseline and every entry whose `path` matches the page URL is layered on top; later matching entries win on conflicting rule keys. If an entry omits `extends`, it behaves like a rule patch and typically only changes the rules it names. If an entry includes `extends` (for example, re-extending `mui:recommended`), it can re-introduce or reset baseline presets rather than acting as a pure patch. An entry without `path` matches every page. If no entry matches, the page is not validated.
  * @property {boolean} [verbose] - Log extra diagnostics during crawling (e.g. resolved html-validate config per page). Defaults to `false`.
  */
 
@@ -392,17 +392,19 @@ function validateIgnoreRule(rule) {
 
 /**
  * Normalizes a single config value to a non-null html-validate config object.
- * Defaults `extends` to `['mui:recommended']` when the caller did not provide
- * one, so overrides typically only need to specify the `rules` they want to
- * change. To opt out of the default, pass `extends: []` explicitly.
+ * Each config is registered as a pure rule patch; `mui:recommended` is pulled
+ * in once by the page's root config (ahead of every patch), so callers only
+ * need to specify the `rules` they want to change and never restate the
+ * recommended ruleset. `true` means "recommended only" (an empty patch). An
+ * explicit `extends` is still honored if a caller wants extra presets.
  * @param {true | import('html-validate').ConfigData} config
  * @returns {import('html-validate').ConfigData}
  */
 function normalizeHtmlValidateConfig(config) {
   if (config === true) {
-    return { extends: ['mui:recommended'] };
+    return {};
   }
-  return { extends: ['mui:recommended'], ...config };
+  return config;
 }
 
 /**

package/src/brokenLinksChecker/index.test.ts

@@ -64,12 +64,18 @@ describe('Broken Links Checker', () => {
       ],
       // Exercise the array form with union semantics: every matching entry
       // contributes to the page's config. The baseline entry (no `path`)
-      // turns off `no-raw-characters` everywhere; the path-specific entry
-      // turns off `no-dup-id` only on /invalid-html.html. Both rules are
+      // turns off `no-dup-id` everywhere; the path-specific entry turns off
+      // `no-raw-characters` only on /invalid-html.html. Both rules are
       // silenced on that page because the configs are merged, not replaced.
+      //
+      // This also guards against the path-specific entry clobbering the
+      // baseline: the path entry only names `no-raw-characters`, so it must
+      // not re-introduce the recommended ruleset and re-enable the
+      // `no-dup-id` that the baseline silenced (which /invalid-html.html
+      // violates). If it did, that page would report `no-dup-id` below.
       htmlValidate: [
-        { config: { rules: { 'no-raw-characters': 'off' } } },
-        { path: '/invalid-html.html', config: { rules: { 'no-dup-id': 'off' } } },
+        { config: { rules: { 'no-dup-id': 'off' } } },
+        { path: '/invalid-html.html', config: { rules: { 'no-raw-characters': 'off' } } },
       ],
     });
 
@@ -277,9 +283,10 @@ describe('Broken Links Checker', () => {
     expect(result.pages.get('/')?.contentType).toBe('text/html');
 
     // Test htmlValidate union semantics: invalid-html.html has both a duplicate
-    // ID (no-dup-id) and a raw `&` (no-raw-characters). The path-specific
-    // entry silences no-dup-id; the baseline entry silences no-raw-characters.
-    // Under union semantics both apply, so the page reports zero issues.
+    // ID (no-dup-id) and a raw `&` (no-raw-characters). The baseline entry
+    // silences no-dup-id; the path-specific entry silences no-raw-characters.
+    // Under union semantics both apply, so the page reports zero issues — and
+    // the path-specific entry must not clobber the baseline's no-dup-id.
     const htmlValidateIssues = result.issues.filter(
       (issue): issue is HtmlValidateIssue => issue.type === 'html-validate',
     );