Merge branch 'release/3.0.0'

[rbdr/serpentity] / config / webpack.js

diff --git a/config/webpack.js b/config/webpack.js
index 793e01131efa2ffb142e95e1d862374581921a3a..b213d0c2381c8b91f10367be76cdffff7e75b335 100644 (file)
--- a/config/webpack.js
+++ b/config/webpack.js
@@ -1,12 +1,10 @@
-'use strict';
-

 const Path = require('path');
 const Webpack = require('webpack');
 
 module.exports = {
   entry: {
 const Path = require('path');
 const Webpack = require('webpack');
 
 module.exports = {
   entry: {

-   serpentity: './lib/serpentity.js',
-   "serpentity.min": './lib/serpentity.js',
+    serpentity: './lib/serpentity.js',
+    'serpentity.min': './lib/serpentity.js'

   },
 
   output: {
   },
 
   output: {


@@ -17,14 +15,11 @@ module.exports = {
   },
 
   module: {
   },
 
   module: {

-    loaders: [
+    rules: [

       {
         test: /\.js$/,
         exclude: /(node_modules|doc)/,
       {
         test: /\.js$/,
         exclude: /(node_modules|doc)/,

-        loader: 'babel-loader',
-        query: {
-          presets: ['es2015']
-        }
+        use: 'babel-loader'

       }
     ]
   },
       }
     ]
   },


@@ -35,16 +30,12 @@ module.exports = {
       Path.resolve(__dirname, '../lib')
     ],
 
       Path.resolve(__dirname, '../lib')
     ],
 

-    extensions: ['.js'],
+    extensions: ['.js']

   },
 
   context: Path.resolve(__dirname, '..'),
 
   },
 
   context: Path.resolve(__dirname, '..'),
 

-  plugins : [
-    new Webpack.optimize.UglifyJsPlugin({
-      include: /\.min\.js$/,
-      minimize: true
-    })
-  ]
+  optimization: {
+    minimize: true
+  }

 };
 };

-