From 500589917ea72ba1e3ddb157f16f2c2c479eab5c Mon Sep 17 00:00:00 2001 From: GrygrFlzr Date: Thu, 11 Mar 2021 21:31:11 +0700 Subject: [PATCH 1/5] kit: Bundle kit in build step --- .changeset/weak-swans-lie.md | 5 +++++ packages/kit/src/core/build/index.js | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/weak-swans-lie.md diff --git a/.changeset/weak-swans-lie.md b/.changeset/weak-swans-lie.md new file mode 100644 index 000000000000..3a6a9b541ba0 --- /dev/null +++ b/.changeset/weak-swans-lie.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +kit: bundle @sveltejs/kit into built application diff --git a/packages/kit/src/core/build/index.js b/packages/kit/src/core/build/index.js index be103b5fee79..18f5d0108739 100644 --- a/packages/kit/src/core/build/index.js +++ b/packages/kit/src/core/build/index.js @@ -389,7 +389,7 @@ async function build_server( }) ], ssr: { - noExternal: ['svelte'] + noExternal: ['svelte', '@sveltejs/kit'] }, optimizeDeps: { entries: [] From 85fb0154148f1761d4e8899c4d755e1d9b46d63b Mon Sep 17 00:00:00 2001 From: GrygrFlzr Date: Fri, 12 Mar 2021 09:46:13 +0700 Subject: [PATCH 2/5] kit: Target es2018 for builds --- packages/kit/src/core/build/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/kit/src/core/build/index.js b/packages/kit/src/core/build/index.js index 18f5d0108739..b0152cc63312 100644 --- a/packages/kit/src/core/build/index.js +++ b/packages/kit/src/core/build/index.js @@ -370,7 +370,8 @@ async function build_server( name: 'app', formats: ['es'] }, - outDir: `${output_dir}/server` + outDir: `${output_dir}/server`, + target: 'es2018' }, resolve: { alias: { From acac110c6c5230a1a65012b4bbbd7b2dc8069655 Mon Sep 17 00:00:00 2001 From: GrygrFlzr Date: Fri, 12 Mar 2021 17:23:29 +0700 Subject: [PATCH 3/5] Bundle production dependencies into SSR build --- examples/hn.svelte.dev/vite.config.js | 11 ++++++++++- examples/realworld.svelte.dev/vite.config.js | 11 ++++++++++- examples/sandbox/vite.config.js | 11 ++++++++++- examples/svelte-kit-demo/vite.config.js | 11 ++++++++++- packages/create-svelte/template/vite.config.js | 9 ++++++++- 5 files changed, 48 insertions(+), 5 deletions(-) diff --git a/examples/hn.svelte.dev/vite.config.js b/examples/hn.svelte.dev/vite.config.js index 4c52b8079c75..ac3f5bb08e02 100644 --- a/examples/hn.svelte.dev/vite.config.js +++ b/examples/hn.svelte.dev/vite.config.js @@ -1,9 +1,18 @@ -import { resolve } from 'path'; +// Consult https://vitejs.dev/config/ to learn about these options +import { join, resolve } from 'path'; +import { readFileSync } from 'fs'; +import { cwd } from 'process'; +const pkg = JSON.parse(readFileSync(join(cwd(), 'package.json'))); + +/** @type {import('vite').UserConfig} */ export default { resolve: { alias: { $components: resolve('src/components') } + }, + ssr: { + noExternal: [...Object.keys(pkg.dependencies || {})] } }; diff --git a/examples/realworld.svelte.dev/vite.config.js b/examples/realworld.svelte.dev/vite.config.js index ad6f3c58cda6..eac9d8c88c49 100644 --- a/examples/realworld.svelte.dev/vite.config.js +++ b/examples/realworld.svelte.dev/vite.config.js @@ -1,10 +1,19 @@ -import { resolve } from 'path'; +// Consult https://vitejs.dev/config/ to learn about these options +import { join, resolve } from 'path'; +import { readFileSync } from 'fs'; +import { cwd } from 'process'; +const pkg = JSON.parse(readFileSync(join(cwd(), 'package.json'))); + +/** @type {import('vite').UserConfig} */ export default { resolve: { alias: { $common: resolve('src/common'), $components: resolve('src/components') } + }, + ssr: { + noExternal: [...Object.keys(pkg.dependencies || {})] } }; diff --git a/examples/sandbox/vite.config.js b/examples/sandbox/vite.config.js index 7fd500d16c9a..693e7c92f091 100644 --- a/examples/sandbox/vite.config.js +++ b/examples/sandbox/vite.config.js @@ -1,5 +1,11 @@ -import { resolve } from 'path'; +// Consult https://vitejs.dev/config/ to learn about these options +import { join, resolve } from 'path'; +import { readFileSync } from 'fs'; +import { cwd } from 'process'; +const pkg = JSON.parse(readFileSync(join(cwd(), 'package.json'))); + +/** @type {import('vite').UserConfig} */ export default { build: { minify: false @@ -8,5 +14,8 @@ export default { alias: { $components: resolve('src/components') } + }, + ssr: { + noExternal: [...Object.keys(pkg.dependencies || {})] } }; diff --git a/examples/svelte-kit-demo/vite.config.js b/examples/svelte-kit-demo/vite.config.js index 4c52b8079c75..ac3f5bb08e02 100644 --- a/examples/svelte-kit-demo/vite.config.js +++ b/examples/svelte-kit-demo/vite.config.js @@ -1,9 +1,18 @@ -import { resolve } from 'path'; +// Consult https://vitejs.dev/config/ to learn about these options +import { join, resolve } from 'path'; +import { readFileSync } from 'fs'; +import { cwd } from 'process'; +const pkg = JSON.parse(readFileSync(join(cwd(), 'package.json'))); + +/** @type {import('vite').UserConfig} */ export default { resolve: { alias: { $components: resolve('src/components') } + }, + ssr: { + noExternal: [...Object.keys(pkg.dependencies || {})] } }; diff --git a/packages/create-svelte/template/vite.config.js b/packages/create-svelte/template/vite.config.js index c24a94e3740d..ac3f5bb08e02 100644 --- a/packages/create-svelte/template/vite.config.js +++ b/packages/create-svelte/template/vite.config.js @@ -1,5 +1,9 @@ // Consult https://vitejs.dev/config/ to learn about these options -import { resolve } from 'path'; +import { join, resolve } from 'path'; +import { readFileSync } from 'fs'; +import { cwd } from 'process'; + +const pkg = JSON.parse(readFileSync(join(cwd(), 'package.json'))); /** @type {import('vite').UserConfig} */ export default { @@ -7,5 +11,8 @@ export default { alias: { $components: resolve('src/components') } + }, + ssr: { + noExternal: [...Object.keys(pkg.dependencies || {})] } }; From 41b4be7dd4daa9e895a34ad6eae5bea5d3b9828f Mon Sep 17 00:00:00 2001 From: GrygrFlzr Date: Fri, 12 Mar 2021 17:27:43 +0700 Subject: [PATCH 4/5] create-svelte changeset --- .changeset/quick-balloons-invite.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/quick-balloons-invite.md diff --git a/.changeset/quick-balloons-invite.md b/.changeset/quick-balloons-invite.md new file mode 100644 index 000000000000..c4df6a5caa55 --- /dev/null +++ b/.changeset/quick-balloons-invite.md @@ -0,0 +1,5 @@ +--- +'create-svelte': patch +--- + +create-svelte: bundle production dependencies for SSR From d2ab8d4d36a28f466e92b0db7d3caa847c627645 Mon Sep 17 00:00:00 2001 From: GrygrFlzr Date: Fri, 12 Mar 2021 18:00:05 +0700 Subject: [PATCH 5/5] Simplify vite config --- examples/hn.svelte.dev/vite.config.js | 2 +- examples/realworld.svelte.dev/vite.config.js | 2 +- examples/sandbox/vite.config.js | 2 +- examples/svelte-kit-demo/vite.config.js | 2 +- packages/create-svelte/template/vite.config.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/hn.svelte.dev/vite.config.js b/examples/hn.svelte.dev/vite.config.js index ac3f5bb08e02..499379c8130d 100644 --- a/examples/hn.svelte.dev/vite.config.js +++ b/examples/hn.svelte.dev/vite.config.js @@ -13,6 +13,6 @@ export default { } }, ssr: { - noExternal: [...Object.keys(pkg.dependencies || {})] + noExternal: Object.keys(pkg.dependencies || {}) } }; diff --git a/examples/realworld.svelte.dev/vite.config.js b/examples/realworld.svelte.dev/vite.config.js index eac9d8c88c49..258a5294921c 100644 --- a/examples/realworld.svelte.dev/vite.config.js +++ b/examples/realworld.svelte.dev/vite.config.js @@ -14,6 +14,6 @@ export default { } }, ssr: { - noExternal: [...Object.keys(pkg.dependencies || {})] + noExternal: Object.keys(pkg.dependencies || {}) } }; diff --git a/examples/sandbox/vite.config.js b/examples/sandbox/vite.config.js index 693e7c92f091..4d8a2e7a2386 100644 --- a/examples/sandbox/vite.config.js +++ b/examples/sandbox/vite.config.js @@ -16,6 +16,6 @@ export default { } }, ssr: { - noExternal: [...Object.keys(pkg.dependencies || {})] + noExternal: Object.keys(pkg.dependencies || {}) } }; diff --git a/examples/svelte-kit-demo/vite.config.js b/examples/svelte-kit-demo/vite.config.js index ac3f5bb08e02..499379c8130d 100644 --- a/examples/svelte-kit-demo/vite.config.js +++ b/examples/svelte-kit-demo/vite.config.js @@ -13,6 +13,6 @@ export default { } }, ssr: { - noExternal: [...Object.keys(pkg.dependencies || {})] + noExternal: Object.keys(pkg.dependencies || {}) } }; diff --git a/packages/create-svelte/template/vite.config.js b/packages/create-svelte/template/vite.config.js index ac3f5bb08e02..499379c8130d 100644 --- a/packages/create-svelte/template/vite.config.js +++ b/packages/create-svelte/template/vite.config.js @@ -13,6 +13,6 @@ export default { } }, ssr: { - noExternal: [...Object.keys(pkg.dependencies || {})] + noExternal: Object.keys(pkg.dependencies || {}) } };