From b4085f78d8ac0a26f87122269af4191bbc7cfa9d Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Sun, 17 Jul 2022 17:43:00 +0200 Subject: [PATCH 1/4] fix(vite): use more strict app entry check in dev-bundler --- packages/vite/src/dev-bundler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts index 3ff06b9bd33..0ae763a010f 100644 --- a/packages/vite/src/dev-bundler.ts +++ b/packages/vite/src/dev-bundler.ts @@ -63,7 +63,7 @@ async function transformRequest (opts: TransformOptions, id: string) { if (id.match(/^\/\w:/)) { id = id.slice(1) } - } else if (!id.includes('entry') && id.startsWith('/')) { + } else if (!id.includes('app/entry') && id.startsWith('/')) { // Relative to the root directory const resolvedPath = resolve(opts.viteServer.config.root, '.' + id) if (existsSync(resolvedPath)) { From de4e88f61b06ad49529c54236f1a8335d7954bbc Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Sun, 17 Jul 2022 17:54:53 +0200 Subject: [PATCH 2/4] improve check --- packages/vite/src/dev-bundler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts index 0ae763a010f..be7150eade0 100644 --- a/packages/vite/src/dev-bundler.ts +++ b/packages/vite/src/dev-bundler.ts @@ -63,7 +63,7 @@ async function transformRequest (opts: TransformOptions, id: string) { if (id.match(/^\/\w:/)) { id = id.slice(1) } - } else if (!id.includes('app/entry') && id.startsWith('/')) { + } else if (!(/\/app\/(entry|entry.mjs)$/.test(id)) && id.startsWith('/')) { // Relative to the root directory const resolvedPath = resolve(opts.viteServer.config.root, '.' + id) if (existsSync(resolvedPath)) { From 5d8a460e9609a38800d133605dcd9d28f359213a Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Sun, 17 Jul 2022 17:55:40 +0200 Subject: [PATCH 3/4] refactor: reorder checks --- packages/vite/src/dev-bundler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts index be7150eade0..16ac8a9628c 100644 --- a/packages/vite/src/dev-bundler.ts +++ b/packages/vite/src/dev-bundler.ts @@ -63,7 +63,7 @@ async function transformRequest (opts: TransformOptions, id: string) { if (id.match(/^\/\w:/)) { id = id.slice(1) } - } else if (!(/\/app\/(entry|entry.mjs)$/.test(id)) && id.startsWith('/')) { + } else if (id.startsWith('/') && !(/\/app\/(entry|entry.mjs)$/.test(id))) { // Relative to the root directory const resolvedPath = resolve(opts.viteServer.config.root, '.' + id) if (existsSync(resolvedPath)) { From 16faf4e15ed3eba41bc9114c3eac03084dc73e8c Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Sun, 17 Jul 2022 17:56:12 +0200 Subject: [PATCH 4/4] simplify regex --- packages/vite/src/dev-bundler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/dev-bundler.ts b/packages/vite/src/dev-bundler.ts index 16ac8a9628c..5d31b8e5b7d 100644 --- a/packages/vite/src/dev-bundler.ts +++ b/packages/vite/src/dev-bundler.ts @@ -63,7 +63,7 @@ async function transformRequest (opts: TransformOptions, id: string) { if (id.match(/^\/\w:/)) { id = id.slice(1) } - } else if (id.startsWith('/') && !(/\/app\/(entry|entry.mjs)$/.test(id))) { + } else if (id.startsWith('/') && !(/\/app\/entry(|.mjs)$/.test(id))) { // Relative to the root directory const resolvedPath = resolve(opts.viteServer.config.root, '.' + id) if (existsSync(resolvedPath)) {