Merge remote-tracking branch 'origin' into fix/promotion-code

shopware · Jul 17, 2024 · 8dec568 · 8dec568
2 parents 9ca7dd6 + d4c4e8a
commit 8dec568
Show file tree

Hide file tree

Showing 73 changed files with 5,879 additions and 6,541 deletions.
diff --git a/.changeset/afraid-keys-hear.md b/.changeset/afraid-keys-hear.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/helpers-next": patch
+---
+
+Removed optional chaining for translated properties. Expecting a different argument type for the `getLanguageName` and `getShippingMethodDeliveryTime` methods.
diff --git a/.changeset/early-trains-run.md b/.changeset/early-trains-run.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/composables-next": patch
+---
+
+`useOrderDetails` - Load shipping address for the order details. Ivoking a `loadOrderDetails` method now will fetch also a `shippingOrderAddress` association.
diff --git a/.changeset/funny-onions-call.md b/.changeset/funny-onions-call.md
@@ -0,0 +1,5 @@
+---
+"@shopware/api-gen": patch
+---
+
+Set `translated` property as required in provided schemas
diff --git a/.changeset/light-cows-protect.md b/.changeset/light-cows-protect.md
diff --git a/.changeset/orange-taxis-kick.md b/.changeset/orange-taxis-kick.md
diff --git a/.changeset/six-pigs-laugh.md b/.changeset/six-pigs-laugh.md
diff --git a/.changeset/sour-starfishes-hide.md b/.changeset/sour-starfishes-hide.md
@@ -0,0 +1,5 @@
+---
+"@shopware/api-client": patch
+---
+
+Update default schemas' `translated` properties as required
diff --git a/.changeset/tidy-comics-attack.md b/.changeset/tidy-comics-attack.md
diff --git a/.changeset/tough-queens-swim.md b/.changeset/tough-queens-swim.md
diff --git a/.changeset/wise-chairs-smile.md b/.changeset/wise-chairs-smile.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/cms-base": patch
+---
+
+Removed optional chaining for translated properties
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,7 +9,7 @@ updates:
     directory: '/'
     schedule:
       interval: 'daily'
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 3
     versioning-strategy: 'increase'
     ignore:
       # used in old client, not upgrading
@@ -20,6 +20,8 @@ updates:
       - dependency-name: 'vitepress-shopware-docs'
       # until https://github.com/nuxt-modules/i18n/issues/2215 is resolved
       - dependency-name: '@nuxtjs/i18n'
+      # Until the upgrade is complete: https://github.com/shopware/frontends/pull/1107
+      - dependency-name: 'openapi-typescript'
     groups:
       astro:
         patterns:
@@ -79,8 +81,4 @@ updates:
           - '@iconify*'
           - '@nuxt/*'
           - '@unocss/*'
-          - 'unocss'
-      # others not defined will be grouped
-      grouped-dependencies:
-        patterns:
-          - "*"
+          - 'unocss'
diff --git a/apps/docs/CHANGELOG.md b/apps/docs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # docs
 
+## 1.7.2
+
+### Patch Changes
+
+- Updated dependencies [[`f9d2735`](https://github.com/shopware/frontends/commit/f9d27353ec6383cb22cdece0469f8fdd13250958), [`d95751e`](https://github.com/shopware/frontends/commit/d95751ecde443a033f17def838bcc25aeba6951e)]:
+  - @shopware-pwa/composables-next@1.1.0
+
 ## 1.7.1
 
 ### Patch Changes

diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docs",
   "private": true,
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "",
   "scripts": {
     "dev": "vitepress",
@@ -26,7 +26,7 @@
     "find-in-files": "0.5.0",
     "ts-dox": "0.1.0",
     "typescript": "5.5.3",
-    "unplugin-export-collector": "0.4.3",
+    "unplugin-export-collector": "0.5.0",
     "vinyl": "3.0.0"
   },
   "pnpm": {

diff --git a/apps/docs/src/getting-started/e-commerce/product-detail-page.md b/apps/docs/src/getting-started/e-commerce/product-detail-page.md
@@ -55,9 +55,9 @@ Having source of the data, you can display all you need in your Vue.js template:
 ```js
 import { computed } from "vue";
 ...
-const productName = computed(() => product.value?.translated?.name);
+const productName = computed(() => product.value?.translated.name);
 const manufacturer = computed(() => product.value?.manufacturer?.name);
-const description = computed(() => product.value?.translated?.description);
+const description = computed(() => product.value?.translated.description);
 const productNumber = computed(() => product.value?.productNumber);
 ...
 ```

diff --git a/apps/docs/src/getting-started/page-elements/examples/footer-navigation/index.md b/apps/docs/src/getting-started/page-elements/examples/footer-navigation/index.md
@@ -38,7 +38,7 @@ loadNavigationElements({
             <h2
               class="mb-6 text-sm font-semibold text-gray-900 uppercase dark:text-white"
             >
-              {{ category.translated?.name }}
+              {{ category.translated.name }}
             </h2>
             <ul
               class="text-gray-500 dark:text-gray-400 font-medium"
@@ -52,7 +52,7 @@ loadNavigationElements({
                 <a
                   :href="getCategoryRoute(childCategory)"
                   class="hover:underline"
-                  >{{ childCategory.translated?.name }}</a
+                  >{{ childCategory.translated.name }}</a
                 >
               </li>
             </ul>

diff --git a/apps/e2e-tests/package.json b/apps/e2e-tests/package.json
@@ -9,7 +9,7 @@
     "start": "npx http-server"
   },
   "devDependencies": {
-    "@playwright/test": "1.45.1"
+    "@playwright/test": "1.45.2"
   },
   "dependencies": {
     "@stackblitz/sdk": "1.11.0",