From 2e390034c9b14b8a3510fafc1a33b16117a479a9 Mon Sep 17 00:00:00 2001 From: Sebastian Alex Date: Wed, 13 Nov 2024 13:20:42 +0100 Subject: [PATCH 1/5] scripts: add range operator support to syncVersions (NFC) --- scripts/syncVersions.ts | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/scripts/syncVersions.ts b/scripts/syncVersions.ts index 58831836..ea730bc7 100755 --- a/scripts/syncVersions.ts +++ b/scripts/syncVersions.ts @@ -19,20 +19,36 @@ import { const rootDir = path.join(__dirname, '..'); +function parseRange(version: string): readonly [op: string, version?: string] { + const num = /\d/.exec(version); + if (!num) { + return [version, undefined]; + } + + return [version.substring(0, num.index), version.substring(num.index)]; +} + function updateDependency(packageJson: PackageJson, type: DependencyType, name: string, newVersion: string) { const deps = packageJson[type]; if (!deps) { return false; } - const currentVersion = deps[name]; - if (!currentVersion) { + const currentRange = deps[name]; + if (!currentRange) { return false; } + const [currentOp, currentVersion] = parseRange(currentRange); + if (currentOp === '*' && !currentVersion) { + return false; + } + + const newRange = `${currentOp}${newVersion}`; + if (currentVersion !== newVersion) { - deps[name] = newVersion; - log(`[${packageJson.name}] - updated ${name} from ${currentVersion} to ${newVersion} in ${type}`); + deps[name] = newRange; + log(`[${packageJson.name}] - updated ${name} from ${currentRange} to ${newRange} in ${type}`); return true; } @@ -43,9 +59,7 @@ function updateDependency(packageJson: PackageJson, type: DependencyType, name: function updateVersions(packageJson: PackageJson, currentVersions: Record) { let updated = false; - for (const [name, version] of Object.entries(currentVersions)) { - const newVersion = `^${version}`; - + for (const [name, newVersion] of Object.entries(currentVersions)) { updated = updateDependency(packageJson, 'dependencies', name, newVersion) || updated; updated = updateDependency(packageJson, 'devDependencies', name, newVersion) || updated; updated = updateDependency(packageJson, 'peerDependencies', name, newVersion) || updated; From 634f9f30f664da9106be2420e1ec379d7925a3dc Mon Sep 17 00:00:00 2001 From: Sebastian Alex Date: Wed, 13 Nov 2024 13:21:31 +0100 Subject: [PATCH 2/5] browser: set sdk-core as normal dependency with fixed version (NFC) --- packages/browser/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/browser/package.json b/packages/browser/package.json index dabc0592..8837f136 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -38,8 +38,10 @@ "files": [ "/lib" ], + "dependencies": { + "@backtrace/sdk-core": "0.6.0" + }, "devDependencies": { - "@backtrace/sdk-core": "^0.6.0", "@reduxjs/toolkit": "^1.9.5", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-json": "^6.1.0", From 1fd6c977a38ae470f1561a24c9fd1c510975bb6b Mon Sep 17 00:00:00 2001 From: Sebastian Alex Date: Wed, 13 Nov 2024 13:21:40 +0100 Subject: [PATCH 3/5] react: set browser as normal dependency with fixed version (NFC) --- packages/react/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/react/package.json b/packages/react/package.json index e11ff045..6f9e5319 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -39,9 +39,10 @@ "files": [ "/lib" ], + "dependencies": { + "@backtrace/browser": "0.4.1" + }, "devDependencies": { - "@backtrace/browser": "^0.4.1", - "@backtrace/sdk-core": "^0.6.0", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3", From dafb47b0e1a1decf14a90b979f49a50cefe83071 Mon Sep 17 00:00:00 2001 From: Sebastian Alex Date: Wed, 13 Nov 2024 13:21:57 +0100 Subject: [PATCH 4/5] session-replay: set sdk-core as normal dependency with fixed version (NFC) --- packages/session-replay/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/session-replay/package.json b/packages/session-replay/package.json index 51f54af8..495065eb 100644 --- a/packages/session-replay/package.json +++ b/packages/session-replay/package.json @@ -30,10 +30,10 @@ ], "homepage": "https://github.com/backtrace-labs/backtrace-javascript#readme", "dependencies": { - "rrweb": "^2.0.0-alpha.15" + "rrweb": "^2.0.0-alpha.15", + "@backtrace/sdk-core": "0.6.0" }, "devDependencies": { - "@backtrace/sdk-core": "^0.6.0", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3", From 687acf73b8bcb971e5ff76272dc3de08df3083e8 Mon Sep 17 00:00:00 2001 From: Sebastian Alex Date: Wed, 13 Nov 2024 13:22:12 +0100 Subject: [PATCH 5/5] chore: update package-lock.json (NFC) --- package-lock.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a156988..fe339340 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23914,8 +23914,10 @@ "name": "@backtrace/browser", "version": "0.4.1", "license": "MIT", + "dependencies": { + "@backtrace/sdk-core": "0.6.0" + }, "devDependencies": { - "@backtrace/sdk-core": "^0.6.0", "@reduxjs/toolkit": "^1.9.5", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-json": "^6.1.0", @@ -24181,9 +24183,10 @@ "name": "@backtrace/react", "version": "0.4.0", "license": "MIT", + "dependencies": { + "@backtrace/browser": "0.4.1" + }, "devDependencies": { - "@backtrace/browser": "^0.4.1", - "@backtrace/sdk-core": "^0.6.0", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3", @@ -24382,10 +24385,10 @@ "version": "0.2.0", "license": "MIT", "dependencies": { + "@backtrace/sdk-core": "0.6.0", "rrweb": "^2.0.0-alpha.15" }, "devDependencies": { - "@backtrace/sdk-core": "^0.6.0", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-json": "^6.1.0", "@rollup/plugin-node-resolve": "^15.2.3",