other / mew-iview

Commit 8ccaa6e9d2d5f4c3e54074d480e73847c73e2270

Authored by Aresn
Committed by GitHub
2 parents faee0fc8 676cdf84

Merge pull request #375 from huixisheng/2.0 

fixed webpack build error
Showing 3 changed files with 8 additions and 6 deletions   Show diff stats
Inline Side-by-side
build/webpack.base.config.js
  Show/Hide comments   View file @8ccaa6e
@@ -62,7 +62,7 @@ module.exports = { @@ -62,7 +62,7 @@ module.exports = {
62 extensions: ['.js', '.vue'], 62 extensions: ['.js', '.vue'],
63 alias: { 63 alias: {
64 'vue': 'vue/dist/vue.esm.js', 64 'vue': 'vue/dist/vue.esm.js',
65 - '@': resolve('src'), 65 + '@': resolve('src')
66 } 66 }
67 } 67 }
68 }; 68 };
build/webpack.dist.dev.config.js
  Show/Hide comments   View file @8ccaa6e
@@ -3,6 +3,8 @@ var webpack = require('webpack'); @@ -3,6 +3,8 @@ var webpack = require('webpack');
3 var merge = require('webpack-merge') 3 var merge = require('webpack-merge')
4 var webpackBaseConfig = require('./webpack.base.config.js'); 4 var webpackBaseConfig = require('./webpack.base.config.js');
5 5
  6 +process.env.NODE_ENV = 'production'
  7 +
6 module.exports = merge(webpackBaseConfig, { 8 module.exports = merge(webpackBaseConfig, {
7 entry: { 9 entry: {
8 main: './src/index.js' 10 main: './src/index.js'
@@ -24,9 +26,10 @@ module.exports = merge(webpackBaseConfig, { @@ -24,9 +26,10 @@ module.exports = merge(webpackBaseConfig, {
24 } 26 }
25 }, 27 },
26 plugins: [ 28 plugins: [
  29 + // @todo
27 new webpack.DefinePlugin({ 30 new webpack.DefinePlugin({
28 'process.env': { 31 'process.env': {
29 - NODE_ENV: '"development"' 32 + NODE_ENV: '"production"'
30 } 33 }
31 }) 34 })
32 ] 35 ]
build/webpack.dist.prod.config.js
  Show/Hide comments   View file @8ccaa6e
@@ -3,7 +3,7 @@ var webpack = require('webpack'); @@ -3,7 +3,7 @@ var webpack = require('webpack');
3 var merge = require('webpack-merge') 3 var merge = require('webpack-merge')
4 var webpackBaseConfig = require('./webpack.base.config.js'); 4 var webpackBaseConfig = require('./webpack.base.config.js');
5 5
6 - 6 +process.env.NODE_ENV = 'production';
7 7
8 module.exports = merge(webpackBaseConfig, { 8 module.exports = merge(webpackBaseConfig, {
9 entry: { 9 entry: {
@@ -26,10 +26,9 @@ module.exports = merge(webpackBaseConfig, { @@ -26,10 +26,9 @@ module.exports = merge(webpackBaseConfig, {
26 } 26 }
27 }, 27 },
28 plugins: [ 28 plugins: [
  29 + // @todo
29 new webpack.DefinePlugin({ 30 new webpack.DefinePlugin({
30 - 'process.env': {  
31 - NODE_ENV: '"production"'  
32 - } 31 + 'process.env.NODE_ENV': '"production"'
33 }), 32 }),
34 new webpack.optimize.UglifyJsPlugin({ 33 new webpack.optimize.UglifyJsPlugin({
35 compress: { 34 compress: {