修改config

mengxiong10 · mengxiong10 · commit ec05fc591d16 · 2018-01-17T14:06:21.000+08:00
diff --git a/dist/build.js b/dist/build.js
diff --git a/index.html b/index.html
@@ -6,6 +6,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script src="dist/build.js"></script>
+    <script src="demo/build.js"></script>
   </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,10 +2,11 @@
   "name": "vue2-datepicker",
   "description": "A Datepicker Component For Vue2",
   "main": "dist/build.js",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "scripts": {
     "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
-    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules"
+    "demo": "cross-env NODE_ENV=production webpack --progress --hide-modules --config webpack.demo.config.js",
+    "build": "cross-env NODE_ENV=production webpack --progress --hide-modules --config webpack.build.config.js"
   },
   "repository": {
     "type": "git",
@@ -49,6 +50,7 @@
     "vue-loader": "^13.0.5",
     "vue-template-compiler": "^2.2.1",
     "webpack": "^2.2.0",
-    "webpack-dev-server": "^2.2.0"
+    "webpack-dev-server": "^2.2.0",
+    "webpack-merge": "^4.1.1"
   }
 }
diff --git a/webpack.build.config.js b/webpack.build.config.js
@@ -0,0 +1,34 @@
+const path = require('path')
+const merge = require('webpack-merge')
+const baseWebpackConfig = require('./webpack.config.js')
+const webpack = require('webpack')
+
+const webpackConfig = merge(baseWebpackConfig, {
+  entry: './index.js',
+  output: {
+    path: path.resolve(__dirname, './dist'),
+    publicPath: '/dist/',
+    filename: 'build.js',
+    library: "DatePicker",
+    libraryTarget: "umd"
+  },
+  devtool: 'source-map',
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      sourceMap: false,
+      compress: {
+        warnings: false
+      }
+    }),
+    new webpack.LoaderOptionsPlugin({
+      minimize: true
+    })
+  ]
+})
+
+module.exports = webpackConfig
diff --git a/webpack.config.js b/webpack.config.js
@@ -4,11 +4,9 @@ var webpack = require('webpack')
 module.exports = {
   entry: './demo/main.js',
   output: {
-    path: path.resolve(__dirname, './dist'),
-    publicPath: '/dist/',
-    filename: 'build.js',
-    library: "DatePicker",
-    libraryTarget: "umd"
+    path: path.resolve(__dirname, './demo'),
+    publicPath: '/demo/',
+    filename: 'build.js'
   },
   module: {
     rules: [
@@ -35,11 +33,6 @@ module.exports = {
       }
     ]
   },
-  resolve: {
-    alias: {
-      // 'vue$': 'vue/dist/vue.esm.js'
-    }
-  },
   devServer: {
     historyApiFallback: true,
     noInfo: true,
@@ -50,25 +43,3 @@ module.exports = {
   },
   devtool: '#eval-source-map'
 }
-
-if (process.env.NODE_ENV === 'production') {
-  module.exports.entry = './index.js'
-  module.exports.devtool = '#source-map'
-  // http://vue-loader.vuejs.org/en/workflow/production.html
-  module.exports.plugins = (module.exports.plugins || []).concat([
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"production"'
-      }
-    }),
-    new webpack.optimize.UglifyJsPlugin({
-      sourceMap: false,
-      compress: {
-        warnings: false
-      }
-    }),
-    new webpack.LoaderOptionsPlugin({
-      minimize: true
-    })
-  ])
-}
diff --git a/webpack.demo.config.js b/webpack.demo.config.js
@@ -0,0 +1,25 @@
+const merge = require('webpack-merge')
+const baseWebpackConfig = require('./webpack.config.js')
+const webpack = require('webpack')
+
+const webpackConfig = merge(baseWebpackConfig, {
+  devtool: 'source-map',
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: '"production"'
+      }
+    }),
+    new webpack.optimize.UglifyJsPlugin({
+      sourceMap: false,
+      compress: {
+        warnings: false
+      }
+    }),
+    new webpack.LoaderOptionsPlugin({
+      minimize: true
+    })
+  ]
+})
+
+module.exports = webpackConfig
