Migrate to npm 7

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

1 files changed, 4 insertions, 9 deletions

diff --git a/webpack.common.js b/webpack.common.js
index 5c067b3e8bf..b140eef8960 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -1,9 +1,11 @@
 /* eslint-disable camelcase */
 const { merge } = require('webpack-merge')
 const { VueLoaderPlugin } = require('vue-loader')
-const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
 const path = require('path')
 
+const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
+const ESLintPlugin = require('eslint-webpack-plugin')
+
 const accessibility = require('./apps/accessibility/webpack')
 const comments = require('./apps/comments/webpack')
 const core = require('./core/webpack')
@@ -69,13 +71,6 @@ module.exports = []
 					use: ['style-loader', 'css-loader', 'sass-loader'],
 				},
 				{
-					test: /\.(js|vue)$/,
-					loader: 'eslint-loader',
-					// no checks against vendors, modules or handlebar compiled files
-					exclude: /node_modules|vendor|templates\.js/,
-					enforce: 'pre',
-				},
-				{
 					test: /\.vue$/,
 					loader: 'vue-loader',
 					exclude: BabelLoaderExcludeNodeModulesExcept([
@@ -123,7 +118,7 @@ module.exports = []
 
 			],
 		},
-		plugins: [new VueLoaderPlugin()],
+		plugins: [new VueLoaderPlugin(), new ESLintPlugin()],
 		resolve: {
 			alias: {
 				OC: path.resolve(__dirname, './core/src/OC'),