summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2020-03-03 10:51:31 +0100
committerGitHub <noreply@github.com>2020-03-03 10:51:31 +0100
commit8d4ff9726263bda4105735a1c10466c3e732818e (patch)
tree25c02d9cd2eae93709dc7443fa33826ee4b0c1cf
parentdf094830bd21466adb061d1f0c24be9e30c350c9 (diff)
parent8fe072b26b629410c928f6d84dbb8e0ed78f06e7 (diff)
Merge pull request #1497 from nextcloud/fix/eslint
Fix eslint
-rw-r--r--package-lock.json139
-rw-r--r--package.json17
-rw-r--r--tests/setup.js37
-rw-r--r--tests/unit/specs/Contacts.spec.js25
4 files changed, 56 insertions, 162 deletions
diff --git a/package-lock.json b/package-lock.json
index 4560cae2..04c1b30a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1146,18 +1146,18 @@
"dev": true
},
"@nextcloud/dialogs": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-1.1.0.tgz",
- "integrity": "sha512-RjA+AEBwIkT2YEtMcfni3KQxn8o2SgbnVGp0n00z9tEhuvx9g3Z7Eh5+bY7zzanedFqryJSazMhk0voUyxr8Ow==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-1.2.0.tgz",
+ "integrity": "sha512-yB2GRzgiIlGg02XAD9A9yTKhPhI6MTqHdOc6T6xIs8IBmlHJrCRcL1e6kBKUTQ4GXVzYDU8JFZ5b88RSiEwS1w==",
"requires": {
"core-js": "3.6.4",
"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==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@nextcloud/eslint-config/-/eslint-config-1.1.0.tgz",
+ "integrity": "sha512-Ell1SygjViw+JNCadtu5vqnfR29kxFTYdjvmVv1i3/jCZl9CcZZBmPeXQ5cFWvOY0pKJhJZcab1wRHqANXBDaw==",
"dev": true
},
"@nextcloud/eslint-plugin": {
@@ -1599,12 +1599,6 @@
"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
"integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
},
- "array-find": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
- "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
- "dev": true
- },
"array-find-index": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
@@ -1814,15 +1808,15 @@
}
},
"babel-eslint": {
- "version": "10.0.3",
- "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz",
- "integrity": "sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==",
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+ "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
- "@babel/parser": "^7.0.0",
- "@babel/traverse": "^7.0.0",
- "@babel/types": "^7.0.0",
+ "@babel/parser": "^7.7.0",
+ "@babel/traverse": "^7.7.0",
+ "@babel/types": "^7.7.0",
"eslint-visitor-keys": "^1.0.0",
"resolve": "^1.12.0"
}
@@ -3027,17 +3021,6 @@
"once": "^1.4.0"
}
},
- "enhanced-resolve": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
- "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.2",
- "memory-fs": "^0.2.0",
- "tapable": "^0.1.8"
- }
- },
"entities": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
@@ -3185,32 +3168,6 @@
"resolve": "^1.13.1"
}
},
- "eslint-import-resolver-webpack": {
- "version": "0.12.1",
- "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz",
- "integrity": "sha512-O/sUAXk6GWrICiN8JUkkjdt9uZpqZHP+FVnTxtEILL6EZMaPSrnP4lGPSFwcKsv7O211maqq4Nz60+dh236hVg==",
- "dev": true,
- "requires": {
- "array-find": "^1.0.0",
- "debug": "^2.6.9",
- "enhanced-resolve": "^0.9.1",
- "find-root": "^1.1.0",
- "has": "^1.0.3",
- "interpret": "^1.2.0",
- "lodash": "^4.17.15",
- "node-libs-browser": "^1.0.0 || ^2.0.0",
- "resolve": "^1.13.1",
- "semver": "^5.7.1"
- },
- "dependencies": {
- "semver": {
- "version": "5.7.1",
- "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
- "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
- "dev": true
- }
- }
- },
"eslint-loader": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-3.0.3.tgz",
@@ -3289,15 +3246,24 @@
}
},
"eslint-plugin-es": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz",
- "integrity": "sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz",
+ "integrity": "sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==",
"dev": true,
"requires": {
- "eslint-utils": "^1.4.2",
+ "eslint-utils": "^2.0.0",
"regexpp": "^3.0.0"
},
"dependencies": {
+ "eslint-utils": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+ "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+ "dev": true,
+ "requires": {
+ "eslint-visitor-keys": "^1.1.0"
+ }
+ },
"regexpp": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz",
@@ -3339,19 +3305,28 @@
}
},
"eslint-plugin-node": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz",
- "integrity": "sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz",
+ "integrity": "sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg==",
"dev": true,
"requires": {
- "eslint-plugin-es": "^2.0.0",
- "eslint-utils": "^1.4.2",
+ "eslint-plugin-es": "^3.0.0",
+ "eslint-utils": "^2.0.0",
"ignore": "^5.1.1",
"minimatch": "^3.0.4",
"resolve": "^1.10.1",
"semver": "^6.1.0"
},
"dependencies": {
+ "eslint-utils": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+ "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+ "dev": true,
+ "requires": {
+ "eslint-visitor-keys": "^1.1.0"
+ }
+ },
"ignore": {
"version": "5.1.4",
"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
@@ -3791,12 +3766,6 @@
"pkg-dir": "^3.0.0"
}
},
- "find-root": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
- "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
- "dev": true
- },
"find-up": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
@@ -5874,12 +5843,6 @@
}
}
},
- "memory-fs": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
- "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
- "dev": true
- },
"meow": {
"version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
@@ -9166,12 +9129,6 @@
}
}
},
- "tapable": {
- "version": "0.1.10",
- "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
- "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
- "dev": true
- },
"tar": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
@@ -9344,9 +9301,9 @@
}
},
"toastify-js": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.6.2.tgz",
- "integrity": "sha512-ECQzgjTjxaElfwp/8e8qoIYx7U5rU2G54e5aiPMv+UtmGOYEitrtNp/Kr8uMgntnQNrDZEQJNGjBtoNnEgR5EA=="
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.7.0.tgz",
+ "integrity": "sha512-GmPy4zJ/ulCfmCHlfCtgcB+K2xhx2AXW3T/ZZOSjyjaIGevhz+uvR8HSCTay/wBq4tt2mUnBqlObP1sSWGlsnQ=="
},
"trim": {
"version": "0.0.1",
@@ -9857,9 +9814,9 @@
"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="
},
"vue-router": {
- "version": "3.1.5",
- "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.5.tgz",
- "integrity": "sha512-BszkPvhl7I9h334GjckCh7sVFyjTPMMJFJ4Bsrem/Ik+B/9gt5tgrk8k4gGLO4ZpdvciVdg7O41gW4DisQWurg=="
+ "version": "3.1.6",
+ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
+ "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA=="
},
"vue-style-loader": {
"version": "4.1.2",
@@ -9932,9 +9889,9 @@
}
},
"webpack": {
- "version": "4.41.6",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
- "integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==",
+ "version": "4.42.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz",
+ "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==",
"dev": true,
"requires": {
"@webassemblyjs/ast": "1.8.5",
diff --git a/package.json b/package.json
index 4f1c989e..80a0b7ae 100644
--- a/package.json
+++ b/package.json
@@ -27,14 +27,14 @@
"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.prod.js",
"dev": "NODE_ENV=development webpack --progress --config webpack.dev.js",
"watch": "NODE_ENV=development webpack --progress --watch --config webpack.dev.js",
- "lint": "eslint --ext .js,.vue src tests",
- "lint:fix": "eslint --ext .js,.vue src tests --fix",
+ "lint": "eslint --ext .js,.vue src",
+ "lint:fix": "eslint --ext .js,.vue src --fix",
"stylelint": "stylelint src",
"stylelint:fix": "stylelint src --fix"
},
"dependencies": {
"@nextcloud/auth": "^1.2.1",
- "@nextcloud/dialogs": "^1.0.0",
+ "@nextcloud/dialogs": "^1.2.0",
"@nextcloud/initial-state": "^1.1.0",
"@nextcloud/l10n": "^1.1.0",
"@nextcloud/paths": "^1.1.0",
@@ -55,7 +55,7 @@
"vue": "^2.6.11",
"vue-click-outside": "^1.0.7",
"vue-clipboard2": "^0.3.1",
- "vue-router": "^3.1.5",
+ "vue-router": "^3.1.6",
"vue-virtual-scroller": "^1.0.0-rc.2",
"vuex": "^3.1.2",
"vuex-router-sync": "^5.0.0"
@@ -69,17 +69,16 @@
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/preset-env": "^7.8.6",
"@nextcloud/browserslist-config": "^1.0.0",
- "@nextcloud/eslint-config": "^1.0.0",
+ "@nextcloud/eslint-config": "^1.1.0",
"@nextcloud/eslint-plugin": "^1.1.0",
- "babel-eslint": "^10.0.3",
+ "babel-eslint": "^10.1.0",
"babel-loader": "^8.0.6",
"css-loader": "^3.4.2",
"eslint": "^5.16.0",
"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-node": "^10.0.0",
+ "eslint-plugin-node": "^11.0.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^5.2.3",
@@ -93,7 +92,7 @@
"url-loader": "^3.0.0",
"vue-loader": "^15.9.0",
"vue-template-compiler": "^2.6.11",
- "webpack": "^4.41.6",
+ "webpack": "^4.42.0",
"webpack-cli": "^3.3.11",
"webpack-merge": "^4.2.2",
"webpack-node-externals": "^1.7.2"
diff --git a/tests/setup.js b/tests/setup.js
deleted file mode 100644
index ef86d905..00000000
--- a/tests/setup.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * @copyright 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-require('jsdom-global')()
-global.expect = require('chai').expect
-
-// https://github.com/vuejs/vue-test-utils/issues/936
-// better fix for "TypeError: Super expression must either be null or
-// a function" than pinning an old version of prettier.
-//
-// https://github.com/vuejs/vue-cli/issues/2128#issuecomment-453109575
-window.Date = Date
-
-global.OC = {
- getLocale: () => 'en',
-}
-
-global.t = (app, text) => text
-global.n = (app, textSingular, textPlural, count) => count > 1 ? textPlural : textSingular
diff --git a/tests/unit/specs/Contacts.spec.js b/tests/unit/specs/Contacts.spec.js
deleted file mode 100644
index f044d797..00000000
--- a/tests/unit/specs/Contacts.spec.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-// eslint-disable-next-line node/no-unpublished-import
-// import { mount } from '@vue/test-utils'
-// import Contacts from '../../../src/views/Contacts.vue'