diff --git a/.eslintrc.yml b/.eslintrc.yml index 7a5c6a7db..5a811b3c4 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -18,3 +18,9 @@ rules: no-plusplus: - error - allowForLoopAfterthoughts: true + +settings: + "import/resolver": + alias: + map: + - ["cookbook", "./src"] diff --git a/CHANGELOG.md b/CHANGELOG.md index e15bb1e12..7fa65088e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,8 @@ [#1051](https://github.com/nextcloud/cookbook/pull/1051) @christianlupus - Add the url as a parameter to allow for specialized parsers per website in the backend [#1060](https://github.com/nextcloud/cookbook/pull/1060) @christianlupus +- Create wrapper in frontend for all API requests + [#1061](https://github.com/nextcloud/cookbook/pull/1061) @christianlupus ### Codebase maintenance - Removed codecov.io upload of intermediate merge commits during pull requests diff --git a/cookbook.code-workspace b/cookbook.code-workspace index 150020e5c..c2955098a 100644 --- a/cookbook.code-workspace +++ b/cookbook.code-workspace @@ -28,7 +28,7 @@ ".github/actions/run-tests/volumes/nextcloud/custom_apps/cookbook/**/*": true, ".github/actions/run-tests/volumes/nextcloud/**/*": true }, - "intelephense.trace.server": "message", + //"intelephense.trace.server": "message", "intelephense.files.exclude": [ "**/.git/**", "**/.svn/**", @@ -44,6 +44,9 @@ ], "cSpell.words": [ "Nextcloud" - ] + ], + "path-intellisense.mappings": { + "cookbook": "${workspaceFolder}/src", + } } } diff --git a/package-lock.json b/package-lock.json index 594dd4895..ebede79a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,6 +31,7 @@ "eslint": "^8.2.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^8.0.0", + "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.22.1", "eslint-plugin-vue": "^9.0.1", "prettier": "^2.2.1", @@ -3876,6 +3877,18 @@ "eslint": ">=7.0.0" } }, + "node_modules/eslint-import-resolver-alias": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz", + "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==", + "dev": true, + "engines": { + "node": ">= 4" + }, + "peerDependencies": { + "eslint-plugin-import": ">=1.4.0" + } + }, "node_modules/eslint-import-resolver-node": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", @@ -15217,6 +15230,13 @@ "dev": true, "requires": {} }, + "eslint-import-resolver-alias": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz", + "integrity": "sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w==", + "dev": true, + "requires": {} + }, "eslint-import-resolver-node": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz", diff --git a/package.json b/package.json index 407667524..698237d7c 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,8 @@ "build": "npx webpack --node-env production --progress --config webpack.config.js", "build-dev": "npx webpack --node-env development --progress --config webpack.config.js", "dev": "npx webpack --node-env development --progress --watch --config webpack.devel.js", - "eslint": "npx eslint --cache --cache-strategy content src/**/*.{vue,js}", - "eslint-fix": "npx eslint --cache --cache-strategy content --fix src/**/*.{vue,js}", + "eslint": "npx eslint --cache --cache-strategy content 'src/**/*.{vue,js}'", + "eslint-fix": "npx eslint --cache --cache-strategy content --fix 'src/**/*.{vue,js}'", "package-lint": "npx prettier-package-json --write ./package.json", "serve": "npx webpack serve --node-env development --progress --config webpack.config.js --env dev_server", "stylelint": "npx stylelint src", @@ -50,6 +50,7 @@ "eslint": "^8.2.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-config-prettier": "^8.0.0", + "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-import": "^2.22.1", "eslint-plugin-vue": "^9.0.1", "prettier": "^2.2.1", diff --git a/src/components/AppIndex.vue b/src/components/AppIndex.vue index 2d52fc8e2..310295b09 100644 --- a/src/components/AppIndex.vue +++ b/src/components/AppIndex.vue @@ -3,7 +3,7 @@