Resolve merge conflicts to sync 2.4.9-develop with main

.github/CONTRIBUTING.md

@@ -45,17 +45,3 @@ feel free to reach out to existing committers to have a conversation about that.
 ## Security Issues
 
 Security issues shouldn't be reported on this issue tracker. Instead, [file an issue to our security experts](https://helpx.adobe.com/security/alertus.html).
-
-## Site preview from a fork
-
-You can build and deploy changes from your branch to a test website using GitHub Pages.
-You must enable Actions in your forked repo settings and configure Pages to deploy from the **root** folder of the **gh-pages** branch.
-
-To build and deploy your branch:
-
-1. Click the **Actions** tab in your forked repo.
-1. In the left navigation menu, click the **GitHub Pages** workflow.
-1. In the upper-right of the page, click **Run workflow**.
-   - Select the branch you want to preview as a website.
-   - Click **Run workflow**.
-When the workflow run is finished, **Github Pages** will be marked with a green check mark. To identify the URL of the generated website, click **GitHub Pages** > **build-and-deploy** > **GH Pages URL**.

.github/dependabot.yml

@@ -1,18 +1,13 @@
+# `dependabot.yml` file with
+#  assignee for all npm pull requests
+
 version: 2
 updates:
-  # Enable version updates for npm
+  # Keep npm dependencies up to date
   - package-ecosystem: "npm"
-    # Look for `package.json` and `lock` files in the `root` directory
     directory: "/"
-    # Check the npm registry for updates every day (weekdays)
     schedule:
-      interval: "daily"
-    allow:
-      - dependency-name: "@adobe/gatsby-theme-aio"
-    versioning-strategy: increase
-    open-pull-requests-limit: 25
-    labels:
-      - "dependencies"
-    ignore:
-      # Ignore updates to package
-      - dependency-name: "gatsby"
+      interval: "weekly"
+    # Raise all npm pull requests with assignees
+    assignees:
+      - "dshevtsov"

.github/workflows/add-to-project-board.yml

@@ -12,5 +12,5 @@ on:
 
 jobs:
   call-workflow-add-to-project:
-    uses: ./.github/workflows/add-to-project_job.yml
+    uses: AdobeDocs/commerce-contributor/.github/workflows/add-to-project_job.yml@main
     secrets: inherit

.github/workflows/add-to-project_job.yml

@@ -5,20 +5,19 @@ on:
 
 jobs:
   add-to-project:
-    if: github.event.repository.fork == false
     runs-on: ubuntu-latest
 
     steps:
       - name: Add to Commerce PR project
         if: github.event_name == 'pull_request_target'
-        uses: actions/add-to-project@v0.4.0
+        uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/AdobeDocs/projects/5 # The organizational project for pull requests
           github-token: ${{ secrets.COMMERCE_PROJECT_AUTOMATION }}
 
       - name: Add to Commerce Issue project
         if: github.event_name == 'issues'
-        uses: actions/add-to-project@v0.4.0
+        uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/AdobeDocs/projects/6 # The organizational project for issues
           github-token: ${{ secrets.COMMERCE_PROJECT_AUTOMATION }}

.github/workflows/build-site-metadata.yml

@@ -0,0 +1,10 @@
+---
+name: Build Site Metadata
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build-site-metadata:
+    name: Build Site Metadata
+    uses: AdobeDocs/adp-devsite-workflow/.github/workflows/build-site-metadata.yml@main

.github/workflows/deploy-github-pages.yml

@@ -0,0 +1,15 @@
+---
+name: Deploy GitHub Pages preview
+on:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  preview:
+    uses: AdobeDocs/commerce-contributor/.github/workflows/github-pages-preview.yml@main
+    with:
+      branch: ${{ github.ref_name }}

.github/workflows/deploy.yml

@@ -0,0 +1,33 @@
+---
+name: Deployment
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+    inputs:
+      env:
+        description: "Select environment to deploy to"
+        type: choice
+        required: true
+        default: "prod"
+        options:
+          - "prod"
+          - "stage & prod"
+      baseSha:
+        description: "Use base SHA commit to deploy from (empty string defaults to last commit before HEAD)"
+        type: string
+        required: false
+        default: ""
+      deployAll:
+        description: "Force deploy all files"
+        type: boolean
+        default: false
+jobs:
+  deployment:
+    name: Deployment
+    uses: AdobeDocs/adp-devsite-workflow/.github/workflows/deploy.yml@main
+    with:
+      env: ${{ inputs.env || 'prod' }}
+      baseSha: ${{ inputs.baseSha || '' }}
+      deployAll: ${{ inputs.deployAll || false }}

.github/workflows/lint.yml

@@ -0,0 +1,36 @@
+---
+name: Lint
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - 'src/pages/**'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Lint
+        id: lint
+        continue-on-error: true
+        run: npx --yes github:AdobeDocs/adp-devsite-utils runLint -v
+
+      - name: Post Linter Report to PR
+        if: always()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_ID: ${{ github.event.pull_request.number }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+        run: |
+          npm install --no-save github:AdobeDocs/adp-devsite-scripts
+          node node_modules/adp-devsite-scripts/linter-bot/postLinterReport.js
+
+      - name: Fail if linter found errors
+        if: steps.lint.outcome == 'failure'
+        run: exit 1

.github/workflows/pr-validation.yml

@@ -0,0 +1,10 @@
+---
+name: PR validation
+on:
+  pull_request:
+
+jobs:
+  validate:
+    uses: AdobeDocs/commerce-contributor/.github/workflows/validate-pr.yml@main
+    with:
+      base_ref: ${{ github.event.pull_request.base.ref }}