Skip to content

Commit 7c1862d

Browse files
authored
Merge pull request #615 from shapehq/next16
Updates to Next 16 and Node 24
2 parents de25c89 + 2c2e2ba commit 7c1862d

File tree

12 files changed

+165
-168
lines changed

12 files changed

+165
-168
lines changed

.eslintrc.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup Node.js
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: 22
24+
node-version: 24
2525
- name: Setup Environment
2626
run: cp .env.example .env.local
2727
- name: Install Dependencies

.github/workflows/lint.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ jobs:
1818
uses: actions/checkout@v4
1919
with:
2020
persist-credentials: false
21+
- name: Setup Node.js
22+
uses: actions/setup-node@v4
23+
with:
24+
node-version: 24
2125
- name: Install modules
2226
run: npm install
2327
- name: Run ESLint

.github/workflows/run-unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup Node.js
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: 22
24+
node-version: 24
2525
- name: Install Dependencies
2626
run: npm install
2727
- name: Run Unit Tests

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.13.1
1+
24

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20.8.1-alpine AS base
1+
FROM node:24-alpine AS base
22

33
# Install dependencies only when needed
44
FROM base AS deps

eslint.config.mjs

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,13 @@
1-
import { defineConfig } from "eslint/config"
2-
import typescriptEslint from "@typescript-eslint/eslint-plugin"
3-
import tsParser from "@typescript-eslint/parser"
4-
import path from "node:path"
5-
import { fileURLToPath } from "node:url"
61
import js from "@eslint/js"
7-
import { FlatCompat } from "@eslint/eslintrc"
2+
import nextCoreWebVitals from "eslint-config-next/core-web-vitals"
3+
import tseslint from "typescript-eslint"
84

9-
const __filename = fileURLToPath(import.meta.url)
10-
const __dirname = path.dirname(__filename)
11-
const compat = new FlatCompat({
12-
baseDirectory: __dirname,
13-
recommendedConfig: js.configs.recommended,
14-
allConfig: js.configs.all
15-
})
16-
17-
export default defineConfig([
5+
const config = [
6+
...nextCoreWebVitals,
7+
js.configs.recommended,
8+
...tseslint.configs.recommended,
189
{
1910
ignores: ["next-env.d.ts", ".next"],
20-
},
21-
{
22-
extends: [
23-
...compat.extends("next/core-web-vitals"),
24-
...compat.extends("eslint:recommended"),
25-
...compat.extends("plugin:@typescript-eslint/recommended")
26-
],
27-
28-
plugins: {
29-
"@typescript-eslint": typescriptEslint,
30-
},
31-
32-
languageOptions: {
33-
parser: tsParser,
34-
},
35-
3611
rules: {
3712
"array-callback-return": ["error"],
3813
"no-await-in-loop": ["error"],
@@ -46,10 +21,11 @@ export default defineConfig([
4621
"no-unreachable-loop": ["error"],
4722
"no-unused-private-class-members": ["error"],
4823
"require-atomic-updates": ["error"],
49-
5024
"@typescript-eslint/no-unused-vars": ["error", {
5125
argsIgnorePattern: "^_",
5226
}],
5327
},
5428
}
55-
])
29+
]
30+
31+
export default config

next.config.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
/** @type {import('next').NextConfig} */
22
const nextConfig = {
3-
eslint: {
4-
// Allows production builds to successfully complete even if it has linting errors.
5-
// This is only OK because we do linting as part of our CI setup.
6-
ignoreDuringBuilds: true,
7-
},
83
// Output standalone to be used for Docker builds.
94
output: 'standalone',
105
}

0 commit comments

Comments
 (0)