Skip to content

Commit 7098a83

Browse files
authored
Merge branch 'develop' into feature/webauthn-login
Signed-off-by: Jinsu Ha <91205717+hajinsuha1@users.noreply.github.com>
2 parents e293a52 + 5e9958a commit 7098a83

File tree

93 files changed

+1446
-826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1446
-826
lines changed

.github/CODEOWNERS

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,15 @@ packages/template-retail-react-app/app/pages/cart/partials/bonus-products-title.
5959
# Standard Products feature files - PR #2697
6060
packages/template-retail-react-app/app/mocks/standard-product.js @SalesforceCommerceCloud/cc-sharks
6161
packages/template-retail-react-app/app/utils/add-to-cart-utils.js @SalesforceCommerceCloud/cc-sharks
62-
62+
63+
# One-Click Checkout feature files
64+
packages/template-retail-react-app/app/pages/checkout-one-click/ @SalesforceCommerceCloud/stretch-armstrong
65+
packages/template-retail-react-app/app/components/otp-auth/ @SalesforceCommerceCloud/stretch-armstrong
66+
packages/template-retail-react-app/app/hooks/use-checkout-auto-select.js @SalesforceCommerceCloud/stretch-armstrong
67+
packages/template-retail-react-app/app/hooks/use-checkout-auto-select.test.js @SalesforceCommerceCloud/stretch-armstrong
68+
packages/template-retail-react-app/app/hooks/use-countdown.js @SalesforceCommerceCloud/stretch-armstrong
69+
packages/template-retail-react-app/app/hooks/use-countdown.test.js @SalesforceCommerceCloud/stretch-armstrong
70+
packages/template-retail-react-app/app/hooks/use-otp-inputs.js @SalesforceCommerceCloud/stretch-armstrong
71+
packages/template-retail-react-app/app/hooks/use-otp-inputs.test.js @SalesforceCommerceCloud/stretch-armstrong
6372

6473
#ECCN:Open Source

.github/workflows/agent_checkout_rebase_action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Node.js
2929
uses: actions/setup-node@v4
3030
with:
31-
node-version: '22' # Or your project's specific Node.js version
31+
node-version: '24' # Or your project's specific Node.js version
3232
cache: 'npm' # Caches npm dependencies for faster runs
3333

3434
# Step 3: Configure Git with a user name and email.

.github/workflows/bundle-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Node
2525
uses: actions/setup-node@v4
2626
with:
27-
node-version: 22 # Use latest LTS version for bundle size check
27+
node-version: 24 # Use latest LTS version for bundle size check
2828
cache: npm
2929

3030
- name: Setup Ubuntu Machine

.github/workflows/deploy_latest_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
id: setup_node
6464
uses: actions/setup-node@v4
6565
with:
66-
node-version: 22
66+
node-version: 24
6767
cache: "npm"
6868

6969
- name: Install Monorepo Dependencies

.github/workflows/e2e-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
if: ${{ env.SKIP_WORKFLOW != 'true' }}
8383
uses: actions/setup-node@v4
8484
with:
85-
node-version: 22
85+
node-version: 24
8686
cache: npm
8787

8888
- name: Install Monorepo Dependencies

.github/workflows/e2e.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
# Run all matrix env at once because we will not deploy demo app to MRT.
14-
node: [20, 22]
14+
node: [20, 22, 24]
1515
npm: [10, 11]
1616
runs-on: ubuntu-latest
1717
env:
1818
# The "default" npm is the one that ships with a given version of node.
1919
# For more: https://nodejs.org/en/download/releases/
2020
# (We also use this env var for making sure a step runs once for the current node version)
21-
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
21+
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) || (matrix.node == 24 && matrix.npm == 11) }}
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v4
@@ -63,14 +63,14 @@ jobs:
6363
max-parallel: 1
6464
matrix:
6565
# Run all matrix env at once because we will not deploy demo app to MRT.
66-
node: [20, 22]
66+
node: [20, 22, 24]
6767
npm: [10, 11]
6868
runs-on: ubuntu-latest
6969
env:
7070
# The "default" npm is the one that ships with a given version of node.
7171
# For more: https://nodejs.org/en/download/releases/
7272
# (We also use this env var for making sure a step runs once for the current node version)
73-
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
73+
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) || (matrix.node == 24 && matrix.npm == 11) }}
7474

7575
steps:
7676
- name: Checkout
@@ -175,14 +175,14 @@ jobs:
175175
max-parallel: 1
176176
matrix:
177177
# Run all matrix env at once because we will not deploy demo app to MRT.
178-
node: [20, 22]
178+
node: [20, 22, 24]
179179
npm: [10, 11]
180180
runs-on: ubuntu-latest
181181
env:
182182
# The "default" npm is the one that ships with a given version of node.
183183
# For more: https://nodejs.org/en/download/releases/
184184
# (We also use this env var for making sure a step runs once for the current node version)
185-
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
185+
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) || (matrix.node == 24 && matrix.npm == 11) }}
186186
steps:
187187
- name: Checkout
188188
uses: actions/checkout@v4
@@ -283,17 +283,17 @@ jobs:
283283
max-parallel: 1
284284
matrix:
285285
# Run all matrix env at once because we will not deploy demo app to MRT.
286-
node: [20, 22]
286+
node: [20, 22, 24]
287287
npm: [10, 11]
288288
runs-on: ubuntu-latest
289289
env:
290290
# The "default" npm is the one that ships with a given version of node.
291291
# For more: https://nodejs.org/en/download/releases/
292292
# (We also use this env var for making sure a step runs once for the current node version)
293-
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) }}
293+
IS_DEFAULT_NPM: ${{ (matrix.node == 20 && matrix.npm == 10) || (matrix.node == 22 && matrix.npm == 10) || (matrix.node == 24 && matrix.npm == 11) }}
294294
# The current recommended version for Managed Runtime:
295295
# https://developer.salesforce.com/docs/commerce/pwa-kit-managed-runtime/guide/upgrade-node-version.html
296-
IS_MRT_NODE: ${{ matrix.node == 22 && matrix.npm == 11 }}
296+
IS_MRT_NODE: ${{ matrix.node == 24 && matrix.npm == 11 }}
297297
steps:
298298
- name: Checkout
299299
uses: actions/checkout@v4
@@ -365,7 +365,7 @@ jobs:
365365
- name: Run Playwright tests
366366
run: npm run test:e2e
367367

368-
- name: Run a11y test for Node 22 with npm 11
368+
- name: Run a11y test for Node 24 with npm 11
369369
if: env.IS_MRT_NODE == 'true'
370370
run: npm run test:e2e:a11y
371371
notify-slack-pwa-private-client:
@@ -405,7 +405,7 @@ jobs:
405405
- name: Setup Node.js
406406
uses: actions/setup-node@v4
407407
with:
408-
node-version: 22
408+
node-version: 24
409409
cache: npm
410410
- name: Install Monorepo Dependencies
411411
run: node ./scripts/gtime.js monorepo_install npm ci

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Node
2525
uses: actions/setup-node@v4
2626
with:
27-
node-version: 22 # Use latest LTS version for linting
27+
node-version: 24 # Use latest LTS version for linting
2828
cache: npm
2929

3030
- name: Setup Ubuntu Machine
@@ -48,7 +48,7 @@ jobs:
4848
- name: Setup Node
4949
uses: actions/setup-node@v4
5050
with:
51-
node-version: 22
51+
node-version: 24
5252
cache: npm
5353

5454
- name: Setup Ubuntu Machine
@@ -87,7 +87,7 @@ jobs:
8787
- name: Setup Node
8888
uses: actions/setup-node@v4
8989
with:
90-
node-version: 22
90+
node-version: 24
9191
cache: npm
9292

9393
- name: Setup Windows Machine

.github/workflows/mrt-pool-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Setup Node
2828
uses: actions/setup-node@v4
2929
with:
30-
node-version: 22
30+
node-version: 24
3131
cache: npm
3232

3333
- name: Install Monorepo Dependencies

.github/workflows/nightly_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Setup Node
4949
uses: actions/setup-node@v4
5050
with:
51-
node-version: 22
51+
node-version: 24
5252
cache: npm
5353

5454
- name: Install Monorepo Dependencies

.github/workflows/performance-metrics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Setup Node
2323
uses: actions/setup-node@v4
2424
with:
25-
node-version: 22
25+
node-version: 24
2626
cache: npm
2727

2828
- name: Install Monorepo Dependencies

0 commit comments

Comments
 (0)