Skip to content

Commit 0363b49

Browse files
committed
fix: add ts-node overrides to package tsconfigs and fix recurring issues
- Add ts-node.compilerOptions to all package tsconfigs (module:commonjs, moduleResolution:node, rewriteRelativeImportExtensions:false) - Fix parse5-utils tsconfig with allowJs/checkJs/emitDeclarationOnly - Restore parse5 v6 types in source files (Token -> Attribute) - Fix extractModulesAndAssets missing extractAssets param - Fix hashInlineScripts parse5 type casts - Restore parse5-utils .js source - Regenerate package-lock.json Assisted-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent d0638e4 commit 0363b49

21 files changed

Lines changed: 475 additions & 408 deletions

packages/dev-server-import-maps/src/importMapsPlugin.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
import { getRequestFilePath } from '@web/dev-server-core';
2-
import type { Plugin, Logger } from '@web/dev-server-core';
1+
import { Plugin, Logger, getRequestFilePath } from '@web/dev-server-core';
32
import {
3+
ParsedImportMap,
44
parse as parseFromObject,
55
parseFromString,
66
resolve,
77
} from '@import-maps/resolve';
8-
import type { ParsedImportMap, ImportMap } from '@import-maps/resolve';
98
import { getHtmlPath } from '@web/dev-server-core';
10-
import { parse as parseHtml, serialize as serializeHtml } from 'parse5';
11-
import type { DefaultTreeAdapterTypes } from 'parse5';
12-
type ElementAst = DefaultTreeAdapterTypes.Element;
9+
import { parse as parseHtml, serialize as serializeHtml, Element as ElementAst } from 'parse5';
1310
import path from 'path';
1411

1512
import {
@@ -20,7 +17,8 @@ import {
2017
shouldInject,
2118
mergeImportMaps,
2219
getDocumentBaseUrl,
23-
} from './utils.ts';
20+
} from './utils.js';
21+
import { ImportMap } from '@import-maps/resolve';
2422
import {
2523
createElement,
2624
findElement,

packages/dev-server-import-maps/src/utils.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import picoMatch from 'picomatch';
2-
import { getHtmlPath } from '@web/dev-server-core';
3-
import type { Context } from '@web/dev-server-core';
4-
import type { DefaultTreeAdapterTypes } from 'parse5';
5-
type ElementAst = DefaultTreeAdapterTypes.Element;
2+
import { Context, getHtmlPath } from '@web/dev-server-core';
3+
import { Element as ElementAst } from 'parse5';
64
import { getAttribute } from '@web/parse5-utils';
7-
import type { ParsedImportMap } from '@import-maps/resolve';
5+
import { ParsedImportMap } from '@import-maps/resolve';
86

9-
import type { NormalizedInjectSetting, InjectSetting } from './importMapsPlugin.ts';
7+
import { NormalizedInjectSetting, InjectSetting } from './importMapsPlugin.ts';
108

119
export const IMPORT_MAP_PARAM = 'wds-import-map';
1210

packages/dev-server-legacy/src/findJsScripts.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
import validUrl from 'valid-url';
2-
3-
const { isUri } = validUrl;
4-
import type { DefaultTreeAdapterTypes } from 'parse5';
5-
type DocumentAst = DefaultTreeAdapterTypes.Document;
6-
type NodeAst = DefaultTreeAdapterTypes.Node;
1+
import { isUri } from 'valid-url';
2+
import { Document as DocumentAst, Node as NodeAst } from 'parse5';
73
import { queryAll, predicates, getAttribute, hasAttribute } from '@web/dev-server-core/dist/dom5';
84

95
function isDeferred(script: NodeAst) {

packages/dev-server-legacy/src/injectPolyfillsLoader.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
import type { Context } from '@web/dev-server-core';
1+
import { Context } from '@web/dev-server-core';
22
import { getAttribute, getTextContent, remove } from '@web/dev-server-core/dist/dom5';
3-
import { parse, serialize } from 'parse5';
4-
import type { DefaultTreeAdapterTypes } from 'parse5';
5-
type DocumentAst = DefaultTreeAdapterTypes.Document;
6-
type NodeAst = DefaultTreeAdapterTypes.Node;
3+
import { parse, serialize, Document as DocumentAst, Node as NodeAst } from 'parse5';
74
import {
85
injectPolyfillsLoader as originalInjectPolyfillsLoader,
6+
PolyfillsConfig,
97
fileTypes,
108
getScriptFileType,
11-
} from '@web/polyfills-loader';
12-
import type {
13-
PolyfillsConfig,
149
GeneratedFile,
1510
File,
1611
} from '@web/polyfills-loader';

0 commit comments

Comments
 (0)