Skip to content

Commit b96f9ab

Browse files
👷 fix check-release script to ignore sub-packages (#3925)
1 parent 6aecbef commit b96f9ab

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

‎scripts/release/check-release.ts‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ interface PackageJsonFile {
88
content: {
99
name: string
1010
version: string
11+
private?: boolean
1112
dependencies?: Record<string, string>
1213
devDependencies?: Record<string, string>
1314
peerDependencies?: Record<string, string>
@@ -51,17 +52,26 @@ function checkBrowserSdkPackageJsonFiles(): void {
5152
}
5253

5354
function checkPackageJsonVersion(packageJsonFile: PackageJsonFile): void {
54-
if (
55-
isBrowserSdkPublicPackageName(packageJsonFile.content.name) &&
56-
packageJsonFile.content.version !== releaseVersion
57-
) {
55+
if (packageJsonFile.content?.private) {
56+
// The developer extension is a private package, but it should still have a version
57+
if (
58+
packageJsonFile.content.version &&
59+
packageJsonFile.content.name !== '@datadog/browser-sdk-developer-extension'
60+
) {
61+
throw new Error(`Private package ${packageJsonFile.relativePath} should not have a version`)
62+
}
63+
} else if (packageJsonFile.content.version !== releaseVersion) {
5864
throw new Error(
5965
`Invalid version for ${packageJsonFile.relativePath}: expected ${releaseVersion}, got ${packageJsonFile.content.version}`
6066
)
6167
}
6268
}
6369

6470
function checkPackageDependencyVersions(packageJsonFile: PackageJsonFile): void {
71+
if (packageJsonFile.content.private) {
72+
return
73+
}
74+
6575
for (const dependencies of [
6676
packageJsonFile.content.dependencies,
6777
packageJsonFile.content.devDependencies,
@@ -72,12 +82,7 @@ function checkPackageDependencyVersions(packageJsonFile: PackageJsonFile): void
7282
}
7383

7484
for (const [dependencyName, dependencyVersion] of Object.entries(dependencies)) {
75-
if (
76-
isBrowserSdkPublicPackageName(dependencyName) &&
77-
!dependencyVersion.startsWith('workspace:') &&
78-
!dependencyVersion.startsWith('file:') &&
79-
dependencyVersion !== releaseVersion
80-
) {
85+
if (isBrowserSdkPackageName(dependencyName) && dependencyVersion !== releaseVersion) {
8186
throw new Error(
8287
`Invalid dependency version for ${dependencyName} in ${packageJsonFile.relativePath}: expected ${releaseVersion}, got ${dependencyVersion}`
8388
)
@@ -86,6 +91,6 @@ function checkPackageDependencyVersions(packageJsonFile: PackageJsonFile): void
8691
}
8792
}
8893

89-
function isBrowserSdkPublicPackageName(name: string): boolean {
94+
function isBrowserSdkPackageName(name: string): boolean {
9095
return name?.startsWith('@datadog/')
9196
}

‎test/apps/base-extension/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "rum-testing-extension",
3-
"version": "1.0.0",
43
"private": true,
54
"scripts": {
65
"build": "webpack"

‎test/apps/react-router-v6-app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router-v6-app",
3-
"version": "0.0.0",
3+
"private": true,
44
"scripts": {
55
"build": "webpack"
66
},

‎test/apps/vanilla/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "app",
3-
"version": "0.0.0",
3+
"private": true,
44
"scripts": {
55
"build": "webpack --config ./webpack.web.js",
66
"compat:tsc": "tsc -p tsconfig.json",

0 commit comments

Comments
 (0)