From 584d23640b6e9258853b73d090c3a07685b36083 Mon Sep 17 00:00:00 2001 From: hexuan Date: Sun, 9 Oct 2022 12:57:56 +0800 Subject: [PATCH 1/2] fix(dev): 404 workbox-*.js when base option exists --- src/plugins/dev.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/dev.ts b/src/plugins/dev.ts index 7d532430..494482a4 100644 --- a/src/plugins/dev.ts +++ b/src/plugins/dev.ts @@ -155,9 +155,9 @@ export function DevPlugin(ctx: PWAPluginContext): Plugin { } return await fs.readFile(swDest, 'utf-8') } - - if (swDevOptions.workboxPaths.has(id)) - return await fs.readFile(swDevOptions.workboxPaths.get(id)!, 'utf-8') + const key = normalizePath(`${options.base}${id.substring(1)}`); + if (swDevOptions.workboxPaths.has(key)) + return await fs.readFile(swDevOptions.workboxPaths.get(key)!, 'utf-8') } }, } From 832d9b952c57398964a845e5da0d7c9a075508f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= Date: Sun, 9 Oct 2022 22:16:33 +0200 Subject: [PATCH 2/2] chore: test fro slash and remove semicolon --- src/plugins/dev.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/dev.ts b/src/plugins/dev.ts index 494482a4..bbd6864d 100644 --- a/src/plugins/dev.ts +++ b/src/plugins/dev.ts @@ -155,7 +155,9 @@ export function DevPlugin(ctx: PWAPluginContext): Plugin { } return await fs.readFile(swDest, 'utf-8') } - const key = normalizePath(`${options.base}${id.substring(1)}`); + + const key = normalizePath(`${options.base}${id.startsWith('/') ? id.slice(1) : id}`) + if (swDevOptions.workboxPaths.has(key)) return await fs.readFile(swDevOptions.workboxPaths.get(key)!, 'utf-8') }