@graphcommerce/magento-customer 3.6.11 → 3.6.15

package/components/AddressSingleLine/index.tsx

@@ -21,14 +21,16 @@ export default function AddressSingleLine(props: CustomerAddressFragment) {
   // todo: detect correct format by locale
   // for now, US format will be returned by default
 
-  let address = `$company ${prefix}, ${firstname}, $middlename ${lastname}, $suffix ${
-    street?.[0]
-  }, ${street?.slice(1).join(' ')}, ${postcode}, ${city}, ${regionName} $countryName`
-
-  address = address.replace('$company', company ? `${company},` : '')
-  address = address.replace('$middlename', middlename ? `${middlename},` : '')
-  address = address.replace('$suffix', suffix ? `${suffix},` : '')
-  address = address.replace('$countryName', countryName ? `${countryName},` : '')
+  const addressLine = [
+    company,
+    `${prefix} ${firstname} ${middlename} ${lastname} ${suffix}`,
+    `${street?.[0]} ${street?.[1]}`,
+    ...(street?.slice(2) ?? []),
+    `${postcode} ${city}`,
+    `${regionName} ${countryName}`,
+  ]
+    .map((v) => (v ?? '').replaceAll('null', '').replace(/\s\s+/g, ' ').trim())
+    .filter(Boolean)
 
-  return <>{address}</>
+  return <>{addressLine.join(', ')}</>
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphcommerce/magento-customer",
-  "version": "3.6.11",
+  "version": "3.6.15",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "browserslist": [
@@ -14,27 +14,27 @@
   },
   "devDependencies": {
     "@graphcommerce/browserslist-config-pwa": "^3.0.2",
-    "@graphcommerce/eslint-config-pwa": "^3.1.6",
+    "@graphcommerce/eslint-config-pwa": "^3.1.8",
     "@graphcommerce/prettier-config-pwa": "^3.0.4",
     "@graphcommerce/typescript-config-pwa": "^3.1.1",
-    "@playwright/test": "^1.16.2"
+    "@playwright/test": "^1.17.1"
   },
   "dependencies": {
-    "@apollo/client": "^3.4.16",
-    "@graphcommerce/graphql": "^2.105.6",
-    "@graphcommerce/image": "^2.105.5",
-    "@graphcommerce/magento-graphql": "^2.104.6",
-    "@graphcommerce/magento-store": "^3.3.11",
-    "@graphcommerce/next-ui": "^3.20.4",
-    "@graphcommerce/react-hook-form": "^2.104.1",
-    "@lingui/macro": "^3.12.1",
+    "@apollo/client": "^3.5.6",
+    "@graphcommerce/graphql": "^2.105.8",
+    "@graphcommerce/image": "^2.105.8",
+    "@graphcommerce/magento-graphql": "^2.104.8",
+    "@graphcommerce/magento-store": "^3.3.15",
+    "@graphcommerce/next-ui": "^3.20.8",
+    "@graphcommerce/react-hook-form": "^2.104.4",
+    "@lingui/macro": "^3.13.0",
     "@material-ui/core": "^4.12.3",
     "@material-ui/lab": "^4.0.0-alpha.60",
     "clsx": "^1.1.1",
-    "framer-motion": "^4.1.17",
-    "next": "^12.0.3",
+    "framer-motion": "^5.5.1",
+    "next": "^12.0.7",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },
-  "gitHead": "b992ac3fbe719310988edb8ad811366431509bc2"
+  "gitHead": "a69bd94ffdcca6ca9487eec1cafe9ade3fcdffa3"
 }