fix: ignore imports inside strings better

morganney · morganney · commit e4870d085988 · 2021-09-12T18:50:32.000-05:00
diff --git a/src/util.js b/src/util.js
@@ -57,7 +57,7 @@ const getOverrideConfig = (overrides, filepath, config) => {
 }
 const importPrefix = /^(?:(\.{1,2}\/)+)|^\/|^.+:\/\/\/?[.-\w]+\//
 const dynamicImportsWithoutComments =
-  /(?<![\w.]|#!|\*[\s\w]*?|\/\/\s*|['"``]\s*)import\s*\((?!\s*\/\*)(?<path>\s*?['"`][^)]+['"`]\s*)\)(?!\s*?\*\/)/g
+  /(?<![\w.]|#!|\*[\s\w]*?|\/\/\s*|['"`][^)$]*)import\s*\((?!\s*\/\*)(?<path>\s*?['"`][^)]+['"`]\s*)\)(?!\s*?\*\/)/g
 
 export {
   getOverrideConfig,

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ const getOverrideConfig = (overrides, filepath, config) => {`
`57`	`57`	`}`
`58`	`58`	`const importPrefix = /^(?:(\.{1,2}\/)+)\|^\/\|^.+:\/\/\/?[.-\w]+\//`
`59`	`59`	`const dynamicImportsWithoutComments =`
`60`		- /(?<![\w.]\|#!\|\[\s\w]?\|\/\/\s\|['"``]\s)import\s\((?!\s\/\)(?<path>\s?['"`][^)]+['"`]\s)\)(?!\s?\*\/)/g
	`60`	+ /(?<![\w.]\|#!\|\[\s\w]?\|\/\/\s\|['"`][^)$])import\s\((?!\s\/\)(?<path>\s?['"`][^)]+['"`]\s)\)(?!\s?\*\/)/g
`61`	`61`
`62`	`62`	`export {`
`63`	`63`	`getOverrideConfig,`