Merge pull request #692 from nextcloud/dependabot/npm_and_yarn/eslint-plugin-node-8.0.0

4 files changed, 112 insertions, 24 deletions

diff --git a/.eslintrc.js b/.eslintrc.js
index 91e6cb09..6c62cc72 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -15,7 +15,8 @@ module.exports = {
 		VueRouter: true
 	},
 	parserOptions: {
-		parser: 'babel-eslint'
+		parser: 'babel-eslint',
+		ecmaVersion: 6
 	},
 	extends: [
 		'eslint:recommended',
@@ -42,8 +43,6 @@ module.exports = {
 		'no-console': ['error', { allow: ['error', 'warn', 'debug'] }],
 		// classes blocks
 		'padded-blocks': ['error', { classes: 'always' }],
-		// always add a trailing comma, for diff readability
-		'comma-dangle': ["error", "only-multiline"],
 		// always have the operator in front
 		'operator-linebreak': ['error', 'before'],
 		// ternary on multiline
@@ -58,9 +57,11 @@ module.exports = {
 		}],
 		// es6 import/export and require
 		'node/no-unpublished-require': ['off'],
-		'node/no-unsupported-features': ['off'],
+		'node/no-unsupported-features/es-syntax': ['off'],
 		// space before self-closing elements
 		'vue/html-closing-bracket-spacing': 'error',
+		// no ending html tag on a new line
+		'vue/html-closing-bracket-newline': ['error', { multiline: 'never' }],
 		// code spacing with attributes
 		'vue/max-attributes-per-line': [
 			'error',
@@ -73,4 +74,4 @@ module.exports = {
 			}
 		]
 	}
-};
+}
diff --git a/package-lock.json b/package-lock.json
index 3fe0b5e3..eca8dace 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4017,7 +4017,17 @@
 			"version": "github:nextcloud/cdav-library#60dd32e46ae9c7753792b2056aaf3f79ad9022cb",
 			"from": "github:nextcloud/cdav-library#60dd32e46ae9c7753792b2056aaf3f79ad9022cb",
 			"requires": {
-				"@babel/polyfill": "^7.0.0"
+				"@babel/polyfill": "^7.0.0",
+				"compare-urls": "^2.0.0",
+				"davclient.js": "git+https://github.com/owncloud/davclient.js.git#0e5ef1af5d174d9ec10dbe889a415b8f481d5094",
+				"normalize-url": "^3.3.0"
+			},
+			"dependencies": {
+				"normalize-url": {
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+					"integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
+				}
 			}
 		},
 		"chalk": {
@@ -4410,6 +4420,49 @@
 			"integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
 			"dev": true
 		},
+		"compare-urls": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/compare-urls/-/compare-urls-2.0.0.tgz",
+			"integrity": "sha512-eCJcWn2OYFEIqbm70ta7LQowJOOZZqq1a2YbbFCFI1uwSvj+TWMwXVn7vPR1ceFNcAIt5RSTDbwdlX82gYLTkA==",
+			"requires": {
+				"normalize-url": "^2.0.1"
+			},
+			"dependencies": {
+				"normalize-url": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz",
+					"integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==",
+					"requires": {
+						"prepend-http": "^2.0.0",
+						"query-string": "^5.0.1",
+						"sort-keys": "^2.0.0"
+					}
+				},
+				"prepend-http": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+					"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
+				},
+				"query-string": {
+					"version": "5.1.1",
+					"resolved": "http://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
+					"integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
+					"requires": {
+						"decode-uri-component": "^0.2.0",
+						"object-assign": "^4.1.0",
+						"strict-uri-encode": "^1.0.0"
+					}
+				},
+				"sort-keys": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
+					"integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=",
+					"requires": {
+						"is-plain-obj": "^1.0.0"
+					}
+				}
+			}
+		},
 		"component-emitter": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
@@ -4862,6 +4915,10 @@
 			"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
 			"dev": true
 		},
+		"davclient.js": {
+			"version": "git+https://github.com/owncloud/davclient.js.git#0e5ef1af5d174d9ec10dbe889a415b8f481d5094",
+			"from": "git+https://github.com/owncloud/davclient.js.git"
+		},
 		"de-indent": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
@@ -4901,8 +4958,7 @@
 		"decode-uri-component": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-			"dev": true
+			"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
 		},
 		"deep-is": {
 			"version": "0.1.3",
@@ -5603,6 +5659,24 @@
 				}
 			}
 		},
+		"eslint-plugin-es": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-1.3.2.tgz",
+			"integrity": "sha512-xrdbConViY20DhGrt9FwjhDo4fr/9Yus2pYf0xJsdJaCcUzMq7+pAoNH7kSXF6V08bRHMpgDWclYbcr/Sn3hNg==",
+			"dev": true,
+			"requires": {
+				"eslint-utils": "^1.3.0",
+				"regexpp": "^2.0.1"
+			},
+			"dependencies": {
+				"regexpp": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+					"integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+					"dev": true
+				}
+			}
+		},
 		"eslint-plugin-import": {
 			"version": "2.14.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz",
@@ -5685,15 +5759,25 @@
 			}
 		},
 		"eslint-plugin-node": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-6.0.1.tgz",
-			"integrity": "sha512-Q/Cc2sW1OAISDS+Ji6lZS2KV4b7ueA/WydVWd1BECTQwVvfQy5JAi3glhINoKzoMnfnuRgNP+ZWKrGAbp3QDxw==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-8.0.0.tgz",
+			"integrity": "sha512-Y+ln8iQ52scz9+rSPnSWRaAxeWaoJZ4wIveDR0vLHkuSZGe44Vk1J4HX7WvEP5Cm+iXPE8ixo7OM7gAO3/OKpQ==",
 			"dev": true,
 			"requires": {
-				"ignore": "^3.3.6",
+				"eslint-plugin-es": "^1.3.1",
+				"eslint-utils": "^1.3.1",
+				"ignore": "^5.0.2",
 				"minimatch": "^3.0.4",
-				"resolve": "^1.3.3",
-				"semver": "^5.4.1"
+				"resolve": "^1.8.1",
+				"semver": "^5.5.0"
+			},
+			"dependencies": {
+				"ignore": {
+					"version": "5.0.4",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.0.4.tgz",
+					"integrity": "sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g==",
+					"dev": true
+				}
 			}
 		},
 		"eslint-plugin-promise": {
@@ -5727,6 +5811,12 @@
 				"estraverse": "^4.1.1"
 			}
 		},
+		"eslint-utils": {
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
+			"integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+			"dev": true
+		},
 		"eslint-visitor-keys": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -7845,8 +7935,7 @@
 		"is-plain-obj": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-			"dev": true
+			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
 		},
 		"is-plain-object": {
 			"version": "2.0.4",
@@ -10635,8 +10724,7 @@
 		"object-assign": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-			"dev": true
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
 		},
 		"object-copy": {
 			"version": "0.1.0",
@@ -13390,8 +13478,7 @@
 		"strict-uri-encode": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-			"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
-			"dev": true
+			"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
 		},
 		"string-length": {
 			"version": "2.0.0",
diff --git a/package.json b/package.json
index 6eeef9a0..bdbde599 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
 		"eslint-friendly-formatter": "^4.0.1",
 		"eslint-loader": "^2.1.1",
 		"eslint-plugin-import": "^2.14.0",
-		"eslint-plugin-node": "^6.0.1",
+		"eslint-plugin-node": "^8.0.0",
 		"eslint-plugin-promise": "^4.0.1",
 		"eslint-plugin-standard": "^3.1.0",
 		"eslint-plugin-vue": "^4.5.0",
diff --git a/src/models/rfcProps.js b/src/models/rfcProps.js
index 127b65bf..8051c1a0 100644
--- a/src/models/rfcProps.js
+++ b/src/models/rfcProps.js
@@ -96,21 +96,21 @@ const properties = {
 		icon: 'icon-calendar-dark',
 		defaultValue: {
 			value: new VCardTime().fromJSDate(new Date())
-		},
+		}
 	},
 	anniversary: {
 		readableName: t('contacts', 'Anniversary'),
 		icon: 'icon-calendar-dark',
 		defaultValue: {
 			value: new VCardTime().fromJSDate(new Date())
-		},
+		}
 	},
 	deathdate: {
 		readableName: t('contacts', 'Date of death'),
 		icon: 'icon-calendar-dark',
 		defaultValue: {
 			value: new VCardTime().fromJSDate(new Date())
-		},
+		}
 	},
 	email: {
 		multiple: true,