Skip to content

Commit 89368d3

Browse files
authored
Merge branch 'storage-node-18' into node18/system-test
2 parents eb053d8 + ae0485b commit 89368d3

85 files changed

Lines changed: 12960 additions & 156 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.pnpmfile.cjs

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,19 @@ module.exports = {
88
if (pkg.devDependencies && pkg.devDependencies.yargs) {
99
mutateYargs(pkg.devDependencies, pkg.name, 'devDependencies', context);
1010
}
11+
12+
// C8 broke Node 18 compatibility the week of July 20th 2026.
13+
// Until we complete the upgrade, we need this workaround to enable CI
14+
// to continue running.
15+
//
16+
// TODO: Remove this workaround after Node 22 upgrade.
17+
if (pkg.dependencies && pkg.dependencies.c8) {
18+
mutateC8(pkg.dependencies, pkg.name, 'dependencies', context);
19+
}
20+
if (pkg.devDependencies && pkg.devDependencies.c8) {
21+
mutateC8(pkg.devDependencies, pkg.name, 'devDependencies', context);
22+
}
23+
1124
return pkg;
1225
}
1326
}
@@ -22,3 +35,19 @@ function mutateYargs(deps, pkgName, depType, context) {
2235
deps.yargs = '18.0.0';
2336
}
2437
}
38+
39+
/**
40+
* Override C8 dependency for versions of Node <=18 to enable CI to continue functioning.
41+
*
42+
* Otherwise, continue to use 10+ version.
43+
*/
44+
function mutateC8(deps, pkgName, depType, context) {
45+
const nodeVersion = process.version;
46+
const majorVersion = parseInt(nodeVersion.replace('v', '').split('.')[0], 10);
47+
48+
if (majorVersion <= 18) {
49+
console.log(`[pnpmfile] Node.js version is ${nodeVersion} (<= 18). Overriding c8 to ^9.1.0 in ${pkgName}`);
50+
deps.c8 = '^9.1.0';
51+
}
52+
}
53+

.release-please-manifest.json

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"core/common": "6.0.1",
2+
"core/common": "6.1.0",
33
"core/dev-packages/jsdoc-fresh": "5.0.4",
4-
"core/dev-packages/jsdoc-region-tag": "4.0.2",
5-
"core/dev-packages/pack-n-play": "4.2.2",
6-
"core/generator/gapic-generator-typescript": "4.12.2",
7-
"core/packages/gapic-node-processing": "0.1.9",
8-
"core/packages/gax": "5.0.7",
9-
"core/packages/gaxios": "7.2.0",
10-
"core/packages/gcp-metadata": "8.1.3",
11-
"core/packages/google-auth-library-nodejs": "10.9.0",
12-
"core/packages/logging-utils": "1.1.4",
13-
"core/packages/nodejs-googleapis-common": "8.0.2",
14-
"core/packages/nodejs-proto-files": "5.0.2",
15-
"core/packages/proto3-json-serializer-nodejs": "3.0.5",
16-
"core/packages/retry-request": "8.0.3",
17-
"core/packages/teeny-request": "10.1.3",
4+
"core/dev-packages/jsdoc-region-tag": "4.0.3",
5+
"core/dev-packages/pack-n-play": "4.2.3",
6+
"core/generator/gapic-generator-typescript": "4.13.0",
7+
"core/packages/gapic-node-processing": "0.1.10",
8+
"core/packages/gax": "5.0.8",
9+
"core/packages/gaxios": "7.3.0",
10+
"core/packages/gcp-metadata": "8.1.4",
11+
"core/packages/google-auth-library-nodejs": "10.9.1",
12+
"core/packages/logging-utils": "1.2.0",
13+
"core/packages/nodejs-googleapis-common": "8.0.3",
14+
"core/packages/nodejs-proto-files": "5.0.3",
15+
"core/packages/proto3-json-serializer-nodejs": "3.0.6",
16+
"core/packages/retry-request": "8.0.4",
17+
"core/packages/teeny-request": "10.1.4",
1818
"core/packages/tools": "1.1.0",
19-
"core/packages/typeless-sample-bot": "3.1.2",
20-
"core/paginator": "6.0.2",
19+
"core/packages/typeless-sample-bot": "3.1.3",
20+
"core/paginator": "6.1.0",
2121
"core/precise-date": "5.1.0",
2222
"core/projectify": "5.1.0",
2323
"core/promisify": "5.1.0",
@@ -33,7 +33,7 @@
3333
"handwritten/logging-bunyan": "5.1.2",
3434
"handwritten/logging-winston": "6.0.2",
3535
"handwritten/pubsub": "5.3.1",
36-
"handwritten/spanner": "8.9.0",
36+
"handwritten/spanner": "8.10.0",
3737
"handwritten/storage": "7.21.0",
3838
"packages/google-ads-admanager": "0.7.0",
3939
"packages/google-ads-datamanager": "0.5.0",
@@ -246,6 +246,7 @@
246246
"packages/google-maps-fleetengine": "0.8.2",
247247
"packages/google-maps-fleetengine-delivery": "0.6.2",
248248
"packages/google-maps-geocode": "0.1.1",
249+
"packages/google-maps-isochrones": "0.1.0",
249250
"packages/google-maps-mapmanagement": "0.1.1",
250251
"packages/google-maps-mapsplatformdatasets": "3.1.2",
251252
"packages/google-maps-navconnect": "0.1.1",

0 commit comments

Comments
 (0)