Simplify build files
Former-commit-id: a0a4589357862c2bd083e9f84cc234ef9ecdf2b6 [formerly ee8797966d10488dd8375fca7f682c80e5f21ef1] [formerly 116a13d907cea4a53448fbcd3e075aa8890b423f [formerly 9adada30674717ca76431dea10501606b38ab46f]] Former-commit-id: 9993fa98d9ea12dac215eb90f9550682118c6728 [formerly da641e3ed83bb471d31c95f2a324fd05901b33a8] Former-commit-id: 1322b5880b009ec6ade22255dec3d145f480209e
This commit is contained in:
		
							parent
							
								
									c3c6c8f3d6
								
							
						
					
					
						commit
						1f1b47f77e
					
				| 
						 | 
				
			
			@ -7,7 +7,7 @@ var rm = require('rimraf')
 | 
			
		|||
var path = require('path')
 | 
			
		||||
var chalk = require('chalk')
 | 
			
		||||
var webpack = require('webpack')
 | 
			
		||||
var config = require('../config')
 | 
			
		||||
var config = require('./config')
 | 
			
		||||
var webpackConfig = require('./webpack.prod.conf')
 | 
			
		||||
 | 
			
		||||
var spinner = ora('building for production...')
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -3,7 +3,9 @@ var path = require('path')
 | 
			
		|||
 | 
			
		||||
module.exports = {
 | 
			
		||||
  build: {
 | 
			
		||||
    env: require('./prod.env'),
 | 
			
		||||
    env: {
 | 
			
		||||
      NODE_ENV: '"production"'
 | 
			
		||||
    },
 | 
			
		||||
    index: path.resolve(__dirname, '../dist/index.html'),
 | 
			
		||||
    assetsRoot: path.resolve(__dirname, '../dist'),
 | 
			
		||||
    assetsSubDirectory: 'static',
 | 
			
		||||
| 
						 | 
				
			
			@ -22,7 +24,9 @@ module.exports = {
 | 
			
		|||
    bundleAnalyzerReport: process.env.npm_config_report
 | 
			
		||||
  },
 | 
			
		||||
  dev: {
 | 
			
		||||
    env: require('./dev.env'),
 | 
			
		||||
    env: {
 | 
			
		||||
      NODE_ENV: '"development"'
 | 
			
		||||
    },
 | 
			
		||||
    index: path.resolve(__dirname, '../dist_dev/templates/index.html'),
 | 
			
		||||
    assetsRoot: path.resolve(__dirname, '../dist_dev/'),
 | 
			
		||||
    assetsSubDirectory: '_',
 | 
			
		||||
| 
						 | 
				
			
			@ -6,7 +6,7 @@ var rm = require('rimraf')
 | 
			
		|||
var path = require('path')
 | 
			
		||||
var chalk = require('chalk')
 | 
			
		||||
var webpack = require('webpack')
 | 
			
		||||
var config = require('../config')
 | 
			
		||||
var config = require('./config')
 | 
			
		||||
var webpackConfig = require('./webpack.dev.conf')
 | 
			
		||||
 | 
			
		||||
rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
var path = require('path')
 | 
			
		||||
var config = require('../config')
 | 
			
		||||
var config = require('./config')
 | 
			
		||||
var ExtractTextPlugin = require('extract-text-webpack-plugin')
 | 
			
		||||
 | 
			
		||||
exports.assetsPath = function (_path) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
var utils = require('./utils')
 | 
			
		||||
var config = require('../config')
 | 
			
		||||
var config = require('./config')
 | 
			
		||||
var isProduction = process.env.NODE_ENV === 'production'
 | 
			
		||||
 | 
			
		||||
module.exports = {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,6 @@
 | 
			
		|||
var path = require('path')
 | 
			
		||||
var utils = require('./utils')
 | 
			
		||||
var config = require('../config')
 | 
			
		||||
var config = require('./config')
 | 
			
		||||
var vueLoaderConfig = require('./vue-loader.conf')
 | 
			
		||||
 | 
			
		||||
function resolve (dir) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@ var fs = require('fs')
 | 
			
		|||
var path = require('path')
 | 
			
		||||
var utils = require('./utils')
 | 
			
		||||
var webpack = require('webpack')
 | 
			
		||||
var config = require('../config')
 | 
			
		||||
var config = require('./config')
 | 
			
		||||
var merge = require('webpack-merge')
 | 
			
		||||
var baseWebpackConfig = require('./webpack.base.conf')
 | 
			
		||||
var CopyWebpackPlugin = require('copy-webpack-plugin')
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +0,0 @@
 | 
			
		|||
var merge = require('webpack-merge')
 | 
			
		||||
var prodEnv = require('./prod.env')
 | 
			
		||||
 | 
			
		||||
module.exports = merge(prodEnv, {
 | 
			
		||||
  NODE_ENV: '"development"'
 | 
			
		||||
})
 | 
			
		||||
| 
						 | 
				
			
			@ -1,3 +0,0 @@
 | 
			
		|||
module.exports = {
 | 
			
		||||
  NODE_ENV: '"production"'
 | 
			
		||||
}
 | 
			
		||||
		Loading…
	
		Reference in New Issue