Skip to content

Commit

Permalink
fix ordering of path alias (internal) + yarn 4, node 20
Browse files Browse the repository at this point in the history
  • Loading branch information
karl-run committed Nov 3, 2023
1 parent 2781760 commit 2f625e5
Show file tree
Hide file tree
Showing 9 changed files with 1,897 additions and 3,734 deletions.
546 changes: 0 additions & 546 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

550 changes: 0 additions & 550 deletions .yarn/plugins/@yarnpkg/plugin-version.cjs

This file was deleted.

874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.1.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.1.cjs

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-version.cjs
spec: "@yarnpkg/plugin-version"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-engines.cjs
spec: "https://raw.githubusercontent.com/devoto13/yarn-plugin-engines/main/bundles/%40yarnpkg/plugin-engines.js"

yarnPath: .yarn/releases/yarn-3.6.1.cjs
yarnPath: .yarn/releases/yarn-4.0.1.cjs
36 changes: 24 additions & 12 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
module.exports = {
extends: ["plugin:@typescript-eslint/recommended", "plugin:react/recommended", "prettier"],
settings: {
"react": {
"version": "detect"
}
},
plugins: [
extends: [
"plugin:@typescript-eslint/recommended",
"plugin:react/recommended",
"prettier",
"testing-library",
"react-hooks",
"import",
],
settings: {
react: {
version: "detect",
},
},
plugins: ["prettier", "testing-library", "react-hooks", "import"],
rules: {
"no-console": "warn",
"prettier/prettier": "warn",
"import/order": ["warn", { "newlines-between": "always" }],
"import/order": [
"warn",
{
groups: [
"builtin",
"external",
"internal",
"parent",
"sibling",
"index",
],
"newlines-between": "always",
},
],
"react-hooks/exhaustive-deps": [
"warn",
{ additionalHooks: "(useUpdateBreadcrumbs)" },
Expand All @@ -39,5 +51,5 @@ module.exports = {
"testing-library/no-debugging-utils": "warn",
},
},
]
],
};
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@navikt/eslint-config-teamsykmelding",
"packageManager": "yarn@3.6.1",
"version": "4.5.0",
"packageManager": "yarn@4.0.1",
"version": "5.0.0",
"engines": {
"node": "18"
"node": "20"
},
"files": [
"prettier",
Expand All @@ -13,10 +13,10 @@
"test": "eslint --config=index.js"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"@typescript-eslint/eslint-plugin": "^6.9.1",
"@typescript-eslint/parser": "^6.9.1",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
Expand All @@ -28,8 +28,7 @@
"typescript": ">=4"
},
"devDependencies": {
"eslint": "^8.51.0",
"node-gyp": "^9.4.0",
"eslint": "^8.52.0",
"prettier": "^3.0.3",
"typescript": "^5.2.2"
}
Expand Down
28 changes: 14 additions & 14 deletions prettier/index.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module.exports = {
semi: false,
trailingComma: 'all',
singleQuote: true,
printWidth: 120,
tabWidth: 4,
overrides: [
{
files: ['*.yml', '*.yaml'],
options: {
bracketSpacing: false,
tabWidth: 2,
},
},
],
semi: false,
trailingComma: "all",
singleQuote: true,
printWidth: 120,
tabWidth: 4,
overrides: [
{
files: ["*.yml", "*.yaml"],
options: {
bracketSpacing: false,
tabWidth: 2,
},
},
],
};
Loading

0 comments on commit 2f625e5

Please sign in to comment.