Merge pull request #29 from ansidev/feature/update-dependencies

Update dependencies, migrate config, rebuild lib
officert · Jan 23, 2019 · 6ddcf8a · 6ddcf8a
2 parents e27e758 + ecb1890
commit 6ddcf8a
Show file tree

Hide file tree

Showing 14 changed files with 6,809 additions and 13,093 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,10 +1,9 @@
 {
   "presets": [
-    "es2015",
-    "stage-2"
+    ["@babel/env", { "modules": false }]
   ],
   "plugins": [
-    "transform-runtime",
+    "@babel/transform-runtime",
     "add-module-exports"
   ],
   "comments": false

diff --git a/LICENSE.MD → LICENSE b/LICENSE.MD → LICENSE
diff --git a/build/webpack.base.js b/build/webpack.base.js
@@ -1,7 +1,8 @@
-'use strict'
+'use strict';
 
 const options = require('./options');
 const autoprefixer = require('autoprefixer');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
 
 module.exports = {
   resolve: {
@@ -20,21 +21,29 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue-loader',
         options: {
-          loaders: {
-            less: 'vue-style-loader!css-loader!less-loader' // <style lang="less">
-          },
           postcss: [
             autoprefixer({
               browsers: ['last 2 versions', 'ie > 9', 'Firefox ESR']
             })
           ]
         }
       },
+      {
+        test: /\.less$/,
+        use: [
+          'vue-style-loader',
+          'css-loader',
+          'less-loader'
+        ]
+      },
       {
         test: /\.js$/,
         loader: 'babel-loader',
         exclude: /node_modules/
       }
     ]
-  }
+  },
+  plugins: [
+    new VueLoaderPlugin(),
+  ]
 };
diff --git a/build/webpack.dev.js b/build/webpack.dev.js
@@ -1,6 +1,6 @@
-'use strict'
+'use strict';
 
-const merge = require('deep-assign');
+const merge = require('webpack-merge');
 const webpack = require('webpack');
 
 const options = require('./options');
@@ -27,4 +27,12 @@ const config = merge(baseConfig, {
   }
 });
 
+config.module.rules.push({
+  test: /\.css$/,
+  use: [
+    'vue-style-loader',
+    'css-loader'
+  ]
+});
+
 module.exports = config;
diff --git a/build/webpack.dist.js b/build/webpack.dist.js
@@ -1,8 +1,9 @@
 'use strict'
 
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const TerserPlugin = require('terser-webpack-plugin');
 
-const merge = require('deep-assign');
+const merge = require('webpack-merge');
 const webpack = require('webpack');
 
 const options = require('./options');
@@ -20,15 +21,25 @@ const config = merge(baseConfig, {
     path: options.paths.output.main,
     libraryTarget: 'umd'
   },
+  optimization: {
+    minimizer: [
+      new TerserPlugin({
+        terserOptions: {
+          ecma: 6,
+          compress: true,
+          output: {
+            comments: false,
+            beautify: false
+          }
+        }
+      }),
+    ]
+  },
   plugins: [
     new webpack.BannerPlugin({
       banner: options.banner,
       raw: true,
       entryOnly: true
-    }),
-
-    new ExtractTextPlugin({
-      filename: options.isProduction ? 'vue2-slideout-panel.min.css' : 'vue2-slideout-panel.css'
     })
   ]
 });
@@ -41,22 +52,30 @@ config.plugins = config.plugins.concat([
   new webpack.DefinePlugin({
     VERSION: JSON.stringify(options.version)
   })
-])
+]);
 
 if (options.isProduction) {
-  config.plugins = config.plugins.concat([
+  config.plugins.push(
     // Set the production environment
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify('production')
-    }),
-
-    // Minify with dead-code elimination
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
     })
-  ]);
+  );
 }
 
+config.module.rules.push({
+  test: /\.css$/,
+  use: [
+    options.isProduction ? MiniCssExtractPlugin.loader : 'vue-style-loader',
+    'css-loader'
+  ]
+});
+
+config.plugins.push(
+  new MiniCssExtractPlugin({
+    filename: options.isProduction ? 'vue2-slideout-panel.min.css' : 'vue2-slideout-panel.css',
+    disable: !options.isProduction
+  })
+);
+
 module.exports = config;
diff --git a/build/webpack.docs.js b/build/webpack.docs.js
@@ -1,12 +1,13 @@
 'use strict'
 
-const merge = require('deep-assign');
+const merge = require('webpack-merge');
 const webpack = require('webpack');
 
 const options = require('./options');
 const baseConfig = require('./webpack.base.js');
 
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const TerserPlugin = require('terser-webpack-plugin');
 
 const config = merge(baseConfig, {
   entry: options.paths.resolve('docs-src/index.js'),
@@ -16,9 +17,23 @@ const config = merge(baseConfig, {
     path: options.paths.output.docs
   },
 
+  optimization: {
+    minimizer: [
+      new TerserPlugin({
+        terserOptions: {
+          ecma: 6,
+          compress: true,
+          output: {
+            comments: false,
+            beautify: false
+          }
+        }
+      }),
+    ]
+  },
   plugins: [
-    new ExtractTextPlugin({
-      filename: 'docs.css'
+    new MiniCssExtractPlugin({
+      filename: 'docs.css',
     }),
 
     new webpack.LoaderOptionsPlugin({
@@ -29,21 +44,19 @@ const config = merge(baseConfig, {
     new webpack.DefinePlugin({
       'process.env.NODE_ENV': JSON.stringify('production'),
       VERSION: JSON.stringify(options.version)
-    }),
-
-    // Minify with dead-code elimination
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
     })
   ]
 });
 
-
-// First item in module.rules array is Vue
 config.module.rules[0].options.loaders = {
   less: 'vue-style-loader!css-loader!less-loader'
 };
+config.module.rules.push({
+    test: /\.css$/,
+    use: [
+      'vue-style-loader',
+      'css-loader'
+    ]
+});
 
 module.exports = config;