diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9068f6b6dc..c21c03a321 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: # TODO(b/419883265): remove commonjs bundles when dropping node 20 support. - node-version: [20.x, 22.x, 24.x] + node-version: [20.x, 22.x, 24.x, 26.x] steps: - uses: actions/checkout@v4 diff --git a/README.md b/README.md index ae5408b02b..34926b2714 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ We recommend using our Code Generation instructions [`codegen_instructions.md`]( ## Prerequisites -1. Node.js version 20 or later +1. Node.js version 22 or later ### The following are required for Gemini Enterprise Agent Platform users (excluding Vertex AI Studio) 1. [Select](https://console.cloud.google.com/project) or [create](https://cloud.google.com/resource-manager/docs/creating-managing-projects#creating_a_project) a Google Cloud project. diff --git a/package-lock.json b/package-lock.json index 2271c501c4..8e82000369 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "@modelcontextprotocol/sdk": "^1.25.2", "@rollup/plugin-json": "^6.1.0", "@types/jasmine": "^5.1.2", - "@types/node": "^20.9.0", + "@types/node": "^22.0.3", "@types/node-fetch": "^2.6.13", "@types/unist": "^3.0.3", "@types/ws": "^8.5.14", @@ -52,7 +52,7 @@ "zod-to-json-schema": "^3.25.0" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "peerDependencies": { "@modelcontextprotocol/sdk": "^1.25.2" @@ -2022,9 +2022,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.19.30", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.30.tgz", - "integrity": "sha512-WJtwWJu7UdlvzEAUm484QNg5eAoq5QR08KDNx7g45Usrs2NtOPiX8ugDqmKdXkyL03rBqU5dYNYVQetEpBHq2g==", + "version": "22.20.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.1.tgz", + "integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==", "dependencies": { "undici-types": "~6.21.0" } diff --git a/package.json b/package.json index 68539a62bf..0b2e976cce 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,10 @@ "node": { "types": "./dist/node/node.d.ts", "import": "./dist/node/index.mjs", - "require": "./dist/node/index.cjs", "default": "./dist/node/index.mjs" }, "types": "./dist/genai.d.ts", "import": "./dist/index.mjs", - "require": "./dist/index.cjs", "default": "./dist/index.mjs" }, "./web": { @@ -39,24 +37,20 @@ "node": { "types": "./dist/tokenizer/node.d.ts", "import": "./dist/tokenizer/node.mjs", - "require": "./dist/tokenizer/node.cjs", "default": "./dist/tokenizer/node.mjs" }, "types": "./dist/tokenizer/node.d.ts", "import": "./dist/tokenizer/node.mjs", - "require": "./dist/tokenizer/node.cjs", "default": "./dist/tokenizer/node.mjs" }, "./tokenizer/node": { "types": "./dist/tokenizer/node.d.ts", "import": "./dist/tokenizer/node.mjs", - "require": "./dist/tokenizer/node.cjs", "default": "./dist/tokenizer/node.mjs" }, "./vertex_internal": { "types": "./dist/vertex_internal/index.d.ts", - "import": "./dist/vertex_internal/index.js", - "require": "./dist/vertex_internal/index.cjs" + "import": "./dist/vertex_internal/index.js" } }, "scripts": { @@ -85,7 +79,7 @@ "generate-proto": "pbjs -t static-module -w es6 -o src/cross/sentencepiece/sentencepiece_model.pb.js src/cross/sentencepiece/sentencepiece_model.proto && pbts -o src/cross/sentencepiece/sentencepiece_model.pb.d.ts src/cross/sentencepiece/sentencepiece_model.pb.js && sed -i.bak 's/import \\* as \\$protobuf from \"protobufjs\\/minimal\"/import \\$protobuf from \"protobufjs\\/minimal.js\"/' src/cross/sentencepiece/sentencepiece_model.pb.js && rm src/cross/sentencepiece/sentencepiece_model.pb.js.bak" }, "engines": { - "node": ">=20.0.0" + "node": ">=22.0.0" }, "overrides": { "tmp": "^0.2.4" @@ -93,24 +87,19 @@ "files": [ "dist/genai.d.ts", "dist/index.mjs", - "dist/index.cjs", "dist/index.mjs.map", "dist/node/index.mjs", - "dist/node/index.cjs", "dist/node/index.mjs.map", "dist/node/node.d.ts", "dist/web/index.mjs", "dist/web/index.mjs.map", "dist/web/web.d.ts", "dist/tokenizer/node.mjs", - "dist/tokenizer/node.cjs", "dist/tokenizer/node.mjs.map", "dist/tokenizer/node.d.ts", "dist/vertex_internal/index.js", - "dist/vertex_internal/index.cjs", "dist/vertex_internal/index.d.ts", "dist/vertex_internal/index.js.map", - "dist/vertex_internal/index.cjs.map", "node/package.json", "web/package.json" ], @@ -121,7 +110,7 @@ "@modelcontextprotocol/sdk": "^1.25.2", "@rollup/plugin-json": "^6.1.0", "@types/jasmine": "^5.1.2", - "@types/node": "^20.9.0", + "@types/node": "^22.0.3", "@types/node-fetch": "^2.6.13", "@types/unist": "^3.0.3", "@types/ws": "^8.5.14", diff --git a/rollup.config.mjs b/rollup.config.mjs index 508de8b7f1..cad112f53e 100644 --- a/rollup.config.mjs +++ b/rollup.config.mjs @@ -50,18 +50,6 @@ export default [ external: externalDeps, }, - // Cross CJS module (dist/index.cjs) - { - input: 'src/index.ts', - output: { - file: pkg.exports['.']['require'], - format: 'cjs', - sourcemap: true, - }, - plugins: rollupPlugins, - external: externalDeps, - }, - // The `node/` ES module (dist/node/index.mjs) { input: 'src/node/index.ts', @@ -74,18 +62,6 @@ export default [ external: externalDeps, }, - // The `node/` CJS module (dist/node/index.cjs) - { - input: 'src/node/index.ts', - output: { - file: pkg.exports['.']['node']['require'], - format: 'cjs', - sourcemap: true, - }, - plugins: rollupPlugins, - external: externalDeps, - }, - // The `web/` module, ES module only (dist/web/index.js) { input: 'src/web/index.ts', @@ -110,18 +86,6 @@ export default [ external: externalDeps, }, - // The `tokenizer/node` CJS module (dist/tokenizer/node.cjs) - { - input: 'src/tokenizer/node.ts', - output: { - file: 'dist/tokenizer/node.cjs', - format: 'cjs', - sourcemap: true, - }, - plugins: rollupPlugins, - external: externalDeps, - }, - // Internal module, only for use by Vertex SDK { input: 'src/vertex_internal/index.ts', @@ -133,14 +97,4 @@ export default [ plugins: rollupPlugins, external: externalDeps, }, - { - input: 'src/vertex_internal/index.ts', - output: { - file: 'dist/vertex_internal/index.cjs', - format: 'cjs', - sourcemap: true, - }, - plugins: rollupPlugins, - external: externalDeps, - }, ];