MWPW-153629: Removal of merch-card-all dep (#2698)

* Removal of merch-card-all dep * improved dep imports * Update mas.js * Update mas.js * removed sequential imports * pr feedback * fixes
adobecom · Aug 20, 2024 · f7608be · f7608be
1 parent dad8c45
commit f7608be
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 1,706 deletions.
diff --git a/libs/deps/mas/merch-card-all.js b/libs/deps/mas/merch-card-all.js
diff --git a/libs/features/mas/mas/src/mas.js b/libs/features/mas/mas/src/mas.js
@@ -1,5 +1,4 @@
 import { init } from '@adobe/mas-commerce';
-
 const { origin, searchParams } = new URL(import.meta.url);
 
 const locale = searchParams.get('locale') ?? 'US_en';
@@ -19,5 +18,9 @@ const config = () => ({
 init(config);
 
 if (features.includes('merch-card')) {
-    import(`${origin}/libs/deps/merch-card-all.js`);
+  await Promise.allSettled([
+    import('../../web-components/src/merch-card.js'),
+    import('../../web-components/src/merch-icon.js'),
+    import('../../web-components/src/merch-datasource.js'),
+  ]);
 }
diff --git a/libs/features/mas/mocks/mas.js b/libs/features/mas/mocks/mas.js
@@ -1,5 +1,7 @@
 import { init } from '@adobe/mas-commerce';
-import '@adobe/mas-web-components/src/merch-card-all.js';
+import '../../../web-components/src/merch-card.js';
+import '../../../web-components/src/merch-icon.js';
+import '../../../web-components/src/merch-datasource.js';
 
 const locale =
     document

diff --git a/libs/features/mas/web-components/build.mjs b/libs/features/mas/web-components/build.mjs
@@ -21,14 +21,6 @@ async function buildLitComponent(name) {
 }
 
 Promise.all([
-    build({
-        bundle: true,
-        format: 'esm',
-        entryPoints: ['./src/merch-card-all.js'],
-        minify: true,
-        outfile: `${outfolder}/merch-card-all.js`,
-        sourcemap: true,
-    }),
     build({
         bundle: true,
         stdin: { contents: '' },

diff --git a/libs/features/mas/web-components/src/merch-card-all.js b/libs/features/mas/web-components/src/merch-card-all.js
diff --git a/libs/features/mas/web-components/src/merch-datasource.js b/libs/features/mas/web-components/src/merch-datasource.js
@@ -55,10 +55,10 @@ const cardContent = {
 };
 
 async function parseMerchCard(item, merchCard) {
-    const cardJson = item.fields.reduce((acc, { name, multiple, values }) => {
-        acc[name] = multiple ? values : values[0];
-        return acc;
-    }, {});
+    const cardJson = Array.isArray(item.fields) ? item.fields.reduce((acc, { name, multiple, values }) => {
+      acc[name] = multiple ? values : values[0];
+      return acc;
+    }, {}) : {};
     const { type = 'catalog' } = cardJson;
     const cardType = cardContent[type] || cardContent.catalog;