From 54407c9b383290bbd5b6c950f2519f9c90c7c4b8 Mon Sep 17 00:00:00 2001 From: userquin Date: Thu, 1 Jun 2023 18:18:56 +0200 Subject: [PATCH 1/3] fix: don't copy public folder in service worker build --- .changeset/tame-kangaroos-film.md | 5 +++++ .gitignore | 1 + packages/kit/src/exports/vite/build/build_service_worker.js | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 .changeset/tame-kangaroos-film.md diff --git a/.changeset/tame-kangaroos-film.md b/.changeset/tame-kangaroos-film.md new file mode 100644 index 000000000000..b553e3e19f25 --- /dev/null +++ b/.changeset/tame-kangaroos-film.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/kit': patch +--- + +Don't copy public folder in service worker build diff --git a/.gitignore b/.gitignore index f53c51190a59..679d1c89e690 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ vite.config.js.timestamp-* .vercel .test-tmp symlink-from +.idea/ diff --git a/packages/kit/src/exports/vite/build/build_service_worker.js b/packages/kit/src/exports/vite/build/build_service_worker.js index b5493f687912..ef06ca10dec8 100644 --- a/packages/kit/src/exports/vite/build/build_service_worker.js +++ b/packages/kit/src/exports/vite/build/build_service_worker.js @@ -65,6 +65,8 @@ export async function build_service_worker( await vite.build({ base: assets_base(kit), + // don't copy anything from public folder + publicDir: false, build: { lib: { entry: /** @type {string} */ (service_worker_entry_file), From fc500feb7e03840ebb3d8483f3846b8234bee462 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Thu, 1 Jun 2023 09:28:52 -0700 Subject: [PATCH 2/3] Update .changeset/tame-kangaroos-film.md --- .changeset/tame-kangaroos-film.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/tame-kangaroos-film.md b/.changeset/tame-kangaroos-film.md index b553e3e19f25..022cf57590e6 100644 --- a/.changeset/tame-kangaroos-film.md +++ b/.changeset/tame-kangaroos-film.md @@ -2,4 +2,4 @@ '@sveltejs/kit': patch --- -Don't copy public folder in service worker build +fix: don't copy public folder in service worker build From 4590f9beaf35d0d5c88e6ae08e897a4d35d1046e Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Thu, 1 Jun 2023 09:29:51 -0700 Subject: [PATCH 3/3] alphebetize --- packages/kit/src/exports/vite/build/build_service_worker.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/kit/src/exports/vite/build/build_service_worker.js b/packages/kit/src/exports/vite/build/build_service_worker.js index ef06ca10dec8..89387ae03cd0 100644 --- a/packages/kit/src/exports/vite/build/build_service_worker.js +++ b/packages/kit/src/exports/vite/build/build_service_worker.js @@ -65,8 +65,6 @@ export async function build_service_worker( await vite.build({ base: assets_base(kit), - // don't copy anything from public folder - publicDir: false, build: { lib: { entry: /** @type {string} */ (service_worker_entry_file), @@ -81,8 +79,9 @@ export async function build_service_worker( outDir: `${out}/client`, emptyOutDir: false }, - define: vite_config.define, configFile: false, + define: vite_config.define, + publicDir: false, resolve: { alias: [...get_config_aliases(kit), { find: '$service-worker', replacement: service_worker }] }