Merge pull request #14232 from nextcloud/enh/updatenoticiation_to_single_webpack

Move updatenotifications to unified webpack

apps/updatenotification/package.json

@@ -1,46 +0,0 @@
-{
-  "name": "notifications",
-  "version": "2.4.0",
-  "description": "This app provides a backend and frontend for the notification API available in Nextcloud.",
-  "main": "init.js",
-  "directories": {
-    "lib": "lib",
-    "test": "tests"
-  },
-  "scripts": {
-    "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",
-    "url": "git+https://github.com/nextcloud/notifications.git"
-  },
-  "author": "Joas Schilling",
-  "license": "AGPL-3.0",
-  "bugs": {
-    "url": "https://github.com/nextcloud/notifications/issues"
-  },
-  "homepage": "https://github.com/nextcloud/notifications#readme",
-  "dependencies": {
-    "nextcloud-vue": "^0.6.3",
-    "v-tooltip": "^2.0.0-rc.33",
-    "vue": "^2.6.4",
-    "vue-click-outside": "^1.0.7"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.2.2",
-    "@babel/preset-env": "^7.3.1",
-    "babel-loader": "^8.0.5",
-    "css-loader": "^2.1.0",
-    "file-loader": "^3.0.1",
-    "node-sass": "^4.11.0",
-    "sass-loader": "^7.1.0",
-    "style-loader": "^0.23.1",
-    "vue-loader": "^15.6.2",
-    "vue-template-compiler": "^2.6.4",
-    "webpack": "^4.29.2",
-    "webpack-cli": "^3.2.3",
-    "webpack-merge": "^4.2.1"
-  }
-}

apps/updatenotification/webpack.dev.js

@@ -1,12 +0,0 @@
-const merge = require('webpack-merge');
-const common = require('./webpack.common.js');
-
-module.exports = merge(common, {
-  mode: 'development',
-  devServer: {
-    historyApiFallback: true,
-    noInfo: true,
-    overlay: true
-  },
-  devtool: '#cheap-source-map',
-})

apps/updatenotification/webpack.prod.js

@@ -1,7 +0,0 @@
-const merge = require('webpack-merge')
-const common = require('./webpack.common.js')
-
-module.exports = merge(common, {
-  mode: 'production',
-  devtool: '#source-map'
-})

package-lock.json

@@ -1872,6 +1872,11 @@
         "supports-color": "^5.3.0"
       }
     },
+    "charenc": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz",
+      "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc="
+    },
     "chokidar": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.0.tgz",
@@ -2198,6 +2203,11 @@
         "which": "^1.2.9"
       }
     },
+    "crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs="
+    },
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
@@ -2887,6 +2897,11 @@
       "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
       "dev": true
     },
+    "fecha": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+      "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
+    },
     "figgy-pudding": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -4592,6 +4607,11 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
+    "lodash.merge": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
+      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ=="
+    },
     "lodash.mergewith": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
@@ -4676,6 +4696,16 @@
       "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.0.tgz",
       "integrity": "sha512-HduzIW2xApSXKXJSpCipSxKyvMbwRRa/TwMbepmlZziKdH8548WSoDP4SxzulEKjlo8BE39l+2fwJZuRKOln6g=="
     },
+    "md5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+      "integrity": "sha1-U6s41f48iJG6RlMp6iP6wFQBJvk=",
+      "requires": {
+        "charenc": "~0.0.1",
+        "crypt": "~0.0.1",
+        "is-buffer": "~1.1.1"
+      }
+    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -4963,6 +4993,20 @@
         "axios": "^0.18.0"
       }
     },
+    "nextcloud-vue": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/nextcloud-vue/-/nextcloud-vue-0.6.3.tgz",
+      "integrity": "sha512-hf46ZRFaMxDTelzhhon+04h9JMkJ5EnV3RDmkXIAz49IRPJYe4nysqBFy/O8omk+ALlr/vMYvOWCsMMcvWNJ3w==",
+      "requires": {
+        "md5": "^2.2.1",
+        "nextcloud-axios": "^0.1.2",
+        "v-tooltip": "^2.0.0-rc.33",
+        "vue": "^2.5.20",
+        "vue-click-outside": "^1.0.7",
+        "vue-multiselect": "^2.1.0",
+        "vue2-datepicker": "^2.6.1"
+      }
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@@ -5531,6 +5575,11 @@
         "find-up": "^3.0.0"
       }
     },
+    "popper.js": {
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.7.tgz",
+      "integrity": "sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ=="
+    },
     "portfinder": {
       "version": "1.0.20",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz",
@@ -7457,6 +7506,16 @@
       "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
       "dev": true
     },
+    "v-tooltip": {
+      "version": "2.0.0-rc.33",
+      "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.0-rc.33.tgz",
+      "integrity": "sha1-ePfY6cNCZWIr5lup3HjGfx3AK3M=",
+      "requires": {
+        "lodash.merge": "^4.6.0",
+        "popper.js": "^1.12.9",
+        "vue-resize": "^0.4.3"
+      }
+    },
     "v8-compile-cache": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz",
@@ -7498,6 +7557,11 @@
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.6.tgz",
       "integrity": "sha512-Y2DdOZD8sxApS+iUlwv1v8U1qN41kq6Kw45lM6nVZKhygeWA49q7VCCXkjXqeDBXgurrKWkYQ9cJeEJwAq0b9Q=="
     },
+    "vue-click-outside": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/vue-click-outside/-/vue-click-outside-1.0.7.tgz",
+      "integrity": "sha1-zdKxYF48SUR4TheU6uShKg9wC9Y="
+    },
     "vue-hot-reload-api": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.2.tgz",
@@ -7517,6 +7581,16 @@
         "vue-style-loader": "^4.1.0"
       }
     },
+    "vue-multiselect": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.3.tgz",
+      "integrity": "sha512-ANLvoLEZv5uzissmh2WSHTn8DGhqsKi6zVtctpf1wnGK6vmZBktQZzeuHGxH7KpIb+4A6BlXmq0RR08jtQ67tg=="
+    },
+    "vue-resize": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
+      "integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="
+    },
     "vue-style-loader": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
@@ -7543,6 +7617,14 @@
       "integrity": "sha512-cliV19VHLJqFUYbz/XeWXe5CO6guzwd0yrrqqp0bmjlMP3ZZULY7fu8RTC4+3lmHwo6ESVDHFDsvjB15hcR5IA==",
       "dev": true
     },
+    "vue2-datepicker": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-2.10.0.tgz",
+      "integrity": "sha512-WGL7ou0TdBiJQuHVp29BtBw3rSkLrIYwXWU/ELmaLdnAerI0EdGVAu7DvZV2iIxY4lsHyjqocApxdvXTmwLrAw==",
+      "requires": {
+        "fecha": "^2.3.3"
+      }
+    },
     "watchpack": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",

package.json

@@ -40,10 +40,13 @@
     "marked": "^0.6.0",
     "moment": "^2.24.0",
     "nextcloud-axios": "^0.1.3",
+    "nextcloud-vue": "^0.6.3",
     "snap.js": "^2.0.9",
     "strengthify": "git+https://github.com/MorrisJobke/strengthify.git",
     "underscore": "^1.9.1",
-    "vue": "^2.6.6"
+    "vue": "^2.6.6",
+    "v-tooltip": "^2.0.0-rc.33",
+    "vue-click-outside": "^1.0.7"
   },
   "devDependencies": {
     "@babel/core": "^7.3.3",

webpack.common.js

@@ -4,6 +4,7 @@ const files_trashbin = require('./apps/files_trashbin/webpack')
 const files_versions = require('./apps/files_versions/webpack');
 const oauth2 = require('./apps/oauth2/webpack')
 const systemtags = require('./apps/systemtags/webpack')
+const updatenotifications = require('./apps/updatenotification/webpack')
 
 module.exports = [].concat(
 	core,
@@ -11,5 +12,6 @@ module.exports = [].concat(
 	files_trashbin,
 	files_versions,
 	oauth2,
-	systemtags
+	systemtags,
+	updatenotifications
 );