Merge branch 'main' into new-productive-master-241120

.github/workflows/codeql-analysis.yml

@@ -24,9 +24,9 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           languages: javascript
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5

.github/workflows/issue-triage-strategic-adopter.yml

@@ -15,18 +15,18 @@ jobs:
         id: regex-match
         with:
           text: ${{ github.event.issue.body }}
-          regex:
-            '\b(API Connect|Turbonomic|Instana|NS1|watsonx Orchestrate|watsonx
+          regex: |
+            \b(API Connect|Turbonomic|Instana|NS1|watsonx Orchestrate|watsonx
             Code Assistant|Planning Analytics|SPSS
-            Statistics|watsonx.data|watsonx.ai|watsonx.governance|Maximo
+            Statistics|watsonx\.data|watsonx\.ai|watsonx\.governance|Maximo
             Application Suite|Environmental Intelligence Suite|Envizi ESG
-            Suite|QRadar Log Insights|QRadar XDR/EDR (ReaQta)|Randori ASM|QRadar
+            Suite|QRadar Log Insights|QRadar XDR/EDR \(ReaQta\)|Randori ASM|QRadar
             SIEM|MaaS360|Flash|Defender|Fusion|APP Connect|Apptio
             Cloudability|Apptio Targetprocess|AIOps Insights|Hybrid Cloud
-            Mesh|Aspera|Blueworks Live|OpenPages|Databand.ai|Cognos
+            Mesh|Aspera|Blueworks Live|OpenPages|Databand\.ai|Cognos
             Analytics|Sterling B2B Integration SaaS|Sterling Order & Inventory
             Management|Supply Chain Intelligence Suite|TRIRIGA Application
-            Suite|QRadar SOAR|Guardium Insights|Verify on Cloud\b'
+            Suite|QRadar SOAR|Guardium Insights|Verify on Cloud|DataPower)\b
           flags: g
       - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1
         if: ${{ steps.regex-match.outputs.match != '' }}

.gitignore

@@ -61,3 +61,7 @@ blob-report
 
 # Local token
 .env
+
+# nx local buiild cache
+.nx/cache
+.nx/workspace-data

README.md

@@ -319,6 +319,10 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
     <td align="center"><a href="https://github.com/mariat189"><img src="https://avatars.githubusercontent.com/u/74430463?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mariat</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=mariat189" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Thamjith"><img src="https://avatars.githubusercontent.com/u/24909620?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thamjith Thaha</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Thamjith" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/Zoe-Gathercole"><img src="https://avatars.githubusercontent.com/u/56911544?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zoë Gathercole</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Zoe-Gathercole" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/a88zach"><img src="https://avatars.githubusercontent.com/u/1724822?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Zach Tindall</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=a88zach" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/ashna000"><img src="https://avatars.githubusercontent.com/u/12691034?s=96&v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ashna Thomas</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=ashna000" title="Code">💻</a></td>
   </tr>
 </table>
 

docs/release.md

@@ -89,6 +89,9 @@ release team will need to do the following:
 
 ```bash
 git checkout main
+```
+
+```bash
 git pull upstream main
 ```
 
@@ -105,6 +108,9 @@ chore(release): v11.2.0-rc.0
 
 ```bash
 git tag -a v11.2.0-rc.0 -m 'v11.2.0-rc.0'
+```
+
+```bash
 git push upstream v11.2.0-rc.0
 ```
 
@@ -139,6 +145,9 @@ this stage, the release team will do the following:
 
 ```bash
 git checkout main
+```
+
+```bash
 git pull upstream main
 ```
 
@@ -155,6 +164,9 @@ chore(release): v11.10.0
 
 ```bash
 git tag -a v11.2.0 -m 'v11.2.0'
+```
+
+```bash
 git push upstream v11.2.0
 ```
 
@@ -264,7 +276,7 @@ cases, follow these steps below to ensure a proper patch release:
 - [ ] Checkout to the tag of the release you want to publish a patch for (most
       likely the latest release tag, to find the previous release, view the
       [tag list](https://github.com/carbon-design-system/carbon/tags)).
-      `git checkout release/vX.Y.Z`
+      `git checkout vX.Y.Z`
 - [ ] Create a new release branch with the intended version to be released.
       Should be the same release that we previously checked out to incremented
       by +0.0.1 to account for a new patch version.
@@ -292,7 +304,13 @@ cases, follow these steps below to ensure a proper patch release:
 
   ```bash
   git add -A
+  ```
+
+  ```bash
   git commit -m 'chore(release): vX.Y.Z'
+  ```
+
+  ```bash
   git push --set-upstream origin release/vX.Y.Z
   ```
 
@@ -310,7 +328,10 @@ cases, follow these steps below to ensure a proper patch release:
 
     ```bash
     git tag -a vX.Y.Z -m 'vX.Y.Z'
-    git push upstream vX.Y.Z
+    ```
+
+    ```bash
+    git push upstream refs/tags/vX.Y.Z
     ```
 
 - [ ] Verify that your push triggered a release action
@@ -326,6 +347,7 @@ cases, follow these steps below to ensure a proper patch release:
   - Do NOT do this for the <kbd>carbon-components</kbd> package.
   - You need to use the individual generatied version number for the package
     here, not the released github tag version.
+  - Ensure you log into the npm cli as `carbon-bot` to avoid auth issues
 
 - [ ] for each package (replace <kbd>carbon-components-react</kbd> with the
       package name):
@@ -404,7 +426,13 @@ yarn lerna version patch \
 
 ```bash
 git add -A
+```
+
+```bash
 git commit -m 'chore(release): vX.Y.Z'
+```
+
+```bash
 git push --set-upstream origin release/vX.Y.Z
 ```
 
@@ -417,6 +445,9 @@ git push --set-upstream origin release/vX.Y.Z
 
 ```bash
 git checkout v10
+```
+
+```bash
 git pull upstream v10
 ```
 
@@ -436,6 +467,9 @@ chore(release): v10.59.1
 
 ```bash
 git tag -a vX.Y.Z -m 'vX.Y.Z'
+```
+
+```bash
 git push upstream vX.Y.Z
 ```
 
@@ -500,9 +534,21 @@ environment as long as you have push access to the repo.
 
 ```bash
 git checkout main
+```
+
+```bash
 git pull upstream main
+```
+
+```bash
 git checkout -b `release/vX.Y.Z`
+```
+
+```bash
 yarn install
+```
+
+```bash
 yarn build
 ```
 
@@ -514,7 +560,13 @@ yarn build
 
 ```bash
 git add .
+```
+
+```bash
 git commit -m "chore(release): vX.Y.Z"
+```
+
+```bash
 git push
 ```
 
@@ -551,6 +603,8 @@ package which does not contain a compiled stylesheet.
 To fix, re-apply the `latest` tag to `v10.x` instead of `v11.x`. Any
 non-versioned unpkg links should now resolve to `[email protected]` again.
 
+- Ensure you log into the npm cli as `carbon-bot` to avoid auth issues.
+
 ```bash
 npm dist-tag add [email protected] latest
 ```

e2e/components/Pagination/Pagination-test.avt.e2e.js

@@ -50,10 +50,10 @@ test.describe('@avt Pagination', () => {
       name: 'Items per page:',
     });
     const pageSelector = page.getByRole('combobox', {
-      name: 'Page number, of 11 pages',
+      name: 'Page of 11 pages',
     });
     const updatedPageSelector = page.getByRole('combobox', {
-      name: 'Page number, of 3 pages',
+      name: 'Page of 3 pages',
     });
     const nextPageButton = page.getByRole('button', { name: 'Next page' });
     const prevPageButton = page.getByRole('button').first();

e2e/components/Popover/Popover-test.e2e.js

@@ -7,7 +7,7 @@
 
 'use strict';
 
-const { test } = require('@playwright/test');
+const { test, expect } = require('@playwright/test');
 const { themes } = require('../../test-utils/env');
 const { snapshot } = require('../../test-utils/snapshot');
 const { snapshotStory, visitStory } = require('../../test-utils/storybook');
@@ -42,6 +42,21 @@ test.describe('Popover', () => {
         await page.evaluate(() => {
           window.scrollBy(-500, 0); // Scroll 500px to the left
         });
+
+        await expect
+          .poll(
+            async () => {
+              const scrollPosition = await page.evaluate(() => {
+                return window.scrollX;
+              });
+              return scrollPosition;
+            },
+            {
+              timeout: 2000,
+            }
+          )
+          .toBe(1376);
+
         await snapshot(page, {
           component: 'popover',
           story: 'experimental-auto-align-left',
@@ -60,6 +75,21 @@ test.describe('Popover', () => {
         await page.evaluate(() => {
           window.scrollBy(500, 0); // Scroll 500px to the right
         });
+
+        await expect
+          .poll(
+            async () => {
+              const scrollPosition = await page.evaluate(() => {
+                return window.scrollX;
+              });
+              return scrollPosition;
+            },
+            {
+              timeout: 2000,
+            }
+          )
+          .toBe(2376);
+
         await snapshot(page, {
           component: 'popover',
           story: 'experimental-auto-align-right',
@@ -78,6 +108,21 @@ test.describe('Popover', () => {
         await page.evaluate(() => {
           window.scrollBy(0, -350); // Scroll 350px to the top
         });
+
+        await expect
+          .poll(
+            async () => {
+              const scrollPosition = await page.evaluate(() => {
+                return window.scrollY;
+              });
+              return scrollPosition;
+            },
+            {
+              timeout: 2000,
+            }
+          )
+          .toBe(1806);
+
         await snapshot(page, {
           component: 'popover',
           story: 'experimental-auto-align-top',
@@ -96,6 +141,21 @@ test.describe('Popover', () => {
         await page.evaluate(() => {
           window.scrollBy(0, 350); // Scroll 350px to the bottom
         });
+
+        await expect
+          .poll(
+            async () => {
+              const scrollPosition = await page.evaluate(() => {
+                return window.scrollY;
+              });
+              return scrollPosition;
+            },
+            {
+              timeout: 2000,
+            }
+          )
+          .toBe(2506);
+
         await snapshot(page, {
           component: 'popover',
           story: 'experimental-auto-align-bottom',

e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap

@@ -606,6 +606,7 @@ Array [
   "Invoice",
   "IotMunich",
   "ItInfrastructureSoftware",
+  "JapanMtFuji",
   "Java",
   "Javascript",
   "Juice",
@@ -659,6 +660,7 @@ Array [
   "MadridCathedral",
   "MadridSkyscrapers",
   "MadridStatue",
+  "MagicWand",
   "Magnify",
   "MailVerse",
   "MainframeQualitiesOfService",
@@ -854,6 +856,7 @@ Array [
   "RedHatApplications",
   "RedefiningFinancialServices",
   "ReducingCost",
+  "ReferenceArchitecture",
   "Refinery",
   "Refresh",
   "RelationshipDiagram",
@@ -1165,6 +1168,7 @@ Array [
   "WeddingCake",
   "Wheat",
   "Whistle",
+  "WhitePaper",
   "Wifi",
   "WindPower",
   "Windows",

e2e/pictograms/__snapshots__/PublicAPI-test.js.snap

@@ -605,6 +605,7 @@ Array [
   "Invoice",
   "IotMunich",
   "ItInfrastructureSoftware",
+  "JapanMtFuji",
   "Java",
   "Javascript",
   "Juice",
@@ -658,6 +659,7 @@ Array [
   "MadridCathedral",
   "MadridSkyscrapers",
   "MadridStatue",
+  "MagicWand",
   "Magnify",
   "MailVerse",
   "MainframeQualitiesOfService",
@@ -853,6 +855,7 @@ Array [
   "RedHatApplications",
   "RedefiningFinancialServices",
   "ReducingCost",
+  "ReferenceArchitecture",
   "Refinery",
   "Refresh",
   "RelationshipDiagram",
@@ -1164,6 +1167,7 @@ Array [
   "WeddingCake",
   "Wheat",
   "Whistle",
+  "WhitePaper",
   "Wifi",
   "WindPower",
   "Windows",