fix: set NODE_ENV for build

fix #1445, fix #1452
vitejs · Jan 9, 2021 · d7ceabe · d7ceabe
1 parent dce2456
commit d7ceabe
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/packages/playground/vue/Main.vue b/packages/playground/vue/Main.vue
@@ -1,4 +1,5 @@
 <template>
+  <div class="comments"><!--hello--></div>
   <h1>Vue SFCs</h1>
   <pre>{{ time }}</pre>
   <Hmr />

diff --git a/packages/playground/vue/__tests__/vue.spec.ts b/packages/playground/vue/__tests__/vue.spec.ts
@@ -14,6 +14,10 @@ test('template/script latest syntax support', async () => {
   expect(await page.textContent('.syntax')).toBe('baz')
 })
 
+test('should remove comments in prod', async () => {
+  expect(await page.innerHTML('.comments')).toBe(isBuild ? `` : `<!--hello-->`)
+})
+
 describe('pre-processors', () => {
   test('pug', async () => {
     expect(await page.textContent('p.pug')).toMatch(

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
@@ -129,7 +129,15 @@ export async function resolveConfig(
   defaultMode = 'development'
 ): Promise<ResolvedConfig> {
   let config = inlineConfig
-  let mode = defaultMode
+  let mode = inlineConfig.mode || defaultMode
+
+  // some dependencies e.g. @vue/compiler-* relies on NODE_ENV for getting
+  // production-specific behavior, so set it here even though we haven't
+  // resolve the final mode yet
+  if (mode === 'production') {
+    process.env.NODE_ENV = 'production'
+  }
+
   let { configFile } = config
   if (configFile !== false) {
     const loadResult = await loadConfigFromFile(
@@ -185,8 +193,12 @@ export async function resolveConfig(
   // Note it is possible for user to have a custom mode, e.g. `staging` where
   // production-like behavior is expected. This is indicated by NODE_ENV=production
   // loaded from `.staging.env` and set by us as VITE_USER_NODE_ENV
-  const resolvedMode = process.env.VITE_USER_NODE_ENV || mode
-  const isProduction = resolvedMode === 'production'
+  const isProduction = (process.env.VITE_USER_NODE_ENV || mode) === 'production'
+  if (isProduction) {
+    // in case default mode was not production and is overwritten
+    process.env.NODE_ENV = 'production'
+  }
+
   const resolvedBuildOptions = resolveBuildOptions(config.build)
 
   // resolve optimizer cache directory

diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
@@ -6,17 +6,11 @@ import { OutputBundle, OutputChunk } from 'rollup'
 import { cleanUrl, isExternalUrl, isDataUrl, generateCodeFrame } from '../utils'
 import { ResolvedConfig } from '../config'
 import slash from 'slash'
-import {
-  AttributeNode,
-  NodeTransform,
-  NodeTypes,
-  parse,
-  transform
-} from '@vue/compiler-dom'
 import MagicString from 'magic-string'
 import { checkPublicFile, assetUrlRE, urlToBuiltUrl } from './asset'
 import { isCSSRequest, chunkToEmittedCssFileMap } from './css'
 import { polyfillId } from './dynamicImportPolyfill'
+import { AttributeNode, NodeTransform, NodeTypes } from '@vue/compiler-dom'
 
 const htmlProxyRE = /\?html-proxy&index=(\d+)\.js$/
 export const isHTMLProxy = (id: string) => htmlProxyRE.test(id)
@@ -95,11 +89,13 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
           return e
         }
 
+        // lazy load compiler-dom
+        const { parse, transform } = await import('@vue/compiler-dom')
         // @vue/compiler-core doesn't like lowercase doctypes
         html = html.replace(/<!doctype\s/i, '<!DOCTYPE ')
         let ast
         try {
-          ast = parse(html)
+          ast = parse(html, { comments: true })
         } catch (e) {
           this.error(formatError(e))
         }