Merge branch 'main' into fix-missing-types-for-jest-dom

shopware · Jan 16, 2025 · e4c94ad · e4c94ad
2 parents 573f851 + 51c4281
commit e4c94ad
Show file tree

Hide file tree

Showing 25 changed files with 982 additions and 1,025 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -179,101 +179,101 @@ jobs:
         id: versions
         uses: shopware/github-actions/versions@main
 
-  ats:
-    name: Acceptance tests
-    timeout-minutes: 20
-    runs-on: ubuntu-latest
-    needs:
-      - circular-dependencies
-      - unit-tests
-      - static-analysis
-      - tested-versions
-    env:
-      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
-      TZ: Europe/Berlin
-    strategy:
-      fail-fast: false
-      matrix:
-        shopware-version:
-          # TODO: add again with next major, does not work right now because 6.5 does not support vue3
-          # - ${{ needs.tested-versions.outputs.lts-latest-version }}
-          - ${{ needs.tested-versions.outputs.first-version }}
-          - trunk
-    steps:
-      - name: Setup shopware
-        uses: shopware/setup-shopware@main
-        with:
-          path: shopware/
-          install: "true"
-          install-admin: "true"
-          install-storefront: "true"
-          shopware-version: "${{ matrix.shopware-version }}"
-          env: dev
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          path: meteor/
-
-      - name: Symlink plugin
-        working-directory: shopware/custom/plugins/
-        run: ln -s ../../../meteor/examples/admin-sdk-plugin TestPlugin
-
-      - name: Activate TestPlugin
-        working-directory: shopware/
-        run: |
-          bin/console plugin:refresh
-          bin/console plugin:install --activate TestPlugin
-          bin/console cache:clear
-
-      - uses: pnpm/action-setup@v3
-        with:
-          version: 9
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          cache: "pnpm"
-          cache-dependency-path: "**/pnpm-lock.yaml"
-
-      - name: Install dependencies
-        working-directory: meteor/
-        run: pnpm install --frozen-lockfile --prefer-offline
-
-      - name: Build packages
-        working-directory: meteor/
-        run: npx turbo run build
-
-      - name: Build assets
-        working-directory: shopware/
-        run: |
-          composer run build:js
-          bin/console assets:install
-
-      - name: Start webserver
-        working-directory: shopware/
-        run: symfony server:start --allow-http --no-tls --port=8000 -d
-
-      - name: Install playwright
-        working-directory: meteor/examples/admin-sdk-plugin/tests/acceptance/
-        run: |
-          pnpm install --frozen-lockfile --prefer-offline
-          npx playwright install --with-deps
-
-      - name: Run Playwrigth
-        working-directory: meteor/examples/admin-sdk-plugin/tests/acceptance/
-        run: npx playwright test --retries=2 --reporter=github --trace=on-first-retry --project chromium
-
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: ats-test-results-${{ matrix.project }}
-          path: meteor/examples/admin-sdk-plugin/tests/acceptance/test-results/
-
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: ats-report-${{ matrix.project }}
-          path: meteor/examples/admin-sdk-plugin/tests/acceptance/playwright-report/
+  # ats:
+  #   name: Acceptance tests
+  #   timeout-minutes: 20
+  #   runs-on: ubuntu-latest
+  #   needs:
+  #     - circular-dependencies
+  #     - unit-tests
+  #     - static-analysis
+  #     - tested-versions
+  #   env:
+  #     TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+  #     TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+  #     TZ: Europe/Berlin
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       shopware-version:
+  #         # TODO: add again with next major, does not work right now because 6.5 does not support vue3
+  #         # - ${{ needs.tested-versions.outputs.lts-latest-version }}
+  #         - ${{ needs.tested-versions.outputs.first-version }}
+  #         - trunk
+  #   steps:
+  #     - name: Setup shopware
+  #       uses: shopware/setup-shopware@main
+  #       with:
+  #         path: shopware/
+  #         install: "true"
+  #         install-admin: "true"
+  #         install-storefront: "true"
+  #         shopware-version: "${{ matrix.shopware-version }}"
+  #         env: dev
+
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         path: meteor/
+
+  #     - name: Symlink plugin
+  #       working-directory: shopware/custom/plugins/
+  #       run: ln -s ../../../meteor/examples/admin-sdk-plugin TestPlugin
+
+  #     - name: Activate TestPlugin
+  #       working-directory: shopware/
+  #       run: |
+  #         bin/console plugin:refresh
+  #         bin/console plugin:install --activate TestPlugin
+  #         bin/console cache:clear
+
+  #     - uses: pnpm/action-setup@v3
+  #       with:
+  #         version: 9
+
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: "20"
+  #         cache: "pnpm"
+  #         cache-dependency-path: "**/pnpm-lock.yaml"
+
+  #     - name: Install dependencies
+  #       working-directory: meteor/
+  #       run: pnpm install --frozen-lockfile --prefer-offline
+
+  #     - name: Build packages
+  #       working-directory: meteor/
+  #       run: npx turbo run build
+
+  #     - name: Build assets
+  #       working-directory: shopware/
+  #       run: |
+  #         composer run build:js
+  #         bin/console assets:install
+
+  #     - name: Start webserver
+  #       working-directory: shopware/
+  #       run: symfony server:start --allow-http --no-tls --port=8000 -d
+
+  #     - name: Install playwright
+  #       working-directory: meteor/examples/admin-sdk-plugin/tests/acceptance/
+  #       run: |
+  #         pnpm install --frozen-lockfile --prefer-offline
+  #         npx playwright install --with-deps
+
+  #     - name: Run Playwrigth
+  #       working-directory: meteor/examples/admin-sdk-plugin/tests/acceptance/
+  #       run: npx playwright test --retries=2 --reporter=github --trace=on-first-retry --project chromium
+
+  #     - uses: actions/upload-artifact@v4
+  #       if: always()
+  #       with:
+  #         name: ats-test-results-${{ matrix.project }}
+  #         path: meteor/examples/admin-sdk-plugin/tests/acceptance/test-results/
+
+  #     - uses: actions/upload-artifact@v4
+  #       if: always()
+  #       with:
+  #         name: ats-report-${{ matrix.project }}
+  #         path: meteor/examples/admin-sdk-plugin/tests/acceptance/playwright-report/
diff --git a/examples/admin-sdk-app/CHANGELOG.md b/examples/admin-sdk-app/CHANGELOG.md
@@ -1,5 +1,13 @@
 # meteor-admin-sdk-app
 
+## 1.0.24
+
+### Patch Changes
+
+- Updated dependencies [f3b0e2f]
+  - @shopware-ag/meteor-component-library@4.0.1
+  - @shopware-ag/meteor-admin-sdk@5.6.2
+
 ## 1.0.23
 
 ### Patch Changes

diff --git a/examples/admin-sdk-app/package.json b/examples/admin-sdk-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor-admin-sdk-app",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "private": true,
   "description": "",
   "repository": {

diff --git a/examples/admin-sdk-plugin/src/Resources/app/administration/CHANGELOG.md b/examples/admin-sdk-plugin/src/Resources/app/administration/CHANGELOG.md
@@ -1,5 +1,13 @@
 # administration
 
+## 1.0.2
+
+### Patch Changes
+
+- Updated dependencies [f3b0e2f]
+  - @shopware-ag/meteor-component-library@4.0.1
+  - @shopware-ag/meteor-admin-sdk@5.6.2
+
 ## 1.0.1
 
 ### Patch Changes

diff --git a/examples/admin-sdk-plugin/src/Resources/app/administration/package.json b/examples/admin-sdk-plugin/src/Resources/app/administration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "administration",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "description": "",
   "license": "MIT",

diff --git a/examples/nuxt-app/CHANGELOG.md b/examples/nuxt-app/CHANGELOG.md
@@ -1,5 +1,12 @@
 # nuxt-app
 
+## 0.0.17
+
+### Patch Changes
+
+- Updated dependencies [f3b0e2f]
+  - @shopware-ag/meteor-component-library@4.0.1
+
 ## 0.0.16
 
 ### Patch Changes

diff --git a/examples/nuxt-app/package.json b/examples/nuxt-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt-app",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/packages/admin-sdk/CHANGELOG.md b/packages/admin-sdk/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 5.6.2
+
+### Patch Changes
+
+- Updated dependencies [f3b0e2f]
+  - @shopware-ag/meteor-component-library@4.0.1
+
 ## 5.6.1
 
 ### Patch Changes

diff --git a/packages/admin-sdk/package.json b/packages/admin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/meteor-admin-sdk",
-  "version": "5.6.1",
+  "version": "5.6.2",
   "description": "The Meteor SDK for the Shopware Administration.",
   "keywords": [
     "iframe",

diff --git a/packages/component-library/CHANGELOG.md b/packages/component-library/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.0.1
+
+### Patch Changes
+
+- f3b0e2f: Fixed the Type generation for components like mt-text-editor or mt-tabs
+
 ## 4.0.0
 
 ### Major Changes

diff --git a/packages/component-library/package.json b/packages/component-library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/meteor-component-library",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "repository": {
     "type": "git",
     "url": "git+ssh://[email protected]:shopware/meteor.git"
@@ -69,8 +69,8 @@
     "@tiptap/starter-kit": "^2.9.1",
     "@tiptap/vue-3": "^2.9.1",
     "@vuepic/vue-datepicker": "^10.0.0",
-    "@vueuse/components": "^10.7.2",
-    "@vueuse/core": "^10.7.2",
+    "@vueuse/components": "^12.4.0",
+    "@vueuse/core": "^12.4.0",
     "codemirror": "^6.0.1",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^2.0.0",
@@ -127,11 +127,11 @@
     "stylelint-config-standard-scss": "^13.1.0",
     "stylelint-define-config": "^1.8.0",
     "ts-morph": "^20.0.0",
-    "typescript": "~5.2.0",
+    "typescript": "~5.7.3",
     "vite": "^4.4.11",
-    "vite-plugin-dts": "^3.6.3",
+    "vite-plugin-dts": "^4.5.0",
     "vite-plugin-svgstring": "^1.0.0",
     "vitest": "^1.1.3",
-    "vue-tsc": "^2.0.21"
+    "vue-tsc": "^2.2.0"
   }
 }