Merge branch 'master' into refactor/product-price-displaying

vuestorefront · May 9, 2022 · 51dcc60 · 51dcc60
2 parents 24c5bb0 + 435e2fe
commit 51dcc60
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 33 deletions.
diff --git a/packages/cli/src/templates/project-template/package.json b/packages/cli/src/templates/project-template/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@shopware-pwa/nuxt-module": "latest",
-    "@storefront-ui/vue": "0.12.3",
+    "@storefront-ui/vue": "0.13.1",
     "@vue/test-utils": "^1.3.0",
     "@vuelidate/core": "^2.0.0-alpha.35",
     "@vuelidate/validators": "^2.0.0-alpha.27",

diff --git a/packages/default-theme/package.json b/packages/default-theme/package.json
@@ -26,7 +26,7 @@
   "dependencies": {
     "@shopware-pwa/cli": "1.4.0",
     "@shopware-pwa/theme-base": "1.4.0",
-    "@storefront-ui/vue": "0.12.3",
+    "@storefront-ui/vue": "0.13.1",
     "@vuelidate/core": "^2.0.0-alpha.35",
     "@vuelidate/validators": "^2.0.0-alpha.27",
     "dayjs": "^1.10.8",

diff --git a/packages/default-theme/src/components/SwCart.vue b/packages/default-theme/src/components/SwCart.vue
@@ -50,10 +50,7 @@
           <div v-if="count">
             <SfProperty
               :name="$t('Total price')"
-              class="
-                sf-property--full-width sf-property--large
-                my-cart__total-price
-              "
+              class="sf-property--full-width sf-property--large my-cart__total-price"
             >
               <template #value>
                 <SfPrice
@@ -99,10 +96,6 @@ import { computed, onMounted, ref, watch } from "@vue/composition-api"
 import SwImage from "@/components/atoms/SwImage.vue"
 import { usePriceFilter } from "@/logic/usePriceFilter.js"
 import { disableBodyScroll, clearAllBodyScrollLocks } from "body-scroll-lock"
-import {
-  mapMobileObserver,
-  unMapMobileObserver,
-} from "@storefront-ui/vue/src/utilities/mobile-observer"
 
 export default {
   name: "SwCart",
@@ -159,20 +152,8 @@ export default {
       filterPrice: usePriceFilter(),
     }
   },
-  computed: {
-    ...mapMobileObserver(),
-  },
-  beforeDestroy() {
-    unMapMobileObserver()
-  },
   watch: {
     isSidebarOpen(val) {
-      // until it's fixed in the storefront-ui we need to disable body scroll lock on mobile
-      if (this.isMobile) {
-        setTimeout(() => {
-          clearAllBodyScrollLocks()
-        }, 0)
-      }
       if (!val) {
         this.$nextTick(() => {
           clearAllBodyScrollLocks()

diff --git a/packages/default-theme/src/components/SwSearchBar.vue b/packages/default-theme/src/components/SwSearchBar.vue
@@ -26,10 +26,6 @@ import { ref, reactive, onMounted, computed } from "@vue/composition-api"
 import { getSearchPageUrl } from "@/helpers"
 import { SfSearchBar } from "@storefront-ui/vue"
 import { useProductQuickSearch } from "@shopware-pwa/composables"
-import {
-  mapMobileObserver,
-  unMapMobileObserver,
-} from "@storefront-ui/vue/src/utilities/mobile-observer"
 import { debounce } from "@shopware-pwa/helpers"
 const SwSuggestSearch = () => import("@/components/SwSuggestSearch.vue")
 
@@ -55,17 +51,21 @@ export default {
       }
     }, 300)
 
+    // TODO: reactive observer
+    const isMobile = ref(true)
+    onMounted(() => {
+      isMobile.value = window?.innerWidth < 768
+    })
+
     return {
       getProducts,
       getTotal,
       isSuggestBoxOpen,
       typingQuery,
       performSuggestSearch,
+      isMobile,
     }
   },
-  computed: {
-    ...mapMobileObserver(),
-  },
   watch: {
     $route(to, from) {
       this.isSuggestBoxOpen = false
@@ -76,9 +76,6 @@ export default {
       }
     },
   },
-  beforeDestroy() {
-    unMapMobileObserver()
-  },
   methods: {
     performSearch() {
       if (this.typingQuery.length > 0) {

diff --git a/packages/default-theme/src/helpers/images/getPlaceholderImage.js b/packages/default-theme/src/helpers/images/getPlaceholderImage.js
@@ -29,5 +29,7 @@ export default function getPlaceholderImage(width, height) {
  </linearGradient>
 </svg>`
 
-  return `data:image/svg+xml;base64,${btoa(svgSource)}`
+  const buf = Buffer.from(svgSource, "utf8")
+
+  return `data:image/svg+xml;base64,${buf.toString("base64")}`
 }
diff --git a/packages/nuxt-module/__tests__/module.spec.ts b/packages/nuxt-module/__tests__/module.spec.ts
@@ -302,6 +302,7 @@ describe("nuxt-module - ShopwarePWAModule runModule", () => {
     await runModule(moduleObject, {});
     expect(packages.useCorePackages).toBeCalledWith(moduleObject, [
       "@shopware-pwa/composables",
+      "@shopware-pwa/commons",
       "@shopware-pwa/helpers",
       "@shopware-pwa/shopware-6-client",
       "@storefront-ui/vue",

diff --git a/packages/nuxt-module/src/module.ts b/packages/nuxt-module/src/module.ts
@@ -208,6 +208,11 @@ export async function runModule(
   // TODO: start - remove this, only for default-theme
   moduleObject.options.build = moduleObject.options.build || {};
   moduleObject.options.build.babel = moduleObject.options.build.babel || {};
+  // https://github.com/zloirock/core-js/issues/743
+  moduleObject.options.build.babel.exclude = [
+    /\bcore-js\b/,
+    /\bwebpack\/buildin\b/,
+  ];
   /* istanbul ignore next */
   moduleObject.options.build.babel.presets = ({ isServer }) => {
     return [
@@ -234,6 +239,7 @@ export async function runModule(
 
   const corePackages: string[] = [
     "@shopware-pwa/composables",
+    "@shopware-pwa/commons",
     "@shopware-pwa/helpers",
     "@shopware-pwa/shopware-6-client",
     "@storefront-ui/vue",