merge master in prod

2020-09-08 12:00:45 +02:00
parent b925edaa9e
commit 3e5e731c2c
226 changed files with 8516 additions and 4149 deletions
@@ -1,7 +1,7 @@
-var webpack = require('webpack'),
-    path = require('path'),
-    UglifyJsPlugin = require('uglifyjs-webpack-plugin'),
-    isProd = process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'production-wip';
+var webpack = require('webpack');
+var path = require('path');
+var UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+var isProd = process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'production-wip';

 module.exports = {
    entry: {
@@ -57,7 +57,7 @@ module.exports = {
                loader: 'babel-loader',
                exclude: /node_modules/,
                query: {
-                    presets: ['es2015', 'stage-3']
+                    presets: ['@babel/preset-env']
                }
            }
        ]