fix(watch): map line-breaking imports (#463)

wellwelwel · Jun 25, 2024 · 0d82461 · 0d82461
1 parent 0c27c4e
commit 0d82461
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/services/map-tests.ts b/src/services/map-tests.ts
@@ -20,7 +20,11 @@ export const getDeepImports = (content: string): Set<string> => {
   const lines = content.split('\n');
 
   for (const line of lines) {
-    if (line.includes('import') || line.includes('require')) {
+    if (
+      line.indexOf('import') !== -1 ||
+      line.indexOf('require') !== -1 ||
+      line.indexOf(' from ') !== -1
+    ) {
       const path = line.match(/['"](\.{1,2}\/[^'"]+)['"]/);
 
       if (path) paths.add(normalizePath(path[1].replace(extFilter, '')));

diff --git a/test/unit/map-tests.test.ts b/test/unit/map-tests.test.ts
@@ -103,6 +103,20 @@ test(async () => {
           import './k';
           import './l.js';
           import('./m.js');
+          import {
+            moduleA,
+            moduleB,
+          } from 'some-c';
+          import {
+            moduleA,
+            moduleB,
+          } from './n.js';
+          import '../../o.js';
+          import {
+            moduleA,
+            moduleB,
+          } from '../p.js';
+          import('../q.js');
           `
         ),
         new Set([
@@ -119,6 +133,10 @@ test(async () => {
           'k',
           'l',
           'm',
+          'n',
+          'o',
+          'p',
+          'q',
         ]),
         'import'
       );
@@ -141,6 +159,7 @@ test(async () => {
           require('./k');
           require('./l.js');
           require('./m.js').default;
+          const { some } = require('../../../n.mjs');
           `
         ),
         new Set([
@@ -157,6 +176,7 @@ test(async () => {
           'k',
           'l',
           'm',
+          'n',
         ]),
         'require'
       );