Skip to content

Commit 3a0c8b8

Browse files
authored
Merge pull request #1338 from melonjs/chore/node24-and-deps
Bump to 18.3.0: Node 24, dependency updates, code-split examples
2 parents a9147da + 244d9d6 commit 3a0c8b8

36 files changed

Lines changed: 798 additions & 679 deletions

File tree

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
- name: Setup node
2121
uses: actions/setup-node@v6
2222
with:
23-
node-version: 22
24-
- uses: pnpm/action-setup@v4
23+
node-version: 24
24+
- uses: pnpm/action-setup@v5
2525
- name: Get pnpm store directory
2626
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
2727
- uses: actions/cache@v5

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
- name: Setup node
2929
uses: actions/setup-node@v6
3030
with:
31-
node-version: 22
32-
- uses: pnpm/action-setup@v4
31+
node-version: 24
32+
- uses: pnpm/action-setup@v5
3333
- name: Get pnpm store directory
3434
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
3535
- uses: actions/cache@v5
@@ -52,8 +52,8 @@ jobs:
5252
- name: Setup node
5353
uses: actions/setup-node@v6
5454
with:
55-
node-version: 22
56-
- uses: pnpm/action-setup@v4
55+
node-version: 24
56+
- uses: pnpm/action-setup@v5
5757
- name: Get pnpm store directory
5858
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
5959
- uses: actions/cache@v5
@@ -73,8 +73,8 @@ jobs:
7373
- name: Setup node
7474
uses: actions/setup-node@v6
7575
with:
76-
node-version: 22
77-
- uses: pnpm/action-setup@v4
76+
node-version: 24
77+
- uses: pnpm/action-setup@v5
7878
- name: Get pnpm store directory
7979
shell: bash
8080
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
node-version: 24
3838
registry-url: "https://registry.npmjs.org"
3939

40-
- uses: pnpm/action-setup@v4
40+
- uses: pnpm/action-setup@v5
4141

4242
- name: Install dependencies
4343
run: pnpm install

.nvmrc

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

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"type": "module",
55
"engines": {
6-
"node": "^20.19.0 || >=22.12.0"
6+
"node": ">=24.0.0"
77
},
88
"scripts": {
99
"build": "turbo build",
@@ -22,21 +22,21 @@
2222
},
2323
"packageManager": "pnpm@10.32.1",
2424
"dependencies": {
25-
"@biomejs/biome": "2.3.14",
26-
"@eslint/js": "^9.39.4",
25+
"@biomejs/biome": "2.4.9",
26+
"@eslint/js": "^10.0.1",
2727
"@types/node": "^25.5.0",
28-
"@vitest/browser": "^4.0.18",
29-
"@vitest/browser-playwright": "^4.0.18",
30-
"eslint": "^9.39.4",
31-
"eslint-plugin-jsdoc": "^62.8.0",
28+
"@vitest/browser": "^4.1.2",
29+
"@vitest/browser-playwright": "^4.1.2",
30+
"eslint": "^10.1.0",
31+
"eslint-plugin-jsdoc": "^62.8.1",
3232
"globals": "^17.4.0",
3333
"lefthook": "^2.1.4",
3434
"tsconfig": "workspace:^",
3535
"tsx": "^4.21.0",
36-
"turbo": "^2.8.20",
37-
"typescript": "^5.9.3",
38-
"typescript-eslint": "^8.57.1",
39-
"vitest": "^4.0.18"
36+
"turbo": "^2.8.21",
37+
"typescript": "^6.0.2",
38+
"typescript-eslint": "^8.57.2",
39+
"vitest": "^4.1.2"
4040
},
4141
"devDependencies": {
4242
"eslint-plugin-react-refresh": "^0.5.2",
@@ -53,7 +53,7 @@
5353
"minimatch@<4.0.0": "3.1.4",
5454
"minimatch@>=9.0.0 <9.0.7": "9.0.7",
5555
"ajv@<6.14.0": "6.14.0",
56-
"vite": "8.0.0",
56+
"vite": "8.0.3",
5757
"esbuild": "0.27.4"
5858
}
5959
}

packages/create-melonjs/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
"files": [
1717
"bin/"
1818
],
19+
"engines": {
20+
"node": ">=24.0.0"
21+
},
1922
"keywords": [
2023
"melonjs",
2124
"game",

packages/debug-plugin/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"author": "Olivier Biot (AltByte Pte Ltd)",
3131
"funding": "https://github.com/sponsors/melonjs",
3232
"engines": {
33-
"node": "^20.19.0 || >=22.12.0"
33+
"node": ">=24.0.0"
3434
},
3535
"types": "./build/index.d.ts",
3636
"exports": {
@@ -51,7 +51,7 @@
5151
"melonjs": "workspace:*",
5252
"tsconfig": "workspace:*",
5353
"tsx": "^4.21.0",
54-
"typescript": "^5.9.3"
54+
"typescript": "^6.0.2"
5555
},
5656
"scripts": {
5757
"dev": "concurrently --raw \"pnpm build:watch\" \"pnpm tsc:watch\"",

packages/debug-plugin/tsconfig.build.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "tsconfig/base.json",
33
"compilerOptions": {
4+
"rootDir": "src",
45
"declarationDir": "build",
56
"removeComments": false,
67
"declarationMap": true,

packages/examples/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"melonjs": "workspace:^",
2020
"react": "^19.2.4",
2121
"react-dom": "^19.2.4",
22-
"react-router-dom": "^7.13.0",
22+
"react-router-dom": "^7.13.2",
2323
"tsconfig": "workspace:^",
24-
"typescript": "^5.9.3",
25-
"vite": "^8.0.0"
24+
"typescript": "^6.0.2",
25+
"vite": "8.0.0"
2626
}
2727
}

packages/examples/src/examples/blendModes/ExampleBlendModes.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ const createGame = () => {
4040
}
4141

4242
// detect which modes are actually supported by probing setBlendMode
43+
// biome-ignore lint/suspicious/noExplicitAny: renderer type varies between WebGL/Canvas
4344
const renderer = video.renderer as any;
4445
const supported: Record<string, boolean> = {};
4546
for (const mode of BLEND_MODES) {
@@ -55,6 +56,7 @@ const createGame = () => {
5556
this.anchorPoint.set(0, 0);
5657
}
5758

59+
// biome-ignore lint/suspicious/noExplicitAny: renderer type varies between WebGL/Canvas
5860
override draw(renderer: any) {
5961
// dark background
6062
renderer.setBlendMode("normal");
@@ -105,7 +107,7 @@ const createGame = () => {
105107
size: 16,
106108
fillStyle: "#aaaaaa",
107109
textAlign: "center",
108-
text: renderer.type + " Supported Blend Modes",
110+
text: `${renderer.type} Supported Blend Modes`,
109111
});
110112
header.anchorPoint.set(0, 0);
111113
header.floating = true;

0 commit comments

Comments
 (0)