Merge branch 'master' into legacy-vite-config

royduin · royduin · commit f87bfdd5381c · 2025-09-30T09:12:16.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,36 @@
 # Changelog 
 
-[Unreleased changes](https://github.com/rapidez/core/compare/4.7.1...4.7.1)
+[Unreleased changes](https://github.com/rapidez/core/compare/4.7.5...4.7.5)
+## [4.7.5](https://github.com/rapidez/core/releases/tag/4.7.5) - 2025-09-26
+
+### Fixed
+
+- Use npm workspaces for Rapidez dependencies (#1026)
+
+## [4.7.4](https://github.com/rapidez/core/releases/tag/4.7.4) - 2025-09-26
+
+### Fixed
+
+- Playwright wait for footer on success page (#1024)
+- Package.json name and version (#1025)
+
+## [4.7.3](https://github.com/rapidez/core/releases/tag/4.7.3) - 2025-09-26
+
+### Fixed
+
+- Playwright test fix (#1023)
+
+## [4.7.2](https://github.com/rapidez/core/releases/tag/4.7.2) - 2025-09-26
+
+### Fixed
+
+- Slider arrows color fix (#1017)
+- Visual swatch filters not showing fix (#1016)
+- Autocomplete focus on mobile fix (#1018)
+- Playwright use screenshot method everywhere (#1022)
+- GraphQL mutation notification event fix (#1021)
+- Fire login event when logged in customer changes (#1019)
+
 ## [4.7.1](https://github.com/rapidez/core/releases/tag/4.7.1) - 2025-09-18
 
 ### Fixed
diff --git a/package.json b/package.json
@@ -1,4 +1,6 @@
 {
+    "name": "@rapidez/core",
+    "version": "1.0.0",
     "private": true,
     "type": "module",
     "scripts": {
@@ -45,5 +47,8 @@
         "vue-turbolinks": "^2.2.2",
         "vue2-teleport": "^1.1.4"
     },
-    "dependencies": {}
+    "dependencies": {},
+    "workspaces": [
+        "vendor/rapidez/*"
+    ]
 }
diff --git a/resources/js/components/GraphqlMutation.vue b/resources/js/components/GraphqlMutation.vue
@@ -201,7 +201,7 @@ export default {
                 if (this.redirect) {
                     if (this.notify.message) {
                         document.addEventListener(
-                            'turbo:load',
+                            'vue:loaded',
                             () => {
                                 Notify(this.notify.message, this.notify.type ?? 'success')
                             },
diff --git a/resources/js/stores/useCart.js b/resources/js/stores/useCart.js
@@ -1,5 +1,5 @@
 import { StorageSerializers, asyncComputed, useLocalStorage, useMemoize } from '@vueuse/core'
-import { computed, ref, watch } from 'vue'
+import { computed, watch } from 'vue'
 import { GraphQLError } from '../fetch'
 import { mask, clearMask } from './useMask'
 import { user } from './useUser'
@@ -110,6 +110,14 @@ export const fetchCart = async function () {
     await fetchGuestCart()
 }
 
+export const loggedIn = async function () {
+    if (mask.value) {
+        await linkUserToCart()
+    } else {
+        await fetchCustomerCart()
+    }
+}
+
 export const fetchAttributeValues = async function (attributes = []) {
     if (!attributes.length) {
         return { data: { customAttributeMetadataV2: { items: null } } }
diff --git a/resources/js/stores/useUser.js b/resources/js/stores/useUser.js
@@ -1,6 +1,6 @@
 import { useLocalStorage, useSessionStorage, StorageSerializers } from '@vueuse/core'
 import { useCookies } from '@vueuse/integrations/useCookies'
-import { clear as clearCart, fetchCustomerCart, linkUserToCart, cart } from './useCart'
+import { clear as clearCart, loggedIn as cartLoginHandler, cart } from './useCart'
 import { clear as clearOrder } from './useOrder'
 import { computed, watch } from 'vue'
 import Jwt from '../jwt'
@@ -61,7 +61,11 @@ export const refresh = async function () {
 
     return (currentRefresh = (async function () {
         try {
+            const oldEmail = userStorage.value?.email
             userStorage.value = (await magentoGraphQL(`{ customer { ${config.queries.customer} } }`))?.data?.customer
+            if (oldEmail !== userStorage.value?.email) {
+                await loggedIn()
+            }
         } catch (error) {
             if (error instanceof SessionExpired) {
                 await clear()
@@ -141,14 +145,12 @@ export const login = async function (email, password) {
 
 export const loginByToken = async function (customerToken) {
     token.value = customerToken
+    await refresh()
+}
 
-    if (mask.value) {
-        await linkUserToCart()
-    } else {
-        await fetchCustomerCart()
-    }
-
+export const loggedIn = async function () {
     window.app.$emit('logged-in')
+    await cartLoginHandler()
 }
 
 export const logout = async function () {
diff --git a/tests/playwright/category.spec.js-snapshots/category-filter-1-Mobile-Chrome-linux.png b/tests/playwright/category.spec.js-snapshots/category-filter-1-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b17ab759ffe3427bda41b1c9d91d80241ca62677811602046c2579e28e954cc
-size 289852
+oid sha256:7e1995c7da021c305e4195f974f6effc3fba5ea9972577d640821dd308c13527
+size 289882
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e6a70aa313cda01d54b979ac8db2d8a0a9ac4f4f37f4e4be38012ac6d1e08a9
-size 107984
+oid sha256:ca4df5f9bab81b6245843813b4fdd80d35ee7adb82f99ff3f5db4b5f2d759bcc
+size 118687
diff --git a/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/default---as-guest-4-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96993097d9100280b47ec16ab9f6cba288ee51560ad3b456497dcf33d217f173
-size 120483
+oid sha256:8605a81daa646cc30533a71c83a2647dff1908f3c28f26d9e901e6975ef1a647
+size 132079
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Chrome-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Chrome-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e6a70aa313cda01d54b979ac8db2d8a0a9ac4f4f37f4e4be38012ac6d1e08a9
-size 107984
+oid sha256:ca4df5f9bab81b6245843813b4fdd80d35ee7adb82f99ff3f5db4b5f2d759bcc
+size 118687
diff --git a/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Safari-linux.png b/tests/playwright/checkout.spec.js-snapshots/onestep---as-guest-3-Mobile-Safari-linux.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96993097d9100280b47ec16ab9f6cba288ee51560ad3b456497dcf33d217f173
-size 120483
+oid sha256:8605a81daa646cc30533a71c83a2647dff1908f3c28f26d9e901e6975ef1a647
+size 132079
diff --git a/tests/playwright/general.spec.js b/tests/playwright/general.spec.js
@@ -5,7 +5,7 @@ test('cookie', async ({ page }) => {
     const acceptCookiesButton = page.getByTestId('accept-cookies')
 
     await page.goto('/?show-cookie-notice')
-    await expect(page).toHaveScreenshot()
+    await new BasePage(page).screenshot()
     await acceptCookiesButton.click()
     await expect(acceptCookiesButton).not.toBeVisible()
 
diff --git a/tests/playwright/pages/BasePage.js b/tests/playwright/pages/BasePage.js
@@ -9,7 +9,23 @@ export class BasePage {
         this.page = page
     }
 
-    async screenshot(type, options = {}) {
+    async screenshot(type = '', options = {}) {
+        const masks = [this.page.getByTestId('masked')]
+        const emailFields = this.page.locator('[name=email]')
+
+        // Only mask filled email fields
+        const emailFieldsCount = await emailFields.count()
+        if (emailFieldsCount) {
+            for (let i = 0; i < emailFieldsCount; i++) {
+                let emailField = emailFields.nth(i)
+                if (await emailField.inputValue()) {
+                    masks.push(emailField)
+                }
+            }
+        }
+
+        options['mask'] = masks
+
         if (type.startsWith('fullpage')) {
             await this.scrolldown()
             options['fullPage'] = true
diff --git a/tests/playwright/pages/CheckoutPage.js b/tests/playwright/pages/CheckoutPage.js
@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test'
+import { BasePage } from './BasePage'
 
 export class CheckoutPage {
     constructor(page, type = 'default') {
@@ -17,19 +18,13 @@ export class CheckoutPage {
         await this.page.waitForLoadState('networkidle')
 
         if (password && !register) {
-            await expect(this.page).toHaveScreenshot({
-                fullPage: true,
-                mask: [await this.page.locator('[name=email]')],
-            })
+            await new BasePage(this.page).screenshot('fullpage')
             await this.page.fill('[name=password]', password)
         }
 
         if (password && register) {
             await this.page.getByTestId('create-account').click()
-            await expect(this.page).toHaveScreenshot({
-                fullPage: true,
-                mask: [await this.page.locator('[name=email]')],
-            })
+            await new BasePage(this.page).screenshot('fullpage')
             await this.page.fill('[name=password]', password)
             await this.page.fill('[name=password_repeat]', password)
             await this.page.fill('[name=firstname]', 'Bruce')
@@ -106,7 +101,7 @@ export class CheckoutPage {
         await this.gotoCheckout()
 
         if (screenshots.includes('login')) {
-            await expect(this.page).toHaveScreenshot({ fullPage: true })
+            await new BasePage(this.page).screenshot('fullpage')
         }
 
         if (email) {
@@ -115,34 +110,31 @@ export class CheckoutPage {
         }
 
         if (screenshots.includes('credentials')) {
-            await expect(this.page).toHaveScreenshot({ fullPage: true })
+            await new BasePage(this.page).screenshot('fullpage')
         }
 
         await this.shippingAddress()
         await this.shippingMethod()
         await this.continue('payment')
 
         if (screenshots.includes('payment')) {
-            await expect(this.page).toHaveScreenshot({ fullPage: true })
+            await new BasePage(this.page).screenshot('fullpage')
         }
 
         await this.paymentMethod()
         await this.continue('success')
         await this.success()
 
         if (screenshots.includes('success')) {
-            await expect(this.page).toHaveScreenshot({
-                fullPage: true,
-                mask: [await this.page.getByTestId('masked')],
-            })
+            await new BasePage(this.page).screenshot('fullpage-footer')
         }
     }
 
     async checkoutOnestep(email = false, password = false, register = false, screenshots = []) {
         await this.gotoCheckout()
 
         if (screenshots.includes('login')) {
-            await expect(this.page).toHaveScreenshot({ fullPage: true })
+            await new BasePage(this.page).screenshot('fullpage')
         }
 
         if (email) {
@@ -154,20 +146,14 @@ export class CheckoutPage {
         await this.paymentMethod()
 
         if (screenshots.includes('payment')) {
-            await expect(this.page).toHaveScreenshot({
-                fullPage: true,
-                mask: [await this.page.locator('[name=email]')],
-            })
+            await new BasePage(this.page).screenshot('fullpage')
         }
 
         await this.continue('success')
         await this.success()
 
         if (screenshots.includes('success')) {
-            await expect(this.page).toHaveScreenshot({
-                fullPage: true,
-                mask: [await this.page.getByTestId('masked')],
-            })
+            await new BasePage(this.page).screenshot('fullpage-footer')
         }
     }
 }
diff --git a/tests/playwright/search.spec.js b/tests/playwright/search.spec.js
@@ -1,12 +1,13 @@
 import { test, expect } from '@playwright/test'
 import { ProductPage } from './pages/ProductPage'
+import { BasePage } from './pages/BasePage'
 
 test('search page', async ({ page }) => {
     const product = await new ProductPage(page).goto(process.env.PRODUCT_URL_SIMPLE)
     await page.goto('/search?q=' + product.name)
     await page.waitForLoadState('networkidle')
     await expect(page.getByTestId('listing-item').first()).toContainText(product.name)
-    await expect(page).toHaveScreenshot()
+    await new BasePage(page).screenshot()
 })
 
 test('autocomplete', async ({ page }) => {
@@ -17,5 +18,5 @@ test('autocomplete', async ({ page }) => {
     await page.getByTestId('autocomplete-input').fill(product.name)
     await page.waitForLoadState('networkidle')
     await expect(page.getByTestId('autocomplete-item').first()).toContainText(product.name)
-    await expect(page).toHaveScreenshot()
+    await new BasePage(page).screenshot()
 })
