Update deps

JsSucks · Mar 3, 2019 · 82e9c25 · 82e9c25
1 parent 6167cc7
commit 82e9c25
Show file tree

Hide file tree

Showing 11 changed files with 9,261 additions and 9,816 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,9 +1,12 @@
 {
     "presets": [
-        ["env", {
+        [
+            "@babel/env",
+            {
             "targets": {
                 "node": "6.7.0"
             }
-        }]
+        }
+    ]
     ]
 }
diff --git a/client/webpack.config.js b/client/webpack.config.js
@@ -1,34 +1,38 @@
 const path = require('path');
 const webpack = require('webpack');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
 
 const jsLoader = {
     test: /\.(js|jsx)$/,
     exclude: /node_modules/,
-    loader: 'babel-loader',
-    query: {
-        presets: ['react']
+    use: {
+        loader: 'babel-loader',
+        options: {
+            presets: ['@babel/env', '@babel/react']
+        }
     }
 };
 
 const vueLoader = {
     test: /\.(vue)$/,
-    loader: 'vue-loader'
+    use: 'vue-loader'
 };
 
 const scssLoader = {
     test: /\.scss$/,
     exclude: /node_modules/,
-    loader: ['css-loader', 'sass-loader']
+    use: ['css-loader', 'sass-loader']
 };
 
 module.exports = {
     entry: './src/index.js',
+    mode: 'development',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'betterdiscord.client.js'
     },
     module: {
-        loaders: [jsLoader, vueLoader, scssLoader]
+        rules: [jsLoader, vueLoader, scssLoader]
     },
     externals: {
         electron: 'require("electron")',
@@ -63,6 +67,6 @@ module.exports = {
     },
     plugins: [
         new webpack.NamedModulesPlugin(),
-        new webpack.EvalSourceMapDevToolPlugin()
+        new VueLoaderPlugin()
     ]
 };
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
@@ -1,25 +1,28 @@
 const path = require('path');
 const webpack = require('webpack');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const VueLoaderPlugin = require('vue-loader/lib/plugin')
 
 const jsLoader = {
     test: /\.(js|jsx)$/,
     exclude: /node_modules/,
-    loader: 'babel-loader',
-    query: {
-        presets: ['react']
+    use: {
+        loader: 'babel-loader',
+        options: {
+            presets: ['@babel/env', '@babel/react']
+        }
     }
 };
 
 const vueLoader = {
     test: /\.(vue)$/,
-    loader: 'vue-loader'
+    use: 'vue-loader'
 };
 
 const scssLoader = {
     test: /\.scss$/,
     exclude: /node_modules/,
-    loader: ['css-loader', 'sass-loader']
+    use: ['css-loader', 'sass-loader']
 };
 
 module.exports = {
@@ -29,7 +32,7 @@ module.exports = {
         filename: 'betterdiscord.client-release.js'
     },
     module: {
-        loaders: [jsLoader, vueLoader, scssLoader]
+        rules: [jsLoader, vueLoader, scssLoader]
     },
     externals: {
         electron: 'require("electron")',
@@ -66,6 +69,7 @@ module.exports = {
         new webpack.DefinePlugin({
             PRODUCTION: JSON.stringify(true)
         }),
-        new UglifyJsPlugin()
+        new UglifyJsPlugin(),
+        new VueLoaderPlugin()
     ]
 };
diff --git a/core/.babelrc b/core/.babelrc
@@ -0,0 +1,12 @@
+{
+    "presets": [
+        [
+            "@babel/env",
+            {
+            "targets": {
+                "node": "6.7.0"
+            }
+        }
+    ]
+    ]
+}
diff --git a/csseditor/webpack.config.js b/csseditor/webpack.config.js
@@ -1,25 +1,26 @@
 const path = require('path');
-const webpack = require('webpack');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
 
 const vueLoader = {
     test: /\.(vue)$/,
     exclude: /node_modules/,
-    loader: 'vue-loader'
+    use: 'vue-loader'
 };
 
 const scssLoader = {
     test: /\.(css|scss)$/,
-    loader: ['css-loader', 'sass-loader']
+    use: ['css-loader', 'sass-loader']
 };
 
 module.exports = {
     entry: './src/index.js',
+    mode: 'development',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'csseditor.js'
     },
     module: {
-        loaders: [vueLoader, scssLoader]
+        rules: [vueLoader, scssLoader]
     },
     externals: {
         electron: 'window.require("electron")',
@@ -35,5 +36,8 @@ module.exports = {
             path.resolve('..', 'node_modules'),
             path.resolve('..', 'common', 'modules')
         ]
-    }
+    },
+    plugins: [
+        new VueLoaderPlugin()
+    ]
 };
diff --git a/csseditor/webpack.production.config.js b/csseditor/webpack.production.config.js
@@ -1,16 +1,17 @@
 const path = require('path');
 const webpack = require('webpack');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
 
 const vueLoader = {
     test: /\.(vue)$/,
     exclude: /node_modules/,
-    loader: 'vue-loader'
+    use: 'vue-loader'
 };
 
 const scssLoader = {
     test: /\.(css|scss)$/,
-    loader: ['css-loader', 'sass-loader']
+    use: ['css-loader', 'sass-loader']
 };
 
 module.exports = {
@@ -20,7 +21,7 @@ module.exports = {
         filename: 'csseditor-release.js'
     },
     module: {
-        loaders: [vueLoader, scssLoader]
+        rules: [vueLoader, scssLoader]
     },
     externals: {
         electron: 'window.require("electron")',
@@ -41,6 +42,7 @@ module.exports = {
         new webpack.DefinePlugin({
             PRODUCTION: JSON.stringify(true)
         }),
-        new UglifyJsPlugin()
+        new UglifyJsPlugin(),
+        new VueLoaderPlugin()
     ]
 };
diff --git a/editor/webpack.config.js b/editor/webpack.config.js
@@ -1,25 +1,26 @@
 const path = require('path');
-const webpack = require('webpack');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
 
 const vueLoader = {
     test: /\.(vue)$/,
     exclude: /node_modules/,
-    loader: 'vue-loader'
+    use: 'vue-loader'
 };
 
 const scssLoader = {
     test: /\.(css|scss)$/,
-    loader: ['css-loader', 'sass-loader']
+    use: ['css-loader', 'sass-loader']
 };
 
 module.exports = {
     entry: './src/index.js',
+    mode: 'development',
     output: {
         path: path.resolve(__dirname, 'dist'),
         filename: 'editor.js'
     },
     module: {
-        loaders: [vueLoader, scssLoader]
+        rules: [vueLoader, scssLoader]
     },
     externals: {
         electron: 'window.require("electron")',
@@ -35,5 +36,8 @@ module.exports = {
             path.resolve('..', 'node_modules'),
             path.resolve('..', 'common', 'modules')
         ]
-    }
+    },
+    plugins: [
+        new VueLoaderPlugin()
+    ]
 };
diff --git a/editor/webpack.production.config.js b/editor/webpack.production.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const webpack = require('webpack');
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
 
 const vueLoader = {
     test: /\.(vue)$/,
@@ -38,6 +39,7 @@ module.exports = {
         ]
     },
     plugins: [
-        new UglifyJsPlugin()
+        new UglifyJsPlugin(),
+        new VueLoaderPlugin()
     ]
 };
diff --git a/installer/webpack.config.js b/installer/webpack.config.js
@@ -1,17 +1,18 @@
 const
     path = require('path'),
     webpack = require('webpack'),
-    HtmlWebpackPlugin = require('html-webpack-plugin');
+    HtmlWebpackPlugin = require('html-webpack-plugin'),
+    VueLoaderPlugin = require('vue-loader/lib/plugin');
 
 const vueLoader = {
     test: /\.(vue)$/,
     exclude: /node_modules/,
-    loader: 'vue-loader'
+    use: 'vue-loader'
 };
 
 const scssLoader = {
     test: /\.(css|scss)$/,
-    loader: ['css-loader', 'sass-loader']
+    use: ['css-loader', 'sass-loader']
 };
 
 module.exports = {
@@ -21,7 +22,7 @@ module.exports = {
         filename: 'installer.js'
     },
     module: {
-        loaders: [vueLoader, scssLoader]
+        rules: [vueLoader, scssLoader]
     },
     resolve: {
         alias: {
@@ -31,6 +32,7 @@ module.exports = {
     plugins: [
         new HtmlWebpackPlugin({
             template: './src/index.html'
-        })
+        }),
+        new VueLoaderPlugin()
     ]
 };