Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ updates:
schedule:
interval: weekly
ignore:
# eslint-plugin-react (transitive via eslint-config-next) is not yet
# compatible with ESLint 10. Revisit once upstream ships a fix.
- dependency-name: eslint
# typescript 7 is the native compiler and ships a different npm package
# layout (no lib/typescript.js). typescript-eslint peer-requires <6.1.0
# and next resolves the TS integration through lib/typescript.js, so both
# eslint and next build crash. Drop this once both support TS 7.
- dependency-name: typescript
update-types:
- version-update:semver-major
groups:
Expand Down
13 changes: 8 additions & 5 deletions apps/web/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import next from "@next/eslint-plugin-next";
import { defineConfig, globalIgnores } from "eslint/config";
import nextVitals from "eslint-config-next/core-web-vitals";
import nextTs from "eslint-config-next/typescript";
import tseslint from "typescript-eslint";
import prettierConfig from "eslint-config-prettier";
import reactHooks from "eslint-plugin-react-hooks";
import tseslint from "typescript-eslint";

// Composed from the plugins directly rather than eslint-config-next, which
// still pulls in eslint-plugin-react. That plugin calls context.getFilename(),
// removed in eslint 10, and crashes on load. See vercel/next.js#89764.
const eslintConfig = defineConfig([
...nextVitals,
...nextTs,
next.configs["core-web-vitals"],
reactHooks.configs.flat["recommended-latest"],
...tseslint.configs.strictTypeChecked,
...tseslint.configs.stylisticTypeChecked,
{
Expand Down
11 changes: 6 additions & 5 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,21 @@
"tw-animate-css": "^1.4.0"
},
"devDependencies": {
"@next/eslint-plugin-next": "16.2.10",
"@tailwindcss/postcss": "^4.3.2",
"@types/geojson": "^7946.0.16",
"@types/node": "^26.1.0",
"@types/node": "^26.1.1",
"@types/react": "^19.2.17",
"@types/react-dom": "^19.2.3",
"@types/topojson-client": "^3.1.5",
"@types/topojson-specification": "^1.0.5",
"eslint": "^9.39.4",
"eslint-config-next": "16.2.10",
"eslint": "^10.7.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-react-hooks": "^7.1.1",
"tailwindcss": "^4.3.2",
"taiwan-atlas": "^2021.9.20",
"tsx": "^4.23.0",
"tsx": "^4.23.1",
"typescript": "^6.0.3",
"typescript-eslint": "^8.63.0"
"typescript-eslint": "^8.64.0"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"check": "pnpm --filter @zipkit/core build && pnpm --recursive typecheck && pnpm --filter web lint && prettier --check ."
},
"devDependencies": {
"prettier": "^3.9.4",
"prettier": "^3.9.5",
"prettier-plugin-tailwindcss": "^0.8.0"
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"test:watch": "vitest"
},
"devDependencies": {
"tsdown": "^0.22.3",
"tsdown": "^0.22.7",
"typescript": "^6.0.3",
"vitest": "^4.1.10"
}
Expand Down
Loading
Loading