chore(rewrite-imports): update regex lastIndex

Kitware · Feb 8, 2024 · 5f98f55 · 5f98f55
1 parent 0a6222a
commit 5f98f55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Sources/Interaction/Manipulators/MouseRangeManipulator/index.d.ts b/Sources/Interaction/Manipulators/MouseRangeManipulator/index.d.ts
@@ -1,7 +1,7 @@
-import { vtkObject } from '../../../interfaces';
 import vtkCompositeMouseManipulator, {
   ICompositeMouseManipulatorInitialValues,
 } from '../../../Interaction/Manipulators/CompositeMouseManipulator';
+import { vtkObject } from '../../../interfaces';
 
 export interface IMouseRangeManipulatorInitialValues
   extends ICompositeMouseManipulatorInitialValues {}

diff --git a/Utilities/build/rewrite-imports.js b/Utilities/build/rewrite-imports.js
@@ -1,15 +1,18 @@
 module.exports = (code, replaceFunc) => {
-  const importRegex = /(?:import|from) ['"]([^'"]*)['"]/g;
+  const importRegex = /(?:import|from)\s+['"]([^'"]*)['"]/g;
   let m;
-  while ((m = importRegex.exec(code)) !== null) {
+  while ((m = importRegex.exec(code)) != null) {
     // This is necessary to avoid infinite loops with zero-width matches
     if (m.index === importRegex.lastIndex) {
       importRegex.lastIndex++;
     }
 
     if (m[1].startsWith('../') || m[1].startsWith('./')) {
       const importPath = replaceFunc(m[1]);
+      const origLen = code.length;
       code = code.replace(m[0], `from '${importPath}'`);
+      const lenDiff = code.length - origLen;
+      importRegex.lastIndex += lenDiff;
     }
   }
   return code;