fix: only warn when dynamic importer in same chunk

vitejs · May 17, 2023 · d16e2e2 · d16e2e2
1 parent 15b005e
commit d16e2e2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/packages/vite/src/node/plugins/reporter.ts b/packages/vite/src/node/plugins/reporter.ts
@@ -115,20 +115,28 @@ export function buildReporterPlugin(config: ResolvedConfig): Plugin {
       for (const id of chunk.moduleIds) {
         const module = this.getModuleInfo(id)
         if (!module) continue
+        // warn if a module is imported both dynamically and statically in a chunk
         if (module.importers.length && module.dynamicImporters.length) {
-          this.warn(
-            `\n(!) ${
-              module.id
-            } is dynamically imported by ${module.dynamicImporters
-              .map((m) => m)
-              .join(', ')} but also statically imported by ${module.importers
-              .map((m) => m)
-              .join(
-                ', ',
-              )}, dynamic import will not move module into another chunk.\n`,
-          )
+          for (const dynamicImporter of module.dynamicImporters) {
+            if (chunk.moduleIds.includes(dynamicImporter)) {
+              this.warn(
+                `\n(!) ${
+                  module.id
+                } is dynamically imported by ${module.dynamicImporters
+                  .map((m) => m)
+                  .join(
+                    ', ',
+                  )} but also statically imported by ${module.importers
+                  .map((m) => m)
+                  .join(
+                    ', ',
+                  )}, dynamic import will not move module into another chunk.\n`,
+              )
+            }
+          }
         }
       }
+
       chunkCount++
       if (shouldLogInfo) {
         if (!tty) {

diff --git a/playground/dynamic-import/__tests__/dynamic-import.spec.ts b/playground/dynamic-import/__tests__/dynamic-import.spec.ts
@@ -133,10 +133,18 @@ test('should work with load ../ and contain itself directory', async () => {
 test.runIf(isBuild)(
   'should rollup warn when static and dynamic import a module in same chunk',
   async () => {
-    await untilUpdated(
-      () => serverLogs.join('\n'),
+    const log = serverLogs.join('\n')
+    expect(log).toContain(
       'dynamic import will not move module into another chunk',
-      true,
+    )
+    expect(log).toMatch(
+      /\(!\).*\/dynamic-import\/files\/mxd\.js is dynamically imported by/,
+    )
+    expect(log).toMatch(
+      /\(!\).*\/dynamic-import\/files\/mxd\.json is dynamically imported by/,
+    )
+    expect(log).not.toMatch(
+      /\(!\).*\/dynamic-import\/nested\/shared\.js is dynamically imported by/,
     )
   },
 )