diff --git a/core/generator/gapic-generator-typescript/package-lock.json b/core/generator/gapic-generator-typescript/package-lock.json index 329be2816856..70ba2ff8fb18 100644 --- a/core/generator/gapic-generator-typescript/package-lock.json +++ b/core/generator/gapic-generator-typescript/package-lock.json @@ -15,8 +15,8 @@ "object-hash": "^3.0.0", "prettier": "^3.2.5", "proto3-json-serializer": "^3.0.3", - "protobufjs": "^7.5.6", - "protobufjs-cli": "^1.2.0", + "protobufjs": "^7.5.7", + "protobufjs-cli": "^1.2.2", "yargs": "^17.7.2" }, "bin": { @@ -475,18 +475,38 @@ } }, "node_modules/@grpc/grpc-js": { - "version": "1.13.3", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.3.tgz", - "integrity": "sha512-FTXHdOoPbZrBjlVLHuKbDZnsTxXv2BlHF57xw6LuThXacXvtkahEPED0CKMk6obZDf65Hv4k3z62eyPNpvinIg==", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.3.tgz", + "integrity": "sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@grpc/proto-loader": "^0.7.13", + "@grpc/proto-loader": "^0.8.0", "@js-sdsl/ordered-map": "^4.4.2" }, "engines": { "node": ">=12.10.0" } }, + "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.1.tgz", + "integrity": "sha512-wtF6h+DY6M3YaDBPAmvuuA6jV8Sif9MjtOI5euKFWRgCDl5PeDpPsHR9u2l6St5ceY8AZgoNDww5+HvEsXFsGg==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "lodash.camelcase": "^4.3.0", + "long": "^5.0.0", + "protobufjs": "^7.5.5", + "yargs": "^17.7.2" + }, + "bin": { + "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@grpc/proto-loader": { "version": "0.7.13", "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz", @@ -5674,9 +5694,9 @@ } }, "node_modules/protobufjs": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.6.tgz", - "integrity": "sha512-M71sTMB146U3u0di3yup8iM+zv8yPRNQVr1KK4tyBitl3qFvEGucq/rGDRShD2rsJhtN02RJaJ7j5X5hmy8SJg==", + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.7.tgz", + "integrity": "sha512-NGnrxS/nLKUo5nkbVQxlC71sB4hdfImdYIbFeSCidxtwATx0AHRPcANSLd0q5Bb2BkoSWo2iisQhGg5/r+ihbA==", "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { @@ -5698,9 +5718,10 @@ } }, "node_modules/protobufjs-cli": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.2.0.tgz", - "integrity": "sha512-+YvqJEmsmZHGzE5j0tvEzFeHm0sX7pzRFpyj7+GazhkS4Y0r+jgbioVvFxxSWIlPzUel/lxeOnLChBmV8NmyHA==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.2.2.tgz", + "integrity": "sha512-gc27fy6Om+92g4UxqOs9ECTc3Xy7zXsnBSFR0dCSEvIRG8cn3eU8x+CcN8ouBB3EjIBVnEOeQb0iVKC4lnBoKA==", + "license": "BSD-3-Clause", "dependencies": { "chalk": "^4.0.0", "escodegen": "^1.13.0", @@ -5721,7 +5742,7 @@ "node": ">=12.0.0" }, "peerDependencies": { - "protobufjs": "^7.0.0" + "protobufjs": ">=7.5.6 <8" } }, "node_modules/protobufjs-cli/node_modules/estraverse": { diff --git a/core/generator/gapic-generator-typescript/package.json b/core/generator/gapic-generator-typescript/package.json index 2a6334ee6b33..8932e6b34ea4 100644 --- a/core/generator/gapic-generator-typescript/package.json +++ b/core/generator/gapic-generator-typescript/package.json @@ -51,8 +51,8 @@ "long": "^5.3.2", "object-hash": "^3.0.0", "proto3-json-serializer": "^3.0.3", - "protobufjs": "^7.5.6", - "protobufjs-cli": "^1.2.0", + "protobufjs": "^7.5.7", + "protobufjs-cli": "^1.2.2", "prettier": "^3.2.5", "yargs": "^17.7.2" }, diff --git a/core/generator/gapic-generator-typescript/pnpm-lock.yaml b/core/generator/gapic-generator-typescript/pnpm-lock.yaml index b331bb06390c..709959dd024d 100644 --- a/core/generator/gapic-generator-typescript/pnpm-lock.yaml +++ b/core/generator/gapic-generator-typescript/pnpm-lock.yaml @@ -24,11 +24,11 @@ dependencies: specifier: ^3.0.3 version: 3.0.4 protobufjs: - specifier: ^7.5.6 - version: 7.5.6 + specifier: ^7.5.7 + version: 7.5.7 protobufjs-cli: - specifier: ^1.2.0 - version: 1.2.0(protobufjs@7.5.6) + specifier: ^1.2.2 + version: 1.2.2(protobufjs@7.5.7) yargs: specifier: ^17.7.2 version: 17.7.2 @@ -63,7 +63,7 @@ devDependencies: version: 0.1.7 gapic-tools: specifier: ^1.0.3 - version: 1.0.5(protobufjs@7.5.6) + version: 1.0.5(protobufjs@7.5.7) google-gax: specifier: ^5.1.1-rc.1 version: 5.1.1-rc.1 @@ -197,6 +197,14 @@ packages: hasBin: true dependencies: '@babel/types': 7.29.0 + dev: true + + /@babel/parser@7.29.3: + resolution: {integrity: sha512-b3ctpQwp+PROvU/cttc4OYl4MzfJUWy6FZg+PMXfzmt/+39iHVF0sDfqay8TQM3JA2EUOyKcFZt75jWriQijsA==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.29.0 /@babel/template@7.28.6: resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==} @@ -335,7 +343,7 @@ packages: dependencies: lodash.camelcase: 4.3.0 long: 5.3.2 - protobufjs: 7.5.6 + protobufjs: 7.5.7 yargs: 17.7.2 dev: true @@ -346,7 +354,7 @@ packages: dependencies: lodash.camelcase: 4.3.0 long: 5.3.2 - protobufjs: 7.5.6 + protobufjs: 7.5.7 yargs: 17.7.2 dev: true @@ -733,7 +741,7 @@ packages: graphemer: 1.4.0 ignore: 5.3.2 natural-compare-lite: 1.4.0 - semver: 7.7.4 + semver: 7.8.0 tsutils: 3.21.0(typescript@5.6.2) typescript: 5.6.2 transitivePeerDependencies: @@ -807,7 +815,7 @@ packages: debug: 4.4.3(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 - semver: 7.7.4 + semver: 7.8.0 tsutils: 3.21.0(typescript@5.6.2) typescript: 5.6.2 transitivePeerDependencies: @@ -828,7 +836,7 @@ packages: '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.6.2) eslint: 8.57.1 eslint-scope: 5.1.1 - semver: 7.7.4 + semver: 7.8.0 transitivePeerDependencies: - supports-color - typescript @@ -1051,7 +1059,7 @@ packages: /builtins@5.1.0: resolution: {integrity: sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==} dependencies: - semver: 7.7.4 + semver: 7.8.0 dev: true /call-bind-apply-helpers@1.0.2: @@ -1551,7 +1559,7 @@ packages: is-core-module: 2.16.1 minimatch: 3.1.5 resolve: 1.22.12 - semver: 7.7.4 + semver: 7.8.0 dev: true /eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0)(eslint@8.57.1)(prettier@3.3.3): @@ -1999,7 +2007,7 @@ packages: - supports-color dev: true - /gapic-tools@1.0.5(protobufjs@7.5.6): + /gapic-tools@1.0.5(protobufjs@7.5.7): resolution: {integrity: sha512-4KfYejUWVXQ3AoEOS4/xr7DpUkyXFED8VbdvtY0Y1i+nB7r1Dj3kUD5M0faSkw9hS9s9i2W9FIMcirSf1Rn2ng==} engines: {node: '>=18'} hasBin: true @@ -2008,7 +2016,7 @@ packages: '@babel/traverse': 7.29.0 google-gax: 5.0.6 google-proto-files: 5.0.1 - protobufjs-cli: 1.2.0(protobufjs@7.5.6) + protobufjs-cli: 1.2.2(protobufjs@7.5.7) rimraf: 5.0.10 uglify-js: 3.19.3 walk-up-path: 3.0.1 @@ -2214,7 +2222,7 @@ packages: node-fetch: 3.3.2 object-hash: 3.0.0 proto3-json-serializer: 3.0.4 - protobufjs: 7.5.6 + protobufjs: 7.5.7 retry-request: 8.0.2 rimraf: 5.0.10 transitivePeerDependencies: @@ -2235,7 +2243,7 @@ packages: node-fetch: 3.3.2 object-hash: 3.0.0 proto3-json-serializer: 3.0.4 - protobufjs: 7.5.6 + protobufjs: 7.5.7 retry-request: 8.0.2 transitivePeerDependencies: - supports-color @@ -2588,7 +2596,7 @@ packages: engines: {node: '>=12.0.0'} hasBin: true dependencies: - '@babel/parser': 7.29.2 + '@babel/parser': 7.29.3 '@jsdoc/salty': 0.2.12 '@types/markdown-it': 14.1.2 bluebird: 3.7.2 @@ -3008,7 +3016,7 @@ packages: dependencies: hosted-git-info: 4.1.0 is-core-module: 2.16.1 - semver: 7.7.4 + semver: 7.8.0 validate-npm-package-license: 3.0.4 dev: true @@ -3216,14 +3224,14 @@ packages: resolution: {integrity: sha512-E1sbAYg3aEbXrq0n1ojJkRHQJGE1kaE/O6GLA94y8rnJBfgvOPTOd1b9hOceQK1FFZI9qMh1vBERCyO2ifubcw==} engines: {node: '>=18'} dependencies: - protobufjs: 7.5.6 + protobufjs: 7.5.7 - /protobufjs-cli@1.2.0(protobufjs@7.5.6): - resolution: {integrity: sha512-+YvqJEmsmZHGzE5j0tvEzFeHm0sX7pzRFpyj7+GazhkS4Y0r+jgbioVvFxxSWIlPzUel/lxeOnLChBmV8NmyHA==} + /protobufjs-cli@1.2.2(protobufjs@7.5.7): + resolution: {integrity: sha512-gc27fy6Om+92g4UxqOs9ECTc3Xy7zXsnBSFR0dCSEvIRG8cn3eU8x+CcN8ouBB3EjIBVnEOeQb0iVKC4lnBoKA==} engines: {node: '>=12.0.0'} hasBin: true peerDependencies: - protobufjs: ^7.0.0 + protobufjs: '>=7.5.6 <8' dependencies: chalk: 4.1.2 escodegen: 1.14.3 @@ -3232,8 +3240,8 @@ packages: glob: 8.1.0 jsdoc: 4.0.5 minimist: 1.2.8 - protobufjs: 7.5.6 - semver: 7.7.4 + protobufjs: 7.5.7 + semver: 7.8.0 tmp: 0.2.5 uglify-js: 3.19.3 @@ -3256,8 +3264,8 @@ packages: long: 5.3.2 dev: true - /protobufjs@7.5.6: - resolution: {integrity: sha512-M71sTMB146U3u0di3yup8iM+zv8yPRNQVr1KK4tyBitl3qFvEGucq/rGDRShD2rsJhtN02RJaJ7j5X5hmy8SJg==} + /protobufjs@7.5.7: + resolution: {integrity: sha512-NGnrxS/nLKUo5nkbVQxlC71sB4hdfImdYIbFeSCidxtwATx0AHRPcANSLd0q5Bb2BkoSWo2iisQhGg5/r+ihbA==} engines: {node: '>=12.0.0'} requiresBuild: true dependencies: @@ -3472,8 +3480,8 @@ packages: hasBin: true dev: true - /semver@7.7.4: - resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==} + /semver@7.8.0: + resolution: {integrity: sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==} engines: {node: '>=10'} hasBin: true diff --git a/core/generator/gapic-generator-typescript/yarn.lock b/core/generator/gapic-generator-typescript/yarn.lock index 3221689b91eb..faac0d669aea 100644 --- a/core/generator/gapic-generator-typescript/yarn.lock +++ b/core/generator/gapic-generator-typescript/yarn.lock @@ -228,11 +228,11 @@ uuid "^8.0.0" "@grpc/grpc-js@^1.12.6": - version "1.13.3" - resolved "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.3.tgz" - integrity sha512-FTXHdOoPbZrBjlVLHuKbDZnsTxXv2BlHF57xw6LuThXacXvtkahEPED0CKMk6obZDf65Hv4k3z62eyPNpvinIg== + version "1.14.3" + resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.14.3.tgz#4c9b817a900ae4020ddc28515ae4b52c78cfb8da" + integrity sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA== dependencies: - "@grpc/proto-loader" "^0.7.13" + "@grpc/proto-loader" "^0.8.0" "@js-sdsl/ordered-map" "^4.4.2" "@grpc/proto-loader@^0.7.13": @@ -3192,10 +3192,10 @@ proto3-json-serializer@^3.0.0, proto3-json-serializer@^3.0.3: dependencies: protobufjs "^7.4.0" -protobufjs-cli@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.2.0.tgz" - integrity sha512-+YvqJEmsmZHGzE5j0tvEzFeHm0sX7pzRFpyj7+GazhkS4Y0r+jgbioVvFxxSWIlPzUel/lxeOnLChBmV8NmyHA== +protobufjs-cli@^1.2.0, protobufjs-cli@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/protobufjs-cli/-/protobufjs-cli-1.2.2.tgz#f5253421d78953baa5dc5bf5cb81149b58e58c21" + integrity sha512-gc27fy6Om+92g4UxqOs9ECTc3Xy7zXsnBSFR0dCSEvIRG8cn3eU8x+CcN8ouBB3EjIBVnEOeQb0iVKC4lnBoKA== dependencies: chalk "^4.0.0" escodegen "^1.13.0" @@ -3226,10 +3226,10 @@ protobufjs@7.5.4: "@types/node" ">=13.7.0" long "^5.0.0" -protobufjs@^7.2.5, protobufjs@^7.4.0, protobufjs@^7.5.3, protobufjs@^7.5.6: - version "7.5.6" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.6.tgz#11af832ebc4b4326f658a5b1308e6141eb57edfd" - integrity sha512-M71sTMB146U3u0di3yup8iM+zv8yPRNQVr1KK4tyBitl3qFvEGucq/rGDRShD2rsJhtN02RJaJ7j5X5hmy8SJg== +protobufjs@^7.2.5, protobufjs@^7.4.0, protobufjs@^7.5.3, protobufjs@^7.5.7: + version "7.5.7" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.5.7.tgz#1dde1c3848ec9cc70a2ad7e3c12ff7b7e5abe280" + integrity sha512-NGnrxS/nLKUo5nkbVQxlC71sB4hdfImdYIbFeSCidxtwATx0AHRPcANSLd0q5Bb2BkoSWo2iisQhGg5/r+ihbA== dependencies: "@protobufjs/aspromise" "^1.1.2" "@protobufjs/base64" "^1.1.2" diff --git a/core/packages/gax/test/test-application/package.json b/core/packages/gax/test/test-application/package.json index 6af31e90dde6..a48cc043c46a 100644 --- a/core/packages/gax/test/test-application/package.json +++ b/core/packages/gax/test/test-application/package.json @@ -24,9 +24,9 @@ "typescript": "^5.1.6" }, "dependencies": { - "@grpc/grpc-js": "~1.6.0", + "@grpc/grpc-js": "~1.14.3", "google-gax": "file:./google-gax.tgz", - "protobufjs": "^7.0.0", + "protobufjs": "^8.3.0", "pumpify": "^2.0.1", "showcase-echo-client": "./showcase-echo-client.tgz", "showcase-server": "./showcase-server.tgz" diff --git a/handwritten/cloud-profiler/package.json b/handwritten/cloud-profiler/package.json index 5b815f1afa17..193db64ca231 100644 --- a/handwritten/cloud-profiler/package.json +++ b/handwritten/cloud-profiler/package.json @@ -43,7 +43,7 @@ "ms": "^2.1.3", "pprof": "4.0.0", "pretty-ms": "^7.0.0", - "protobufjs": "~7.4.0", + "protobufjs": "~8.3.0", "semver": "^7.0.0", "teeny-request": "^9.0.0" }, @@ -70,7 +70,7 @@ "nock": "^13.0.0", "sinon": "^18.0.0", "source-map": "^0.7.0", - "tmp": "0.2.4", + "tmp": "0.2.5", "typescript": "5.1.6" }, "files": [