diff --git a/eslint.config.js b/eslint.config.js index 4027dc6..f12d6e7 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,21 +1,24 @@ -import prettier from "eslint-config-prettier"; -import js from "@eslint/js"; import { includeIgnoreFile } from "@eslint/compat"; +import js from "@eslint/js"; +import { defineConfig } from "eslint/config"; +import prettier from "eslint-config-prettier"; import svelte from "eslint-plugin-svelte"; import tailwind from "eslint-plugin-tailwindcss"; import globals from "globals"; -import { fileURLToPath } from "node:url"; import ts from "typescript-eslint"; +import { fileURLToPath } from "url"; +import svelteConfig from "./svelte.config.js"; + const gitignorePath = fileURLToPath(new URL("./.gitignore", import.meta.url)); -export default ts.config( +export default defineConfig( includeIgnoreFile(gitignorePath), js.configs.recommended, ...ts.configs.recommended, - ...svelte.configs["flat/recommended"], + ...svelte.configs.recommended, ...tailwind.configs["flat/recommended"], prettier, - ...svelte.configs["flat/prettier"], + ...svelte.configs.prettier, { languageOptions: { globals: { @@ -23,13 +26,18 @@ export default ts.config( ...globals.node, }, }, + rules: { + "no-undef": "off", + }, }, { - files: ["**/*.svelte"], - + files: ["**/*.svelte", "**/*.svelte.ts", "**/*.svelte.js"], languageOptions: { parserOptions: { + projectService: true, + extraFileExtensions: [".svelte"], parser: ts.parser, + svelteConfig, }, }, }, diff --git a/package.json b/package.json index bd44d2c..3479c2c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "arkvault", "private": true, - "version": "0.5.1", + "version": "0.6.0", "type": "module", "scripts": { "dev": "vite dev", @@ -16,7 +16,7 @@ "db:migrate": "kysely migrate" }, "devDependencies": { - "@eslint/compat": "^1.4.1", + "@eslint/compat": "^2.0.0", "@iconify-json/material-symbols": "^1.2.50", "@sveltejs/adapter-node": "^5.4.0", "@sveltejs/kit": "^2.49.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9503e44..9dcf04f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -40,8 +40,8 @@ importers: version: 4.2.1 devDependencies: '@eslint/compat': - specifier: ^1.4.1 - version: 1.4.1(eslint@9.39.2(jiti@1.21.7)) + specifier: ^2.0.0 + version: 2.0.0(eslint@9.39.2(jiti@1.21.7)) '@iconify-json/material-symbols': specifier: ^1.2.50 version: 1.2.50 @@ -326,9 +326,9 @@ packages: resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/compat@1.4.1': - resolution: {integrity: sha512-cfO82V9zxxGBxcQDr1lfaYB7wykTa0b00mGa36FrJl7iTFd0Z2cHfEYuxcBRP/iNijCsWsEkA+jzT8hGYmv33w==} - engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/compat@2.0.0': + resolution: {integrity: sha512-T9AfE1G1uv4wwq94ozgTGio5EUQBqAVe1X9qsQtSNVEYW6j3hvtZVm8Smr4qL1qDPFg+lOB2cL5RxTRMzq4CTA==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} peerDependencies: eslint: ^8.40 || 9 peerDependenciesMeta: @@ -347,6 +347,10 @@ packages: resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@eslint/core@1.0.0': + resolution: {integrity: sha512-PRfWP+8FOldvbApr6xL7mNCw4cJcSTq4GA7tYbgq15mRb0kWKO/wEB2jr+uwjFH3sZvEZneZyCUGTxsv4Sahyw==} + engines: {node: ^20.19.0 || ^22.13.0 || >=24} + '@eslint/eslintrc@3.3.3': resolution: {integrity: sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -2117,9 +2121,9 @@ snapshots: '@eslint-community/regexpp@4.12.2': {} - '@eslint/compat@1.4.1(eslint@9.39.2(jiti@1.21.7))': + '@eslint/compat@2.0.0(eslint@9.39.2(jiti@1.21.7))': dependencies: - '@eslint/core': 0.17.0 + '@eslint/core': 1.0.0 optionalDependencies: eslint: 9.39.2(jiti@1.21.7) @@ -2139,6 +2143,10 @@ snapshots: dependencies: '@types/json-schema': 7.0.15 + '@eslint/core@1.0.0': + dependencies: + '@types/json-schema': 7.0.15 + '@eslint/eslintrc@3.3.3': dependencies: ajv: 6.12.6