Merge branch 'main' into ff-drawer-test-fix

ni · Apr 2, 2024 · f5ca7c5 · f5ca7c5
2 parents 1cd8e03 + 59c7366
commit f5ca7c5
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 24 deletions.
diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Tue, 02 Apr 2024 15:32:11 GMT",
+      "version": "20.7.1",
+      "tag": "@ni/nimble-angular_v20.7.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "26874831+atmgrifter00@users.noreply.github.com",
+            "package": "@ni/nimble-angular",
+            "commit": "7f2f7042d7b4006b32a841c3c5124bf33489392a",
+            "comment": "Combobox CVA optimization"
+          },
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v24.1.3",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 29 Mar 2024 23:26:43 GMT",
       "version": "20.7.0",

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md
@@ -1,9 +1,18 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Fri, 29 Mar 2024 23:26:43 GMT and should not be manually modified.
+This log was last generated on Tue, 02 Apr 2024 15:32:11 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 20.7.1
+
+Tue, 02 Apr 2024 15:32:11 GMT
+
+### Patches
+
+- Combobox CVA optimization ([ni/nimble@7f2f704](https://github.com/ni/nimble/commit/7f2f7042d7b4006b32a841c3c5124bf33489392a))
+- Bump @ni/nimble-components to v24.1.3
+
 ## 20.7.0
 
 Fri, 29 Mar 2024 23:26:43 GMT

diff --git a/angular-workspace/projects/ni/nimble-angular/package.json b/angular-workspace/projects/ni/nimble-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "20.7.0",
+  "version": "20.7.1",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish"
@@ -31,7 +31,7 @@
     "@angular/forms": "^15.2.10",
     "@angular/localize": "^15.2.10",
     "@angular/router": "^15.2.10",
-    "@ni/nimble-components": "^24.1.2"
+    "@ni/nimble-components": "^24.1.3"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/change/@ni-nimble-angular-4a3497c2-75cc-4a2e-9481-ec2173b625f2.json b/change/@ni-nimble-angular-4a3497c2-75cc-4a2e-9481-ec2173b625f2.json
diff --git a/change/@ni-nimble-components-72576d53-e315-4da0-93b1-35ea3554fcc7.json b/change/@ni-nimble-components-72576d53-e315-4da0-93b1-35ea3554fcc7.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/nimble-blazor/package.json b/packages/nimble-blazor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-blazor",
-  "version": "14.7.0",
+  "version": "14.7.1",
   "description": "Blazor components for the NI Nimble Design System",
   "scripts": {
     "postinstall": "node build/generate-playwright-version-properties/source/index.js",

diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Tue, 02 Apr 2024 15:32:11 GMT",
+      "version": "24.1.3",
+      "tag": "@ni/nimble-components_v24.1.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "26874831+atmgrifter00@users.noreply.github.com",
+            "package": "@ni/nimble-components",
+            "commit": "7f2f7042d7b4006b32a841c3c5124bf33489392a",
+            "comment": "Re-introduce ListOptionOwner to Combobox."
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 01 Apr 2024 22:25:47 GMT",
       "version": "24.1.2",

diff --git a/packages/nimble-components/CHANGELOG.md b/packages/nimble-components/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-components
 
-This log was last generated on Thu, 28 Mar 2024 17:27:01 GMT and should not be manually modified.
+This log was last generated on Tue, 02 Apr 2024 15:32:11 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 24.1.3
+
+Tue, 02 Apr 2024 15:32:11 GMT
+
+### Patches
+
+- Re-introduce ListOptionOwner to Combobox. ([ni/nimble@7f2f704](https://github.com/ni/nimble/commit/7f2f7042d7b4006b32a841c3c5124bf33489392a))
+
 ## 24.1.2
 
 Thu, 28 Mar 2024 17:27:01 GMT

diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "24.1.2",
+  "version": "24.1.3",
   "description": "Styled web components for the NI Nimble Design System",
   "scripts": {
     "build": "npm run generate-icons && npm run generate-workers && npm run build-components && npm run bundle-components && npm run generate-scss && npm run build-storybook",