Skip to content

Commit

Permalink
Merge branch 'next' into joscha/location/continent
Browse files Browse the repository at this point in the history
  • Loading branch information
xDivisionByZerox authored Oct 12, 2024
2 parents 02d4c5a + 033c23b commit 2ce8d00
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 98 deletions.
1 change: 0 additions & 1 deletion eslint.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ const config: ReturnType<typeof tseslint.config> = tseslint.config(

// TODO @Shinigami92 2023-09-23: The following rules currently conflict with our code.
// Each rule should be checked whether it should be enabled/configured and the problems fixed, or stay disabled permanently.
'unicorn/better-regex': 'off',
'unicorn/consistent-function-scoping': 'off',
'unicorn/no-object-as-default-parameter': 'off',
'unicorn/prefer-export-from': 'off',
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,17 +112,17 @@
"@types/sanitize-html": "2.13.0",
"@types/semver": "7.5.8",
"@types/validator": "13.12.2",
"@vitest/coverage-v8": "2.1.1",
"@vitest/eslint-plugin": "1.1.4",
"@vitest/ui": "2.1.1",
"@vitest/coverage-v8": "2.1.2",
"@vitest/eslint-plugin": "1.1.7",
"@vitest/ui": "2.1.2",
"@vueuse/core": "11.1.0",
"commit-and-tag-version": "12.4.4",
"cypress": "13.15.0",
"eslint": "9.12.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-jsdoc": "50.3.1",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-unicorn": "55.0.0",
"eslint-plugin-unicorn": "56.0.0",
"jiti": "1.21.6",
"npm-run-all2": "6.2.3",
"prettier": "3.3.3",
Expand All @@ -139,7 +139,7 @@
"validator": "13.12.0",
"vite": "5.4.8",
"vitepress": "1.4.0",
"vitest": "2.1.1",
"vitest": "2.1.2",
"vue": "3.5.11",
"vue-tsc": "2.1.6"
},
Expand Down
168 changes: 77 additions & 91 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2ce8d00

Please sign in to comment.