Merge branch 'main' into fork-templates

packages/angular-workspace/angular.json

@@ -150,7 +150,11 @@
                 }
               ],
               "buildOptimizer": true,
-              "optimization": true,
+              "optimization": {
+                "styles": {
+                  "inlineCritical": false
+                }
+              },
               "sourceMap": true
             },
             "development": {

packages/angular-workspace/example-client-app/src/app/customapp/customapp.component.html

@@ -1,7 +1,10 @@
 <div class="content container">
-    <p>Explore the components below to see the Nimble components in action. See the <a
-            href="https://ni.github.io/nimble/storybook/">Nimble
-            component docs</a> for additional usage details.</p>
+    <p>
+        Explore the components below to see the Nimble components in action. See the <a
+        href="https://ni.github.io/nimble/storybook/">Nimble
+        component docs</a> for additional usage details.
+        Navigate to the <a href="../index.html">parent page</a>.
+    </p>
     <div class="container">
         <div class="sub-container">
             <div class="container-label">Anchor</div>

packages/blazor-workspace/Examples/Demo.Client/wwwroot/index.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <title>Blazor All Components Demo - Nimble Design System - NI</title>
     <meta name="description" content="Blazor demo showing all nimble components">
+    <base href="./" />
     <link href="css/site.css" rel="stylesheet" />
     <link href="Demo.Client.styles.css" rel="stylesheet" />
     <link href="_content/NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />

packages/blazor-workspace/Examples/Demo.Shared/Pages/ComponentsDemo.razor

@@ -1,4 +1,5 @@
 @page "/"
+@page "/index.html"
 @namespace Demo.Shared.Pages
 @inherits LayoutComponentBase
 
@@ -7,6 +8,7 @@
         Explore the components below to see the Nimble components in action. See the <a
                 href="https://nimble.ni.dev/storybook/">Nimble
                 component docs</a> for additional usage details.
+                Navigate to the <a href="../../index.html">parent page</a>.
     </p>
     <div class="container">
         <div class="sub-container">

packages/nimble-components/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Wed, 11 Dec 2024 14:25:17 GMT",
+      "version": "32.9.1",
+      "tag": "@ni/nimble-components_v32.9.1",
+      "comments": {
+        "none": [
+          {
+            "author": "[email protected]",
+            "package": "@ni/nimble-components",
+            "commit": "175279322e7fab0932a68a3d0cefb4da9819a7af",
+            "comment": "Disable failing tests in Firefox"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 10 Dec 2024 20:15:57 GMT",
       "version": "32.9.1",

packages/nimble-components/src/rich-text/models/tests/markdown-serializer.spec.ts

@@ -337,7 +337,8 @@ Plain text 3`);
 <user:1> `);
         });
 
-        it('Mention node', async () => {
+        // Firefox skipped, see https://github.com/ni/nimble/issues/2488
+        it('Mention node #SkipFirefox', async () => {
             await appendUserMentionConfiguration(element, [
                 { key: 'user:1', displayName: 'username1' }
             ]);
@@ -347,7 +348,8 @@ Plain text 3`);
             expect(element.getMarkdown()).toEqual('<user:1> ');
         });
 
-        it('Multiple Mention node of same type', async () => {
+        // Firefox skipped, see https://github.com/ni/nimble/issues/2488
+        it('Multiple Mention node of same type #SkipFirefox', async () => {
             await appendUserMentionConfiguration(element, [
                 { key: 'user:1', displayName: 'username1' },
                 { key: 'user:2', displayName: 'username2' }

packages/nimble-components/src/table-column/duration-text/tests/table-column-duration-text.spec.ts

@@ -142,7 +142,8 @@ describe('TableColumnDurationText', () => {
         expect(tablePageObject.getCellTitle(0, 0)).toEqual('');
     });
 
-    it('removes title on mouseout of cell', async () => {
+    // Firefox skipped, see https://github.com/ni/nimble/issues/2490
+    it('removes title on mouseout of cell #SkipFirefox', async () => {
         table.style.width = '100px';
         await table.setData([{ field: 8607022000 }]);
         await waitForUpdatesAsync();
@@ -161,7 +162,8 @@ describe('TableColumnDurationText', () => {
         );
     });
 
-    it('updates displayed date when lang token changes', async () => {
+    // Firefox skipped, see https://github.com/ni/nimble/issues/2490
+    it('updates displayed date when lang token changes #SkipFirefox', async () => {
         await table.setData([{ field: 8607022000 }]);
         await waitForUpdatesAsync();
         expect(tablePageObject.getRenderedCellTextContent(0, 0)).toBe(

packages/nimble-components/src/table/tests/table.spec.ts

@@ -2620,7 +2620,8 @@ describe('Table', () => {
             await waitForUpdatesAsync();
         }
 
-        it('maintains scroll position if data does not change', async () => {
+        // Firefox skipped, see https://github.com/ni/nimble/issues/2491
+        it('maintains scroll position if data does not change #SkipFirefox', async () => {
             await setDataAndScrollToBottom(largeData200);
             const scrollTopBeforeDisconnect = element.viewport.scrollTop;
             const firstRenderedRowBeforeDisconnect = getFirstRenderedRowDataIndex(largeData200);
@@ -2634,7 +2635,8 @@ describe('Table', () => {
             );
         });
 
-        it('updates scroll position if data length is reduced while not attached', async () => {
+        // Firefox skipped, see https://github.com/ni/nimble/issues/2491
+        it('updates scroll position if data length is reduced while not attached #SkipFirefox', async () => {
             await setDataAndScrollToBottom(largeData400);
             const scrollTopBeforeDisconnect = element.viewport.scrollTop;
             const firstRenderedRowBeforeDisconnect = getFirstRenderedRowDataIndex(largeData400);
@@ -2689,7 +2691,8 @@ describe('Table', () => {
             );
         });
 
-        it('adjusts the number of rendered rows when the table height decreases while not attached', async () => {
+        // Firefox skipped, see https://github.com/ni/nimble/issues/2491
+        it('adjusts the number of rendered rows when the table height decreases while not attached #SkipFirefox', async () => {
             element.style.height = '500px';
             await element.setData(largeData200);
             await waitForUpdatesAsync();

packages/performance/src/index.html

@@ -12,5 +12,6 @@ <h1>Performance tests</h1>
     <ul>
         <li><a href="./wafer-map/index.html">Wafer Map</a></li>
     </ul>
+    Navigate to the <a href="../index.html">parent page</a>.
 </body>
 </html>

packages/performance/src/wafer-map/index.html

@@ -9,6 +9,7 @@
     <script type="module" src="./index.ts"></script>
 </head>
 <body>
+    <p>Navigate to the <a href="../index.html">parent page</a>.</p>
     <p>See devtools performance timing for results.</p>
     <p>Loading...</p>
     <p class="running" hidden>Running...</p>

packages/site/landing/index.html

@@ -25,7 +25,7 @@
             </div>
             <div class="cards">
                 <div class="card-wrapper">
-                    <a class="card" href="storybook/">
+                    <a class="card" href="storybook/index.html">
                         <div class="icon"><img src="./images/sb.svg" width="64" height="64" alt="Storybook Logo"></div>
                         <div class="name">Storybook</div>
                         <div class="description">Browse documentation</div>
@@ -46,14 +46,14 @@
                     </a>
                 </div>
                 <div class="card-wrapper">
-                    <a class="card" href="storybook/example-client-app">
+                    <a class="card" href="storybook/example-client-app/index.html">
                         <div class="icon"><img src="./images/ng.svg" width="64" height="64" alt="Angular Logo"></div>
                         <div class="name">Angular Demo</div>
                         <div class="description">View the Angular demo application</div>
                     </a>
                 </div>
                 <div class="card-wrapper">
-                    <a class="card" href="storybook/blazor-client-app/wwwroot/">
+                    <a class="card" href="storybook/blazor-client-app/wwwroot/index.html">
                         <div class="icon"><img src="./images/blazor.svg" width="187" height="64" alt="Blazor Logo">
                         </div>
                         <div class="name">Blazor Demo</div>

packages/site/package.json

@@ -6,7 +6,7 @@
     "scripts": {
         "build": "npm run build:landing && npm run build:eleventy",
         "build:eleventy": "eleventy",
-        "build:landing": "tsc && vite build landing",
+        "build:landing": "tsc && vite --config ./vite.config.js build landing",
         "pack": "npm pack",
         "lint": "eslint .",
         "start:eleventy": "eleventy --serve",

packages/site/vite.config.js

@@ -0,0 +1,7 @@
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { defineConfig } from 'vite';
+
+// eslint-disable-next-line import/no-default-export
+export default defineConfig({
+    base: './'
+});

packages/storybook/src/docs/nimble-intro.mdx

@@ -22,11 +22,11 @@ documentation on using or contributing to the component libraries. To add or
 update component design documentation, refer to the
 [documentation guide](https://github.com/ni/nimble/tree/main/packages/storybook/CONTRIBUTING.md).
 
-See the <a href="./example-client-app" target="_blank">example Angular app</a>
-or <a href="./blazor-client-app/wwwroot" target="_blank">example Blazor app</a>
-using the components!
+{/* prettier-ignore */}
+<p>See the <a href="./example-client-app/index.html" target="_parent">example Angular app</a> or <a href="./blazor-client-app/wwwroot/index.html" target="_parent">example Blazor app</a> using the components!</p>
 
-See the <a href="./performance" target="_blank">component performance tests</a>.
+{/* prettier-ignore */}
+<p>See the <a href="./performance/index.html" target="_parent">component performance tests</a>. Navigate to the <a href="../index.html" target="_parent">parent page</a>.</p>
 
 ## How to use this site?