From 7df2e411e2cd0574c6c4ea31bb1f09ff3adc021f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20R=C3=B6hrich?= <47457568+felix-roehrich@users.noreply.github.com> Date: Sat, 30 Mar 2024 11:23:41 +0000 Subject: [PATCH 1/2] add fix and tests --- packages/package/src/utils.js | 2 +- .../package/test/fixtures/resolve-alias/expected/Test.svelte | 1 + .../test/fixtures/resolve-alias/expected/Test.svelte.d.ts | 1 + .../package/test/fixtures/resolve-alias/expected/css/global.css | 1 + .../package/test/fixtures/resolve-alias/src/lib/Test.svelte | 2 ++ .../package/test/fixtures/resolve-alias/src/lib/css/global.css | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 packages/package/test/fixtures/resolve-alias/expected/css/global.css create mode 100644 packages/package/test/fixtures/resolve-alias/src/lib/css/global.css diff --git a/packages/package/src/utils.js b/packages/package/src/utils.js index 39012a6f1779..c5856c0bda7e 100644 --- a/packages/package/src/utils.js +++ b/packages/package/src/utils.js @@ -30,7 +30,7 @@ export function resolve_aliases(input, file, content, aliases) { return match; }; - content = content.replace(/from\s+('|")([^"';,]+?)\1/g, replace_import_path); + content = content.replace(/(?:import|from)\s*('|")([^"';,]+?)\1/g, replace_import_path); content = content.replace(/import\s*\(\s*('|")([^"';,]+?)\1\s*\)/g, replace_import_path); return content; } diff --git a/packages/package/test/fixtures/resolve-alias/expected/Test.svelte b/packages/package/test/fixtures/resolve-alias/expected/Test.svelte index d6dbdc91b465..92bda05ea19f 100644 --- a/packages/package/test/fixtures/resolve-alias/expected/Test.svelte +++ b/packages/package/test/fixtures/resolve-alias/expected/Test.svelte @@ -1,4 +1,5 @@