fix: process all files when dynamic import (#60)

vuejs · Jun 14, 2023 · 7049ae0 · 7049ae0
1 parent 698b878
commit 7049ae0
Showing 1 changed file with 56 additions and 18 deletions.
diff --git a/src/output/moduleCompiler.ts b/src/output/moduleCompiler.ts
@@ -60,30 +60,55 @@ function processFile(
     return processHtmlFile(store, file.code, file.filename, processed, seen)
   }
 
-  let [js, importedFiles] = processModule(
+  let {
+    code: js,
+    importedFiles,
+    hasDynamicImport
+  } = processModule(
     store,
     isSSR ? file.compiled.ssr : file.compiled.js,
     file.filename
   )
+  processChildFiles(
+    store,
+    importedFiles,
+    hasDynamicImport,
+    processed,
+    seen,
+    isSSR
+  )
   // append css
   if (!isSSR && file.compiled.css) {
     js += `\nwindow.__css__ += ${JSON.stringify(file.compiled.css)}`
   }
-  // crawl child imports
-  if (importedFiles.size) {
+
+  // push self
+  processed.push(js)
+}
+
+function processChildFiles(
+  store: Store,
+  importedFiles: Set<string>,
+  hasDynamicImport: boolean,
+  processed: string[],
+  seen: Set<File>,
+  isSSR: boolean
+) {
+  if (hasDynamicImport) {
+    // process all files
+    for (const file of Object.values(store.state.files)) {
+      if (seen.has(file)) continue
+      processFile(store, file, processed, seen, isSSR)
+    }
+  } else if (importedFiles.size > 0) {
+    // crawl child imports
     for (const imported of importedFiles) {
       processFile(store, store.state.files[imported], processed, seen, isSSR)
     }
   }
-  // push self
-  processed.push(js)
 }
 
-function processModule(
-  store: Store,
-  src: string,
-  filename: string
-): [string, Set<string>] {
+function processModule(store: Store, src: string, filename: string) {
   const s = new MagicString(src)
 
   const ast = babelParse(src, {
@@ -255,11 +280,13 @@ function processModule(
   }
 
   // 4. convert dynamic imports
-  ;(walk as any)(ast, {
+  let hasDynamicImport = false
+  walk(ast, {
     enter(node: Node, parent: Node) {
       if (node.type === 'Import' && parent.type === 'CallExpression') {
         const arg = parent.arguments[0]
         if (arg.type === 'StringLiteral' && arg.value.startsWith('./')) {
+          hasDynamicImport = true
           s.overwrite(node.start!, node.start! + 6, dynamicImportKey)
           s.overwrite(
             arg.start!,
@@ -271,7 +298,11 @@ function processModule(
     }
   })
 
-  return [s.toString(), importedFiles]
+  return {
+    code: s.toString(),
+    importedFiles,
+    hasDynamicImport
+  }
 }
 
 const scriptRE = /<script\b(?:\s[^>]*>|>)([^]*?)<\/script>/gi
@@ -289,12 +320,19 @@ function processHtmlFile(
   let jsCode = ''
   const html = src
     .replace(scriptModuleRE, (_, content) => {
-      const [code, importedFiles] = processModule(store, content, filename)
-      if (importedFiles.size) {
-        for (const imported of importedFiles) {
-          processFile(store, store.state.files[imported], deps, seen, false)
-        }
-      }
+      const { code, importedFiles, hasDynamicImport } = processModule(
+        store,
+        content,
+        filename
+      )
+      processChildFiles(
+        store,
+        importedFiles,
+        hasDynamicImport,
+        deps,
+        seen,
+        false
+      )
       jsCode += '\n' + code
       return ''
     })