From 9098b4a4fc62d5ee94ea0329cca8a87f6940a410 Mon Sep 17 00:00:00 2001 From: nishumurmu Date: Thu, 14 Nov 2024 11:26:40 +0530 Subject: [PATCH 1/5] fix: Add / to PublicPath and browser.runtime.getURL --- packages/wxt/src/core/generate-wxt-dir.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wxt/src/core/generate-wxt-dir.ts b/packages/wxt/src/core/generate-wxt-dir.ts index cf9980c7f..ddb2a05be 100644 --- a/packages/wxt/src/core/generate-wxt-dir.ts +++ b/packages/wxt/src/core/generate-wxt-dir.ts @@ -78,7 +78,7 @@ async function getPathsDeclarationEntry( isHtmlEntrypoint(entry) ? '.html' : '.js', ), ) - .concat(await getPublicFiles()); + .concat([...(await getPublicFiles()), '']); await wxt.hooks.callHook('prepare:publicPaths', wxt, paths); From 055761cb04cec3ba5c7fc83ce10fdae50a8d332e Mon Sep 17 00:00:00 2001 From: nishumurmu Date: Thu, 14 Nov 2024 12:49:54 +0530 Subject: [PATCH 2/5] fix(test): adding missing snapshot for getURL test. --- packages/wxt/e2e/tests/typescript-project.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/wxt/e2e/tests/typescript-project.test.ts b/packages/wxt/e2e/tests/typescript-project.test.ts index 34c372af6..167e01f8b 100644 --- a/packages/wxt/e2e/tests/typescript-project.test.ts +++ b/packages/wxt/e2e/tests/typescript-project.test.ts @@ -48,6 +48,7 @@ describe('TypeScript Project', () => { declare module "wxt/browser" { export type PublicPath = + | "/" | "/options.html" | "/popup.html" | "/sandbox.html" From 3be59af3cd3c4c7ac9f824efe3c91c202cc2be28 Mon Sep 17 00:00:00 2001 From: nishumurmu Date: Thu, 14 Nov 2024 13:15:17 +0530 Subject: [PATCH 3/5] fix: Unused '@ts-expect-error' directive. --- packages/wxt-demo/src/entrypoints/background.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/wxt-demo/src/entrypoints/background.ts b/packages/wxt-demo/src/entrypoints/background.ts index a8996acc8..f4a21fb75 100644 --- a/packages/wxt-demo/src/entrypoints/background.ts +++ b/packages/wxt-demo/src/entrypoints/background.ts @@ -14,7 +14,6 @@ export default defineBackground({ console.log(useAppConfig()); - // @ts-expect-error: should only accept entrypoints or public assets browser.runtime.getURL('/'); browser.runtime.getURL('/background.js'); browser.runtime.getURL('/icons/128.png'); From d7be35dfeb28c7c1d1c584d21051d60cc8a6e73d Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 14 Nov 2024 01:55:44 -0600 Subject: [PATCH 4/5] simplify concat --- packages/wxt/src/core/generate-wxt-dir.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/wxt/src/core/generate-wxt-dir.ts b/packages/wxt/src/core/generate-wxt-dir.ts index ddb2a05be..a96c6353f 100644 --- a/packages/wxt/src/core/generate-wxt-dir.ts +++ b/packages/wxt/src/core/generate-wxt-dir.ts @@ -78,7 +78,8 @@ async function getPathsDeclarationEntry( isHtmlEntrypoint(entry) ? '.html' : '.js', ), ) - .concat([...(await getPublicFiles()), '']); + .concat(['']) + .concat(await getPublicFiles()); await wxt.hooks.callHook('prepare:publicPaths', wxt, paths); From 763877050860472d93690875895720c1146ebc72 Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 14 Nov 2024 01:56:48 -0600 Subject: [PATCH 5/5] Add back type check in demo --- packages/wxt-demo/src/entrypoints/background.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/wxt-demo/src/entrypoints/background.ts b/packages/wxt-demo/src/entrypoints/background.ts index f4a21fb75..096261015 100644 --- a/packages/wxt-demo/src/entrypoints/background.ts +++ b/packages/wxt-demo/src/entrypoints/background.ts @@ -19,6 +19,8 @@ export default defineBackground({ browser.runtime.getURL('/icons/128.png'); browser.runtime.getURL('/example.html#hash'); browser.runtime.getURL('/example.html?query=param'); + // @ts-expect-error: should only accept entrypoints or public assets + browser.runtime.getURL('/unknown'); // @ts-expect-error: should only allow hashes/query params on HTML files browser.runtime.getURL('/icon-128.png?query=param');