8000 [Release] Stage to Main by milo-pr-merge[bot] · Pull Request #4227 · adobecom/milo · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[Release] Stage to Main #4227

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

Merged
merged 16 commits into from
Jun 2, 2025
Merged

[Release] Stage to Main #4227

merged 16 commits into from
Jun 2, 2025

Conversation

milo-pr-merge[bot]
Copy link
Contributor
@milo-pr-merge milo-pr-merge bot commented May 22, 2025

common base root URLs

Homepage : https://www.stage.adobe.com/
BACOM: https://business.stage.adobe.com/fr/
CC: https://www.stage.adobe.com/creativecloud.html
Blog: https://blog.stage.adobe.com/
Acrobat: https://www.stage.adobe.com/acrobat/online/sign-pdf.html

Milo:

GNav Test URLs

Gnav + Footer + Region Picker modal:

Thin Gnav + ThinFooter + Region Picker dropup:

Localnav + Promo:

Sticky Branch Banner:

Inline Branch Banner:

Blog

RTL Locale

overmyheadandbody and others added 5 commits May 22, 2025 12:41
* wip

* wip

* wip

* wip

* unit tests + css

* demo page

* updated deps

* tooltip

* tooltip

* Update popover.js

* Update fries.html

* Update fries.html

* cta toggle text

* wip

* updated deps

* wip

* wip

* updated deps

* unit tests

* ut fixes

* updated deps

* ut fix

* Update merch-offer-select.test.js

* NALA fix

* conflicts resolved

* fixes

* text decoration

* yellow color dark theme

* Update fries.html

* remove console log

* font size addon confirmation

* Update merch-card.fries.test.html.js

* dark theme body color

* dark theme

* icon size

* responsiveness

* styles

* body-s color

* Update styles.css

* Update fries.html

* Updated CSS

* color

* updated deps

* resolved conflicts

* css

* increased max count for fries card
8000
* ribbon in-line

* ribbon in-line

* ribbon in-line

* review comment

---------

Co-authored-by: Drashti Modasara <dmodasara@Drashtis-MacBook-Pro.local>
* MWPW-169410: Add download icon to sidekick

* MWPW-169410: Remove title and description to avoid announcment duplication

* MWPW-169410: Change title to Download icon
@milo-pr-merge
Copy link
Contributor Author
milo-pr-merge bot commented May 22, 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 May 22, 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
@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/eaa83879472508c76c94c9e09495d1e4e47d15ad/libs/features/mas/src/variants/fries.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/eaa83879472508c76c94c9e09495d1e4e47d15ad/libs/features/mas/src/variants/fries.js


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

https://github.com/adobecom/milo/blob/eaa83879472508c76c94c9e09495d1e4e47d15ad/libs/features/mas/src/variants/plans.js


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

https://github.com/adobecom/milo/blob/eaa83879472508c76c94c9e09495d1e4e47d15ad/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/eaa83879472508c76c94c9e09495d1e4e47d15ad/libs/features/mas/test/merch-card.fries.test.html.js


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

https://github.com/adobecom/milo/blob/eaa83879472508c76c94c9e09495d1e4e47d15ad/libs/features/mas/test/merch-offer-select.test.html.js


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

https://github.com/adobecom/milo/blob/eaa83879472508c76c94c9e09495d1e4e47d15ad/libs/features/spectrum-web-components/dist/popover.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.

A3DB
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.

document.querySelectorAll('code.demo').forEach(el => {
const targetContainer = document.createElement('div');
targetContainer.classList.toggle('light', el.classList.contains('light'));
targetContainer.innerHTML = `<h4>Demo: </h4><div class="demo-container">${el.textContent}</div>`;

Check warning

Code scanning / CodeQL

DOM text reinterpreted as HTML Medium documentation

DOM text
is reinterpreted as HTML without escaping meta-characters.

Copilot Autofix

AI about 2 months ago

To fix the issue, we need to ensure that the content of el.textContent is treated as plain text and not reinterpreted as HTML. This can be achieved by creating a text node for the content and appending it to the DOM instead of using innerHTML. This approach ensures that any special characters in the text are properly escaped and cannot be executed as HTML or JavaScript.

The fix involves:

  1. Replacing the use of innerHTML with DOM manipulation methods that handle text safely.
  2. Creating a text node for el.textContent and appending it to the appropriate container.

The changes will be made in the <script> block starting at line 126.


Suggested changeset 1
libs/features/mas/docs/fries.html

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/libs/features/mas/docs/fries.html b/libs/features/mas/docs/fries.html
--- a/libs/features/mas/docs/fries.html
+++ b/libs/features/mas/docs/fries.html
@@ -129,3 +129,9 @@
             targetContainer.classList.toggle('light', el.classList.contains('light'));
-            targetContainer.innerHTML = `<h4>Demo: </h4><div class="demo-container">${el.textContent}</div>`;
+            const demoHeader = document.createElement('h4');
+            demoHeader.textContent = 'Demo: ';
+            const demoContainer = document.createElement('div');
+            demoContainer.className = 'demo-container';
+            demoContainer.textContent = el.textContent;
+            targetContainer.appendChild(demoHeader);
+            targetContainer.appendChild(demoContainer);
             el.parentElement.after(targetContainer);
EOF
@@ -129,3 +129,9 @@
targetContainer.classList.toggle('light', el.classList.contains('light'));
targetContainer.innerHTML = `<h4>Demo: </h4><div class="demo-container">${el.textContent}</div>`;
const demoHeader = document.createElement('h4');
demoHeader.textContent = 'Demo: ';
const demoContainer = document.createElement('div');
demoContainer.className = 'demo-container';
demoContainer.textContent = el.textContent;
targetContainer.appendChild(demoHeader);
targetContainer.appendChild(demoContainer);
el.parentElement.after(targetContainer);
Copilot is powered by AI and may make mistakes. Always verify output.
@mokimo mokimo temporarily deployed to milo_pr_merge May 22, 2025 16:20 — with GitHub Actions Inactive
Updating codeowners for region nav and navigation folder
* Wrapping the test urls in a collapsed section

* Update title
@aem-code-sync aem-code-sync bot temporarily deployed to stage May 22, 2025 16:21 Inactive
* Update notification z indexes with values

* Update notification.css
)

* Logging only when it is sent as localnav but is not

* Test fix

* Lint fix
* [MWPW-173016] - block korea free trial links/buttons

* [MWPW-173016] - korea text filter added

* [MWPW-173016] - update if

* [MWPW-173016] - code optimization

* [MWPW-173016] - improve import

* [MWPW-173016] - modal check, string check added

* [MWPW-173016] - strings added

* [MWPW-173470] - update logic

* [MWPW-173470] - update logic

* [MWPW-173470] - update logic

* [MWPW-173470] - remove whitespace

* [MWPW-173470] - optimize

* [MWPW-173470] - remove variable

* [MWPW-173016] - optimize code

* [MWPW-173016] - group logic

* [MWPW-173016] - merch solution added

* [MWPW-173016] - merch ref comment added

* [MWPW-173470] - null safe

* [MWPW-173470] - code optimization

* [MWPW-173470] - nav korea restrict coverage

* [MWPW-173470] - fix eslint console error

---------

Co-authored-by: Dusan Kosanovic <dusan.kosanovic@hitthecode.com>
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ [eslint] <no-console> reported by reviewdog 🐶
Unexpected console statement.

@mokimo mokimo temporarily deployed to milo_pr_merge May 30, 2025 16:20 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 30, 2025 20:18 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 31, 2025 01:17 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 31, 2025 04:20 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 31, 2025 08:19 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 31, 2025 09:16 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 31, 2025 12:30 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 31, 2025 16:18 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge May 31, 2025 20:16 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 1, 2025 01:42 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 1, 2025 04:32 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 1, 2025 08:20 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 1, 2025 09:16 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 1, 2025 12:31 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 1, 2025 16:18 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 1, 2025 20:17 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 2, 2025 01:23 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 2, 2025 04:27 — with GitHub Actions Inactive
@mokimo mokimo temporarily deployed to milo_pr_merge June 2, 2025 08:23 — with GitHub Actions Inactive
@milo-pr-merge milo-pr-merge bot merged commit f388e08 into main Jun 2, 2025
50 of 52 checks passed
@milo-pr-merge milo-pr-merge bot temporarily deployed to milo_pr_merge June 2, 2025 08:59 Inactive
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.

0