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

Sync stage and main #3326

Merged
merged 86 commits into from
Dec 6, 2024
Merged

Sync stage and main #3326

merged 86 commits into from
Dec 6, 2024

Conversation

mokimo
Copy link
Contributor

@mokimo mokimo commented Dec 6, 2024

Description

Syncs stage and main and re-pushes #3325 ... The diff to main looks correct after this again. We should NOT SQUASH MERGE THIS to get the right history into stage

Test URLs:

milo-pr-merge bot and others added 19 commits October 29, 2024 08:00
* [MWPW-160011] - GNAV light mode color changes (adobecom#3019)

* Color changes

* Promo background color fix

* Add text and subtext font color changes in megamenu

* cross cloud menu background color changes

* Fix reveiew comments

* colors hexcode formatted as lowercase for css variables

* Bug fix MWPW-161889

* MWPW-161590, 161606, 161871, 161987 [MEP] Update placeholders before updating href (adobecom#3142)

* MWPW-161590 [MEP] Update placeholders before updating href

* unit test updates

* MWPW-161871 [MEP] useblockcode action fails if page is on milo site (adobecom#3161)

* stash

* ready to publish

* interact call coming back but timing out

* working on a fast connection

* clean up ifs

* working with promise

* use camel case on let variable

* unit tests

* update unit tests

* MWPW-149504 [MILO][MEP] Move entitlements object to the same JSON file used by the library (adobecom#3047)

* create mepxlg branch

* update library

* require full hostname match

* update reference for unit test

* switch to use config instead of domain list and stub response in unit test

* update fetch to 2

* updating another fetch to 2

* restore normalizePath to use preview domains on preview links

* preload segment list json

* use getFederatedUrl instead

* import at top so we don't have to make normalizePath async

* MWPW-148129 [MILO][MEP][GNAV] Able to use select by url feature with federated link (adobecom#3064)

* add federated link function to registerInBlockActions

* add to unit test

* add unit test coverage

* initial commit

* Fix useblock code issue

---------

Co-authored-by: vgoodric <vgoodric@adobe.com>
Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>

* MWPW-161606 [MEP] Modify within modals with MEP (adobecom#3171)

initial commit publish

Co-authored-by: viloria <viloria@adobe.com>

* add conditionals

---------

Co-authored-by: Mark Perry <124626043+markpadbe@users.noreply.github.com>
Co-authored-by: viloria <viloria@adobe.com>

* [MWPW-161782] - Added logo changes for older GNAV experience (adobecom#3162)

* Added logo changes for older GNAV experience

* Lint Fix

* Logo alighned to left for older GNAV

* [MWPW-161563] CDT Overlap in Global and APAC Promotion file (adobecom#3168)

* Use schedule as source for CDT

* seperate start and end

* Added unit tests

* [MWPW-157451] [Accessibility] Merch cards | Focus is lost on comparing plans section (adobecom#3103)

* remive tabindex=0 as the attributes from merchcard div

* fresh commit with same changes as commit 1 after resolving the merge conflict

* Redesign mini-compare chart. Added checkmarks for icons. Backward compatibility using "checkmark" class. Horizontal line added.

* Revert "Redesign mini-compare chart. Added checkmarks for icons. Backward compatibility using "checkmark" class. Horizontal line added."

This reverts commit 610807a.

* run build in mas

* run build

---------

Co-authored-by: Rohit Sahu <rosahu@adobe.com>

* MWPW-159381: Replaces CSS 'body *' with '.consonant-Wrapper *' (adobecom#3152)

* Revert "MWPW-156749: Fix video CLS " (adobecom#2899) (adobecom#2900)

Revert "MWPW-156749: Fix video CLS  (adobecom#2849)"

This reverts commit d4134c8.

* [MWPW-159903] Fix quiz video marquees (adobecom#3009) (adobecom#3013)

fix quiz marquees

* [MWPW-159328] handle a case where there are not placeholders availabl… (adobecom#3014)

[MWPW-159328] handle a case where there are not placeholders available (adobecom#2998)

* [MWPW-159328] handle a case where there are not palceholders availble

* fixed typos

---------

Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>

* MWPW-146211 [MILO][MEP] Option to select all elements (adobecom#2976) (adobecom#3023)

* stash

* stash

* stash

* working well

* set updated command list for inline

* remove querySelector function

* unit test and custom block fix

* updates for in-block

* merch-card-collection unit test fixed

* unit test updates

* more unit test repair

* linting errors

* more linting

* Fix Invalid selector test

* add coverage

* force git checks to refire

* remove comment

* pass rootEl to getSelectedElements for use when needed (gnav)

* skip if clause in codecov

---------

Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>
Co-authored-by: markpadbe <markp@adobe.com>

* MWPW-158455: Promobar overlays with localnav elements in devices (adobecom#2991)

* Revert "MWPW-156749: Fix video CLS " (adobecom#2899) (adobecom#2900)

Revert "MWPW-156749: Fix video CLS  (adobecom#2849)"

This reverts commit d4134c8.

* Changing z-index of promobar and popup

* Changing z-index of promobar and popup

* Reverting z-index to 4 for promobar

---------

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: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Akansha Arora <>

* Replaces CSS 'body *' with '.consonant-Wrapper *'

---------

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: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>
Co-authored-by: Rares Munteanu <overmyheadandbody@gmail.com>
Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>
Co-authored-by: markpadbe <markp@adobe.com>
Co-authored-by: Akansha Arora <akanshaarora090@gmail.com>

* [MWPW-160948] Remove blockquote default spacing (adobecom#3159)

* [MWPW-161098] Environment-aware links support for CaaS (adobecom#3165)

* relative urls caas support

* added unit tests

* [MWPW-162059] - Fix for vertical alignment of logo on AH (adobecom#3180)

Fix for verticle alignment of logo

* Global links underlined by default (adobecom#3166)

* a links underline, a.quite added

* added styles to omit header/footer

* added default link styles for headlines and lockup area

* minor :hover style alignment on cards-horiz, marquee-anchors, brick

* removed dubs underline on links

* removed styles overrides to support double in horiz-card, marquee-anch, brick

* [MWPW-145672] Remove Gnav global link styles

* [MWPW-161624] Link farm double underline on focus

* Ensure sub text in anchors is underlined correctly

* Ensure sub text in anchors is underlined correctly

---------

Co-authored-by: thi64146 <thi64146@adobe.com>

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

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

This reverts commit f379815.

Co-authored-by: Rares Munteanu <overmyheadandbody@gmail.com>

* [MWPW-145672] Change link color only on hover (adobecom#3186)

---------

Co-authored-by: Dev Ashish Saradhana <41122199+Deva309@users.noreply.github.com>
Co-authored-by: Vivian A Goodrich <101133187+vgoodric@users.noreply.github.com>
Co-authored-by: Mark Perry <124626043+markpadbe@users.noreply.github.com>
Co-authored-by: viloria <viloria@adobe.com>
Co-authored-by: Rahul Gupta <rahulgupta999@gmail.com>
Co-authored-by: rohitsahu <sahurohit9@gmail.com>
Co-authored-by: Rohit Sahu <rosahu@adobe.com>
Co-authored-by: cmiqueo <64917520+cmiqueo@users.noreply.github.com>
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: Blaine Gunn <Blainegunn@gmail.com>
Co-authored-by: Denys Fedotov <denlight@gmail.com>
Co-authored-by: Denys Fedotov <dfedotov@Denyss-MacBook-Pro.local>
Co-authored-by: Rares Munteanu <overmyheadandbody@gmail.com>
Co-authored-by: markpadbe <markp@adobe.com>
Co-authored-by: Akansha Arora <akanshaarora090@gmail.com>
Co-authored-by: Robert Bogos <146744221+robert-bogos@users.noreply.github.com>
Co-authored-by: thi64146 <thi64146@adobe.com>
Co-authored-by: Narcis Radu <github@narcisradu.ro>
adobecom#3319)

Revert "MWPW-161273 Standalone Gnav needs a release cycle [Bundle] (adobecom#3132)"

This reverts commit f2fbeaa.
…3132)

* bundled standalone gnav and footer

* Fixed dark mode; load css from navigation.js

* Refactored global footer to no longer use milo modal to render region-nav

* global footer unit test

* fix lint

* Added keyboard navigation to the new region nav modal

* export stuff from modal.js

* replaced the new modal implementation with a more explicit usage of the current milo modal so that it can be bundled

* code compatibility ignore pattern

* Fix keyboard navigation unit tests

* fixed footer unit test after changing the implementation of the region nav (again)

* added sourcemaps; fixed dark mode issue

* navigation unit tests

* Cover uncovered lines in global-footer.js

* prevent FOUC in region nav

* built latest gnav changes

* modified package.json to have a files field

* use evergreen css for non-bundled and built css for bundled

* Fixed region picker when there's no hash

* Added a workflow to release standalone feds and removed dist from the PR

* changed workflow_call to workflow_dispatch

* Adjusted the cd command in the workflow

* added a working directory

* missed a space in the gh release upload command

* added GITHUB_TOKEN to the upload asset step

* fixed an error with file upload in the workflow

* Removed a console.log from the build script; explicitly load fragment block in footer

* Removed an unused import

* Renamed a funciton in the build file and added a comment

* Fixed region nav breaking on certain milo consumers

* Fixed region nav breaking on some milo consumers for real this time

* Removed an unused import

* Added logic to not call the region nav code twice

* unit test

* modified a standalone footer unit test slightly

* Removed a comment
Copy link

codecov bot commented Dec 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.41%. Comparing base (5f8f157) to head (6a93ab3).
Report is 87 commits behind head on stage.

Additional details and impacted files
@@            Coverage Diff             @@
##            stage    #3326      +/-   ##
==========================================
- Coverage   96.41%   96.41%   -0.01%     
==========================================
  Files         246      246              
  Lines       57509    57567      +58     
==========================================
+ Hits        55450    55504      +54     
- Misses       2059     2063       +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mokimo mokimo merged commit b72ed94 into adobecom:stage Dec 6, 2024
12 of 13 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.

6 participants