From 78e6eca8539a8319a96f1d4c0ad957740c1dcb73 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 27 May 2024 13:09:52 +0200 Subject: [PATCH 1/2] fix: only apply infix filter to basename --- .changeset/slow-eagles-unite.md | 5 +++++ packages/vite-plugin-svelte/src/utils/id.js | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 .changeset/slow-eagles-unite.md diff --git a/.changeset/slow-eagles-unite.md b/.changeset/slow-eagles-unite.md new file mode 100644 index 000000000..f52fb22fc --- /dev/null +++ b/.changeset/slow-eagles-unite.md @@ -0,0 +1,5 @@ +--- +'@sveltejs/vite-plugin-svelte': patch +--- + +fix: only apply infix filter to basename diff --git a/packages/vite-plugin-svelte/src/utils/id.js b/packages/vite-plugin-svelte/src/utils/id.js index d7e3bfc14..f9fb1c972 100644 --- a/packages/vite-plugin-svelte/src/utils/id.js +++ b/packages/vite-plugin-svelte/src/utils/id.js @@ -1,5 +1,6 @@ import { createFilter, normalizePath } from 'vite'; import * as fs from 'node:fs'; +import * as path from 'node:path'; import { log } from './log.js'; import { DEFAULT_SVELTE_MODULE_EXT, DEFAULT_SVELTE_MODULE_INFIX } from './constants.js'; @@ -179,10 +180,15 @@ function buildFilter(include, exclude, extensions) { */ function buildModuleFilter(include, exclude, infixes, extensions) { const rollupFilter = createFilter(include, exclude); - return (filename) => - rollupFilter(filename) && - infixes.some((infix) => filename.includes(infix)) && - extensions.some((ext) => filename.endsWith(ext)); + return (filename) => { + const basename = path.basename(filename); + + return ( + rollupFilter(filename) && + infixes.some((infix) => basename.includes(infix)) && + extensions.some((ext) => filename.endsWith(ext)) + ); + }; } /** From 3821a75c262713998abc111b0e9edda52d6a7c0d Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Mon, 27 May 2024 13:59:31 +0200 Subject: [PATCH 2/2] Update packages/vite-plugin-svelte/src/utils/id.js Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com> --- packages/vite-plugin-svelte/src/utils/id.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite-plugin-svelte/src/utils/id.js b/packages/vite-plugin-svelte/src/utils/id.js index f9fb1c972..5a2bdba9b 100644 --- a/packages/vite-plugin-svelte/src/utils/id.js +++ b/packages/vite-plugin-svelte/src/utils/id.js @@ -186,7 +186,7 @@ function buildModuleFilter(include, exclude, infixes, extensions) { return ( rollupFilter(filename) && infixes.some((infix) => basename.includes(infix)) && - extensions.some((ext) => filename.endsWith(ext)) + extensions.some((ext) => basename.endsWith(ext)) ); }; }