From 4a138667fa4e84c6c5423c0de83357a3b3f10251 Mon Sep 17 00:00:00 2001 From: dominikg Date: Mon, 23 May 2022 11:20:39 +0200 Subject: [PATCH 1/3] fix: use named imports from vite to support upcoming vite 3.0 esm --- .changeset/short-guests-sort.md | 5 +++++ .../kit/src/core/build/build_service_worker.js | 14 +++++++------- packages/kit/src/core/build/utils.js | 4 ++-- packages/kit/src/core/dev/index.js | 6 +++--- 4 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 .changeset/short-guests-sort.md diff --git a/.changeset/short-guests-sort.md b/.changeset/short-guests-sort.md new file mode 100644 index 000000000000..d3c36a6bb11a --- /dev/null +++ b/.changeset/short-guests-sort.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +use named imports of vite to support upcoming vite 3.0 diff --git a/packages/kit/src/core/build/build_service_worker.js b/packages/kit/src/core/build/build_service_worker.js index dbbcd93666e4..86513abefe52 100644 --- a/packages/kit/src/core/build/build_service_worker.js +++ b/packages/kit/src/core/build/build_service_worker.js @@ -1,5 +1,5 @@ import fs from 'fs'; -import vite from 'vite'; +import { build } from 'vite'; import { s } from '../../utils/misc.js'; import { deep_merge } from '../../utils/object.js'; import { normalize_path } from '../../utils/url.js'; @@ -22,12 +22,12 @@ export async function build_service_worker( prerendered, client_manifest ) { - const build = new Set(); + const build_files = new Set(); for (const key in client_manifest) { const { file, css = [], assets = [] } = client_manifest[key]; - build.add(file); - css.forEach((file) => build.add(file)); - assets.forEach((file) => build.add(file)); + build_files.add(file); + css.forEach((file) => build_files.add(file)); + assets.forEach((file) => build_files.add(file)); } const service_worker = `${config.kit.outDir}/generated/service-worker.js`; @@ -43,7 +43,7 @@ export async function build_service_worker( }; export const build = [ - ${Array.from(build) + ${Array.from(build_files) .map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/${file}`)}`) .join(',\n\t\t\t\t')} ]; @@ -96,5 +96,5 @@ export async function build_service_worker( print_config_conflicts(conflicts, 'kit.vite.', 'build_service_worker'); - await vite.build(merged_config); + await build(merged_config); } diff --git a/packages/kit/src/core/build/utils.js b/packages/kit/src/core/build/utils.js index bf7e553499ac..4d2a3238d602 100644 --- a/packages/kit/src/core/build/utils.js +++ b/packages/kit/src/core/build/utils.js @@ -1,4 +1,4 @@ -import vite from 'vite'; +import { build } from 'vite'; /** * @typedef {import('rollup').RollupOutput} RollupOutput @@ -8,7 +8,7 @@ import vite from 'vite'; /** @param {import('vite').UserConfig} config */ export async function create_build(config) { - const { output } = /** @type {RollupOutput} */ (await vite.build(config)); + const { output } = /** @type {RollupOutput} */ (await build(config)); const chunks = output.filter( /** @returns {output is OutputChunk} */ (output) => output.type === 'chunk' diff --git a/packages/kit/src/core/dev/index.js b/packages/kit/src/core/dev/index.js index 350bff1c74f9..0ab5d38db61d 100644 --- a/packages/kit/src/core/dev/index.js +++ b/packages/kit/src/core/dev/index.js @@ -1,6 +1,6 @@ import path from 'path'; import { svelte } from '@sveltejs/vite-plugin-svelte'; -import vite from 'vite'; +import { createServer, searchForWorkspaceRoot } from 'vite'; import { deep_merge } from '../../utils/object.js'; import { print_config_conflicts } from '../config/index.js'; import { get_aliases, get_runtime_path } from '../utils.js'; @@ -33,7 +33,7 @@ export async function dev({ cwd, port, host, https, config }) { config.kit.outDir, path.resolve(cwd, 'src'), path.resolve(cwd, 'node_modules'), - path.resolve(vite.searchForWorkspaceRoot(cwd), 'node_modules') + path.resolve(searchForWorkspaceRoot(cwd), 'node_modules') ]) ] }, @@ -94,7 +94,7 @@ export async function dev({ cwd, port, host, https, config }) { merged_config.server.port = port; } - const server = await vite.createServer(merged_config); + const server = await createServer(merged_config); await server.listen(port); const address_info = /** @type {import('net').AddressInfo} */ ( From 051e1fd4a5bd7ead2375850aff53c8fe3abf615f Mon Sep 17 00:00:00 2001 From: dominikg Date: Mon, 23 May 2022 16:54:55 +0200 Subject: [PATCH 2/3] fix: use namespace import for vite instead of named imports --- .../kit/src/core/build/build_service_worker.js | 14 +++++++------- packages/kit/src/core/build/utils.js | 4 ++-- packages/kit/src/core/dev/index.js | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/kit/src/core/build/build_service_worker.js b/packages/kit/src/core/build/build_service_worker.js index 86513abefe52..e193242d665d 100644 --- a/packages/kit/src/core/build/build_service_worker.js +++ b/packages/kit/src/core/build/build_service_worker.js @@ -1,5 +1,5 @@ import fs from 'fs'; -import { build } from 'vite'; +import * as vite from 'vite'; import { s } from '../../utils/misc.js'; import { deep_merge } from '../../utils/object.js'; import { normalize_path } from '../../utils/url.js'; @@ -22,12 +22,12 @@ export async function build_service_worker( prerendered, client_manifest ) { - const build_files = new Set(); + const build = new Set(); for (const key in client_manifest) { const { file, css = [], assets = [] } = client_manifest[key]; - build_files.add(file); - css.forEach((file) => build_files.add(file)); - assets.forEach((file) => build_files.add(file)); + build.add(file); + css.forEach((file) => build.add(file)); + assets.forEach((file) => build.add(file)); } const service_worker = `${config.kit.outDir}/generated/service-worker.js`; @@ -43,7 +43,7 @@ export async function build_service_worker( }; export const build = [ - ${Array.from(build_files) + ${Array.from(build) .map((file) => `${s(`${config.kit.paths.base}/${config.kit.appDir}/${file}`)}`) .join(',\n\t\t\t\t')} ]; @@ -96,5 +96,5 @@ export async function build_service_worker( print_config_conflicts(conflicts, 'kit.vite.', 'build_service_worker'); - await build(merged_config); + await vite.build(merged_config); } diff --git a/packages/kit/src/core/build/utils.js b/packages/kit/src/core/build/utils.js index 4d2a3238d602..23904c58b245 100644 --- a/packages/kit/src/core/build/utils.js +++ b/packages/kit/src/core/build/utils.js @@ -1,4 +1,4 @@ -import { build } from 'vite'; +import * as vite from 'vite'; /** * @typedef {import('rollup').RollupOutput} RollupOutput @@ -8,7 +8,7 @@ import { build } from 'vite'; /** @param {import('vite').UserConfig} config */ export async function create_build(config) { - const { output } = /** @type {RollupOutput} */ (await build(config)); + const { output } = /** @type {RollupOutput} */ (await vite.build(config)); const chunks = output.filter( /** @returns {output is OutputChunk} */ (output) => output.type === 'chunk' diff --git a/packages/kit/src/core/dev/index.js b/packages/kit/src/core/dev/index.js index 0ab5d38db61d..4931a485ecc8 100644 --- a/packages/kit/src/core/dev/index.js +++ b/packages/kit/src/core/dev/index.js @@ -1,6 +1,6 @@ import path from 'path'; import { svelte } from '@sveltejs/vite-plugin-svelte'; -import { createServer, searchForWorkspaceRoot } from 'vite'; +import * as vite from 'vite'; import { deep_merge } from '../../utils/object.js'; import { print_config_conflicts } from '../config/index.js'; import { get_aliases, get_runtime_path } from '../utils.js'; @@ -33,7 +33,7 @@ export async function dev({ cwd, port, host, https, config }) { config.kit.outDir, path.resolve(cwd, 'src'), path.resolve(cwd, 'node_modules'), - path.resolve(searchForWorkspaceRoot(cwd), 'node_modules') + path.resolve(vite.searchForWorkspaceRoot(cwd), 'node_modules') ]) ] }, @@ -94,7 +94,7 @@ export async function dev({ cwd, port, host, https, config }) { merged_config.server.port = port; } - const server = await createServer(merged_config); + const server = await vite.createServer(merged_config); await server.listen(port); const address_info = /** @type {import('net').AddressInfo} */ ( From 3253b09be0dcb6963ad0a14a89e4706739fd50c0 Mon Sep 17 00:00:00 2001 From: dominikg Date: Mon, 23 May 2022 16:57:17 +0200 Subject: [PATCH 3/3] chore: update changeset --- .changeset/short-guests-sort.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/short-guests-sort.md b/.changeset/short-guests-sort.md index d3c36a6bb11a..e5658bfbda44 100644 --- a/.changeset/short-guests-sort.md +++ b/.changeset/short-guests-sort.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -use named imports of vite to support upcoming vite 3.0 +use namespace import for vite to support upcoming vite 3.0 esm