SalesforceCommerceCloud
diff --git a/‎.eslintrc.js‎
Lines changed: 2 additions & 2 deletions b/‎.eslintrc.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 1 addition & 1 deletion b/‎.github/PULL_REQUEST_TEMPLATE.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/actions/changelog-check/action.yml‎
Lines changed: 11 additions & 2 deletions b/‎.github/actions/changelog-check/action.yml‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎.github/actions/e2e_generate_app/action.yml‎
Lines changed: 13 additions & 2 deletions b/‎.github/actions/e2e_generate_app/action.yml‎
Lines changed: 13 additions & 2 deletions
diff --git a/‎.github/actions/e2e_validate_generated_app/action.yml‎
Lines changed: 13 additions & 3 deletions b/‎.github/actions/e2e_validate_generated_app/action.yml‎
Lines changed: 13 additions & 3 deletions
diff --git a/‎.github/workflows/deploy_latest_release.yml‎
Lines changed: 4 additions & 4 deletions b/‎.github/workflows/deploy_latest_release.yml‎
Lines changed: 4 additions & 4 deletions
@@ -18,15 +18,15 @@ module.exports = {
             ]
         ],
         // Sometimes VS Code will automatically add missing imports, but will do so via
-        // @salesforce/retail-react-app/node_modules/ instead of a normal import. It technically
+        // template-chakra-storefront/node_modules/ instead of a normal import. It technically
         // works inside the monorepo, but won't necessarily work in customer projects, so we want to
         // avoid the pattern. (Also just because it's weird.)
         'no-restricted-imports': [
             'error',
             {
                 patterns: [
                     {
-                        group: ['@salesforce/retail-react-app/node_modules/*'],
+                        group: ['template-chakra-storefront/node_modules/*'],
                         message: 'Did your IDE auto-complete this import? Avoid /node_modules/ and import the package directly.'
                     }
                 ]
 
@@ -53,4 +53,4 @@ _or..._
 
 ## Localization
 
-- [ ] Changes include a UI text update in the Retail React App (which requires translation)
+- [ ] Changes include a UI text update in the Chakra Storefront (which requires translation)
@@ -27,10 +27,19 @@ runs:
         fi
       shell: bash
 
+    - name: Get latest PR data
+      id: get_pr
+      uses: octokit/request-action@v2.x
+      with:
+        route: GET /repos/${{ github.repository }}/issues/${{ inputs.pr_number }}
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+
     - name: Check if 'skip changelog' label is present
       id: check_labels
       run: |
-        SKIP_CHANGELOG_LABEL="${{ contains(github.event.pull_request.labels.*.name, 'skip changelog') }}"
+        echo "PR labels: ${{ toJSON(fromJSON(steps.get_pr.outputs.data).labels.*.name) }}"
+        SKIP_CHANGELOG_LABEL="${{ contains(fromJSON(steps.get_pr.outputs.data).labels.*.name, 'skip changelog') }}"
         if [ "$SKIP_CHANGELOG_LABEL" = "true" ]; then
           echo "Skip changelog label is present. Skipping changelog check."
           echo "SKIP_CHANGELOG_CHECK=true" >> $GITHUB_ENV
@@ -55,7 +64,7 @@ runs:
         fi
         echo "Changed files: $CHANGED_FILES"
         
-        PUBLIC_PACKAGES=("commerce-sdk-react" "pwa-kit-create-app" "pwa-kit-dev" "pwa-kit-react-sdk" "pwa-kit-runtime" "template-retail-react-app")
+        PUBLIC_PACKAGES=("commerce-sdk-react" "pwa-kit-create-app" "pwa-kit-dev" "pwa-kit-react-sdk" "pwa-kit-runtime")
 
         for PACKAGE in "${PUBLIC_PACKAGES[@]}"; do
           if echo "$CHANGED_FILES" | grep -iq "^packages/$PACKAGE/"; then
 
@@ -1,12 +1,23 @@
 name: e2e_generate_app
 inputs:
   PROJECT_KEY:
-    description: Project key to specify project to generate ("retail-app-demo")
+    description: Project key to specify project to generate ("chakra-storefront-demo")
     required: true
     type: string
+
+  TEMPLATE_VERSION:
+    description: Version of the template to use for the project
+    required: false
+    type: string
+
 runs:
   using: composite
   steps:
   - name: Generate new project based on project-key
-    run: node e2e/scripts/generate-project.js --project-key ${{ inputs.PROJECT_KEY }}
+    run: |
+      COMMAND="node e2e/scripts/generate-project.js --project-key ${{ inputs.PROJECT_KEY }}"
+      if [[ -n "${{ inputs.TEMPLATE_VERSION }}" ]]; then
+        COMMAND="$COMMAND --templateVersion ${{ inputs.TEMPLATE_VERSION }}"
+      fi
+      $COMMAND
     shell: bash
@@ -1,12 +1,22 @@
 name: e2e_validate_generated_app
 inputs:
   PROJECT_KEY:
-    description: Project key to specify project to validate ("retail-app-demo")
+    description: Project key to specify project to validate ("chakra-storefront-demo")
+    required: true
+    type: string
+
+  TEMPLATE_VERSION:
+    description: Version of the template to use for the project
     required: true
     type: string
 runs:
   using: composite
   steps:
-  - name: Validate generated project based on project-key
-    run: node e2e/scripts/validate-generated-project.js ${{ inputs.PROJECT_KEY }}
+  - name: Validate generated project
+    run: |
+      COMMAND="node e2e/scripts/validate-generated-project.js ${{ inputs.PROJECT_KEY }}"
+      if [[ -n "${{ inputs.TEMPLATE_VERSION }}" ]]; then
+        COMMAND="$COMMAND --templateVersion ${{ inputs.TEMPLATE_VERSION }}"
+      fi
+      $COMMAND
     shell: bash
@@ -13,15 +13,15 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       IS_LATEST_RELEASE: ${{ steps.checkRelease.outputs.IS_LATEST_RELEASE }}
-    steps:  
+    steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Check if latest release
         uses: ./.github/actions/check_if_latest_release
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-      
+
       - name: Update Github Outputs
         id: checkRelease
         run: |-
@@ -40,14 +40,14 @@ jobs:
       matrix:
         environment:
           - name: bug-bounty
-            project_key: retail-react-app-bug-bounty
+            project_key: chakra-storefront-bug-bounty
             target: testing
             project: pwa-kit
             mobify_user: MOBIFY_STG_CLIENT_USER
             mobify_api_key: MOBIFY_STG_CLIENT_API_KEY
             flags: --cloud-origin https://cloud-testing.mobify-staging.com -c ~/.mobify --wait
           - name: demo-site
-            project_key: retail-react-app-demo-site
+            project_key: chakra-storefront-demo-site
             target: production
             project: scaffold-pwa
             mobify_user: MOBIFY_CLIENT_USER
Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ module.exports = {`
`18`	`18`	`]`
`19`	`19`	`],`
`20`	`20`	`// Sometimes VS Code will automatically add missing imports, but will do so via`
`21`		`- // @salesforce/retail-react-app/node_modules/ instead of a normal import. It technically`
	`21`	`+ // template-chakra-storefront/node_modules/ instead of a normal import. It technically`
`22`	`22`	`// works inside the monorepo, but won't necessarily work in customer projects, so we want to`
`23`	`23`	`// avoid the pattern. (Also just because it's weird.)`
`24`	`24`	`'no-restricted-imports': [`
`25`	`25`	`'error',`
`26`	`26`	`{`
`27`	`27`	`patterns: [`
`28`	`28`	`{`
`29`		`- group: ['@salesforce/retail-react-app/node_modules/*'],`
	`29`	`+ group: ['template-chakra-storefront/node_modules/*'],`
`30`	`30`	`message: 'Did your IDE auto-complete this import? Avoid /node_modules/ and import the package directly.'`
`31`	`31`	`}`
`32`	`32`	`]`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,4 @@ _or..._`
`53`	`53`
`54`	`54`	`## Localization`
`55`	`55`
`56`		`-- [ ] Changes include a UI text update in the Retail React App (which requires translation)`
	`56`	`+- [ ] Changes include a UI text update in the Chakra Storefront (which requires translation)`