Skip to content

Commit ddebf84

Browse files
authored
[chore]: Upgrade repository to node22 and add testing for node22 (#2960)
* migrate the repository for usage with node 22 - and upgrade typescript * test node 22 * check if it was the lerna update braking windows order * change build target back to 18 for cli
1 parent 594ed48 commit ddebf84

File tree

14 files changed

+18938
-18309
lines changed

14 files changed

+18938
-18309
lines changed

.github/workflows/ci-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ on:
33
push:
44
branches:
55
- master
6-
- 4.0.x
76
tags: # for automatic releases
87
# normal versions
98
- "v[0-9]+.[0-9]+.[0-9]+"
@@ -43,7 +42,7 @@ jobs:
4342
fail-fast: false
4443
matrix:
4544
os: [windows-latest, ubuntu-20.04, macos-latest]
46-
node: [18, 20]
45+
node: [18, 20, 22]
4746

4847
steps:
4948
- uses: actions/checkout@v4
@@ -123,11 +122,11 @@ jobs:
123122
if: steps.automerge.outputs.mergeResult == 'merged'
124123
uses: actions/checkout@v4
125124

126-
- name: Use Node.js 18
125+
- name: Use Node.js
127126
if: steps.automerge.outputs.mergeResult == 'merged'
128127
uses: actions/setup-node@v4
129128
with:
130-
node-version: 18
129+
node-version-file: '.nvmrc'
131130

132131
- name: Determine version
133132
if: steps.automerge.outputs.mergeResult == 'merged'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ ioBroker
3131
/packages/controller/iob-vendor.json
3232
build
3333
lerna-debug.log
34+
.nx

.nvmrc

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

package-lock.json

Lines changed: 18914 additions & 18284 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"iobroker.js-controller": "file:packages/controller"
2020
},
2121
"devDependencies": {
22-
"@alcalzone/esm2cjs": "^1.1.2",
22+
"@alcalzone/esm2cjs": "^1.3.0",
2323
"@alcalzone/pak": "^0.11.0",
2424
"@alcalzone/release-script": "~3.8.0",
2525
"@alcalzone/release-script-plugin-iobroker": "~3.7.0",
@@ -30,7 +30,7 @@
3030
"@iobroker/types": "file:packages/types-public",
3131
"@iobroker/types-dev": "file:packages/types-dev",
3232
"@microsoft/api-extractor": "^7.43.0",
33-
"@tsconfig/node18": "^18.2.2",
33+
"@tsconfig/node22": "^22.0.0",
3434
"@types/chai": "^4.3.3",
3535
"@types/chai-as-promised": "^7.1.5",
3636
"@types/debug": "^4.1.12",
@@ -57,7 +57,7 @@
5757
"chai-as-promised": "^7.1.1",
5858
"cpy-cli": "^4.2.0",
5959
"fs-extra": "^11.1.0",
60-
"lerna": "^7.1.4",
60+
"lerna": "^7.4.2",
6161
"mocha": "^10.4.0",
6262
"prettier": "^3.0.1",
6363
"semver": "^7.5.2",
@@ -66,10 +66,10 @@
6666
"ts-json-schema-generator": "~1.2.0",
6767
"ts-node": "^10.9.2",
6868
"tsc-alias": "^1.8.8",
69-
"typedoc": "^0.25.12",
70-
"typedoc-plugin-markdown": "^3.17.1",
71-
"typedoc-plugin-missing-exports": "^2.2.0",
72-
"typescript": "~5.4.2"
69+
"typedoc": "^0.26.11",
70+
"typedoc-plugin-markdown": "^4.2.10",
71+
"typedoc-plugin-missing-exports": "^3.0.0",
72+
"typescript": "~5.6.3"
7373
},
7474
"scripts": {
7575
"clean": "rimraf packages/*/build packages/*/*.tsbuildinfo",

packages/adapter/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/// <reference types="@iobroker/types-dev" />
12
export { Adapter, AdapterClass } from '@/lib/adapter/adapter.js';
23
export { Validator } from '@/lib/adapter/validator.js';
34
export * from '@/lib/_Types.js';

packages/adapter/src/lib/adapter/adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import type NodeSchedule from 'node-schedule';
3535
import yargs from 'yargs/yargs';
3636

3737
// local version is always the same as controller version, since lerna exact: true is used
38-
import packJson from '@iobroker/js-controller-adapter/package.json' assert { type: 'json' };
38+
import packJson from '@iobroker/js-controller-adapter/package.json' with { type: 'json' };
3939

4040
const controllerVersion = packJson.version;
4141

packages/cli/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/// <reference types="@iobroker/types-dev" />
12
export { execute } from '@/lib/setup.js';
23
export { dbConnectAsync } from '@/lib/setup/dbConnection.js';
34
export { Vendor } from '@/lib/setup/setupVendor.js';

packages/common/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/// <reference types="@iobroker/types-dev" />
12
export {
23
getStatesConstructor,
34
statesDbHasServer,

packages/controller/src/main.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
1-
/**
2-
* application.controller
3-
*
4-
* Controls Adapter-Processes
5-
*
6-
* Copyright 2013-2024 bluefox <[email protected]>,
7-
* 2013-2014 hobbyquaker <[email protected]>
8-
* MIT License
9-
*
10-
*/
11-
1+
/// <reference types="@iobroker/types-dev" />
122
import schedule from 'node-schedule';
133
import os from 'node:os';
144
import fs from 'fs-extra';

0 commit comments

Comments
 (0)