From 64b58419c2a5845f888f283c6c0365c466048bab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <joaquin.sanchez@fi2net.es>
Date: Fri, 10 Feb 2023 17:38:56 +0100
Subject: [PATCH] fix: use build base on virtual module (#464)

* fix: use build base on virtual module

* chore: include build base tests

* chore: include build base tests for virtual
---
 examples/vanilla-ts-dev-options/package.json   | 3 +++
 examples/vanilla-ts-dev-options/vite.config.ts | 1 +
 examples/vanilla-ts-no-ip/vite.config.ts       | 1 +
 src/modules.ts                                 | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/examples/vanilla-ts-dev-options/package.json b/examples/vanilla-ts-dev-options/package.json
index 59cba4e3..4114448a 100644
--- a/examples/vanilla-ts-dev-options/package.json
+++ b/examples/vanilla-ts-dev-options/package.json
@@ -10,6 +10,9 @@
     "dev-inline-destroy": "rimraf dev-dist && cross-env DEBUG=vite-plugin-pwa:* SW_DEV=true SW_DESTROY=true SW_INLINE=inline vite --force",
     "dev-script-destroy": "rimraf dev-dist && cross-env DEBUG=vite-plugin-pwa:* SW_DEV=true SW_DESTROY=true SW_INLINE=script vite --force",
     "build": "cross-env DEBUG=vite-plugin-pwa:* vite build",
+    "build-auto": "rimraf dev-dist && cross-env DEBUG=vite-plugin-pwa:* SW_DEV=true SW_INLINE=auto vite build --force",
+    "build-inline": "rimraf dev-dist && cross-env DEBUG=vite-plugin-pwa:* SW_DEV=true SW_INLINE=inline vite build --force",
+    "build-script": "rimraf dev-dist && cross-env DEBUG=vite-plugin-pwa:* SW_DEV=true SW_INLINE=script vite build --force",
     "serve": "serve dist"
   },
   "devDependencies": {
diff --git a/examples/vanilla-ts-dev-options/vite.config.ts b/examples/vanilla-ts-dev-options/vite.config.ts
index f1711be7..19fd8cf5 100644
--- a/examples/vanilla-ts-dev-options/vite.config.ts
+++ b/examples/vanilla-ts-dev-options/vite.config.ts
@@ -12,6 +12,7 @@ export default defineConfig({
     VitePWA({
       mode: 'development',
       base: '/',
+      /* buildBase: '/test-build-base/', */
       includeAssets: ['favicon.svg'],
       injectRegister,
       selfDestroying,
diff --git a/examples/vanilla-ts-no-ip/vite.config.ts b/examples/vanilla-ts-no-ip/vite.config.ts
index 0c193514..aa198575 100644
--- a/examples/vanilla-ts-no-ip/vite.config.ts
+++ b/examples/vanilla-ts-no-ip/vite.config.ts
@@ -13,6 +13,7 @@ export default defineConfig({
     VitePWA({
       mode: 'development',
       base: '/',
+      /* buildBase: '/test-build-base/', */
       strategies: 'injectManifest',
       registerType: 'autoUpdate',
       includeAssets: ['favicon.svg'],
diff --git a/src/modules.ts b/src/modules.ts
index 7090f764..7770579a 100644
--- a/src/modules.ts
+++ b/src/modules.ts
@@ -39,7 +39,7 @@ async function loadRollupReplacePlugin() {
 }
 
 export async function generateRegisterSW(options: ResolvedVitePWAOptions, mode: 'build' | 'dev', source = 'register') {
-  const sw = options.base + options.filename
+  const sw = options.buildBase + options.filename
   const scope = options.scope
 
   const content = await fs.readFile(resolve(_dirname, `client/${mode}/${source}.mjs`), 'utf-8')