Skip to content

Commit 5fdeb62

Browse files
renovate[bot]zyoshoka
authored andcommitted
chore(deps): update node.js to v22.15.0 (misskey-dev#15606)
* chore(deps): update node.js to v22.15.0 * chore: determine Jest args from Node.js version * fix * fix: `import.meta.dirname` is not supported in v20.10.0 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
1 parent e4e4c3d commit 5fdeb62

File tree

8 files changed

+44
-9
lines changed

8 files changed

+44
-9
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"workspaceFolder": "/workspace",
66
"features": {
77
"ghcr.io/devcontainers/features/node:1": {
8-
"version": "22.11.0"
8+
"version": "22.15.0"
99
},
1010
"ghcr.io/devcontainers-extra/features/pnpm:2": {
1111
"version": "10.10.0"

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.11.0
1+
22.15.0

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## Unreleased
22

3+
### Note
4+
- DockerのNode.jsが22.15.0に更新されました
5+
36
### General
47
-
58

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax = docker/dockerfile:1.4
22

3-
ARG NODE_VERSION=22.11.0-bookworm
3+
ARG NODE_VERSION=22.15.0-bookworm
44

55
# build assets & compile TypeScript
66

packages/backend/eslint.config.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
import tsParser from '@typescript-eslint/parser';
2+
import globals from 'globals';
23
import sharedConfig from '../shared/eslint.config.js';
34

45
export default [
56
...sharedConfig,
67
{
78
ignores: ['**/node_modules', 'built', '@types/**/*', 'migration'],
89
},
10+
{
11+
languageOptions: {
12+
globals: {
13+
...globals.node,
14+
},
15+
},
16+
},
917
{
1018
files: ['**/*.ts', '**/*.tsx'],
1119
languageOptions: {

packages/backend/jest.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/usr/bin/env node
2+
import child_process from 'node:child_process';
3+
import path from 'node:path';
4+
import url from 'node:url';
5+
6+
import semver from 'semver';
7+
8+
const __filename = url.fileURLToPath(import.meta.url);
9+
const __dirname = path.dirname(__filename);
10+
11+
const args = [];
12+
args.push(...[
13+
...semver.satisfies(process.version, '^20.17.0 || ^22.0.0') ? ['--no-experimental-require-module'] : [],
14+
'--experimental-vm-modules',
15+
'--experimental-import-meta-resolve',
16+
path.join(__dirname, 'node_modules/jest/bin/jest.js'),
17+
...process.argv.slice(2),
18+
]);
19+
20+
child_process.spawn(process.execPath, args, { stdio: 'inherit' });

packages/backend/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
"typecheck": "tsc --noEmit && tsc -p test --noEmit && tsc -p test-federation --noEmit",
2323
"eslint": "eslint --quiet \"{src,test-federation}/**/*.ts\"",
2424
"lint": "pnpm typecheck && pnpm eslint",
25-
"jest": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.unit.cjs",
26-
"jest:e2e": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.e2e.cjs",
27-
"jest:fed": "node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.fed.cjs",
28-
"jest-and-coverage": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --config jest.config.unit.cjs",
29-
"jest-and-coverage:e2e": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --config jest.config.e2e.cjs",
30-
"jest-clear": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --clearCache",
25+
"jest": "cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.unit.cjs",
26+
"jest:e2e": "cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.e2e.cjs",
27+
"jest:fed": "node ./jest.js --forceExit --config jest.config.fed.cjs",
28+
"jest-and-coverage": "cross-env NODE_ENV=test node ./jest.js --coverage --forceExit --config jest.config.unit.cjs",
29+
"jest-and-coverage:e2e": "cross-env NODE_ENV=test node ./jest.js --coverage --forceExit --config jest.config.e2e.cjs",
30+
"jest-clear": "cross-env NODE_ENV=test node ./jest.js --clearCache",
3131
"test": "pnpm jest",
3232
"test:e2e": "pnpm build && pnpm build:test && pnpm jest:e2e",
3333
"test:fed": "pnpm jest:fed",

packages/backend/test-federation/compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ services:
5050
source: ../jest.config.fed.cjs
5151
target: /misskey/packages/backend/jest.config.fed.cjs
5252
read_only: true
53+
- type: bind
54+
source: ../jest.js
55+
target: /misskey/packages/backend/jest.js
56+
read_only: true
5357
- type: bind
5458
source: ../../misskey-js/built
5559
target: /misskey/packages/misskey-js/built

0 commit comments

Comments
 (0)