Unify vue template design

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

apps/updatenotification/Makefile

@@ -24,8 +24,8 @@ watch-js:
 	npm run watch
 
 clean:
-	rm -f js/merged.js
-	rm -f js/merged.js.map
+	rm -f js/$(app_name).js
+	rm -f js/$(app_name).js.map
 	rm -rf $(build_dir)
 
 clean-dev:

apps/updatenotification/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "notifications",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

apps/updatenotification/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notifications",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "This app provides a backend and frontend for the notification API available in Nextcloud.",
   "main": "init.js",
   "directories": {
@@ -8,9 +8,9 @@
     "test": "tests"
   },
   "scripts": {
-    "dev": "webpack --config js-src/webpack.dev.js",
-    "watch": "webpack --progress --watch --config js-src/webpack.dev.js",
-    "build": "webpack --progress --hide-modules --config js-src/webpack.prod.js"
+    "dev": "webpack --config webpack.dev.js",
+    "watch": "webpack --progress --watch --config webpack.dev.js",
+    "build": "webpack --progress --hide-modules --config webpack.prod.js"
   },
   "repository": {
     "type": "git",

apps/updatenotification/templates/admin.php

@@ -8,7 +8,7 @@ declare(strict_types=1);
  * This file is licensed under the Affero General Public License version 3 or
  * later. See the COPYING file.
  */
-script('updatenotification', 'merged');
+script('updatenotification', 'updatenotification');
 style('updatenotification', 'admin');
 /** @var array $_ */
 ?>

apps/updatenotification/js-src/webpack.common.js → apps/updatenotification/webpack.common.js

@@ -2,11 +2,11 @@ const path = require('path')
 const { VueLoaderPlugin } = require('vue-loader');
 
 module.exports = {
-	entry: './js-src/init.js',
+  entry: path.join(__dirname, 'src', 'init.js'),
   output: {
-		path: path.resolve(__dirname, '../js'),
-		publicPath: '/',
-		filename: 'merged.js'
+    path: path.resolve(__dirname, './js'),
+    publicPath: '/js/',
+    filename: 'updatenotification.js'
   },
   module: {
     rules: [