From ad1cf1bf632c5560877feebebded941a50fa37f4 Mon Sep 17 00:00:00 2001 From: Lasse Boisen Andersen Date: Tue, 28 Jan 2025 16:20:39 +0100 Subject: [PATCH 1/6] should forward toolbar prop upstream --- packages/react-sdk/src/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-sdk/src/index.tsx b/packages/react-sdk/src/index.tsx index 6fffad73..ae952313 100644 --- a/packages/react-sdk/src/index.tsx +++ b/packages/react-sdk/src/index.tsx @@ -136,6 +136,7 @@ export function BucketProvider({ logger: config.debug ? console : undefined, sdkVersion: SDK_VERSION, featureList, + toolbar: config.toolbar, }); clientRef.current = client; From 2d9aed1aee7ffd336de2adb79ccd57177997f82e Mon Sep 17 00:00:00 2001 From: Lasse Boisen Andersen Date: Tue, 28 Jan 2025 17:03:40 +0100 Subject: [PATCH 2/6] try using workspace in local dep resolutions --- packages/react-sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index c8d9a1fa..0665e70e 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -34,7 +34,7 @@ } }, "dependencies": { - "@bucketco/browser-sdk": "3.0.0-alpha.0", + "@bucketco/browser-sdk": "workspace:^", "canonical-json": "^0.0.4", "rollup": "^4.2.0" }, From aa0a7c9ac47e086d3b092bfb7443c7e778bdf666 Mon Sep 17 00:00:00 2001 From: Lasse Boisen Andersen Date: Tue, 28 Jan 2025 17:06:17 +0100 Subject: [PATCH 3/6] fix test --- packages/react-sdk/test/usage.test.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/react-sdk/test/usage.test.tsx b/packages/react-sdk/test/usage.test.tsx index 97a705d8..e251d7a3 100644 --- a/packages/react-sdk/test/usage.test.tsx +++ b/packages/react-sdk/test/usage.test.tsx @@ -187,6 +187,7 @@ describe("", () => { logger: undefined, sseBaseUrl: "https://test.com", sseHost: undefined, + toolbar: undefined, enableTracking: false, feedback: undefined, featureList: undefined, From cbd0da61b7f03c201b0b04faa44957d7532fa7eb Mon Sep 17 00:00:00 2001 From: Lasse Boisen Andersen Date: Tue, 28 Jan 2025 19:36:10 +0100 Subject: [PATCH 4/6] update yarn.lock --- yarn.lock | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/yarn.lock b/yarn.lock index e79fc1d5..99f5f554 100644 --- a/yarn.lock +++ b/yarn.lock @@ -894,19 +894,7 @@ __metadata: languageName: node linkType: hard -"@bucketco/browser-sdk@npm:3.0.0-alpha.0": - version: 3.0.0-alpha.0 - resolution: "@bucketco/browser-sdk@npm:3.0.0-alpha.0" - dependencies: - "@floating-ui/dom": "npm:^1.6.8" - canonical-json: "npm:^0.0.4" - js-cookie: "npm:^3.0.5" - preact: "npm:^10.22.1" - checksum: 10c0/eba1a2f15c49c1aeca37c6d2b218e50d92e2034c51a9acdd6884ce143156dc7f285f9141f5e6cfcc2aed0186c0b8fc61bb9939aca737a1e76d1a2d9d65a7b74c - languageName: node - linkType: hard - -"@bucketco/browser-sdk@workspace:packages/browser-sdk": +"@bucketco/browser-sdk@workspace:^, @bucketco/browser-sdk@workspace:packages/browser-sdk": version: 0.0.0-use.local resolution: "@bucketco/browser-sdk@workspace:packages/browser-sdk" dependencies: @@ -1042,7 +1030,7 @@ __metadata: version: 0.0.0-use.local resolution: "@bucketco/react-sdk@workspace:packages/react-sdk" dependencies: - "@bucketco/browser-sdk": "npm:3.0.0-alpha.0" + "@bucketco/browser-sdk": "workspace:^" "@bucketco/eslint-config": "workspace:^" "@bucketco/tsconfig": "workspace:^" "@testing-library/react": "npm:^15.0.7" From 9aa4758e214166bf0f557998c368d119cf502151 Mon Sep 17 00:00:00 2001 From: Lasse Boisen Andersen Date: Wed, 29 Jan 2025 16:20:18 +0100 Subject: [PATCH 5/6] Revert "try using workspace in local dep resolutions" This reverts commit 2d9aed1aee7ffd336de2adb79ccd57177997f82e. --- packages/react-sdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json index 0665e70e..c8d9a1fa 100644 --- a/packages/react-sdk/package.json +++ b/packages/react-sdk/package.json @@ -34,7 +34,7 @@ } }, "dependencies": { - "@bucketco/browser-sdk": "workspace:^", + "@bucketco/browser-sdk": "3.0.0-alpha.0", "canonical-json": "^0.0.4", "rollup": "^4.2.0" }, From e9cbc531bd141a3992c5fcf37ca7116375af1892 Mon Sep 17 00:00:00 2001 From: Lasse Boisen Andersen Date: Wed, 29 Jan 2025 16:20:48 +0100 Subject: [PATCH 6/6] Revert "update yarn.lock" This reverts commit cbd0da61b7f03c201b0b04faa44957d7532fa7eb. --- yarn.lock | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/yarn.lock b/yarn.lock index 99f5f554..e79fc1d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -894,7 +894,19 @@ __metadata: languageName: node linkType: hard -"@bucketco/browser-sdk@workspace:^, @bucketco/browser-sdk@workspace:packages/browser-sdk": +"@bucketco/browser-sdk@npm:3.0.0-alpha.0": + version: 3.0.0-alpha.0 + resolution: "@bucketco/browser-sdk@npm:3.0.0-alpha.0" + dependencies: + "@floating-ui/dom": "npm:^1.6.8" + canonical-json: "npm:^0.0.4" + js-cookie: "npm:^3.0.5" + preact: "npm:^10.22.1" + checksum: 10c0/eba1a2f15c49c1aeca37c6d2b218e50d92e2034c51a9acdd6884ce143156dc7f285f9141f5e6cfcc2aed0186c0b8fc61bb9939aca737a1e76d1a2d9d65a7b74c + languageName: node + linkType: hard + +"@bucketco/browser-sdk@workspace:packages/browser-sdk": version: 0.0.0-use.local resolution: "@bucketco/browser-sdk@workspace:packages/browser-sdk" dependencies: @@ -1030,7 +1042,7 @@ __metadata: version: 0.0.0-use.local resolution: "@bucketco/react-sdk@workspace:packages/react-sdk" dependencies: - "@bucketco/browser-sdk": "workspace:^" + "@bucketco/browser-sdk": "npm:3.0.0-alpha.0" "@bucketco/eslint-config": "workspace:^" "@bucketco/tsconfig": "workspace:^" "@testing-library/react": "npm:^15.0.7"