From 6dc1385705b8b68fdd52d8423a000eca656b4990 Mon Sep 17 00:00:00 2001 From: Tee Ming Date: Tue, 31 Mar 2026 18:01:56 +0800 Subject: [PATCH 1/2] upgrade to ts6 --- .gitignore | 1 + package.json | 4 +- pnpm-lock.yaml | 104 +++++++++++++++++---------------- src/autoProcess.ts | 2 +- src/processors/babel.ts | 2 +- src/processors/coffeescript.ts | 2 +- src/processors/globalStyle.ts | 2 +- src/processors/less.ts | 2 +- src/processors/postcss.ts | 2 +- src/processors/pug.ts | 2 +- src/processors/replace.ts | 2 +- src/processors/scss.ts | 2 +- src/processors/stylus.ts | 2 +- src/processors/typescript.ts | 2 +- tsconfig.build.json | 3 + tsconfig.json | 5 +- 16 files changed, 73 insertions(+), 66 deletions(-) diff --git a/.gitignore b/.gitignore index 6e23188b..a929ea6b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ node_modules coverage dist/ .idea +*.tsbuildinfo \ No newline at end of file diff --git a/package.json b/package.json index db2239be..1cf41c2a 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "stylus": "^0.55.0", "sugarss": "^4.0.0", "svelte": "^4.0.0", - "typescript": "^5.0.2", + "typescript": "^6.0.2", "vitest": "^1.6.0" }, "peerDependencies": { @@ -95,7 +95,7 @@ "stylus": ">=0.55", "sugarss": "^2.0.0 || ^3.0.0 || ^4.0.0", "svelte": "^4.0.0 || ^5.0.0-next.100 || ^5.0.0", - "typescript": "^5.0.0" + "typescript": "^5.0.0 || ^6.0.0" }, "peerDependenciesMeta": { "@babel/core": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 23b3d4e7..7cfdaeb8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 11.0.0 '@kiwi/eslint-config': specifier: ^2.0.2 - version: 2.4.0(eslint@8.57.0)(jest@29.7.0(@types/node@18.19.34))(prettier@3.3.2)(svelte@4.2.18)(typescript@5.4.5) + version: 2.4.0(eslint@8.57.0)(jest@29.7.0(@types/node@18.19.34))(prettier@3.3.2)(svelte@4.2.18)(typescript@6.0.2) '@kiwi/prettier-config': specifier: ^2.0.2 version: 2.4.0(prettier@3.3.2)(svelte@4.2.18) @@ -84,8 +84,8 @@ importers: specifier: ^4.0.0 version: 4.2.18 typescript: - specifier: ^5.0.2 - version: 5.4.5 + specifier: ^6.0.2 + version: 6.0.2 vitest: specifier: ^1.6.0 version: 1.6.0(@types/node@18.19.34)(less@3.13.1)(sass@1.79.3)(stylus@0.55.0)(sugarss@4.0.1(postcss@8.4.38)) @@ -1777,6 +1777,7 @@ packages: conventional-changelog-cli@2.2.2: resolution: {integrity: sha512-8grMV5Jo8S0kP3yoMeJxV2P5R6VJOqK72IiSV9t/4H5r/HiRqEBQ83bYGuz4Yzfdj4bjaAEhZN/FFbsFXr5bOA==} engines: {node: '>=10'} + deprecated: This package is no longer maintained. Please use the conventional-changelog package instead. hasBin: true conventional-changelog-codemirror@2.0.8: @@ -2206,6 +2207,7 @@ packages: eslint@8.57.0: resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options. hasBin: true espree@9.6.1: @@ -2379,6 +2381,7 @@ packages: git-raw-commits@2.0.11: resolution: {integrity: sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A==} engines: {node: '>=10'} + deprecated: This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead. hasBin: true git-remote-origin-url@2.0.0: @@ -2388,6 +2391,7 @@ packages: git-semver-tags@4.1.1: resolution: {integrity: sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA==} engines: {node: '>=10'} + deprecated: This package is no longer maintained. For the JavaScript API, please use @conventional-changelog/git-client instead. hasBin: true gitconfiglocal@1.0.0: @@ -2403,7 +2407,7 @@ packages: glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} - deprecated: Glob versions prior to v9 are no longer supported + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me global-dirs@0.1.1: resolution: {integrity: sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==} @@ -3962,8 +3966,8 @@ packages: resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} engines: {node: '>= 0.4'} - typescript@5.4.5: - resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} + typescript@6.0.2: + resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==} engines: {node: '>=14.17'} hasBin: true @@ -5028,7 +5032,7 @@ snapshots: '@commitlint/format@11.0.0': dependencies: '@commitlint/types': 11.0.0 - chalk: 4.1.0 + chalk: 4.1.2 '@commitlint/is-ignored@11.0.0': dependencies: @@ -5397,17 +5401,17 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@kiwi/eslint-config@2.4.0(eslint@8.57.0)(jest@29.7.0(@types/node@18.19.34))(prettier@3.3.2)(svelte@4.2.18)(typescript@5.4.5)': + '@kiwi/eslint-config@2.4.0(eslint@8.57.0)(jest@29.7.0(@types/node@18.19.34))(prettier@3.3.2)(svelte@4.2.18)(typescript@6.0.2)': dependencies: '@kiwi/eslint-plugin': 2.4.0(eslint@8.57.0) - '@typescript-eslint/eslint-plugin': 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/eslint-plugin': 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0)(typescript@6.0.2) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@6.0.2) confusing-browser-globals: 1.0.11 eslint: 8.57.0 eslint-config-prettier: 9.1.0(eslint@8.57.0) eslint-plugin-cypress: 2.15.2(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0) - eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@18.19.34))(typescript@5.4.5) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0) + eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0)(jest@29.7.0(@types/node@18.19.34))(typescript@6.0.2) eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0) eslint-plugin-node: 11.1.0(eslint@8.57.0) eslint-plugin-prettier: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.2) @@ -5420,7 +5424,7 @@ snapshots: jest: 29.7.0(@types/node@18.19.34) prettier: 3.3.2 svelte: 4.2.18 - typescript: 5.4.5 + typescript: 6.0.2 transitivePeerDependencies: - '@types/eslint' - eslint-import-resolver-typescript @@ -5587,34 +5591,34 @@ snapshots: '@types/yargs-parser': 21.0.3 optional: true - '@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0)(typescript@6.0.2)': dependencies: '@eslint-community/regexpp': 4.10.1 - '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@6.0.2) '@typescript-eslint/scope-manager': 7.13.0 - '@typescript-eslint/type-utils': 7.13.0(eslint@8.57.0)(typescript@5.4.5) - '@typescript-eslint/utils': 7.13.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/type-utils': 7.13.0(eslint@8.57.0)(typescript@6.0.2) + '@typescript-eslint/utils': 7.13.0(eslint@8.57.0)(typescript@6.0.2) '@typescript-eslint/visitor-keys': 7.13.0 eslint: 8.57.0 graphemer: 1.4.0 ignore: 5.3.1 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.4.5) + ts-api-utils: 1.3.0(typescript@6.0.2) optionalDependencies: - typescript: 5.4.5 + typescript: 6.0.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2)': dependencies: '@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/types': 7.13.0 - '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.4.5) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@6.0.2) '@typescript-eslint/visitor-keys': 7.13.0 debug: 4.3.5 eslint: 8.57.0 optionalDependencies: - typescript: 5.4.5 + typescript: 6.0.2 transitivePeerDependencies: - supports-color @@ -5628,15 +5632,15 @@ snapshots: '@typescript-eslint/types': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.0 - '@typescript-eslint/type-utils@7.13.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/type-utils@7.13.0(eslint@8.57.0)(typescript@6.0.2)': dependencies: - '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.4.5) - '@typescript-eslint/utils': 7.13.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@6.0.2) + '@typescript-eslint/utils': 7.13.0(eslint@8.57.0)(typescript@6.0.2) debug: 4.3.5 eslint: 8.57.0 - ts-api-utils: 1.3.0(typescript@5.4.5) + ts-api-utils: 1.3.0(typescript@6.0.2) optionalDependencies: - typescript: 5.4.5 + typescript: 6.0.2 transitivePeerDependencies: - supports-color @@ -5644,7 +5648,7 @@ snapshots: '@typescript-eslint/types@7.13.0': {} - '@typescript-eslint/typescript-estree@5.62.0(typescript@5.4.5)': + '@typescript-eslint/typescript-estree@5.62.0(typescript@6.0.2)': dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 @@ -5652,13 +5656,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.2 - tsutils: 3.21.0(typescript@5.4.5) + tsutils: 3.21.0(typescript@6.0.2) optionalDependencies: - typescript: 5.4.5 + typescript: 6.0.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@7.13.0(typescript@5.4.5)': + '@typescript-eslint/typescript-estree@7.13.0(typescript@6.0.2)': dependencies: '@typescript-eslint/types': 7.13.0 '@typescript-eslint/visitor-keys': 7.13.0 @@ -5667,20 +5671,20 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.4 semver: 7.6.2 - ts-api-utils: 1.3.0(typescript@5.4.5) + ts-api-utils: 1.3.0(typescript@6.0.2) optionalDependencies: - typescript: 5.4.5 + typescript: 6.0.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@6.0.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.5) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@6.0.2) eslint: 8.57.0 eslint-scope: 5.1.1 semver: 7.6.2 @@ -5688,12 +5692,12 @@ snapshots: - supports-color - typescript - '@typescript-eslint/utils@7.13.0(eslint@8.57.0)(typescript@5.4.5)': + '@typescript-eslint/utils@7.13.0(eslint@8.57.0)(typescript@6.0.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) '@typescript-eslint/scope-manager': 7.13.0 '@typescript-eslint/types': 7.13.0 - '@typescript-eslint/typescript-estree': 7.13.0(typescript@5.4.5) + '@typescript-eslint/typescript-estree': 7.13.0(typescript@6.0.2) eslint: 8.57.0 transitivePeerDependencies: - supports-color @@ -6723,11 +6727,11 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.8.1(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): + eslint-module-utils@2.8.1(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0): dependencies: debug: 3.2.7 optionalDependencies: - '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@6.0.2) eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: @@ -6744,7 +6748,7 @@ snapshots: eslint-utils: 2.1.0 regexpp: 3.2.0 - eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0): + eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0): dependencies: array-includes: 3.1.8 array.prototype.findlastindex: 1.2.5 @@ -6754,7 +6758,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint-import-resolver-node@0.3.9)(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -6765,18 +6769,18 @@ snapshots: semver: 6.3.1 tsconfig-paths: 3.15.0 optionalDependencies: - '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/parser': 7.13.0(eslint@8.57.0)(typescript@6.0.2) transitivePeerDependencies: - eslint-import-resolver-typescript - eslint-import-resolver-webpack - supports-color - eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(jest@29.7.0(@types/node@18.19.34))(typescript@5.4.5): + eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0)(jest@29.7.0(@types/node@18.19.34))(typescript@6.0.2): dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@6.0.2) eslint: 8.57.0 optionalDependencies: - '@typescript-eslint/eslint-plugin': 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5) + '@typescript-eslint/eslint-plugin': 7.13.0(@typescript-eslint/parser@7.13.0(eslint@8.57.0)(typescript@6.0.2))(eslint@8.57.0)(typescript@6.0.2) jest: 29.7.0(@types/node@18.19.34) transitivePeerDependencies: - supports-color @@ -8927,9 +8931,9 @@ snapshots: trim-newlines@3.0.1: {} - ts-api-utils@1.3.0(typescript@5.4.5): + ts-api-utils@1.3.0(typescript@6.0.2): dependencies: - typescript: 5.4.5 + typescript: 6.0.2 tsconfig-paths@3.15.0: dependencies: @@ -8942,10 +8946,10 @@ snapshots: tslib@2.6.3: {} - tsutils@3.21.0(typescript@5.4.5): + tsutils@3.21.0(typescript@6.0.2): dependencies: tslib: 1.14.1 - typescript: 5.4.5 + typescript: 6.0.2 type-check@0.4.0: dependencies: @@ -8996,7 +9000,7 @@ snapshots: is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 - typescript@5.4.5: {} + typescript@6.0.2: {} ufo@1.5.3: {} diff --git a/src/autoProcess.ts b/src/autoProcess.ts index 09da5146..0760348a 100644 --- a/src/autoProcess.ts +++ b/src/autoProcess.ts @@ -58,7 +58,7 @@ export function sveltePreprocess( { aliases, markupTagName = 'template', - sourceMap = process?.env?.NODE_ENV === 'development' ?? false, + sourceMap = process?.env?.NODE_ENV === 'development' || false, ...rest } = {} as AutoPreprocessOptions, ): AutoPreprocessGroup { diff --git a/src/processors/babel.ts b/src/processors/babel.ts index 890d2974..7285d8ea 100644 --- a/src/processors/babel.ts +++ b/src/processors/babel.ts @@ -6,7 +6,7 @@ import type { PreprocessorGroup, Options } from '../types'; const babel = (options?: Options.Babel): PreprocessorGroup => ({ async script(svelteFile) { - const { transformer } = await import('../transformers/babel'); + const { transformer } = await import('../transformers/babel.js'); let { content, filename, dependencies, attributes } = await getTagInfo(svelteFile); diff --git a/src/processors/coffeescript.ts b/src/processors/coffeescript.ts index 97be16fc..d13e04a7 100644 --- a/src/processors/coffeescript.ts +++ b/src/processors/coffeescript.ts @@ -6,7 +6,7 @@ import type { PreprocessorGroup, Options } from '../types'; const coffeescript = (options?: Options.Coffeescript): PreprocessorGroup => ({ async script(svelteFile) { - const { transformer } = await import('../transformers/coffeescript'); + const { transformer } = await import('../transformers/coffeescript.js'); let { content, filename, attributes, lang, dependencies } = await getTagInfo(svelteFile); diff --git a/src/processors/globalStyle.ts b/src/processors/globalStyle.ts index ef23a187..0d785234 100644 --- a/src/processors/globalStyle.ts +++ b/src/processors/globalStyle.ts @@ -3,7 +3,7 @@ import type { PreprocessorGroup } from '../types'; const globalStyle = (): PreprocessorGroup => { return { async style({ content, attributes, filename }) { - const { transformer } = await import('../transformers/globalStyle'); + const { transformer } = await import('../transformers/globalStyle.js'); if (!attributes.global) { return { code: content }; diff --git a/src/processors/less.ts b/src/processors/less.ts index bed77022..1803449f 100644 --- a/src/processors/less.ts +++ b/src/processors/less.ts @@ -6,7 +6,7 @@ import type { PreprocessorGroup, Options } from '../types'; const less = (options?: Options.Less): PreprocessorGroup => ({ async style(svelteFile) { - const { transformer } = await import('../transformers/less'); + const { transformer } = await import('../transformers/less.js'); let { content, filename, attributes, lang, dependencies } = await getTagInfo(svelteFile); diff --git a/src/processors/postcss.ts b/src/processors/postcss.ts index 14ee3822..21e3034f 100644 --- a/src/processors/postcss.ts +++ b/src/processors/postcss.ts @@ -7,7 +7,7 @@ import type { PreprocessorGroup, Options } from '../types'; /** Adapted from https://github.com/TehShrike/svelte-preprocess-postcss */ const postcss = (options?: Options.Postcss): PreprocessorGroup => ({ async style(svelteFile) { - const { transformer } = await import('../transformers/postcss'); + const { transformer } = await import('../transformers/postcss.js'); let { content, filename, attributes, dependencies } = await getTagInfo(svelteFile); diff --git a/src/processors/pug.ts b/src/processors/pug.ts index 8c729610..d4ca8cb0 100644 --- a/src/processors/pug.ts +++ b/src/processors/pug.ts @@ -5,7 +5,7 @@ import type { Options, PreprocessorGroup } from '../types/index'; const pug = (options?: Options.Pug): PreprocessorGroup => ({ async markup({ content, filename }) { - const { transformer } = await import('../transformers/pug'); + const { transformer } = await import('../transformers/pug.js'); content = prepareContent({ options: { diff --git a/src/processors/replace.ts b/src/processors/replace.ts index c3c0dd33..b036f82f 100644 --- a/src/processors/replace.ts +++ b/src/processors/replace.ts @@ -2,7 +2,7 @@ import type { PreprocessorGroup, Options } from '../types'; const replace = (options: Options.Replace): PreprocessorGroup => ({ async markup({ content, filename }) { - const { transformer } = await import('../transformers/replace'); + const { transformer } = await import('../transformers/replace.js'); return transformer({ content, filename, options }); }, diff --git a/src/processors/scss.ts b/src/processors/scss.ts index 0e50bf9c..948fa07b 100644 --- a/src/processors/scss.ts +++ b/src/processors/scss.ts @@ -6,7 +6,7 @@ import type { PreprocessorGroup, Options } from '../types'; const scss = (options?: Options.Sass): PreprocessorGroup => ({ async style(svelteFile) { - const { transformer } = await import('../transformers/scss'); + const { transformer } = await import('../transformers/scss.js'); let { content, filename, attributes, lang, alias, dependencies } = await getTagInfo(svelteFile); diff --git a/src/processors/stylus.ts b/src/processors/stylus.ts index b2d190db..42860734 100644 --- a/src/processors/stylus.ts +++ b/src/processors/stylus.ts @@ -6,7 +6,7 @@ import type { Options, PreprocessorGroup } from '../types'; const stylus = (options?: Options.Stylus): PreprocessorGroup => ({ async style(svelteFile) { - const { transformer } = await import('../transformers/stylus'); + const { transformer } = await import('../transformers/stylus.js'); let { content, filename, attributes, lang, dependencies } = await getTagInfo(svelteFile); diff --git a/src/processors/typescript.ts b/src/processors/typescript.ts index 8d00c97b..bbfd2782 100644 --- a/src/processors/typescript.ts +++ b/src/processors/typescript.ts @@ -6,7 +6,7 @@ import type { Options, PreprocessorGroup } from '../types'; const typescript = (options?: Options.Typescript): PreprocessorGroup => ({ async script(svelteFile) { - const { transformer } = await import('../transformers/typescript'); + const { transformer } = await import('../transformers/typescript.js'); let { content, markup, filename, attributes, lang, dependencies } = await getTagInfo(svelteFile); diff --git a/tsconfig.build.json b/tsconfig.build.json index 56fd5680..b158ca86 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -1,4 +1,7 @@ { "extends": "./tsconfig.json", + "compilerOptions": { + "rootDir": "./src" + }, "include": ["src/**/*.ts"] } diff --git a/tsconfig.json b/tsconfig.json index 026128f7..64657283 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,8 @@ { "compilerOptions": { - "strict": true, "sourceMap": false, - "module": "commonjs", - "moduleResolution": "node", + "module": "node16", + "moduleResolution": "node16", "esModuleInterop": true, "target": "es2018", "lib": ["es2018"], From 5b32ef4ec587ef702dc92d1e16d529c1499f5a83 Mon Sep 17 00:00:00 2001 From: Tee Ming Date: Tue, 31 Mar 2026 18:10:48 +0800 Subject: [PATCH 2/2] fix? --- src/transformers/typescript.ts | 10 +++++++--- test/transformers/typescript.test.ts | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/transformers/typescript.ts b/src/transformers/typescript.ts index 27fd6a41..35027703 100644 --- a/src/transformers/typescript.ts +++ b/src/transformers/typescript.ts @@ -67,13 +67,17 @@ function getCompilerOptions({ // force module(resolution) to esnext and a compatible moduleResolution. Reason: // transpileModule treats NodeNext as CommonJS because it doesn't read the package.json. // Also see https://github.com/microsoft/TypeScript/issues/53022 (the filename workaround doesn't work). - module: ts.ModuleKind.ESNext, + module: + convertedCompilerOptions.moduleResolution === + ts.ModuleResolutionKind.Bundler + ? ts.ModuleKind.ESNext + : ts.ModuleKind.Node16, moduleResolution: convertedCompilerOptions.moduleResolution === ts.ModuleResolutionKind.Bundler ? ts.ModuleResolutionKind.Bundler - : ts.ModuleResolutionKind.Node10, - customConditions: undefined, // fails when using an invalid moduleResolution combination which could happen when we force moduleResolution to Node10 + : ts.ModuleResolutionKind.Node16, + customConditions: undefined, // fails when using an invalid moduleResolution combination which could happen when we force moduleResolution to Node16 allowNonTsExtensions: true, // Clear outDir since it causes source map issues when the files aren't actually written to disk. outDir: undefined, diff --git a/test/transformers/typescript.test.ts b/test/transformers/typescript.test.ts index 756affc3..06fc6cc4 100644 --- a/test/transformers/typescript.test.ts +++ b/test/transformers/typescript.test.ts @@ -139,7 +139,9 @@ describe('transformer - typescript', () => { const { code } = await preprocess(tpl, opts); - expect(code).toBe(``); + expect(code).toBe( + ``, + ); }); it('should produce sourcemap', async () => {