From 8ad8fb7c8863070969429bf51624384542b464c3 Mon Sep 17 00:00:00 2001 From: Kieran Osgood Date: Fri, 27 Mar 2026 17:49:45 +0000 Subject: [PATCH 1/8] Bump @shopify/checkout-sheet-kit to 3.6.0 Update React Native wrapper to target ShopifyCheckoutSheetKit v3.6.0. This increments the package version and updates the CocoaPods dependency constraints to ~> 3.6.0 so the RN release will pick up the critical patch in checkout-sheet-kit-swift 3.6.0. The pod itself hasn't been published yet, so CI/builds will fail until that pod is released, but this prepares the RN package for the Swift release once it's available. --- .../checkout-sheet-kit/RNShopifyCheckoutSheetKit.podspec | 4 ++-- modules/@shopify/checkout-sheet-kit/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/@shopify/checkout-sheet-kit/RNShopifyCheckoutSheetKit.podspec b/modules/@shopify/checkout-sheet-kit/RNShopifyCheckoutSheetKit.podspec index 6f055a19..b73322d1 100644 --- a/modules/@shopify/checkout-sheet-kit/RNShopifyCheckoutSheetKit.podspec +++ b/modules/@shopify/checkout-sheet-kit/RNShopifyCheckoutSheetKit.podspec @@ -20,8 +20,8 @@ Pod::Spec.new do |s| s.source_files = "ios/*.{h,m,mm,swift}" s.dependency "React-Core" - s.dependency "ShopifyCheckoutSheetKit", "~> 3.5.0" - s.dependency "ShopifyCheckoutSheetKit/AcceleratedCheckouts", "~> 3.5.0" + s.dependency "ShopifyCheckoutSheetKit", "~> 3.6.0" + s.dependency "ShopifyCheckoutSheetKit/AcceleratedCheckouts", "~> 3.6.0" if fabric_enabled # Use React Native's helper if available, otherwise add dependencies directly diff --git a/modules/@shopify/checkout-sheet-kit/package.json b/modules/@shopify/checkout-sheet-kit/package.json index d263e54b..64c3421c 100644 --- a/modules/@shopify/checkout-sheet-kit/package.json +++ b/modules/@shopify/checkout-sheet-kit/package.json @@ -1,7 +1,7 @@ { "name": "@shopify/checkout-sheet-kit", "license": "MIT", - "version": "3.5.0", + "version": "3.6.0", "main": "lib/commonjs/index.js", "types": "src/index.ts", "source": "src/index.ts", From 729973bdbb52626e335921283c1c07fbcf9ab397 Mon Sep 17 00:00:00 2001 From: Kieran Osgood Date: Fri, 27 Mar 2026 18:17:04 +0000 Subject: [PATCH 2/8] Bump RNShopifyCheckoutSheetKit / ShopifyCheckoutSheetKit to 3.6.0 Update iOS Podfile.lock to reference RNShopifyCheckoutSheetKit and ShopifyCheckoutSheetKit 3.6.0 and refresh spec checksums. This prepares the repo for a new react-native release that targets the 3.6.0 checkout-sheet-kit Swift build (which contains a critical patch). The CocoaPod itself has not been published yet, so iOS builds can't be executed now; this change ensures the release will point at the correct pod version once it becomes available. --- sample/ios/Podfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock index 198c4028..d6ece585 100644 --- a/sample/ios/Podfile.lock +++ b/sample/ios/Podfile.lock @@ -2578,7 +2578,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - RNShopifyCheckoutSheetKit (3.5.0): + - RNShopifyCheckoutSheetKit (3.6.0): - boost - DoubleConversion - fast_float @@ -2605,8 +2605,8 @@ PODS: - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - ShopifyCheckoutSheetKit (~> 3.5.0) - - ShopifyCheckoutSheetKit/AcceleratedCheckouts (~> 3.5.0) + - ShopifyCheckoutSheetKit (~> 3.6.0) + - ShopifyCheckoutSheetKit/AcceleratedCheckouts (~> 3.6.0) - SocketRocket - Yoga - RNVectorIcons (10.3.0): @@ -2638,11 +2638,11 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - ShopifyCheckoutSheetKit (3.5.0): - - ShopifyCheckoutSheetKit/Core (= 3.5.0) - - ShopifyCheckoutSheetKit/AcceleratedCheckouts (3.5.0): + - ShopifyCheckoutSheetKit (3.6.0): + - ShopifyCheckoutSheetKit/Core (= 3.6.0) + - ShopifyCheckoutSheetKit/AcceleratedCheckouts (3.6.0): - ShopifyCheckoutSheetKit/Core - - ShopifyCheckoutSheetKit/Core (3.5.0) + - ShopifyCheckoutSheetKit/Core (3.6.0) - SocketRocket (0.7.1) - Yoga (0.0.0) @@ -2996,9 +2996,9 @@ SPEC CHECKSUMS: RNGestureHandler: eeb622199ef1fb3a076243131095df1c797072f0 RNReanimated: 288616f9c66ff4b0911f3862ffcf4104482a2adc RNScreens: 3fc29af06302e1f1c18a7829fe57cbc2c0259912 - RNShopifyCheckoutSheetKit: 13a5ac0a5f517b7df5ee202539a82b17d82b71e4 + RNShopifyCheckoutSheetKit: 47613bb3e98558dd948215b1e3e7c78bee1b3619 RNVectorIcons: be4d047a76ad307ffe54732208fb0498fcb8477f - ShopifyCheckoutSheetKit: b63973f5aadcab5d6483871f36f3d3f19ec67e12 + ShopifyCheckoutSheetKit: e307ac7adc4af43ac4d041922b2073641462cd04 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 Yoga: a742cc68e8366fcfc681808162492bc0aa7a9498 From 0c95b9ee9bc33654388537786c7c00868d0a2f65 Mon Sep 17 00:00:00 2001 From: Kieran Osgood Date: Fri, 27 Mar 2026 18:31:18 +0000 Subject: [PATCH 3/8] Bump @shopify/checkout-sheet-kit to 3.7.0 Prepare a new React Native release that targets the patched CheckoutSheetKit Swift pod. Bump the package version to 3.7.0 and update the sample iOS Podfile.lock to reference RNShopifyCheckoutSheetKit 3.7.0 (updated checksum). This is done so the RN package can be cut and pick up the critical Swift patch (checkout-sheet-kit-swift 3.6.0). Note: the CocoaPod for the Swift module has not been published yet, so the iOS sample build will fail until that pod is released. --- modules/@shopify/checkout-sheet-kit/package.json | 2 +- sample/ios/Podfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/@shopify/checkout-sheet-kit/package.json b/modules/@shopify/checkout-sheet-kit/package.json index 64c3421c..efd4b641 100644 --- a/modules/@shopify/checkout-sheet-kit/package.json +++ b/modules/@shopify/checkout-sheet-kit/package.json @@ -1,7 +1,7 @@ { "name": "@shopify/checkout-sheet-kit", "license": "MIT", - "version": "3.6.0", + "version": "3.7.0", "main": "lib/commonjs/index.js", "types": "src/index.ts", "source": "src/index.ts", diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock index d6ece585..67df1fda 100644 --- a/sample/ios/Podfile.lock +++ b/sample/ios/Podfile.lock @@ -2578,7 +2578,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - RNShopifyCheckoutSheetKit (3.6.0): + - RNShopifyCheckoutSheetKit (3.7.0): - boost - DoubleConversion - fast_float @@ -2996,7 +2996,7 @@ SPEC CHECKSUMS: RNGestureHandler: eeb622199ef1fb3a076243131095df1c797072f0 RNReanimated: 288616f9c66ff4b0911f3862ffcf4104482a2adc RNScreens: 3fc29af06302e1f1c18a7829fe57cbc2c0259912 - RNShopifyCheckoutSheetKit: 47613bb3e98558dd948215b1e3e7c78bee1b3619 + RNShopifyCheckoutSheetKit: cd168719464e7805f43eafd44dc9f8805933b03e RNVectorIcons: be4d047a76ad307ffe54732208fb0498fcb8477f ShopifyCheckoutSheetKit: e307ac7adc4af43ac4d041922b2073641462cd04 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 From 6b70c9a7d7f7cbca75e1781454ace69c0117cf75 Mon Sep 17 00:00:00 2001 From: Kieran Osgood Date: Fri, 27 Mar 2026 18:33:32 +0000 Subject: [PATCH 4/8] ci(actions): bump Node.js to 24 and remove temporary npm install Update the GitHub Actions setup to use Node.js 24 and remove the temporary step that installed npm@11. This prepares the CI for the upcoming React Native 3.6.0 work (including the checkout-sheet-kit-swift patch). Node 24 ships with the required npm version, so the manual npm install step is no longer necessary. The CocoaPod for the RN patch isn't released yet, so the build can't be exercised end-to-end today, but the CI is now ready for the new release target. --- .github/actions/setup/action.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 6fb09410..f0dd47c0 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -7,14 +7,9 @@ runs: - name: Setup Node.js uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2 with: - node-version: 22 + node-version: 24 registry-url: 'https://registry.npmjs.org' - # TODO: Can be removed once node-version is 24 as this will be the minimum - - name: Install npm 11 - run: npm install -g npm@11 - shell: bash - - name: Cache turbo build setup uses: actions/cache@v4 with: From 140cd4ab49c380493d2bcb0274cbfe5a707c7a0d Mon Sep 17 00:00:00 2001 From: Kieran Osgood Date: Fri, 27 Mar 2026 18:35:02 +0000 Subject: [PATCH 5/8] Bump React Native checkout-sheet-kit to 3.6.0 Align the React Native wrapper with the checkout-sheet-kit-swift 3.6.0 build so the critical patch is picked up. Update package.json version and Podfile.lock references/checksum for RNShopifyCheckoutSheetKit to 3.6.0. Note: the native CocoaPod for the Swift kit has not been released yet, so the iOS build cannot be run now. This change prepares the RN release so it can be cut once the pod is available. --- modules/@shopify/checkout-sheet-kit/package.json | 2 +- sample/ios/Podfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/@shopify/checkout-sheet-kit/package.json b/modules/@shopify/checkout-sheet-kit/package.json index efd4b641..64c3421c 100644 --- a/modules/@shopify/checkout-sheet-kit/package.json +++ b/modules/@shopify/checkout-sheet-kit/package.json @@ -1,7 +1,7 @@ { "name": "@shopify/checkout-sheet-kit", "license": "MIT", - "version": "3.7.0", + "version": "3.6.0", "main": "lib/commonjs/index.js", "types": "src/index.ts", "source": "src/index.ts", diff --git a/sample/ios/Podfile.lock b/sample/ios/Podfile.lock index 67df1fda..d6ece585 100644 --- a/sample/ios/Podfile.lock +++ b/sample/ios/Podfile.lock @@ -2578,7 +2578,7 @@ PODS: - ReactCommon/turbomodule/core - SocketRocket - Yoga - - RNShopifyCheckoutSheetKit (3.7.0): + - RNShopifyCheckoutSheetKit (3.6.0): - boost - DoubleConversion - fast_float @@ -2996,7 +2996,7 @@ SPEC CHECKSUMS: RNGestureHandler: eeb622199ef1fb3a076243131095df1c797072f0 RNReanimated: 288616f9c66ff4b0911f3862ffcf4104482a2adc RNScreens: 3fc29af06302e1f1c18a7829fe57cbc2c0259912 - RNShopifyCheckoutSheetKit: cd168719464e7805f43eafd44dc9f8805933b03e + RNShopifyCheckoutSheetKit: 47613bb3e98558dd948215b1e3e7c78bee1b3619 RNVectorIcons: be4d047a76ad307ffe54732208fb0498fcb8477f ShopifyCheckoutSheetKit: e307ac7adc4af43ac4d041922b2073641462cd04 SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748 From d2a7bece75e2df7a36426bd9436c4da7fab64ec4 Mon Sep 17 00:00:00 2001 From: Kieran Osgood Date: Mon, 30 Mar 2026 09:25:03 +0100 Subject: [PATCH 6/8] Revert "ci(actions): bump Node.js to 24 and remove temporary npm install" This reverts commit 6b70c9a7d7f7cbca75e1781454ace69c0117cf75. --- .github/actions/setup/action.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index f0dd47c0..6fb09410 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -7,9 +7,14 @@ runs: - name: Setup Node.js uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2 with: - node-version: 24 + node-version: 22 registry-url: 'https://registry.npmjs.org' + # TODO: Can be removed once node-version is 24 as this will be the minimum + - name: Install npm 11 + run: npm install -g npm@11 + shell: bash + - name: Cache turbo build setup uses: actions/cache@v4 with: From d8074c0b8cabee229d9e9d00d078baaf9d6312ce Mon Sep 17 00:00:00 2001 From: Kieran Osgood Date: Mon, 30 Mar 2026 10:04:45 +0100 Subject: [PATCH 7/8] Enable check-latest for actions/setup-node in CI Turn on check-latest: true for actions/setup-node so CI will pick up the latest Node 22 patch release instead of a potentially outdated pinned version. This helps ensure builds for the upcoming React Native 3.6.0 release (and the checkout-sheet-kit-swift work) get any critical runtime fixes during the release prep. The existing TODO still applies: this can be removed once we move the minimum Node version to 24. --- .github/actions/setup/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 6fb09410..c6245bb6 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -8,6 +8,7 @@ runs: uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2 with: node-version: 22 + check-latest: true registry-url: 'https://registry.npmjs.org' # TODO: Can be removed once node-version is 24 as this will be the minimum From 29194f2591da76d02b8d02d00c8ca739341bbb52 Mon Sep 17 00:00:00 2001 From: Kieran Osgood Date: Mon, 30 Mar 2026 10:07:44 +0100 Subject: [PATCH 8/8] Pin Node.js version to 22.22.1 in setup action Pin the Node.js version used by the GitHub Action to 22.22.1 and remove check-latest. This makes the CI runtime explicit and reproducible while we prepare the React Native 3.6.0-related changes (checkout-sheet-kit-swift). The previous loose "22" spec could resolve to different patch builds; specifying 22.22.1 prevents unexpected variations. The check-latest option was removed because we now target an exact patch version. Note: the Cocoapod for the RN change hasn't been released yet so the build can't be run end-to-end, and the TODO about raising the minimum Node version to 24 remains. --- .github/actions/setup/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index c6245bb6..7fb7163e 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -7,8 +7,7 @@ runs: - name: Setup Node.js uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2 with: - node-version: 22 - check-latest: true + node-version: 22.22.1 registry-url: 'https://registry.npmjs.org' # TODO: Can be removed once node-version is 24 as this will be the minimum