From 379d02cc4760d5ab908f5f0cfec4ceea2136a50f Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Mon, 14 Feb 2022 18:53:48 +0800
Subject: [PATCH] wip(app): nvue

---
 packages/uni-app-vite/src/nvue/index.ts             | 9 +++++----
 packages/uni-app-vite/src/nvue/plugins/esbuild.ts   | 4 +++-
 packages/uni-app-vite/src/nvue/plugins/mainJs.ts    | 8 +++-----
 packages/uni-app-vite/src/nvue/plugins/pagesJson.ts | 8 ++------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/packages/uni-app-vite/src/nvue/index.ts b/packages/uni-app-vite/src/nvue/index.ts
index 2344ddeb5..02848134e 100644
--- a/packages/uni-app-vite/src/nvue/index.ts
+++ b/packages/uni-app-vite/src/nvue/index.ts
@@ -18,16 +18,17 @@ export { initNVueNodeTransforms } from './plugin'
 
 export function initNVuePlugins() {
   const renderer = process.env.UNI_RENDERER
+  const app = process.env.UNI_COMPILER_NVUE === 'app'
   return [
     uniAppCssPlugin(),
     uniEasycomPlugin({ exclude: UNI_EASYCOM_EXCLUDE }),
     uniHBuilderXConsolePlugin(),
-    uniMainJsPlugin({ renderer }),
-    ...(process.env.UNI_RENDERER === 'native' ? [uniManifestJsonPlugin()] : []),
-    uniPagesJsonPlugin({ renderer }),
+    uniMainJsPlugin({ app }),
+    ...(app ? [uniManifestJsonPlugin()] : []),
+    uniPagesJsonPlugin({ app }),
     uniViteInjectPlugin('uni:app-inject', initAppProvide()),
     uniStatsPlugin(),
     uniAppNVuePlugin(),
-    uniEsbuildPlugin({ renderer }),
+    uniEsbuildPlugin({ renderer, app }),
   ]
 }
diff --git a/packages/uni-app-vite/src/nvue/plugins/esbuild.ts b/packages/uni-app-vite/src/nvue/plugins/esbuild.ts
index 78ea61261..b33bcf845 100644
--- a/packages/uni-app-vite/src/nvue/plugins/esbuild.ts
+++ b/packages/uni-app-vite/src/nvue/plugins/esbuild.ts
@@ -18,8 +18,10 @@ const debugEsbuild = debug('uni:app-nvue-esbuild')
 
 export function uniEsbuildPlugin({
   renderer,
+  app,
 }: {
   renderer?: 'native'
+  app: boolean
 }): Plugin {
   let buildOptions: BuildOptions
   const outputDir = process.env.UNI_OUTPUT_DIR
@@ -50,7 +52,7 @@ export function uniEsbuildPlugin({
           entryPoints.push(name)
         }
       })
-      if (renderer === 'native') {
+      if (app) {
         debugEsbuild('start', APP_SERVICE_FILENAME)
         await buildNVueAppService(buildOptions).then((code) => {
           return fs.outputFile(
diff --git a/packages/uni-app-vite/src/nvue/plugins/mainJs.ts b/packages/uni-app-vite/src/nvue/plugins/mainJs.ts
index 62535dd5b..559d85dd3 100644
--- a/packages/uni-app-vite/src/nvue/plugins/mainJs.ts
+++ b/packages/uni-app-vite/src/nvue/plugins/mainJs.ts
@@ -1,21 +1,19 @@
 import { defineUniMainJsPlugin, PAGES_JSON_JS } from '@dcloudio/uni-cli-shared'
 import { APP_CSS_JS } from './appCss'
 
-export function uniMainJsPlugin({ renderer }: { renderer?: 'native' }) {
+export function uniMainJsPlugin({ app }: { app: boolean }) {
   return defineUniMainJsPlugin((opts) => {
     return {
       name: 'uni:app-nvue-main-js',
       enforce: 'pre',
       transform(code, id) {
         if (opts.filter(id)) {
-          if (renderer === 'native') {
+          if (app) {
             code = code.includes('createSSRApp')
               ? createApp(code)
               : createLegacyApp(code)
             return {
-              code:
-                `import './${PAGES_JSON_JS}';import('${APP_CSS_JS}').then(()=>{});` +
-                code,
+              code,
               map: { mappings: '' },
             }
           }
diff --git a/packages/uni-app-vite/src/nvue/plugins/pagesJson.ts b/packages/uni-app-vite/src/nvue/plugins/pagesJson.ts
index 8f4e20571..54062f534 100644
--- a/packages/uni-app-vite/src/nvue/plugins/pagesJson.ts
+++ b/packages/uni-app-vite/src/nvue/plugins/pagesJson.ts
@@ -11,11 +11,7 @@ import {
   MANIFEST_JSON_JS,
 } from '@dcloudio/uni-cli-shared'
 
-export function uniPagesJsonPlugin({
-  renderer,
-}: {
-  renderer?: 'native'
-}): Plugin {
+export function uniPagesJsonPlugin({ app }: { app: boolean }): Plugin {
   return defineUniPagesJsonPlugin((opts) => {
     return {
       name: 'uni:app-nvue-pages-json',
@@ -38,7 +34,7 @@ export function uniPagesJsonPlugin({
             )
           }
         })
-        if (renderer === 'native') {
+        if (app) {
           this.emitFile({
             fileName: `app-config-service.js`,
             type: 'asset',
-- 
GitLab