From 71312b81df5e4baa382f1577621e4b30b7649731 Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Fri, 11 Jun 2021 17:57:34 +0800
Subject: [PATCH] fix: outDir

---
 packages/vite-plugin-uni/src/cli/index.ts | 12 ++++++---
 packages/vite-plugin-uni/src/cli/utils.ts | 32 ++++++++++++++++++-----
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/packages/vite-plugin-uni/src/cli/index.ts b/packages/vite-plugin-uni/src/cli/index.ts
index f59ecd216..143ec19bf 100644
--- a/packages/vite-plugin-uni/src/cli/index.ts
+++ b/packages/vite-plugin-uni/src/cli/index.ts
@@ -38,7 +38,7 @@ cli
 
 cli
   .command('')
-  .alias('serve')
+  .alias('dev')
   .option('--host [host]', `[string] specify hostname`)
   .option('--port <port>', `[number] specify port`)
   .option('--https', `[boolean] use TLS + HTTP/2`)
@@ -50,7 +50,7 @@ cli
     `[boolean] force the optimizer to ignore the cache and re-bundle`
   )
   .action(async (options: CliOptions & ServerOptions) => {
-    initEnv(options)
+    initEnv('dev', options)
     try {
       await (options.ssr ? createSSRServer(options) : createServer(options))
     } catch (e) {
@@ -81,16 +81,20 @@ cli
   .option('--ssrManifest', `[boolean] emit ssr manifest json`)
   .option(
     '--emptyOutDir',
-    `[boolean] force empty outDir when it's outside of root`
+    `[boolean] force empty outDir when it's outside of root`,
+    {
+      default: true,
+    }
   )
   .option('-m, --mode <mode>', `[string] set env mode`)
   .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
   .action(async (options: CliOptions & BuildOptions) => {
-    initEnv(options)
+    initEnv('build', options)
     try {
       await (options.ssr && options.platform === 'h5'
         ? buildSSR(options)
         : build(options))
+      console.log(` DONE  Build complete.`)
     } catch (e) {
       createLogger(options.logLevel).error(
         chalk.red(`error during build:\n${e.stack}`)
diff --git a/packages/vite-plugin-uni/src/cli/utils.ts b/packages/vite-plugin-uni/src/cli/utils.ts
index 806281309..a5767a26b 100644
--- a/packages/vite-plugin-uni/src/cli/utils.ts
+++ b/packages/vite-plugin-uni/src/cli/utils.ts
@@ -14,20 +14,38 @@ export const PLATFORMS = [
   'quickapp-webview-union',
 ]
 
-export function initEnv(options: CliOptions) {
+export function initEnv(type: 'dev' | 'build', options: CliOptions) {
+  if (type === 'dev') {
+    process.env.NODE_ENV = 'development'
+  } else if (type === 'build') {
+    if ((options as BuildOptions).watch) {
+      process.env.NODE_ENV = 'development'
+    } else {
+      process.env.NODE_ENV = 'production'
+    }
+  }
+
   process.env.UNI_CLI_CONTEXT = process.cwd() // TODO HBuilderX
 
+  process.env.UNI_PLATFORM = options.platform as UniApp.PLATFORM
+
   process.env.VITE_ROOT_DIR = process.env.UNI_INPUT_DIR || process.cwd()
 
   process.env.UNI_INPUT_DIR =
     process.env.UNI_INPUT_DIR || path.resolve(process.cwd(), 'src')
 
-  process.env.UNI_OUTPUT_DIR =
-    (options as BuildOptions).outDir ||
-    process.env.UNI_OUTPUT_DIR ||
-    path.resolve(process.cwd(), 'dist')
-
-  process.env.UNI_PLATFORM = options.platform as UniApp.PLATFORM
+  if (process.env.UNI_OUTPUT_DIR) {
+    ;(options as BuildOptions).outDir = process.env.UNI_OUTPUT_DIR
+  } else {
+    if (!(options as BuildOptions).outDir) {
+      ;(options as BuildOptions).outDir = path.join(
+        'dist',
+        process.env.NODE_ENV === 'production' ? 'build' : 'dev',
+        process.env.UNI_PLATFORM
+      )
+    }
+    process.env.UNI_OUTPUT_DIR = (options as BuildOptions).outDir!
+  }
 }
 
 export function cleanOptions(options: CliOptions) {
-- 
GitLab