MWPW-151392: Sorting button/menu issues on Mobile (#2690)

* changed the swc version to 0.46.0 * added polyfills import * corrected import * corrected import * added warning about polyfills in readme * fixed typos and changed imports * corrected import * brought back the loadScript * correction for the readme
adobecom · Aug 21, 2024 · 7ba11cd · 7ba11cd
1 parent 8f8834b
commit 7ba11cd
Show file tree

Hide file tree

Showing 42 changed files with 9,940 additions and 1,008 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,9 +2,9 @@
 .aem/*
 coverage
 logs/*
-node_modules
+*node_modules
 .DS_Store
 .idea
 .iml
 .env
-**/mas/stats.json
+**/mas/*/stats.json
diff --git a/libs/blocks/merch-card-collection/merch-card-collection.js b/libs/blocks/merch-card-collection/merch-card-collection.js
@@ -187,7 +187,10 @@ export default async function init(el) {
   const cardsDataPromise = fetchCardsData(config, type, el);
 
   const merchCardCollectionDep = import('../../deps/mas/merch-card-collection.js');
+  const polyfills = import('../merch/merch.js');
+  await polyfills;
   let deps = [
+    polyfills,
     merchCardCollectionDep,
     import('../merch-card/merch-card.js'),
     import('../../deps/mas/merch-card.js'),

diff --git a/libs/blocks/merch/merch.js b/libs/blocks/merch/merch.js
@@ -161,7 +161,7 @@ export async function polyfills() {
     polyfills.promise = Promise.resolve();
   } else {
     const { base } = getConfig();
-    polyfills.promise = loadScript(`${base}/deps/custom-elements.js`);
+    polyfills.promise = await loadScript(`${base}/deps/custom-elements.js`);
   }
   return polyfills.promise;
 }

diff --git a/libs/features/mas/package-lock.json b/libs/features/mas/package-lock.json
diff --git a/libs/features/mas/package.json b/libs/features/mas/package.json
@@ -15,29 +15,42 @@
     "build": "npm run build --workspaces"
   },
   "dependencies": {
-    "@spectrum-web-components/action-button": "^0.43.0",
-    "@spectrum-web-components/action-menu": "^0.43.0",
-    "@spectrum-web-components/button": "^0.43.0",
-    "@spectrum-web-components/button-group": "^0.43.0",
-    "@spectrum-web-components/checkbox": "^0.43.0",
-    "@spectrum-web-components/dialog": "^0.43.0",
-    "@spectrum-web-components/icon": "^0.43.0",
-    "@spectrum-web-components/icons": "^0.43.0",
-    "@spectrum-web-components/icons-workflow": "^0.43.0",
-    "@spectrum-web-components/link": "^0.43.0",
-    "@spectrum-web-components/menu": "^0.43.0",
-    "@spectrum-web-components/overlay": "^0.43.0",
-    "@spectrum-web-components/popover": "^0.43.0",
-    "@spectrum-web-components/progress-circle": "^0.43.0",
-    "@spectrum-web-components/radio": "^0.43.0",
-    "@spectrum-web-components/reactive-controllers": "^0.43.0",
-    "@spectrum-web-components/search": "^0.43.0",
-    "@spectrum-web-components/sidenav": "0.42.1",
-    "@spectrum-web-components/split-button": "^0.43.0",
-    "@spectrum-web-components/tabs": "^0.43.0",
-    "@spectrum-web-components/theme": "^0.43.0",
-    "@spectrum-web-components/tooltip": "^0.43.0",
-    "@spectrum-web-components/tray": "^0.43.0",
+    "@spectrum-web-components/action-button": "^0.46.0",
+    "@spectrum-web-components/action-menu": "^0.46.0",
+    "@spectrum-web-components/alert-dialog": "^0.46.0",
+    "@spectrum-web-components/base": "^0.46.0",
+    "@spectrum-web-components/button": "^0.46.0",
+    "@spectrum-web-components/button-group": "^0.46.0",
+    "@spectrum-web-components/checkbox": "^0.46.0",
+    "@spectrum-web-components/close-button": "^0.46.0",
+    "@spectrum-web-components/dialog": "^0.46.0",
+    "@spectrum-web-components/divider": "^0.46.0",
+    "@spectrum-web-components/field-label": "^0.46.0",
+    "@spectrum-web-components/help-text": "^0.46.0",
+    "@spectrum-web-components/icon": "^0.46.0",
+    "@spectrum-web-components/icons": "^0.46.0",
+    "@spectrum-web-components/icons-ui": "^0.46.0",
+    "@spectrum-web-components/icons-workflow": "^0.46.0",
+    "@spectrum-web-components/link": "^0.46.0",
+    "@spectrum-web-components/menu": "^0.46.0",
+    "@spectrum-web-components/modal": "^0.46.0",
+    "@spectrum-web-components/overlay": "^0.46.0",
+    "@spectrum-web-components/picker": "^0.46.0",
+    "@spectrum-web-components/popover": "^0.46.0",
+    "@spectrum-web-components/progress-circle": "^0.46.0",
+    "@spectrum-web-components/radio": "^0.46.0",
+    "@spectrum-web-components/reactive-controllers": "^0.46.0",
+    "@spectrum-web-components/search": "^0.46.0",
+    "@spectrum-web-components/shared": "^0.46.0",
+    "@spectrum-web-components/sidenav": "^0.46.0",
+    "@spectrum-web-components/split-button": "^0.46.0",
+    "@spectrum-web-components/tabs": "^0.46.0",
+    "@spectrum-web-components/textfield": "^0.46.0",
+    "@spectrum-web-components/theme": "^0.46.0",
+    "@spectrum-web-components/toast": "^0.46.0",
+    "@spectrum-web-components/tooltip": "^0.46.0",
+    "@spectrum-web-components/tray": "^0.46.0",
+    "@spectrum-web-components/underlay": "^0.46.0",
     "lit": "^2.8.0"
   },
   "devDependencies": {