fix conflicts

sofisl · sofisl · commit dbab2d9fbe43 · 2025-04-25T02:01:22.000Z
diff --git a/baselines/asset-esm/package.json b/baselines/asset-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/asset/package.json b/baselines/asset/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/bigquery-storage-esm/package.json b/baselines/bigquery-storage-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/bigquery-storage/package.json b/baselines/bigquery-storage/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/bigquery-v2-esm/package.json b/baselines/bigquery-v2-esm/package.json
@@ -98,9 +98,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/bigquery-v2/package.json b/baselines/bigquery-v2/package.json
@@ -55,8 +55,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/compute-esm/package.json b/baselines/compute-esm/package.json
@@ -93,9 +93,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/compute/package.json b/baselines/compute/package.json
@@ -50,8 +50,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/deprecatedtest-esm/package.json b/baselines/deprecatedtest-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/deprecatedtest/package.json b/baselines/deprecatedtest/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/disable-packing-test-esm/package.json b/baselines/disable-packing-test-esm/package.json
@@ -97,9 +97,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/disable-packing-test/package.json b/baselines/disable-packing-test/package.json
@@ -54,8 +54,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/dlp-esm/package.json b/baselines/dlp-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/dlp/package.json b/baselines/dlp/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/kms-esm/package.json b/baselines/kms-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/kms/package.json b/baselines/kms/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/logging-esm/package.json b/baselines/logging-esm/package.json
@@ -94,9 +94,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/logging/package.json b/baselines/logging/package.json
@@ -51,8 +51,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/monitoring-esm/package.json b/baselines/monitoring-esm/package.json
@@ -97,9 +97,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/monitoring/package.json b/baselines/monitoring/package.json
@@ -54,8 +54,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/naming-esm/package.json b/baselines/naming-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/naming/package.json b/baselines/naming/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/redis-esm/package.json b/baselines/redis-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/redis/package.json b/baselines/redis/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/routingtest-esm/package.json b/baselines/routingtest-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/routingtest/package.json b/baselines/routingtest/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/showcase-esm/package.json b/baselines/showcase-esm/package.json
@@ -97,9 +97,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/showcase-legacy-esm/package.json b/baselines/showcase-legacy-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/showcase-legacy/package.json b/baselines/showcase-legacy/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/showcase/package.json b/baselines/showcase/package.json
@@ -54,8 +54,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/tasks-esm/package.json b/baselines/tasks-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/tasks/package.json b/baselines/tasks/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/texttospeech-esm/package.json b/baselines/texttospeech-esm/package.json
@@ -92,9 +92,9 @@
     "jsdoc-fresh": "^3.0.0",
     "long": "^5.3.2",
     "mocha": "^11.1.0",
-    "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
+    "pack-n-play": "^2.1.0",
     "typescript": "5.8.3",
+    "sinon": "^20.0.0",
     "ts-loader": "^8.4.0",
     "webpack": "^5.99.6",
     "webpack-cli": "^4.10.0"
diff --git a/baselines/texttospeech/package.json b/baselines/texttospeech/package.json
@@ -49,8 +49,8 @@
     "jsdoc-region-tag": "^3.0.0",
     "mocha": "^11.1.0",
     "pack-n-play": "^3.0.0",
-    "sinon": "^18.0.1",
-    "typescript": "5.8.3"
+    "typescript": "5.8.3",
+    "sinon": "^20.0.0"
   },
   "engines": {
     "node": ">=v18"
diff --git a/baselines/translate-esm/package.json b/baselines/translate-esm/package.json
diff --git a/baselines/translate/package.json b/baselines/translate/package.json
diff --git a/baselines/videointelligence-esm/package.json b/baselines/videointelligence-esm/package.json
diff --git a/baselines/videointelligence/package.json b/baselines/videointelligence/package.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/templates/cjs/typescript_gapic/package.json b/templates/cjs/typescript_gapic/package.json
diff --git a/templates/esm/typescript_gapic/package.json b/templates/esm/typescript_gapic/package.json
