Skip to content

Commit 9001570

Browse files
committed
fix(scripts): correctly find package name in package.json
1 parent 24b960d commit 9001570

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

scripts/release/createReleasePR.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ async function createReleasePR(): Promise<void> {
361361
`git fetch origin refs/tags/${RELEASED_TAG}:refs/tags/${RELEASED_TAG}`
362362
);
363363

364-
console.log('Search for commits since last release...');
364+
console.log('Searching for commits since last release...');
365365
const { validCommits, skippedCommits } = await getCommits();
366366

367367
const versions = decideReleaseStrategy({

scripts/release/updateAPIVersions.ts

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,34 +72,33 @@ async function updateVersionForJavascript(
7272
Object.values(GENERATORS)
7373
.filter((gen) => gen.language === 'javascript')
7474
.forEach((gen) => {
75-
const additionalProperties = gen.additionalProperties;
75+
const { additionalProperties } = gen;
7676
const newVersion = semver.inc(
7777
additionalProperties.packageVersion,
7878
jsVersion.releaseType
7979
);
80+
const packageName = `${clientsConfig.javascript.npmNamespace}/${additionalProperties.packageName}`;
8081

8182
if (!newVersion) {
8283
throw new Error(
83-
`Failed to bump version ${additionalProperties.packageVersion} by ${jsVersion.releaseType}.`
84+
`Failed to bump '${packageName}' by '${jsVersion.releaseType}'.`
8485
);
8586
}
8687

8788
additionalProperties.packageVersion = newVersion;
8889

89-
if (!additionalProperties.packageName) {
90+
if (!packageName) {
9091
throw new Error(
91-
`Package name is missing for JavaScript - ${gen.client}.`
92+
`Package name is missing for JavaScript - ${packageName}.`
9293
);
9394
}
9495

95-
if (nodePgPackageFile.dependencies[additionalProperties.packageName]) {
96-
nodePgPackageFile.dependencies[additionalProperties.packageName] =
97-
newVersion;
96+
if (nodePgPackageFile.dependencies[packageName]) {
97+
nodePgPackageFile.dependencies[packageName] = newVersion;
9898
}
9999

100-
if (browserPgPackageFile.dependencies[additionalProperties.packageName]) {
101-
browserPgPackageFile.dependencies[additionalProperties.packageName] =
102-
newVersion;
100+
if (browserPgPackageFile.dependencies[packageName]) {
101+
browserPgPackageFile.dependencies[packageName] = newVersion;
103102
}
104103

105104
// We don't want this field to be in the final file, it only exists

0 commit comments

Comments
 (0)