diff --git a/CHANGELOG.md b/CHANGELOG.md index e40f59271a..f2995f7f04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ ### Dependencies +- Update @bugsnag/cuid to [v3.2.1] (https://github.com/bugsnag/cuid/releases/tag/v3.2.1) [#2706](https://github.com/bugsnag/bugsnag-js/pull/2706) - Update bugsnag-cocoa to [v6.35.0](https//github.com/bugsnag/bugsnag-cocoa/releases/tag/v6.35.0) [#2663](https://github.com/bugsnag/bugsnag-js/pull/2663) - Update bugsnag-android to [v6.22.0](https//github.com/bugsnag/bugsnag-android/releases/tag/v6.22.0) [#2656](https://github.com/bugsnag/bugsnag-js/pull/2656) - Update bugsnag-android to [v6.23.0](https//github.com/bugsnag/bugsnag-android/releases/tag/v6.23.0) [#2673](https://github.com/bugsnag/bugsnag-js/pull/2673) diff --git a/package-lock.json b/package-lock.json index b75e7d4e1a..9c910e8918 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2627,11 +2627,6 @@ "resolved": "packages/core", "link": true }, - "node_modules/@bugsnag/cuid": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.1.1.tgz", - "integrity": "sha512-d2z4b0rEo3chI07FNN1Xds8v25CNeekecU6FC/2Fs9MxY2EipkZTThVcV2YinMn8dvRUlViKOyC50evoUxg8tw==" - }, "node_modules/@bugsnag/delivery-electron": { "resolved": "packages/delivery-electron", "link": true @@ -46675,13 +46670,19 @@ "version": "8.8.0", "license": "MIT", "dependencies": { - "@bugsnag/cuid": "^3.0.0", + "@bugsnag/cuid": "^3.2.1", "@bugsnag/safe-json-stringify": "^6.0.0", "error-stack-parser": "^2.0.3", "iserror": "^0.0.2", "stack-generator": "^2.0.3" } }, + "packages/core/node_modules/@bugsnag/cuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.2.1.tgz", + "integrity": "sha512-zpvN8xQ5rdRWakMd/BcVkdn2F8HKlDSbM3l7duueK590WmI1T0ObTLc1V/1e55r14WNjPd5AJTYX4yPEAFVi+Q==", + "license": "MIT" + }, "packages/delivery-electron": { "name": "@bugsnag/delivery-electron", "version": "8.8.0", @@ -46818,7 +46819,7 @@ "version": "8.8.0", "license": "MIT", "dependencies": { - "@bugsnag/cuid": "^3.0.0" + "@bugsnag/cuid": "^3.2.1" }, "devDependencies": { "@bugsnag/core": "^8.8.0" @@ -46827,6 +46828,12 @@ "@bugsnag/core": "^8.0.0" } }, + "packages/in-flight/node_modules/@bugsnag/cuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.2.1.tgz", + "integrity": "sha512-zpvN8xQ5rdRWakMd/BcVkdn2F8HKlDSbM3l7duueK590WmI1T0ObTLc1V/1e55r14WNjPd5AJTYX4yPEAFVi+Q==", + "license": "MIT" + }, "packages/js": { "name": "@bugsnag/js", "version": "8.8.1", @@ -52954,7 +52961,7 @@ "version": "8.8.0", "license": "MIT", "dependencies": { - "@bugsnag/cuid": "^3.0.0" + "@bugsnag/cuid": "^3.2.1" }, "devDependencies": { "@bugsnag/core": "^8.8.0" @@ -52963,6 +52970,12 @@ "@bugsnag/core": "^8.0.0" } }, + "packages/plugin-browser-device/node_modules/@bugsnag/cuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.2.1.tgz", + "integrity": "sha512-zpvN8xQ5rdRWakMd/BcVkdn2F8HKlDSbM3l7duueK590WmI1T0ObTLc1V/1e55r14WNjPd5AJTYX4yPEAFVi+Q==", + "license": "MIT" + }, "packages/plugin-browser-request": { "name": "@bugsnag/plugin-browser-request", "version": "8.8.0", @@ -53037,6 +53050,7 @@ "packages/plugin-electron-app": { "name": "@bugsnag/plugin-electron-app", "version": "8.8.0", + "hasInstallScript": true, "license": "MIT", "dependencies": { "bindings": "^1.5.0" @@ -53078,6 +53092,7 @@ "packages/plugin-electron-client-state-persistence": { "name": "@bugsnag/plugin-electron-client-state-persistence", "version": "8.8.0", + "hasInstallScript": true, "license": "MIT", "dependencies": { "bindings": "^1.5.0" @@ -55675,18 +55690,20 @@ "@bugsnag/core": { "version": "file:packages/core", "requires": { - "@bugsnag/cuid": "^3.0.0", + "@bugsnag/cuid": "^3.2.1", "@bugsnag/safe-json-stringify": "^6.0.0", "error-stack-parser": "^2.0.3", "iserror": "^0.0.2", "stack-generator": "^2.0.3" + }, + "dependencies": { + "@bugsnag/cuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.2.1.tgz", + "integrity": "sha512-zpvN8xQ5rdRWakMd/BcVkdn2F8HKlDSbM3l7duueK590WmI1T0ObTLc1V/1e55r14WNjPd5AJTYX4yPEAFVi+Q==" + } } }, - "@bugsnag/cuid": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.1.1.tgz", - "integrity": "sha512-d2z4b0rEo3chI07FNN1Xds8v25CNeekecU6FC/2Fs9MxY2EipkZTThVcV2YinMn8dvRUlViKOyC50evoUxg8tw==" - }, "@bugsnag/delivery-electron": { "version": "file:packages/delivery-electron", "requires": { @@ -55780,7 +55797,14 @@ "version": "file:packages/in-flight", "requires": { "@bugsnag/core": "^8.8.0", - "@bugsnag/cuid": "^3.0.0" + "@bugsnag/cuid": "^3.2.1" + }, + "dependencies": { + "@bugsnag/cuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.2.1.tgz", + "integrity": "sha512-zpvN8xQ5rdRWakMd/BcVkdn2F8HKlDSbM3l7duueK590WmI1T0ObTLc1V/1e55r14WNjPd5AJTYX4yPEAFVi+Q==" + } } }, "@bugsnag/js": { @@ -59758,7 +59782,14 @@ "version": "file:packages/plugin-browser-device", "requires": { "@bugsnag/core": "^8.8.0", - "@bugsnag/cuid": "^3.0.0" + "@bugsnag/cuid": "^3.2.1" + }, + "dependencies": { + "@bugsnag/cuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.2.1.tgz", + "integrity": "sha512-zpvN8xQ5rdRWakMd/BcVkdn2F8HKlDSbM3l7duueK590WmI1T0ObTLc1V/1e55r14WNjPd5AJTYX4yPEAFVi+Q==" + } } }, "@bugsnag/plugin-browser-request": { diff --git a/packages/core/package.json b/packages/core/package.json index 2743f6d6a6..00f3e176be 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -20,7 +20,7 @@ "author": "Bugsnag", "license": "MIT", "dependencies": { - "@bugsnag/cuid": "^3.0.0", + "@bugsnag/cuid": "^3.2.1", "@bugsnag/safe-json-stringify": "^6.0.0", "error-stack-parser": "^2.0.3", "iserror": "^0.0.2", diff --git a/packages/in-flight/package.json b/packages/in-flight/package.json index 0153c00ffa..ce406b7ad6 100644 --- a/packages/in-flight/package.json +++ b/packages/in-flight/package.json @@ -19,7 +19,7 @@ "author": "Bugsnag", "license": "MIT", "dependencies": { - "@bugsnag/cuid": "^3.0.0" + "@bugsnag/cuid": "^3.2.1" }, "devDependencies": { "@bugsnag/core": "^8.8.0" diff --git a/packages/plugin-browser-device/device.js b/packages/plugin-browser-device/device.js index bd1437b970..d1d60f75d8 100644 --- a/packages/plugin-browser-device/device.js +++ b/packages/plugin-browser-device/device.js @@ -1,5 +1,6 @@ const assign = require('@bugsnag/core/lib/es-utils/assign') const BUGSNAG_ANONYMOUS_ID_KEY = 'bugsnag-anonymous-id' +const cuid = require('@bugsnag/cuid') const getDeviceId = (win) => { try { @@ -7,13 +8,11 @@ const getDeviceId = (win) => { let id = storage.getItem(BUGSNAG_ANONYMOUS_ID_KEY) - // If we get an ID, make sure it looks like a valid cuid. The length can - // fluctuate slightly, so some leeway is built in - if (id && /^c[a-z0-9]{20,32}$/.test(id)) { + // If we get an ID, make sure it looks like a valid cuid + if (id && cuid.isCuid(id)) { return id } - const cuid = require('@bugsnag/cuid') id = cuid() storage.setItem(BUGSNAG_ANONYMOUS_ID_KEY, id) diff --git a/packages/plugin-browser-device/package.json b/packages/plugin-browser-device/package.json index f2711a1b7b..fcf8019eff 100644 --- a/packages/plugin-browser-device/package.json +++ b/packages/plugin-browser-device/package.json @@ -17,7 +17,7 @@ "author": "Bugsnag", "license": "MIT", "dependencies": { - "@bugsnag/cuid": "^3.0.0" + "@bugsnag/cuid": "^3.2.1" }, "devDependencies": { "@bugsnag/core": "^8.8.0"