fix: restore parse5 v8 types, fix lint errors on PR4

bennypowers · bennypowers · commit 7db500187043 · 2026-03-23T20:20:55.000+02:00
- Copy parse5 v8 type imports from fix/node24 for all affected source files
- Remove unused path imports from test files
- Rename unused event parameter to _event in storybook-utils
- Regenerate package-lock.json

Assisted-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/dev-server-esbuild/test/banner-footer.test.ts b/packages/dev-server-esbuild/test/banner-footer.test.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import path from 'path';
 import { createTestServer } from '@web/dev-server-core/test-helpers';
 import { expectIncludes } from '@web/dev-server-core/test-helpers';
 
diff --git a/packages/dev-server-esbuild/test/json.test.ts b/packages/dev-server-esbuild/test/json.test.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import path from 'path';
 import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers';
 
 import { esbuildPlugin } from '../src/index.ts';
diff --git a/packages/dev-server-esbuild/test/jsx.test.ts b/packages/dev-server-esbuild/test/jsx.test.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import path from 'path';
 import { expectIncludes, createTestServer } from '@web/dev-server-core/test-helpers';
 
 import { esbuildPlugin } from '../src/index.ts';
diff --git a/packages/dev-server-esbuild/test/target.test.ts b/packages/dev-server-esbuild/test/target.test.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import path from 'path';
 import { createTestServer, expectIncludes } from '@web/dev-server-core/test-helpers';
 
 import { esbuildPlugin } from '../src/index.ts';
diff --git a/packages/dev-server-esbuild/test/tsx.test.ts b/packages/dev-server-esbuild/test/tsx.test.ts
@@ -1,6 +1,5 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
-import path from 'path';
 import { createTestServer } from '@web/dev-server-core/test-helpers';
 import { expectIncludes, expectNotIncludes } from '@web/dev-server-core/test-helpers';
 
diff --git a/packages/dev-server-import-maps/src/importMapsPlugin.ts b/packages/dev-server-import-maps/src/importMapsPlugin.ts
@@ -1,12 +1,15 @@
-import { Plugin, Logger, getRequestFilePath } from '@web/dev-server-core';
+import { getRequestFilePath } from '@web/dev-server-core';
+import type { Plugin, Logger } from '@web/dev-server-core';
 import {
-  ParsedImportMap,
   parse as parseFromObject,
   parseFromString,
   resolve,
 } from '@import-maps/resolve';
+import type { ParsedImportMap, ImportMap } from '@import-maps/resolve';
 import { getHtmlPath } from '@web/dev-server-core';
-import { parse as parseHtml, serialize as serializeHtml, Element as ElementAst } from 'parse5';
+import { parse as parseHtml, serialize as serializeHtml } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type ElementAst = DefaultTreeAdapterTypes.Element;
 import path from 'path';
 
 import {
@@ -17,8 +20,7 @@ import {
   shouldInject,
   mergeImportMaps,
   getDocumentBaseUrl,
-} from './utils.js';
-import { ImportMap } from '@import-maps/resolve';
+} from './utils.ts';
 import {
   createElement,
   findElement,
diff --git a/packages/dev-server-import-maps/src/utils.ts b/packages/dev-server-import-maps/src/utils.ts
@@ -1,10 +1,12 @@
 import picoMatch from 'picomatch';
-import { Context, getHtmlPath } from '@web/dev-server-core';
-import { Element as ElementAst } from 'parse5';
+import { getHtmlPath } from '@web/dev-server-core';
+import type { Context } from '@web/dev-server-core';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type ElementAst = DefaultTreeAdapterTypes.Element;
 import { getAttribute } from '@web/parse5-utils';
-import { ParsedImportMap } from '@import-maps/resolve';
+import type { ParsedImportMap } from '@import-maps/resolve';
 
-import { NormalizedInjectSetting, InjectSetting } from './importMapsPlugin.ts';
+import type { NormalizedInjectSetting, InjectSetting } from './importMapsPlugin.ts';
 
 export const IMPORT_MAP_PARAM = 'wds-import-map';
 
diff --git a/packages/dev-server-legacy/src/findJsScripts.ts b/packages/dev-server-legacy/src/findJsScripts.ts
@@ -1,5 +1,9 @@
-import { isUri } from 'valid-url';
-import { Document as DocumentAst, Node as NodeAst } from 'parse5';
+import validUrl from 'valid-url';
+
+const { isUri } = validUrl;
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type DocumentAst = DefaultTreeAdapterTypes.Document;
+type NodeAst = DefaultTreeAdapterTypes.Node;
 import { queryAll, predicates, getAttribute, hasAttribute } from '@web/dev-server-core/dist/dom5';
 
 function isDeferred(script: NodeAst) {
diff --git a/packages/dev-server-legacy/src/injectPolyfillsLoader.ts b/packages/dev-server-legacy/src/injectPolyfillsLoader.ts
@@ -1,11 +1,16 @@
-import { Context } from '@web/dev-server-core';
+import type { Context } from '@web/dev-server-core';
 import { getAttribute, getTextContent, remove } from '@web/dev-server-core/dist/dom5';
-import { parse, serialize, Document as DocumentAst, Node as NodeAst } from 'parse5';
+import { parse, serialize } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type DocumentAst = DefaultTreeAdapterTypes.Document;
+type NodeAst = DefaultTreeAdapterTypes.Node;
 import {
   injectPolyfillsLoader as originalInjectPolyfillsLoader,
-  PolyfillsConfig,
   fileTypes,
   getScriptFileType,
+} from '@web/polyfills-loader';
+import type {
+  PolyfillsConfig,
   GeneratedFile,
   File,
 } from '@web/polyfills-loader';
diff --git a/packages/polyfills-loader/src/injectPolyfillsLoader.ts b/packages/polyfills-loader/src/injectPolyfillsLoader.ts
@@ -1,4 +1,8 @@
-import { Document, Node, ParentNode, parse, serialize } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type Document = DefaultTreeAdapterTypes.Document;
+type Node = DefaultTreeAdapterTypes.Node;
+type ParentNode = DefaultTreeAdapterTypes.ParentNode;
+import { parse, serialize } from 'parse5';
 import {
   findElements,
   getAttribute,
@@ -9,16 +13,16 @@ import {
   createElement,
   findElement,
   getTagName,
-  Element,
 } from '@web/parse5-utils';
+import type { Element } from '@web/parse5-utils';
 
-import { PolyfillsLoaderConfig, PolyfillsLoader, GeneratedFile } from './types.ts';
+import type { PolyfillsLoaderConfig, PolyfillsLoader, GeneratedFile } from './types.ts';
 import { createPolyfillsLoader } from './createPolyfillsLoader.ts';
 import { hasFileOfType, fileTypes } from './utils.ts';
 
 function injectImportMapPolyfill(headAst: ParentNode, originalScript: Node, type: string) {
   const systemJsScript = createScript({ type }, getTextContent(originalScript));
-  insertBefore(headAst, systemJsScript, originalScript);
+  insertBefore(headAst, systemJsScript, originalScript as any);
 }
 
 function findImportMapScripts(document: Document) {
diff --git a/packages/polyfills-loader/src/types.ts b/packages/polyfills-loader/src/types.ts
@@ -1,4 +1,5 @@
-import { Attribute } from 'parse5';
+import type { Token } from 'parse5';
+type Attribute = Token.Attribute;
 
 export interface PolyfillsLoaderConfig {
   // files to load on modern browsers. loaded when there are no
diff --git a/packages/polyfills-loader/src/utils.ts b/packages/polyfills-loader/src/utils.ts
@@ -1,7 +1,8 @@
-import { Element } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type Element = DefaultTreeAdapterTypes.Element;
 import { getAttribute } from '@web/parse5-utils';
 import crypto from 'crypto';
-import { FileType, PolyfillsLoaderConfig } from './types.ts';
+import type { FileType, PolyfillsLoaderConfig } from './types.ts';
 
 export const noModuleSupportTest = "!('noModule' in HTMLScriptElement.prototype)";
 
diff --git a/packages/rollup-plugin-html/src/RollupPluginHTMLOptions.ts b/packages/rollup-plugin-html/src/RollupPluginHTMLOptions.ts
@@ -1,5 +1,9 @@
 import type { OutputChunk, OutputOptions, OutputBundle } from 'rollup';
-import type { Attribute } from 'parse5';
+import type { Token } from 'parse5';
+type Attribute = Token.Attribute;
+
+// Ensure this file is evaluated as an ES module
+export const __esModule = true;
 
 export interface InputHTMLOptions {
   /** The html source code. If set, overwrites path. */
diff --git a/packages/rollup-plugin-html/src/assets/utils.ts b/packages/rollup-plugin-html/src/assets/utils.ts
@@ -1,22 +1,14 @@
-import { Document, Element } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type Document = DefaultTreeAdapterTypes.Document;
+type Element = DefaultTreeAdapterTypes.Element;
 import path from 'path';
 import picomatch from 'picomatch';
 import { findElements, getTagName, getAttribute } from '@web/parse5-utils';
 import { createError } from '../utils.ts';
 import { serialize } from 'v8';
 
-const assetLinkRels = [
-  'icon',
-  'apple-touch-icon',
-  'mask-icon',
-  'stylesheet',
-  'manifest',
-  'preload',
-  'prefetch',
-  'modulepreload',
-];
-const legacyHashedLinkRels = ['stylesheet'];
-const assetMetaProperties = ['og:image'];
+const hashedLinkRels = ['stylesheet'];
+const linkRels = [...hashedLinkRels, 'icon', 'manifest', 'apple-touch-icon', 'mask-icon'];
 
 function getSrcSetUrls(srcset: string) {
   if (!srcset) {
@@ -51,14 +43,13 @@ function isAsset(node: Element) {
         path = extractFirstUrlOfSrcSet(node) ?? '';
       }
       break;
-    case 'link': {
-      if (assetLinkRels.includes(getAttribute(node, 'rel') ?? '')) {
+    case 'link':
+      if (linkRels.includes(getAttribute(node, 'rel') ?? '')) {
         path = getAttribute(node, 'href') ?? '';
       }
       break;
-    }
     case 'meta':
-      if (assetMetaProperties.includes(getAttribute(node, 'property') ?? '')) {
+      if (getAttribute(node, 'property') === 'og:image' && getAttribute(node, 'content')) {
         path = getAttribute(node, 'content') ?? '';
       }
       break;
@@ -81,24 +72,16 @@ function isAsset(node: Element) {
   }
 }
 
-export function isHashedAsset(
-  node: Element,
-  extractAssets: boolean | 'legacy-html' | 'legacy-html-and-css',
-) {
+export function isHashedAsset(node: Element) {
   switch (getTagName(node)) {
     case 'img':
       return true;
     case 'source':
       return true;
     case 'script':
       return true;
-    case 'link': {
-      if (extractAssets === 'legacy-html' || extractAssets === 'legacy-html-and-css') {
-        return legacyHashedLinkRels.includes(getAttribute(node, 'rel') ?? '');
-      } else {
-        return true;
-      }
-    }
+    case 'link':
+      return hashedLinkRels.includes(getAttribute(node, 'rel')!);
     case 'meta':
       return true;
     default:
@@ -160,7 +143,7 @@ export function getSourcePaths(node: Element) {
   return paths;
 }
 
-export function findAssets(document: Document) {
+export function findAssets(document: Document): Element[] {
   return findElements(document, isAsset);
 }
 
diff --git a/packages/rollup-plugin-html/src/input/extract/extractAssets.ts b/packages/rollup-plugin-html/src/input/extract/extractAssets.ts
@@ -1,21 +1,22 @@
-import { Document, serialize } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type Document = DefaultTreeAdapterTypes.Document;
+import { serialize } from 'parse5';
 import fs from 'fs';
 import path from 'path';
-import { InputAsset } from '../InputData.ts';
+import type { InputAsset } from '../InputData.ts';
 import {
   findAssets,
   getSourcePaths,
   isHashedAsset,
   resolveAssetFilePath,
   createAssetPicomatchMatcher,
-} from '../../assets/utils.js';
+} from '../../assets/utils.ts';
 
 export interface ExtractAssetsParams {
   document: Document;
   htmlFilePath: string;
   htmlDir: string;
   rootDir: string;
-  extractAssets: boolean | 'legacy-html' | 'legacy-html-and-css';
   externalAssets?: string | string[];
   absolutePathPrefix?: string;
 }
@@ -36,7 +37,7 @@ export function extractAssets(params: ExtractAssetsParams): InputAsset[] {
         params.rootDir,
         params.absolutePathPrefix,
       );
-      const hashed = isHashedAsset(node, params.extractAssets);
+      const hashed = isHashedAsset(node);
       const alreadyHandled = allAssets.find(a => a.filePath === filePath && a.hashed === hashed);
       if (!alreadyHandled) {
         try {
@@ -50,7 +51,7 @@ export function extractAssets(params: ExtractAssetsParams): InputAsset[] {
         }
 
         const content = fs.readFileSync(filePath);
-        allAssets.push({ filePath, hashed: hashed, content });
+        allAssets.push({ filePath, hashed, content });
       }
     }
   }
diff --git a/packages/rollup-plugin-html/src/input/extract/extractModules.ts b/packages/rollup-plugin-html/src/input/extract/extractModules.ts
@@ -1,10 +1,12 @@
 import { findElements, getAttribute, getTagName, getTextContent, remove } from '@web/parse5-utils';
-import { Document, Attribute } from 'parse5';
+import type { DefaultTreeAdapterTypes, Token } from 'parse5';
+type Document = DefaultTreeAdapterTypes.Document;
+type Attribute = Token.Attribute;
 import path from 'path';
 import crypto from 'crypto';
 import { resolveAssetFilePath } from '../../assets/utils.ts';
 import { getAttributes } from '@web/parse5-utils';
-import { ScriptModuleTag } from '../../RollupPluginHTMLOptions.ts';
+import type { ScriptModuleTag } from '../../RollupPluginHTMLOptions.ts';
 
 export interface ExtractModulesParams {
   document: Document;
diff --git a/packages/rollup-plugin-html/src/input/extract/extractModulesAndAssets.ts b/packages/rollup-plugin-html/src/input/extract/extractModulesAndAssets.ts
@@ -30,7 +30,6 @@ export function extractModulesAndAssets(params: ExtractParams) {
         htmlDir,
         htmlFilePath,
         rootDir,
-        extractAssets: params.extractAssets,
         externalAssets,
         absolutePathPrefix,
       })
diff --git a/packages/rollup-plugin-html/src/output/getEntrypointBundles.ts b/packages/rollup-plugin-html/src/output/getEntrypointBundles.ts
@@ -1,4 +1,5 @@
-import type { Attribute } from 'parse5';
+import type { Token } from 'parse5';
+type Attribute = Token.Attribute;
 import path from 'path';
 import type { OutputChunk } from 'rollup';
 
diff --git a/packages/rollup-plugin-html/src/output/hashInlineScripts.ts b/packages/rollup-plugin-html/src/output/hashInlineScripts.ts
@@ -1,4 +1,7 @@
-import { Document, Element, ParentNode } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type Document = DefaultTreeAdapterTypes.Document;
+type Element = DefaultTreeAdapterTypes.Element;
+type ParentNode = DefaultTreeAdapterTypes.ParentNode;
 import {
   findElement,
   findElements,
diff --git a/packages/rollup-plugin-html/src/output/injectAbsoluteBaseUrl.ts b/packages/rollup-plugin-html/src/output/injectAbsoluteBaseUrl.ts
@@ -1,4 +1,6 @@
-import { Document, Element } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type Document = DefaultTreeAdapterTypes.Document;
+type Element = DefaultTreeAdapterTypes.Element;
 import { findElements, getTagName, getAttribute, setAttribute } from '@web/parse5-utils';
 
 function isAbsoluteableNode(node: Element) {
diff --git a/packages/rollup-plugin-html/src/output/injectBundles.ts b/packages/rollup-plugin-html/src/output/injectBundles.ts
@@ -1,10 +1,12 @@
-import { Document, Attribute } from 'parse5';
+import type { DefaultTreeAdapterTypes, Token } from 'parse5';
+type Document = DefaultTreeAdapterTypes.Document;
+type Attribute = Token.Attribute;
 import { createScript, findElement, getTagName, appendChild } from '@web/parse5-utils';
 
-import { EntrypointBundle } from '../RollupPluginHTMLOptions.ts';
+import type { EntrypointBundle } from '../RollupPluginHTMLOptions.ts';
 import { createError } from '../utils.ts';
 
-export function createLoadScript(src: string, format: string, attributes?: Attribute[]) {
+export function createLoadScript(src: string, format: string, attributes?: Attribute[]): DefaultTreeAdapterTypes.Element {
   const attributesObject: Record<string, string> = {};
   if (attributes) {
     for (const attribute of attributes) {
diff --git a/packages/rollup-plugin-html/src/output/injectServiceWorkerRegistration.ts b/packages/rollup-plugin-html/src/output/injectServiceWorkerRegistration.ts
@@ -1,5 +1,6 @@
 import path from 'path';
-import { Document } from 'parse5';
+import type { DefaultTreeAdapterTypes } from 'parse5';
+type Document = DefaultTreeAdapterTypes.Document;
 import {
   findElement,
   getTagName,
diff --git a/packages/rollup-plugin-html/src/output/injectedUpdatedAssetPaths.ts b/packages/rollup-plugin-html/src/output/injectedUpdatedAssetPaths.ts
diff --git a/packages/storybook-utils/src/create-addon.ts b/packages/storybook-utils/src/create-addon.ts
