From 23324b9eae1a39fdedea115d669181403fdbfe3f Mon Sep 17 00:00:00 2001
From: "Xin Du (Clark)" <clark.duxin@gmail.com>
Date: Mon, 29 Jun 2020 16:44:08 +0100
Subject: [PATCH] fix(webpack): modern build should wait for legacy assets
 (#7635)

#7562
---
 packages/webpack/src/plugins/vue/modern.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/webpack/src/plugins/vue/modern.js b/packages/webpack/src/plugins/vue/modern.js
index b7b3dd9039..7878927d86 100644
--- a/packages/webpack/src/plugins/vue/modern.js
+++ b/packages/webpack/src/plugins/vue/modern.js
@@ -35,15 +35,15 @@ export default class ModernModePlugin {
   }
 
   getAssets (name) {
-    const asset = this.assets[name]
-    if (!asset) {
-      return
-    }
     return new Promise((resolve) => {
-      watcher.once(name, () => {
+      const asset = this.assets[name]
+      if (asset) {
+        return resolve(asset)
+      }
+      return watcher.once(name, () => {
+        const asset = this.assets[name]
         return asset && resolve(asset)
       })
-      return asset && resolve(asset)
     })
   }