Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release] Stage to Main #3422

Merged
merged 9 commits into from
Jan 9, 2025
Merged

[Release] Stage to Main #3422

merged 9 commits into from
Jan 9, 2025

Conversation

bandana147 and others added 9 commits January 7, 2025 09:16
* Ading uncConfig for unav

* Ading uncConfig for unav

* Lint fix
* MWPW-162385 add wcsApiKey attribute

* MWPW-161355: Update MAS documentation (#3135)

* MWPW-159374: Update hydrate logic

to support all cta styles
organise code and code coverage

Update tests

* add workaround for ccd-suggested cards

* remove source maps

* improve code coverage

* merge MWPW-159374

* MWPW-161355: Update MAS documentation

* Example with contextual menu
* Checkout click event with correct event target
 when the CTA contains a text wrapped by a span

* cleanup all attributes during card hydration

* remove deps/mas/mas.js

* update test

* update doc

* allow list libs/features/mas/mas/dist/mas.js

* change order in ignore

* trying with wildcard

* allow list dist

* update hlxignore rules

* update hlxignore rules

* MWPW-161176: restructure ccd gallery (#3169)

restructure ccd gallery

* fix mas path

* fix undefined error in merch-icon

* fix regression in ctas size

* update doc

* fix css with checkout-link

* fix random rtl issue

* revert removal of mas.js from deps

* update ccd gallery

---------

Co-authored-by: Mariia Lukianets <lukianet@adobe.com>

* MWPW-161845: basic analytics on mas cards (#3206)

* MWPW-161845: add analytics

* fix review changes

* add build files

* MWPW-159191: MAS Freyja support (#3209)

* initial freyja commit

* increase codecov

* trival

* add qa support to ccd page

* improve page performance

* update ccd.html

* MWPW-161804: Merch card style auditing (#3216)

Refactor merch-card styles to improve structure and specificity

* Added space after price recurrence label for display-per-unit prices (#3196)

* Added space after price recurrence label for display-per-unit prices

* more specific selector

* built

* fix cr

* built

* adding example

* MWPW-162933: merge mas modules (#3248)

* MWPW-162933: merge mas modules

+ consonant-templates module from tacocat.js
into a single module

* MWPW-160755 - add tests for CCD cards (#3256)

* MWPW-160755 - add tests for CCD cards

* refactor and prepare dark mode checks

* add tests for slice cards

* activate dark for suggested and eslint fixes

* add check for cta variant

* fix multi mnemonic check

* fix lint

* add analytics check

* remove comment

* MWPW-163041: analytics fix (#3257)

* MWPW-163041: fix analytics & add docs

* add tests for analytics

* add analytics docu

* fix test

* Fix overriding of border style on merch cards (#3278)

* Fix overriding of border style on merch cards

* width change

* built

---------

Co-authored-by: Mariia Lukianets <mariia.lukianets@gmail.com>

* Bump timeout from 2 to 10 sec (#3282)

* bump to 10 seconds

* new change

* MWPW-163479: Switch to Spectrum CSS from SWC

CCD app already provides Spectrum CCS styles.

* update doc style

* update doc style

* update doc style

* update doc style

* update doc style

* update doc style

* Update styles

* update docs

* Keep SWC logic as an option

* MWPW-161645: lana logging for CCD (#3271)

* MWPW-161645: lana logging for CCD

with <mas-commerce-service data-lana-tags="consumer=ccd" ...>

lana will be enabled.

TODO:

Update docs

* Update tests

* fix review comments

* add host env attribute, fix lana override

* fix docs

* fix unit tests

* start loggin missing osi's

* fix message

* fix message

* Update libs/features/mas/src/lana.js

Co-authored-by: Axel Cureno Basurto <axelcureno@gmail.com>

* PR review changes

* avoid duplicate logging, log wcs url, limit page length in log

* fix formatString error

* fix render

* add tests

* fix loggin

* revert ccd comments

* fix milo tags

---------

Co-authored-by: Mariia Lukianets <mariia.lukianets@gmail.com>
Co-authored-by: Axel Cureno Basurto <axelcureno@gmail.com>

* fix gaps with Spectrum CSS support

* update version

* fix gaps reported by ccd teamm

* address gaps

* address gaps

* address gaps

* address gaps

* address gaps

* fix for MWPW-163718

addressed design gaps.

* addressed design gaps.

* bump the version

* add build artifacts

* Update colors based on CCD app

* Update colors based on CCD app

* build without source maps

* update Nala tests

* fix lint

* reset box-sizing for merch-card elements

* Force box-sizing on merch-card

* update styles: box-sizing

* fix ccd gallery

* update version

* limit ccd price style to their variants

* limit ccd price style to suggest variant

* preserve white spaces in prices section

* fix spacing in price

* Update version

* Update doc

* update cards

* update gallery styles

* make the gallery responsive

* align slice card ctas

* cards resize responsively

* fix 1x of gap issue

* fix description text alignement

* fix gaps in minimal widths

* fix the gallery layout

* Fix strikethrough price color in promos

* Update nala tests

* MWPW-164177: clean up card style on fragment

* Added a new section to ccd gallery

* update mas version

* fix missing default spectrum css button style

---------

Co-authored-by: Nicolas Peltier <npeltier@adobe.com>
Co-authored-by: Mariia Lukianets <lukianet@adobe.com>
Co-authored-by: Axel Cureno Basurto <axelcureno@gmail.com>
Co-authored-by: Angelo Statescu <angelostatescu.adobe@gmail.com>
Co-authored-by: Milica Micic <cod23684@adobe.com>
Co-authored-by: Mariia Lukianets <mariia.lukianets@gmail.com>
* MWPW-150560 make search literals usable as fragments

* Revert "MWPW-140452 - Icon authoring in milo using the federal repo a… (#3357)

Revert "MWPW-140452 - Icon authoring in milo using the federal repo and individual SVG assets (#3259)"

This reverts commit 81a5770.

* review comment

* Update libs/blocks/merch-card-collection/merch-card-collection.js

Co-authored-by: Mariia Lukianets <mariia.lukianets@gmail.com>

* fix unit test

---------

Co-authored-by: milo-pr-merge[bot] <169241390+milo-pr-merge[bot]@users.noreply.github.com>
Co-authored-by: Okan Sahin <39759830+mokimo@users.noreply.github.com>
Co-authored-by: Mariia Lukianets <mariia.lukianets@gmail.com>
* MWPW-162046 Tabs - Stacked Mobile

* figma review adjustments

* remove unused variable
…odal (#3375)

* MWPW-164084 [Catalog] Page position not preserved after closing the modal

* Trigger Build

* MWPW-164084 [Catalog] Page position not preserved after closing the modal

* MWPW-164084 [Catalog] Page position not preserved after closing the modal

---------

Co-authored-by: Bozo Jovicic <bozo@hitthecode.com>
remove sticky section when footer is visible
* MWPW-159299 Add chart role

* Update echarts library and dynamically set aria text

* Update aria settings
@milo-pr-merge
Copy link
Contributor Author

milo-pr-merge bot commented Jan 7, 2025

Testing can start @adobecom/bacom-sot @adobecom/creative-cloud-sot @adobecom/document-cloud-sot @adobecom/express-sot @adobecom/homepage-sot @adobecom/miq-sot

Copy link
Contributor

aem-code-sync bot commented Jan 7, 2025

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch and validate page speed.
In case there are problems, just click a checkbox below to rerun the respective action.

  • Re-run PSI checks
  • Re-sync branch
Commits

Copy link
Contributor

aem-code-sync bot commented Jan 7, 2025

Page Scores Audits Google
📱 /?martech=off PERFORMANCE A11Y SEO BEST PRACTICES SI FCP LCP TBT CLS PSI
🖥️ /?martech=off PERFORMANCE A11Y SEO BEST PRACTICES SI FCP LCP TBT CLS PSI

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

eslint

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/src/merch-icon.js


⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/src/variants/catalog.css.js


⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/src/variants/ccd-slice.css.js


⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/src/variants/ccd-slice.js


⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/src/variants/ccd-suggested.css.js


⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/src/variants/ccd-suggested.js


⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/src/variants/variant-layout.js


⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/test/hydrate.test.js


⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

https://github.com/adobecom/milo/blob/82694a30e44b40290f33d728c1e3e849ff95d61f/libs/features/mas/test/merch-card.ccd-suggested.test.html.js

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [eslint] reported by reviewdog 🐶
File ignored because of a matching ignore pattern. Use "--no-ignore" to override.

@aem-code-sync aem-code-sync bot had a problem deploying to feds-standalone-v0.0.2 January 7, 2025 10:44 Failure
@Dli3 Dli3 temporarily deployed to milo_pr_merge January 8, 2025 22:01 — with GitHub Actions Inactive
@milo-pr-merge milo-pr-merge bot merged commit d8fb2eb into main Jan 9, 2025
61 of 62 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.