Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/add-on-request-hook
Browse files Browse the repository at this point in the history
  • Loading branch information
JimTacobs committed Dec 17, 2024
2 parents 0450434 + 3cb133d commit 2c3e09b
Show file tree
Hide file tree
Showing 57 changed files with 12,950 additions and 23,654 deletions.
9 changes: 9 additions & 0 deletions .changeset/mighty-walls-shake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"vue-demo-store": minor
"vue-vite-blank": minor
"vue-blank": minor
"shopware-astro": minor
"docs": minor
---

Update to the Node 22 LTS as the default
5 changes: 5 additions & 0 deletions .changeset/unlucky-dogs-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@shopware-pwa/composables-next": patch
---

`useCustomerOrders` - added checkPromotions flag for loading orders
100 changes: 50 additions & 50 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,57 @@ description: File a bug/issue
title: "[BUG] "
labels: [bug]
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Current Behavior
description: A concise description of what you're experiencing.
validations:
required: false
- type: textarea
attributes:
label: Expected Behavior
description: A concise description of what you expected to happen.
validations:
required: false
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: false
- type: textarea
attributes:
label: Environment
description: |
examples:
- **OS**: Manjaro Linux 22.1.0
- **Node**: 20.8.1
- **pnpm**: 8.9.2
value: |
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Current Behavior
description: A concise description of what you're experiencing.
validations:
required: false
- type: textarea
attributes:
label: Expected Behavior
description: A concise description of what you expected to happen.
validations:
required: false
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: false
- type: textarea
attributes:
label: Environment
description: |
examples:
- **OS**: Manjaro Linux 22.1.0
- **Node**: 22.11.0
- **pnpm**: 9.14.2
value: |
- OS:
- Node:
- pnpm:
render: markdown
validations:
required: false
- type: textarea
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
render: markdown
validations:
required: false
- type: textarea
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the issue you are encountering!
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
4 changes: 2 additions & 2 deletions .github/workflows/audit-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand Down
71 changes: 33 additions & 38 deletions .github/workflows/check-stackblitz-templates.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,40 @@
name: Stackblitz templates


run-name: Playwright stackblitz templates 🚀
on:
workflow_dispatch:
schedule:
- cron: "59 23 * * *"
workflow_dispatch:
schedule:
- cron: "59 23 * * *"
jobs:
run-stackblitz-templates-tests:
runs-on: macos-14
env:
run-stackblitz-templates-tests:
runs-on: macos-14
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
steps:
- name: Check out code
uses: actions/checkout@v4


- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20


- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
run: pnpm install --no-frozen-lockfile --prefer-offline


- name: Install dependencies with Playwright
run: |
pnpm playwright install --with-deps
- name: Run tests
run: |
cd apps/e2e-tests
npx playwright test -c examples.config.ts checkStackblitzTemplates.spec.ts
steps:
- name: Check out code
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
run: pnpm install --no-frozen-lockfile --prefer-offline

- name: Install dependencies with Playwright
run: |
pnpm playwright install --with-deps
- name: Run tests
run: |
cd apps/e2e-tests
npx playwright test -c examples.config.ts checkStackblitzTemplates.spec.ts
12 changes: 6 additions & 6 deletions .github/workflows/code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand All @@ -56,13 +56,13 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand Down Expand Up @@ -98,13 +98,13 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/code-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codspeed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
- uses: "actions/checkout@v4"
- uses: "actions/setup-node@v4"
with:
node-version: 20
node-version: 22
- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
- name: Audit URLs using Lighthouse
uses: treosh/lighthouse-ci-action@v12
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ jobs:
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22

- run: corepack enable
- run: pnpm --version
- uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
cache: "pnpm"
cache-dependency-path: "**/pnpm-lock.yaml"
- name: install
Expand Down
6 changes: 3 additions & 3 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
"vitepress": "1.3.4",
"vitepress-plugin-search": "1.0.4-alpha.22",
"vitepress-shopware-docs": "1.3.0-alpha.16",
"vue": "3.5.12"
"vue": "3.5.13"
},
"devDependencies": {
"@types/markdown-it": "14.1.2",
"@types/node": "20.17.0",
"@types/node": "22.10.0",
"@shopware-docs/cli": "^1.3.0-alpha.16",
"@shopware-docs/storybook": "^1.3.0-alpha.16",
"@shopware-docs/typer": "^1.3.0-alpha.16",
"@shopware-docs/vitepress": "^1.3.0-alpha.16",
"@shopware-docs/vitest": "^1.3.0-alpha.16",
"@vitejs/plugin-vue": "5.1.4",
"@vitejs/plugin-vue": "5.2.1",
"find-in-files": "0.5.0",
"ts-dox": "0.1.0",
"typescript": "5.6.3",
Expand Down
3 changes: 2 additions & 1 deletion apps/docs/src/framework/requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ Shopware Frontends requires a Node.js runtime environment.

Supported versions:

- **v20.x** LTS
- **v22.x** LTS
- **v20.x** - maintenance
- **v18.x** - maintenance

:::tip
Expand Down
Loading

0 comments on commit 2c3e09b

Please sign in to comment.