diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2020-02-25 09:18:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 09:18:12 +0100 |
| commit | 80ed082ac6d90808753f980da957d3db2c143515 (patch) | |
| tree | f7b92d962a72686f01f26f2dd20727e216f110ae | |
| parent | 9cfef7c64d99f36af4f925362e3a1e1c0f214fe4 (diff) | |
| parent | 8bb509c9374f077b5cf0c831cacac4c6c9fb2827 (diff) | |
Merge pull request #1483 from nextcloud/deps/nextcloud/eslint
@nextcloud/eslint
| -rw-r--r-- | .eslintrc.js | 2 | ||||
| -rw-r--r-- | package-lock.json | 30 | ||||
| -rw-r--r-- | package.json | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/.eslintrc.js b/.eslintrc.js index f4cb547a..f4cdaeac 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -4,6 +4,6 @@ module.exports = { appVersion: true }, extends: [ - 'nextcloud' + '@nextcloud' ] } diff --git a/package-lock.json b/package-lock.json index a0e88eea..81d80a5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -944,6 +944,21 @@ "toastify-js": "^1.6.2" } }, + "@nextcloud/eslint-config": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-1.0.0.tgz", + "integrity": "sha512-oXEXknssQeXHn+7fS4JaK2bSZ9t2dyvJeB27EqWexjpY05SOfHTlbX10nfRllwVi0uywCgdIYkg270Ao3m2WnA==", + "dev": true + }, + "@nextcloud/eslint-plugin": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@nextcloud/eslint-plugin/-/eslint-plugin-1.1.0.tgz", + "integrity": "sha512-EH9HpO28vEbBRLOREJpqwVEj9EMDedlgYP0IGwbWByF0ppD1lfz6eo4AbEPwtzJ3+B7chymvHMslPCmrYXzpSA==", + "dev": true, + "requires": { + "requireindex": "~1.2.0" + } + }, "@nextcloud/event-bus": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@nextcloud/event-bus/-/event-bus-1.1.2.tgz", @@ -2948,12 +2963,6 @@ } } }, - "eslint-config-nextcloud": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/eslint-config-nextcloud/-/eslint-config-nextcloud-0.1.1.tgz", - "integrity": "sha512-/1VAkt7Y/m63eZfBiYkSzZMwQtmz0DFXuJnLebrzIY1GtpIj/Y3c//j4ZDiH5o0vbdn9laIc2Mb/01DIjzvt3g==", - "dev": true - }, "eslint-config-standard": { "version": "12.0.0", "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz", @@ -3123,15 +3132,6 @@ } } }, - "eslint-plugin-nextcloud": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-nextcloud/-/eslint-plugin-nextcloud-0.3.0.tgz", - "integrity": "sha512-LUD2qdirGL0BRt4uaMDGxen17mWVq9JwuGDt7P7Celz7bzdu0X48RrS8mhXn9e0w78+nYN5kPoULG2Bw04r4HA==", - "dev": true, - "requires": { - "requireindex": "~1.2.0" - } - }, "eslint-plugin-node": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz", diff --git a/package.json b/package.json index 0b741be5..759ce23c 100644 --- a/package.json +++ b/package.json @@ -69,16 +69,16 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/preset-env": "^7.8.4", "@nextcloud/browserslist-config": "^1.0.0", + "@nextcloud/eslint-config": "^1.0.0", + "@nextcloud/eslint-plugin": "^1.1.0", "babel-eslint": "^10.0.3", "babel-loader": "^8.0.6", "css-loader": "^3.4.2", "eslint": "^5.16.0", - "eslint-config-nextcloud": "0.1.1", "eslint-config-standard": "^12.0.0", "eslint-import-resolver-webpack": "^0.12.1", "eslint-loader": "^3.0.3", "eslint-plugin-import": "^2.20.1", - "eslint-plugin-nextcloud": "^0.3.0", "eslint-plugin-node": "^10.0.0", "eslint-plugin-promise": "^4.2.1", "eslint-plugin-standard": "^4.0.1", |