Bump build and config

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

.gitignore

@@ -31,11 +31,6 @@
 !/apps/testing
 !/apps/admin_audit
 !/apps/updatenotification
-/apps/updatenotification/build
-#/apps/updatenotification/js/merged.js
-#/apps/updatenotification/js/merged.js.map
-/apps/updatenotification/js/*.hot-update.*
-/apps/updatenotification/node_modules
 !/apps/theming
 !/apps/twofactor_backupcodes
 !/apps/workflowengine
@@ -46,6 +41,9 @@
 /apps/files_external/3rdparty/irodsphp/prods/test*
 /apps/files_external/tests/config.*.php
 
+# apps modules
+/apps/*/node_modules
+
 
 # ignore themes except the example and the README
 /themes/*

apps/oauth2/Makefile

@@ -19,7 +19,7 @@ watch-js:
 
 clean:
 	rm -f js/oauth2.js
-	rm -f js/oauth2.map
+	rm -f js/oauth2.js.map
 
 clean-dev:
 	rm -rf node_modules

apps/oauth2/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth2",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

apps/oauth2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oauth2",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "OAuth2 setup",
   "author": "Roeland Jago Douma <roeland@famdouma.nl>",
   "license": "AGPL-3.0-or-later",
@@ -10,9 +10,9 @@
     "test": "tests"
   },
   "scripts": {
-    "dev": "webpack --config src/webpack.dev.js",
+    "dev": "webpack --config webpack.dev.js",
-    "watch": "webpack --progress --watch --config src/webpack.dev.js",
+    "watch": "webpack --progress --watch --config webpack.dev.js",
-    "build": "webpack --progress --hide-modules --config src/webpack.prod.js",
+    "build": "webpack --progress --hide-modules --config webpack.prod.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {

apps/oauth2/webpack.common.js

@@ -2,9 +2,9 @@ const path = require('path')
 const { VueLoaderPlugin } = require('vue-loader');
 
 module.exports = {
-  entry: path.join(__dirname, 'main.js'),
+  entry: path.join(__dirname, 'src', 'main.js'),
   output: {
-    path: path.resolve(__dirname, '../js'),
+    path: path.resolve(__dirname, './js'),
     publicPath: '/js',
     filename: 'oauth2.js'
   },