diff --git a/.github/workflows/generator-tests.yaml b/.github/workflows/generator-tests.yaml index 0f51abe3ed24..efa80d2caeb2 100644 --- a/.github/workflows/generator-tests.yaml +++ b/.github/workflows/generator-tests.yaml @@ -41,136 +41,10 @@ jobs: run: npm install working-directory: core/generator/gapic-generator-typescript - - name: Run bazel build - working-directory: core/generator/gapic-generator-typescript - run: bazelisk build --noremote_accept_cached '//...' - - - name: Run bazel test - working-directory: core/generator/gapic-generator-typescript - run: bazelisk test --test_output=errors --noremote_accept_cached //... - - - name: Verify error conformance + - name: Strip local GCC 15 flags for CI working-directory: core/generator/gapic-generator-typescript - run: | - curl -sSL https://github.com/googleapis/gapic-config-validator/releases/download/v0.6.0/gapic-config-validator-0.6.0-linux-amd64.tar.gz > config-validator.tar.gz - tar xzf config-validator.tar.gz --no-same-owner - chmod +x gapic-error-conformance - chmod +x bazel-bin/protoc_plugin_/protoc_plugin - ./gapic-error-conformance -plugin="bazel-bin/protoc_plugin_/protoc_plugin" + run: sed -i '/--gsframe/d' .bazelrc - - name: Prepare baseline artifacts - working-directory: core/generator/gapic-generator-typescript - run: | - mkdir -p ~/artifacts - cp bazel-testlogs/unit_tests/test.outputs/outputs.zip ~/artifacts/ - bazelisk run -- @pnpm//:pnpm --dir $PWD install - tar cfz ~/artifacts/node_modules.tar.gz node_modules - - - name: Save artifacts - uses: actions/upload-artifact@v5 - with: - name: artifacts - path: ~/artifacts - - - name: Test generated libraries - working-directory: core/generator/gapic-generator-typescript - run: | - set -ex - unzip ~/artifacts/outputs.zip -d library - for lib in showcase kms translate monitoring dlp texttospeech showcase-legacy compute logging bigquery-v2 redis retail; do - echo "--- Testing library $lib ---" - cd library/.test-out-$lib - npm install - npm test - npm run fix - rm -rf build - npm run compile - npm run system-test - npm run docs - cd ../.. - done - - - name: Test generated ESM libraries - working-directory: core/generator/gapic-generator-typescript - run: | - set -ex - for lib in showcase kms translate monitoring dlp texttospeech showcase-legacy compute logging bigquery-v2 redis retail; do - echo "--- Testing ESM library $lib ---" - cd library/.test-out-$lib-esm - npm install - npm test - npm run fix - rm -rf build - npm run compile - npm run system-test - cd ../.. - done - - name: Test combined library (Speech) - if: steps.generator-changes.outputs.changes == 'true' - env: - TEST_ENV_DESTINATION_PATH: generator/gapic-generator-typescript/test-fixtures/google-cloud-speech - run: generator/gapic-generator-typescript/rules_typescript_gapic/combine_script.sh generator/gapic-generator-typescript/test-fixtures/google-cloud-speech-nodejs v1 "" "" generator/gapic-generator-typescript/node_modules/gapic-tools/build/src/compileProtos.js generator/gapic-generator-typescript/node_modules/gapic-node-processing/build/src/cli.js "" - - - name: Run tests for combined library (Speech) - if: steps.generator-changes.outputs.changes == 'true' - run: | - set -ex - cd generator/gapic-generator-typescript/test-fixtures/google-cloud-speech - npm install - npm test - npm run system-test - - - name: Test combined library (Tasks) - if: steps.generator-changes.outputs.changes == 'true' - env: - TEST_ENV_DESTINATION_PATH: generator/gapic-generator-typescript/test-fixtures/google-cloud-tasks - run: generator/gapic-generator-typescript/rules_typescript_gapic/combine_script.sh generator/gapic-generator-typescript/test-fixtures/google-cloud-tasks-nodejs v2 "" "" generator/gapic-generator-typescript/node_modules/gapic-tools/build/src/compileProtos.js generator/gapic-generator-typescript/node_modules/gapic-node-processing/build/src/cli.js "" - - - name: Run tests for combined library (Tasks) - if: steps.generator-changes.outputs.changes == 'true' - run: | - set -ex - cd generator/gapic-generator-typescript/test-fixtures/google-cloud-tasks - npm install - npm test - npm run system-test - - continuous: - if: github.event_name == 'push' && github.ref == 'refs/heads/main' - runs-on: ubuntu-latest - container: gcr.io/gapic-images/googleapis:20250404 - steps: - - uses: actions/checkout@v5 - with: - fetch-depth: 2 # Need at least two commits for HEAD~.. - - - name: Mark repo as safe for git - run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - - - name: Compute GIT_DIFF_ARG - id: diff-logic - run: | - # For continuous build, we want to know the difference in the last - # commit. This assumes we use squash commit when merging PRs. - git fetch origin main --deepen=1 - echo "GIT_DIFF_ARG=HEAD~.." >> $GITHUB_ENV - - - name: Cache Bazel files - id: cache-bazel - uses: actions/cache@v5 - with: - path: ~/.cache/bazel - key: ${{ runner.os }}-googleapis-20250422-${{ secrets.CACHE_VERSION }} - - - name: Setup Node.js - uses: actions/setup-node@v6 - with: - node-version: 18.x - - - name: Install Node dependencies with npm - run: npm install - working-directory: core/generator/gapic-generator-typescript - - name: Run bazel build working-directory: core/generator/gapic-generator-typescript run: bazelisk build --noremote_accept_cached '//...' @@ -235,7 +109,7 @@ jobs: npm run system-test cd ../.. done - - name: Test combined library (Speech) + - name: Test combined library (Speech) if: steps.generator-changes.outputs.changes == 'true' env: TEST_ENV_DESTINATION_PATH: generator/gapic-generator-typescript/test-fixtures/google-cloud-speech @@ -263,4 +137,4 @@ jobs: cd generator/gapic-generator-typescript/test-fixtures/google-cloud-tasks npm install npm test - npm run system-test \ No newline at end of file + npm run system-test diff --git a/core/generator/gapic-generator-typescript/.bazeliskrc b/core/generator/gapic-generator-typescript/.bazeliskrc index 74cd900fbd3c..f7d5d8d41cfc 100644 --- a/core/generator/gapic-generator-typescript/.bazeliskrc +++ b/core/generator/gapic-generator-typescript/.bazeliskrc @@ -1,2 +1,2 @@ # See https://github.com/bazelbuild/bazelisk -USE_BAZEL_VERSION=6.3.0 +USE_BAZEL_VERSION=7.7.1 diff --git a/core/generator/gapic-generator-typescript/.bazelrc b/core/generator/gapic-generator-typescript/.bazelrc index 5b84b3d13b80..365a2863bc5a 100644 --- a/core/generator/gapic-generator-typescript/.bazelrc +++ b/core/generator/gapic-generator-typescript/.bazelrc @@ -1,24 +1,34 @@ -# Copied from https://github.com/googleapis/googleapis/blob/master/.bazelrc -# Need because absl library requires C++14 while the Bazel default is C++0x +common --noenable_bzlmod +# --- C++ Toolchain & Compilation --- +# Force C++17 for Protobuf 31 / gRPC 1.74 compatibility +build --cxxopt='-std=c++17' +build --host_cxxopt='-std=c++17' +build --action_env=BAZEL_CXXOPTS="-std=c++17" +build --copt='-Wa,--gsframe=no' +build --host_copt='-Wa,--gsframe=no' + + +# --- Java Toolchain & Runtime (JDK 21) --- +build --java_language_version=21 +build --java_runtime_version=remotejdk_21 +build --javacopt="-Xep:ImpossibleNullComparison:OFF" + +# --- Protobuf & gRPC --- +build --proto_toolchain_for_java="@com_google_protobuf//:java_toolchain" +build --define=grpc_no_ares=true # To make proto_library rules to include source info in the descriptor build --protocopt=--include_source_info build --protocopt=--experimental_allow_proto3_optional -# New boringssl requires C++14 -build --repo_env=BAZEL_CXXOPTS="-std=c++14" +# --- Test Environment Fixes --- +test --jvmopt="-Djava.security.manager=allow" +test --jvmopt="--add-opens=java.base/java.lang=ALL-UNNAMED" -# This is to avoid JVM SIGBUS crashes on highly parallel builds, -# see https://github.com/bazelbuild/bazel/issues/3236 for more details -build --enable_platform_specific_config +# --- Linux Specific Config --- build:linux --sandbox_tmpfs_path=/tmp +common:linux --experimental_convenience_symlinks=ignore -build --cxxopt=-std=c++17 -build --host_cxxopt=-std=c++17 - -common --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig - - # Between Bazel 6.0 and 6.3, you need all of this, to avoid discarding the analysis cache: - build --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig - fetch --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig - query --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig \ No newline at end of file +# --- Performance & Analysis --- +# Bazel 6.4+: 'common' applies to all commands that support the flag +common --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig \ No newline at end of file diff --git a/core/generator/gapic-generator-typescript/WORKSPACE b/core/generator/gapic-generator-typescript/WORKSPACE index af5d4ebdbcb5..7f9eef47df52 100644 --- a/core/generator/gapic-generator-typescript/WORKSPACE +++ b/core/generator/gapic-generator-typescript/WORKSPACE @@ -2,13 +2,26 @@ workspace( # How this workspace would be referenced with absolute labels from another workspace name = "gapic_generator_typescript", ) + load("//:repositories.bzl", "gapic_generator_typescript_repositories", "NODE_VERSION") gapic_generator_typescript_repositories() +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + +http_archive( + name = "rules_java", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/7.11.1/rules_java-7.11.1.tar.gz", + ], + sha256 = "6f3ce0e9fba979a844faba2d60467843fbf5191d8ca61fa3d2ea17655b56bb8c", +) + load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() + + load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() diff --git a/core/generator/gapic-generator-typescript/baselines/asset-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/asset-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/asset-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/asset-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/asset-esm/package.json b/core/generator/gapic-generator-typescript/baselines/asset-esm/package.json index 6ce6377d6b17..659bdec70889 100644 --- a/core/generator/gapic-generator-typescript/baselines/asset-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/asset-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/asset/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/asset/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/asset/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/asset/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/asset/package.json b/core/generator/gapic-generator-typescript/baselines/asset/package.json index a2fcaab01434..ee6499cbe0c7 100644 --- a/core/generator/gapic-generator-typescript/baselines/asset/package.json +++ b/core/generator/gapic-generator-typescript/baselines/asset/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/asset/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/asset/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/asset/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/asset/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/package.json b/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/package.json index 7d44ad95f1ca..8a6f9cea3dc2 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-storage-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-storage/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/bigquery-storage/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-storage/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-storage/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-storage/package.json b/core/generator/gapic-generator-typescript/baselines/bigquery-storage/package.json index 090d3b5ad0f3..d7bb5b125abf 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-storage/package.json +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-storage/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-storage/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/bigquery-storage/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-storage/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-storage/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/package.json b/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/package.json index 304fa6244fad..39b7ea64a005 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-v2-esm/package.json @@ -88,7 +88,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -98,9 +98,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-v2/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/bigquery-v2/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-v2/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-v2/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-v2/package.json b/core/generator/gapic-generator-typescript/baselines/bigquery-v2/package.json index 049b466a0c47..d4c98eed0cc8 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-v2/package.json +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-v2/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -56,7 +56,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/bigquery-v2/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/bigquery-v2/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/bigquery-v2/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/bigquery-v2/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/compute-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/compute-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/compute-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/compute-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/compute-esm/package.json b/core/generator/gapic-generator-typescript/baselines/compute-esm/package.json index 929314eec85b..574539631ffa 100644 --- a/core/generator/gapic-generator-typescript/baselines/compute-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/compute-esm/package.json @@ -83,7 +83,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -93,9 +93,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/compute/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/compute/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/compute/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/compute/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/compute/package.json b/core/generator/gapic-generator-typescript/baselines/compute/package.json index 129bfb86f90d..341a8d6bb41f 100644 --- a/core/generator/gapic-generator-typescript/baselines/compute/package.json +++ b/core/generator/gapic-generator-typescript/baselines/compute/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -51,7 +51,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/compute/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/compute/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/compute/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/compute/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/package.json b/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/package.json index 4bdd687667c1..843f1661d115 100644 --- a/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/deprecatedtest-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/deprecatedtest/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/deprecatedtest/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/deprecatedtest/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/deprecatedtest/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/deprecatedtest/package.json b/core/generator/gapic-generator-typescript/baselines/deprecatedtest/package.json index 06d84d4b8f47..88c1982c292e 100644 --- a/core/generator/gapic-generator-typescript/baselines/deprecatedtest/package.json +++ b/core/generator/gapic-generator-typescript/baselines/deprecatedtest/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/deprecatedtest/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/deprecatedtest/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/deprecatedtest/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/deprecatedtest/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/package.json b/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/package.json index fb57db573139..6de66ad2bdaf 100644 --- a/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/disable-packing-test-esm/package.json @@ -87,7 +87,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -97,9 +97,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/disable-packing-test/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/disable-packing-test/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/disable-packing-test/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/disable-packing-test/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/disable-packing-test/package.json b/core/generator/gapic-generator-typescript/baselines/disable-packing-test/package.json index e98811017023..e02a97d7b12a 100644 --- a/core/generator/gapic-generator-typescript/baselines/disable-packing-test/package.json +++ b/core/generator/gapic-generator-typescript/baselines/disable-packing-test/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -55,7 +55,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/dlp-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/dlp-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/dlp-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/dlp-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/dlp-esm/package.json b/core/generator/gapic-generator-typescript/baselines/dlp-esm/package.json index 5c2327723cf0..7f1c4d87c4af 100644 --- a/core/generator/gapic-generator-typescript/baselines/dlp-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/dlp-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/dlp/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/dlp/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/dlp/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/dlp/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/dlp/package.json b/core/generator/gapic-generator-typescript/baselines/dlp/package.json index ec6c2a719150..9de123fa37a0 100644 --- a/core/generator/gapic-generator-typescript/baselines/dlp/package.json +++ b/core/generator/gapic-generator-typescript/baselines/dlp/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/dlp/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/dlp/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/dlp/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/dlp/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/kms-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/kms-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/kms-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/kms-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/kms-esm/package.json b/core/generator/gapic-generator-typescript/baselines/kms-esm/package.json index 3dd7d50fc156..afb55956344b 100644 --- a/core/generator/gapic-generator-typescript/baselines/kms-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/kms-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/kms/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/kms/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/kms/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/kms/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/kms/package.json b/core/generator/gapic-generator-typescript/baselines/kms/package.json index 006e9d29f07a..407ed881406f 100644 --- a/core/generator/gapic-generator-typescript/baselines/kms/package.json +++ b/core/generator/gapic-generator-typescript/baselines/kms/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/kms/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/kms/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/kms/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/kms/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/logging-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/logging-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/logging-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/logging-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/logging-esm/package.json b/core/generator/gapic-generator-typescript/baselines/logging-esm/package.json index 2b869d218db5..51e69ba5b936 100644 --- a/core/generator/gapic-generator-typescript/baselines/logging-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/logging-esm/package.json @@ -84,7 +84,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -94,9 +94,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/logging/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/logging/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/logging/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/logging/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/logging/package.json b/core/generator/gapic-generator-typescript/baselines/logging/package.json index f3aa9fd72991..6b10e452bd2c 100644 --- a/core/generator/gapic-generator-typescript/baselines/logging/package.json +++ b/core/generator/gapic-generator-typescript/baselines/logging/package.json @@ -42,7 +42,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -52,7 +52,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/logging/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/logging/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/logging/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/logging/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/monitoring-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/monitoring-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/monitoring-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/monitoring-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/monitoring-esm/package.json b/core/generator/gapic-generator-typescript/baselines/monitoring-esm/package.json index a135bea93a03..df3eec55f353 100644 --- a/core/generator/gapic-generator-typescript/baselines/monitoring-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/monitoring-esm/package.json @@ -87,7 +87,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -97,9 +97,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/monitoring/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/monitoring/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/monitoring/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/monitoring/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/monitoring/package.json b/core/generator/gapic-generator-typescript/baselines/monitoring/package.json index 0a84ff7cb8c7..8a476819d8c6 100644 --- a/core/generator/gapic-generator-typescript/baselines/monitoring/package.json +++ b/core/generator/gapic-generator-typescript/baselines/monitoring/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -55,7 +55,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/monitoring/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/monitoring/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/monitoring/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/monitoring/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/naming-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/naming-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/naming-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/naming-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/naming-esm/package.json b/core/generator/gapic-generator-typescript/baselines/naming-esm/package.json index 5fd822eb9f84..cd6f9ad7dfb8 100644 --- a/core/generator/gapic-generator-typescript/baselines/naming-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/naming-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/naming/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/naming/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/naming/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/naming/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/naming/package.json b/core/generator/gapic-generator-typescript/baselines/naming/package.json index 76709bf6259a..6e82b91d416d 100644 --- a/core/generator/gapic-generator-typescript/baselines/naming/package.json +++ b/core/generator/gapic-generator-typescript/baselines/naming/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/naming/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/naming/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/naming/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/naming/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/redis-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/redis-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/redis-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/redis-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/redis-esm/package.json b/core/generator/gapic-generator-typescript/baselines/redis-esm/package.json index 913d5e631d4c..7d0e5005ce24 100644 --- a/core/generator/gapic-generator-typescript/baselines/redis-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/redis-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/redis/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/redis/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/redis/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/redis/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/redis/package.json b/core/generator/gapic-generator-typescript/baselines/redis/package.json index da34e28bae27..0997ee995e3c 100644 --- a/core/generator/gapic-generator-typescript/baselines/redis/package.json +++ b/core/generator/gapic-generator-typescript/baselines/redis/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/redis/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/redis/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/redis/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/redis/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/retail-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/retail-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/retail-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/retail-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/retail-esm/package.json b/core/generator/gapic-generator-typescript/baselines/retail-esm/package.json index 59520a89caa9..4dad3cdc8951 100644 --- a/core/generator/gapic-generator-typescript/baselines/retail-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/retail-esm/package.json @@ -96,7 +96,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -106,9 +106,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/retail/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/retail/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/retail/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/retail/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/retail/package.json b/core/generator/gapic-generator-typescript/baselines/retail/package.json index 838a6fc3a077..cce57a59a986 100644 --- a/core/generator/gapic-generator-typescript/baselines/retail/package.json +++ b/core/generator/gapic-generator-typescript/baselines/retail/package.json @@ -54,7 +54,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -64,7 +64,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/retail/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/retail/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/retail/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/retail/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/routingtest-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/routingtest-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/routingtest-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/routingtest-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/routingtest-esm/package.json b/core/generator/gapic-generator-typescript/baselines/routingtest-esm/package.json index a2a510bdfdaa..d4c5a67c414e 100644 --- a/core/generator/gapic-generator-typescript/baselines/routingtest-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/routingtest-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/routingtest/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/routingtest/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/routingtest/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/routingtest/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/routingtest/package.json b/core/generator/gapic-generator-typescript/baselines/routingtest/package.json index 197b276ae03d..0ab0042ce5f7 100644 --- a/core/generator/gapic-generator-typescript/baselines/routingtest/package.json +++ b/core/generator/gapic-generator-typescript/baselines/routingtest/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/routingtest/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/routingtest/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/routingtest/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/routingtest/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/showcase-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/showcase-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-esm/package.json b/core/generator/gapic-generator-typescript/baselines/showcase-esm/package.json index fb57db573139..6de66ad2bdaf 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/showcase-esm/package.json @@ -87,7 +87,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -97,9 +97,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/package.json b/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/package.json index 2958920b00a5..14a70ca73ffb 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/showcase-legacy-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-legacy/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/showcase-legacy/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-legacy/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/showcase-legacy/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-legacy/package.json b/core/generator/gapic-generator-typescript/baselines/showcase-legacy/package.json index 8d7cc58f7bee..a77345c1a7cf 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-legacy/package.json +++ b/core/generator/gapic-generator-typescript/baselines/showcase-legacy/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/showcase-legacy/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/showcase-legacy/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase-legacy/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/showcase-legacy/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/showcase/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/showcase/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/showcase/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/showcase/package.json b/core/generator/gapic-generator-typescript/baselines/showcase/package.json index e98811017023..e02a97d7b12a 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase/package.json +++ b/core/generator/gapic-generator-typescript/baselines/showcase/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -55,7 +55,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/showcase/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/showcase/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/showcase/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/showcase/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/tasks-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/tasks-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/tasks-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/tasks-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/tasks-esm/package.json b/core/generator/gapic-generator-typescript/baselines/tasks-esm/package.json index 644d1b1b12e4..6d4ca6260b1f 100644 --- a/core/generator/gapic-generator-typescript/baselines/tasks-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/tasks-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/tasks/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/tasks/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/tasks/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/tasks/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/tasks/package.json b/core/generator/gapic-generator-typescript/baselines/tasks/package.json index efbcfa2e8a20..2717514a26d4 100644 --- a/core/generator/gapic-generator-typescript/baselines/tasks/package.json +++ b/core/generator/gapic-generator-typescript/baselines/tasks/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/tasks/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/tasks/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/tasks/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/tasks/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/package.json b/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/package.json index d099263bb223..7acefc2a563d 100644 --- a/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/texttospeech-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/texttospeech/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/texttospeech/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/texttospeech/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/texttospeech/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/texttospeech/package.json b/core/generator/gapic-generator-typescript/baselines/texttospeech/package.json index 074c58ce24dc..07f6bb0a393b 100644 --- a/core/generator/gapic-generator-typescript/baselines/texttospeech/package.json +++ b/core/generator/gapic-generator-typescript/baselines/texttospeech/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/texttospeech/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/texttospeech/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/texttospeech/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/texttospeech/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/translate-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/translate-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/translate-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/translate-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/translate-esm/package.json b/core/generator/gapic-generator-typescript/baselines/translate-esm/package.json index 7b776032c5b9..5df9b5f36163 100644 --- a/core/generator/gapic-generator-typescript/baselines/translate-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/translate-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/translate/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/translate/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/translate/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/translate/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/translate/package.json b/core/generator/gapic-generator-typescript/baselines/translate/package.json index 35ab053cdb88..e04f1dc2d7bd 100644 --- a/core/generator/gapic-generator-typescript/baselines/translate/package.json +++ b/core/generator/gapic-generator-typescript/baselines/translate/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/translate/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/translate/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/translate/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/translate/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/package.json b/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/package.json index 88917fed13f6..c897e60b4a5e 100644 --- a/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/package.json +++ b/core/generator/gapic-generator-typescript/baselines/videointelligence-esm/package.json @@ -82,7 +82,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -92,9 +92,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0", + "pack-n-play": "^4.2.1", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1" diff --git a/core/generator/gapic-generator-typescript/baselines/videointelligence/.eslintrc.json.baseline b/core/generator/gapic-generator-typescript/baselines/videointelligence/.eslintrc.json.baseline index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/baselines/videointelligence/.eslintrc.json.baseline +++ b/core/generator/gapic-generator-typescript/baselines/videointelligence/.eslintrc.json.baseline @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/baselines/videointelligence/package.json b/core/generator/gapic-generator-typescript/baselines/videointelligence/package.json index 535fa3e45c53..f80a1458ef48 100644 --- a/core/generator/gapic-generator-typescript/baselines/videointelligence/package.json +++ b/core/generator/gapic-generator-typescript/baselines/videointelligence/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/baselines/videointelligence/system-test/install.ts.baseline b/core/generator/gapic-generator-typescript/baselines/videointelligence/system-test/install.ts.baseline index 394f3362d203..f66069aa3940 100644 --- a/core/generator/gapic-generator-typescript/baselines/videointelligence/system-test/install.ts.baseline +++ b/core/generator/gapic-generator-typescript/baselines/videointelligence/system-test/install.ts.baseline @@ -40,7 +40,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/repositories.bzl b/core/generator/gapic-generator-typescript/repositories.bzl index 8a58d3317cdd..159afbe262e3 100644 --- a/core/generator/gapic-generator-typescript/repositories.bzl +++ b/core/generator/gapic-generator-typescript/repositories.bzl @@ -40,9 +40,9 @@ def gapic_generator_typescript_repositories(): maybe( http_archive, name = "com_google_protobuf", - sha256 = "79cc6d09d02706c5a73e900ea842b5b3dae160f371b6654774947fe781851423", - strip_prefix = "protobuf-27.5", - urls = ["https://github.com/protocolbuffers/protobuf/archive/v27.5.tar.gz"], + sha256 = "2b695cb1eaef8e173f884235ee6d55f57186e95d89ebb31361ee55cb5fd1b996", + strip_prefix = "protobuf-31.0", + urls = ["https://github.com/protocolbuffers/protobuf/archive/v31.0.tar.gz"], ) # This is the version of Node.js that would run the generator, it's unrelated to the versions supported by the generated libraries NODE_VERSION = "18.12.1" # https://github.com/bazelbuild/rules_nodejs/blob/stable/nodejs/private/node_versions.bzl diff --git a/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/.eslintrc.json.njk b/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/.eslintrc.json.njk index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/.eslintrc.json.njk +++ b/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/.eslintrc.json.njk @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/package.json b/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/package.json index c9b7da717878..1b1007c6b329 100644 --- a/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/package.json +++ b/core/generator/gapic-generator-typescript/templates/cjs/typescript_gapic/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "c8": "^10.1.3", "gapic-tools": "^1.0.3", "gts": "^6.0.2", @@ -50,7 +50,7 @@ "mocha": "^11.7.4", "pack-n-play": "^4.2.1", "typescript": "5.8.3", - "sinon": "^21.0.0" + "sinon": "^20.0.0" }, "engines": { "node": ">=v18" diff --git a/core/generator/gapic-generator-typescript/templates/cjs/typescript_packing_test/system-test/install.ts.njk b/core/generator/gapic-generator-typescript/templates/cjs/typescript_packing_test/system-test/install.ts.njk index f3f678c359c2..cfaaee093de8 100644 --- a/core/generator/gapic-generator-typescript/templates/cjs/typescript_packing_test/system-test/install.ts.njk +++ b/core/generator/gapic-generator-typescript/templates/cjs/typescript_packing_test/system-test/install.ts.njk @@ -41,7 +41,7 @@ describe('📦 pack-n-play test', () => { packageDir: process.cwd(), sample: { description: 'JavaScript user can use the library', - ts: readFileSync('./system-test/fixtures/sample/src/index.js').toString() + cjs: readFileSync('./system-test/fixtures/sample/src/index.js').toString() } }; await packNTest(options); diff --git a/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/.eslintrc.json.njk b/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/.eslintrc.json.njk index 782153495464..3e8d97ccb390 100644 --- a/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/.eslintrc.json.njk +++ b/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/.eslintrc.json.njk @@ -1,3 +1,4 @@ { - "extends": "./node_modules/gts" + "extends": "./node_modules/gts", + "root": true } diff --git a/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/package.json b/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/package.json index 1e11ac189ae8..67eb93b22220 100644 --- a/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/package.json +++ b/core/generator/gapic-generator-typescript/templates/esm/typescript_gapic/package.json @@ -83,7 +83,7 @@ "@babel/preset-typescript": "^7.28.5", "@types/mocha": "^10.0.10", "@types/node": "^22.18.12", - "@types/sinon": "^17.0.4", + "@types/sinon": "^20.0.0", "babel-plugin-replace-import-extension": "^1.1.5", "c8": "^10.1.3", "gapic-tools": "^1.0.3", @@ -93,10 +93,9 @@ "jsdoc-fresh": "^5.0.2", "long": "^5.3.2", "mocha": "^11.7.4", - "pack-n-play": "^3.0.0", "typescript": "5.8.3", "pack-n-play": "^4.2.1", - "sinon": "^21.0.0", + "sinon": "^20.0.0", "ts-loader": "^8.4.0", "webpack": "^5.102.1", "webpack-cli": "^6.0.1"