Move to latest webpack-vue-config and global babel config

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

1 files changed, 7 insertions, 4 deletions

diff --git a/webpack.js b/webpack.js
index 410dd18..0bacc9c 100644
--- a/webpack.js
+++ b/webpack.js
@@ -1,13 +1,16 @@
 const webpackConfig = require('@nextcloud/webpack-vue-config')
-const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
+const webpackRules = require('@nextcloud/webpack-vue-config/rules')
 
-const jsRule = webpackConfig.module.rules.findIndex(t => (t.test.toString() === /\.js$/.toString()))
+const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
 
-webpackConfig.module.rules[jsRule].exclude = BabelLoaderExcludeNodeModulesExcept([
+// Edit JS rule
+webpackRules.RULE_JS.exclude = BabelLoaderExcludeNodeModulesExcept([
 	'@juliushaertl/vue-richtext',
 	'@nextcloud/event-bus',
 	'semver',
 ])
 
-// Merge rules by replacing existing tests
+// Replaces rules array
+webpackConfig.module.rules = Object.values(webpackRules)
+
 module.exports = webpackConfig