From 047c6211aff6a1096fb39c345621c412699d75b0 Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Thu, 9 Jul 2020 17:24:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BA=AF=20nvue=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B7=B7=E6=B7=86=E5=90=8E=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/platforms/app-plus/index.js           | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
index f26142d60..88d7b2659 100644
--- a/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
+++ b/packages/webpack-uni-pages-loader/lib/platforms/app-plus/index.js
@@ -179,8 +179,8 @@ module.exports = function (pagesJson, userManifestJson) {
   if (!manifestJson.permissions) {
     manifestJson.permissions = {}
   }
-
-  const nvuePages = pagesJson.nvue && pagesJson.nvue.pages
+
+  const nvuePages = process.env.UNI_USING_V3_NATIVE ? pagesJson.pages : (pagesJson.nvue && pagesJson.nvue.pages)
 
   if (nvuePages && nvuePages.length) {
     const pages = {}
@@ -197,10 +197,13 @@ module.exports = function (pagesJson, userManifestJson) {
     appJson.nvue = {
       pages
     }
+
+    if (process.env.UNI_USING_V3_NATIVE) {
+      appJson.nvue.entryPagePath = nvuePages[0]
+    } else if (pagesJson.nvue.entryPagePath) {
+      appJson.nvue.entryPagePath = pagesJson.nvue.entryPagePath
+    }
 
-    if (pagesJson.nvue.entryPagePath) {
-      appJson.nvue.entryPagePath = pagesJson.nvue.entryPagePath
-    }
     // nvue 权限
     manifestJson.permissions.UniNView = {
       description: 'UniNView原生渲染'
@@ -344,9 +347,10 @@ module.exports = function (pagesJson, userManifestJson) {
         resources[key.replace(/\.nvue$/, '.js')] = confusion.resources[key]
       }
       if (!Object.keys(nvuePages).find(path => {
-        const subNVues = nvuePages[path].window.subNVues || []
-        return path.replace(/\.html$/, '.nvue') === key || subNVues.find(({
-          path
+        const subNVues = nvuePages[path].window.subNVues || []
+        // TODO
+        return (path.replace(/\.html$/, '.nvue') === key || path.replace(/\.html$/, '.nvue') + '.nvue' === key) || subNVues.find(({
+          path
         }) => path === key.replace(/\.nvue$/, ''))
       }) && !pagesJson.pages.find(({
         style = {}
-- 
GitLab