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 f26142d607616fd5afcf31b3a9bee4d30a143d21..88d7b26592d98eea3591f005cac4eaf3ee06042f 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 = {}