From 768a6285216ef1ba08925a3a2f988d42fa3015cb Mon Sep 17 00:00:00 2001 From: DetachHead Date: Fri, 14 Apr 2023 20:34:06 +1000 Subject: [PATCH 1/3] change `moduleResolution` in `vite-plugin-svelte` to `nodenext` since it's an esmodule --- packages/vite-plugin-svelte/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite-plugin-svelte/tsconfig.json b/packages/vite-plugin-svelte/tsconfig.json index c0543ef45..8a953ccbd 100644 --- a/packages/vite-plugin-svelte/tsconfig.json +++ b/packages/vite-plugin-svelte/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "dist", "target": "ES2020", "module": "ES2020", - "moduleResolution": "node", + "moduleResolution": "nodenext", "strict": true, "declaration": true, "sourceMap": true, From c6693480c74f274cd42cda4652d0cc37ebd7b82a Mon Sep 17 00:00:00 2001 From: DetachHead Date: Fri, 14 Apr 2023 20:38:14 +1000 Subject: [PATCH 2/3] set `moduleResolution` to `bundler` because it uses `tsup-node` --- packages/vite-plugin-svelte/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite-plugin-svelte/tsconfig.json b/packages/vite-plugin-svelte/tsconfig.json index 8a953ccbd..fc9c5cfb7 100644 --- a/packages/vite-plugin-svelte/tsconfig.json +++ b/packages/vite-plugin-svelte/tsconfig.json @@ -5,7 +5,7 @@ "outDir": "dist", "target": "ES2020", "module": "ES2020", - "moduleResolution": "nodenext", + "moduleResolution": "bundler", "strict": true, "declaration": true, "sourceMap": true, From 7de0ff900713aeb7124bbc29dfff083af6041434 Mon Sep 17 00:00:00 2001 From: DetachHead Date: Fri, 14 Apr 2023 20:44:23 +1000 Subject: [PATCH 3/3] update svelte imports for esm --- packages/vite-plugin-svelte/src/utils/id.ts | 2 +- packages/vite-plugin-svelte/src/utils/options.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/vite-plugin-svelte/src/utils/id.ts b/packages/vite-plugin-svelte/src/utils/id.ts index b8b3a6e4d..84f0ff8eb 100644 --- a/packages/vite-plugin-svelte/src/utils/id.ts +++ b/packages/vite-plugin-svelte/src/utils/id.ts @@ -4,7 +4,7 @@ import { Arrayable, ResolvedOptions } from './options'; import { normalizePath } from 'vite'; import * as fs from 'fs'; //eslint-disable-next-line node/no-missing-import -import { CompileOptions } from 'svelte/types/compiler/interfaces'; +import { CompileOptions } from 'svelte/compiler'; import { log } from './log'; const VITE_FS_PREFIX = '/@fs/'; diff --git a/packages/vite-plugin-svelte/src/utils/options.ts b/packages/vite-plugin-svelte/src/utils/options.ts index e42b2dffa..3a7edce74 100644 --- a/packages/vite-plugin-svelte/src/utils/options.ts +++ b/packages/vite-plugin-svelte/src/utils/options.ts @@ -9,15 +9,14 @@ import { SVELTE_RESOLVE_MAIN_FIELDS, VITE_RESOLVE_MAIN_FIELDS } from './constants'; -// eslint-disable-next-line node/no-missing-import -import type { CompileOptions, Warning } from 'svelte/types/compiler/interfaces'; import type { + CompileOptions, MarkupPreprocessor, Preprocessor, PreprocessorGroup, Processed // eslint-disable-next-line node/no-missing-import -} from 'svelte/types/compiler/preprocess'; +} from 'svelte/compiler'; import path from 'path'; import { esbuildSveltePlugin, facadeEsbuildSveltePluginName } from './esbuild';