@dcloudio/vue-cli-plugin-hbuilderx 2.0.2-alpha-4020520240731002 → 2.0.2-alpha-4020520240731003

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.2-alpha-4020520240731002",
+  "version": "2.0.2-alpha-4020520240731003",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "040a3d5ab3be23eb01793f17e9e20b774ac5b536"
+  "gitHead": "d5530492c32ba9127c340ed282452e5ca5509590"
 }

package/packages/webpack-app-plus-plugin/index.js

@@ -7,7 +7,9 @@ const {
   done
 } = require('@vue/cli-shared-utils')
 
-const { showRunPrompt } = require('@dcloudio/uni-cli-shared')
+const {
+  showRunPrompt
+} = require('@dcloudio/uni-cli-shared')
 
 let nvueCompiled = true
 let serviceCompiled = true
@@ -25,11 +27,26 @@ class WebpackAppPlusPlugin {
     if (process.env.UNI_USING_V3) {
       const chunkVersions = {}
 
-      const entry = compiler.options.entry()
-      const isAppService = !!entry['app-service']
-      const isAppView = !!entry['app-view']
+      let isAppService = false
+      let isAppView = false
+      let isAppNVue = false
 
-      const isAppNVue = !isAppService && !isAppView
+      const entry = compiler.options.entry()
+      // 兼容webpack5
+      if (entry instanceof Promise) {
+        compiler.hooks.beforeRun.tapAsync('EntryListPlugin', (compilation, callback) => {
+          entry.then(entry => {
+            isAppService = !!entry['app-service']
+            isAppView = !!entry['app-view']
+            isAppNVue = !isAppService && !isAppView
+            callback()
+          }).catch(callback)
+        })
+      } else {
+        isAppService = !!entry['app-service']
+        isAppView = !!entry['app-view']
+        isAppNVue = !isAppService && !isAppView
+      }
 
       compiler.hooks.invalid.tap('WebpackAppPlusPlugin', (fileName, changeTime) => {
         if (!compiling) {