diff --git a/package.json b/package.json index 2ccf67d864..157638b26d 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ }, "devDependencies": { "@semantic-release/exec": "6.0.3", - "@tsconfig/node18": "18.2.2", + "@tsconfig/node20": "20.1.2", "@tsconfig/strictest": "2.0.2", "@types/global-agent": "2.1.3", "@types/node": "18.18.13", @@ -98,7 +98,7 @@ }, "packageManager": "pnpm@8.11.0", "engines": { - "node": "^18.12.0 || >=20.9.0", + "node": ">=20.9.0", "pnpm": "^8.0.0" }, "pnpm": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c17d3d3094..58691443b1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -69,9 +69,9 @@ devDependencies: '@semantic-release/exec': specifier: 6.0.3 version: 6.0.3(semantic-release@22.0.8) - '@tsconfig/node18': - specifier: 18.2.2 - version: 18.2.2 + '@tsconfig/node20': + specifier: 20.1.2 + version: 20.1.2 '@tsconfig/strictest': specifier: 2.0.2 version: 2.0.2 @@ -905,8 +905,8 @@ packages: defer-to-connect: 2.0.1 dev: false - /@tsconfig/node18@18.2.2: - resolution: {integrity: sha512-d6McJeGsuoRlwWZmVIeE8CUA27lu6jLjvv1JzqmpsytOYYbVi1tHZEnwCNVOXnj4pyLvneZlFlpXUK+X9wBWyw==} + /@tsconfig/node20@20.1.2: + resolution: {integrity: sha512-madaWq2k+LYMEhmcp0fs+OGaLFk0OenpHa4gmI4VEmCKX4PJntQ6fnnGADVFrVkBj0wIdAlQnK/MrlYTHsa1gQ==} dev: true /@tsconfig/strictest@2.0.2: diff --git a/tools/esbuild.js b/tools/esbuild.js index c5dfc21593..f1161667f8 100644 --- a/tools/esbuild.js +++ b/tools/esbuild.js @@ -3,11 +3,13 @@ import { exec } from '@yao-pkg/pkg'; import { build } from 'esbuild'; import esbuildPluginPino from 'esbuild-plugin-pino'; +const nodeVersion = 20; + await build({ entryPoints: { 'containerbase-cli': './src/cli/index.ts' }, bundle: true, platform: 'node', - target: 'node18', + target: `node${nodeVersion}`, minify: false, tsconfig: 'tsconfig.dist.json', // format: "esm", // not supported https://github.com/vercel/pkg/issues/1291 @@ -33,7 +35,10 @@ await fs.writeFile( }, pkg: { scripts: ['pino-*.js', 'thread-stream-worker.js'], - targets: ['node18-linux-x64', 'node18-linux-arm64'], + targets: [ + `node${nodeVersion}-linux-x64`, + `node${nodeVersion}-linux-arm64`, + ], patches: { './containerbase-cli.js': [ 'pinoBundlerAbsolutePath("./pino-file.js")', diff --git a/tsconfig.json b/tsconfig.json index 4ffcf41a84..f7a0b8a5ac 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "extends": [ "@tsconfig/strictest/tsconfig.json", - "@tsconfig/node18/tsconfig.json" + "@tsconfig/node20/tsconfig.json" ], "compilerOptions": { "baseUrl": ".",