From 50d9e64e0e9480e46edb374ee97578f6e7c0b09a Mon Sep 17 00:00:00 2001 From: Ignatius Bagus Date: Tue, 31 Aug 2021 12:30:31 +0700 Subject: [PATCH 1/5] add package to core/dev instead --- packages/kit/src/core/dev/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/kit/src/core/dev/index.js b/packages/kit/src/core/dev/index.js index 9ae31440ef3b..e361b03a3abb 100644 --- a/packages/kit/src/core/dev/index.js +++ b/packages/kit/src/core/dev/index.js @@ -167,8 +167,12 @@ class Watcher extends EventEmitter { } }, ssr: { - // @ts-expect-error - ssr is considered in alpha, so not yet exposed by Vite - noExternal: [...((vite_config.ssr && vite_config.ssr.noExternal) || []), ...svelte_packages] + noExternal: [ + '@sveltejs/kit', // TODO: see https://github.com/vitejs/vite/issues/3953 + // @ts-expect-error - ssr is considered in alpha, so not yet exposed by Vite + ...((vite_config.ssr && vite_config.ssr.noExternal) || []), + ...svelte_packages + ] }, base: this.config.kit.paths.assets.startsWith('/') ? `${this.config.kit.paths.assets}/` : '/' }); From 27b5b1be3eaa333ca689b89d6cecbe51526206ed Mon Sep 17 00:00:00 2001 From: Ignatius Bagus Date: Tue, 31 Aug 2021 12:30:54 +0700 Subject: [PATCH 2/5] reverts core/build changes --- packages/kit/src/core/build/index.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/kit/src/core/build/index.js b/packages/kit/src/core/build/index.js index a169e9d2504e..ddf544e80070 100644 --- a/packages/kit/src/core/build/index.js +++ b/packages/kit/src/core/build/index.js @@ -488,12 +488,10 @@ async function build_server( } }, ssr: { - noExternal: [ - '@sveltejs/kit', // TODO: see https://github.com/vitejs/vite/issues/3953 - // @ts-expect-error - ssr is considered in alpha, so not yet exposed by Vite - ...((vite_config.ssr && vite_config.ssr.noExternal) || []), - ...svelte_packages - ] + // note to self: this _might_ need to be ['svelte', '@sveltejs/kit', ...other_packages] + // but I'm honestly not sure. roll with this for now and see if it's ok + // @ts-expect-error - ssr is considered in alpha, so not yet exposed by Vite + noExternal: [...((vite_config.ssr && vite_config.ssr.noExternal) || []), ...svelte_packages] } }); From 27e159b596b813c18a45d0d9864651e48e69a67d Mon Sep 17 00:00:00 2001 From: Ignatius Bagus Date: Tue, 31 Aug 2021 12:31:55 +0700 Subject: [PATCH 3/5] add changeset --- .changeset/witty-maps-pull.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/witty-maps-pull.md diff --git a/.changeset/witty-maps-pull.md b/.changeset/witty-maps-pull.md new file mode 100644 index 000000000000..f10a1326dcb7 --- /dev/null +++ b/.changeset/witty-maps-pull.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +Actually add `@sveltejs/kit` to noExternal in dev server From 639be6a82176d622990f920997c868d517a99684 Mon Sep 17 00:00:00 2001 From: Ignatius Bagus Date: Tue, 31 Aug 2021 22:19:18 +0700 Subject: [PATCH 4/5] revert the reverted --- packages/kit/src/core/build/index.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/kit/src/core/build/index.js b/packages/kit/src/core/build/index.js index ddf544e80070..a169e9d2504e 100644 --- a/packages/kit/src/core/build/index.js +++ b/packages/kit/src/core/build/index.js @@ -488,10 +488,12 @@ async function build_server( } }, ssr: { - // note to self: this _might_ need to be ['svelte', '@sveltejs/kit', ...other_packages] - // but I'm honestly not sure. roll with this for now and see if it's ok - // @ts-expect-error - ssr is considered in alpha, so not yet exposed by Vite - noExternal: [...((vite_config.ssr && vite_config.ssr.noExternal) || []), ...svelte_packages] + noExternal: [ + '@sveltejs/kit', // TODO: see https://github.com/vitejs/vite/issues/3953 + // @ts-expect-error - ssr is considered in alpha, so not yet exposed by Vite + ...((vite_config.ssr && vite_config.ssr.noExternal) || []), + ...svelte_packages + ] } }); From 039f39b8346329fcca02651173e21f015af25e07 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 31 Aug 2021 08:54:27 -0700 Subject: [PATCH 5/5] update changelog message --- .changeset/witty-maps-pull.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/witty-maps-pull.md b/.changeset/witty-maps-pull.md index f10a1326dcb7..7d57cffdf39e 100644 --- a/.changeset/witty-maps-pull.md +++ b/.changeset/witty-maps-pull.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -Actually add `@sveltejs/kit` to noExternal in dev server +Add `@sveltejs/kit` to `noExternal` in dev server as well