Skip to content

Commit

Permalink
Merge branch 'main' into text-field-error-spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
mollykreis authored Sep 26, 2024
2 parents 5755841 + c17dc0b commit 6290332
Show file tree
Hide file tree
Showing 34 changed files with 2,470 additions and 3,695 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Dependency updates",
"packageName": "@ni/nimble-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Dependency updates",
"packageName": "@ni/spright-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
5,811 changes: 2,155 additions & 3,656 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"sync": "beachball sync",
"invoke-publish": "cross-env-shell beachball publish --yes --access public --message \\\"applying package updates [skip ci]\\\" -n $NPM_SECRET_TOKEN",
"performance": "npm run performance --workspaces --if-present",
"validate": "concurrently --timings --group \"npm:validate:*\"",
"validate": "concurrently --pad-prefix --timings --group \"npm:validate:*\"",
"validate:lint:sequential": "npm run lint --workspaces --if-present",
"validate:test:sequential": "npm run test --workspaces --if-present",
"validate:lint-concurrent:nimble-components": "npm run lint-concurrent -w packages/nimble-components",
"validate:test-concurrent:nimble-components": "npm run test-concurrent -w packages/nimble-components",
"test": "concurrently --timings --group \"npm:validate:test*\"",
"lint": "concurrently --timings --group \"npm:validate:lint*\"",
"test": "concurrently --pad-prefix --timings --group \"npm:validate:test*\"",
"lint": "concurrently --pad-prefix --timings --group \"npm:validate:lint*\"",
"storybook": "npm run start -w @ni-private/storybook"
},
"repository": {
Expand Down Expand Up @@ -57,7 +57,7 @@
],
"devDependencies": {
"beachball": "^2.45.0",
"concurrently": "^8.2.2",
"concurrently": "^9.0.0",
"cross-env": "^7.0.3",
"patch-package": "^8.0.0",
"playwright": "1.44.0"
Expand Down
15 changes: 15 additions & 0 deletions packages/angular-workspace/nimble-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/nimble-angular",
"entries": [
{
"date": "Wed, 25 Sep 2024 22:17:40 GMT",
"version": "28.2.6",
"tag": "@ni/nimble-angular_v28.2.6",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v32.2.7",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 18 Sep 2024 20:24:09 GMT",
"version": "28.2.5",
Expand Down
10 changes: 9 additions & 1 deletion packages/angular-workspace/nimble-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/nimble-angular

This log was last generated on Wed, 18 Sep 2024 20:24:09 GMT and should not be manually modified.
This log was last generated on Wed, 25 Sep 2024 22:17:40 GMT and should not be manually modified.

<!-- Start content -->

## 28.2.6

Wed, 25 Sep 2024 22:17:40 GMT

### Patches

- Bump @ni/nimble-components to v32.2.7

## 28.2.5

Wed, 18 Sep 2024 20:24:09 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/angular-workspace/nimble-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-angular",
"version": "28.2.5",
"version": "28.2.6",
"description": "Angular components for the NI Nimble Design System",
"scripts": {
"invoke-publish": "npm run invoke-publish:setup && cd ../dist/nimble-angular && npm publish",
Expand Down Expand Up @@ -32,7 +32,7 @@
"@angular/forms": "^17.3.12",
"@angular/localize": "^17.3.12",
"@angular/router": "^17.3.12",
"@ni/nimble-components": "^32.2.6"
"@ni/nimble-components": "^32.2.7"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
15 changes: 15 additions & 0 deletions packages/angular-workspace/spright-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/spright-angular",
"entries": [
{
"date": "Wed, 25 Sep 2024 22:17:40 GMT",
"version": "5.1.7",
"tag": "@ni/spright-angular_v5.1.7",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-angular",
"comment": "Bump @ni/spright-components to v4.1.7",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 18 Sep 2024 20:24:09 GMT",
"version": "5.1.6",
Expand Down
10 changes: 9 additions & 1 deletion packages/angular-workspace/spright-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/spright-angular

This log was last generated on Wed, 18 Sep 2024 20:24:09 GMT and should not be manually modified.
This log was last generated on Wed, 25 Sep 2024 22:17:40 GMT and should not be manually modified.

<!-- Start content -->

## 5.1.7

Wed, 25 Sep 2024 22:17:40 GMT

### Patches

- Bump @ni/spright-components to v4.1.7

## 5.1.6

Wed, 18 Sep 2024 20:24:09 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/angular-workspace/spright-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/spright-angular",
"version": "5.1.6",
"version": "5.1.7",
"description": "Angular components for NI Spright",
"scripts": {
"invoke-publish": "npm run invoke-publish:setup && cd ../dist/spright-angular && npm publish",
Expand All @@ -24,7 +24,7 @@
"peerDependencies": {
"@angular/common": "^17.3.12",
"@angular/core": "^17.3.12",
"@ni/spright-components": "^4.1.6"
"@ni/spright-components": "^4.1.7"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
15 changes: 15 additions & 0 deletions packages/blazor-workspace/NimbleBlazor/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/nimble-blazor",
"entries": [
{
"date": "Wed, 25 Sep 2024 22:17:40 GMT",
"version": "18.2.6",
"tag": "@ni/nimble-blazor_v18.2.6",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-blazor",
"comment": "Bump @ni/nimble-components to v32.2.7",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 18 Sep 2024 20:24:09 GMT",
"version": "18.2.5",
Expand Down
10 changes: 9 additions & 1 deletion packages/blazor-workspace/NimbleBlazor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/nimble-blazor

This log was last generated on Wed, 18 Sep 2024 20:24:09 GMT and should not be manually modified.
This log was last generated on Wed, 25 Sep 2024 22:17:40 GMT and should not be manually modified.

<!-- Start content -->

## 18.2.6

Wed, 25 Sep 2024 22:17:40 GMT

### Patches

- Bump @ni/nimble-components to v32.2.7

## 18.2.5

Wed, 18 Sep 2024 20:24:09 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/blazor-workspace/NimbleBlazor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-blazor",
"version": "18.2.5",
"version": "18.2.6",
"description": "Blazor components for the NI Nimble Design System",
"scripts": {
"pack": "cross-env-shell dotnet pack -c Release -p:PackageVersion=$npm_package_version --output ../dist",
Expand All @@ -25,7 +25,7 @@
"!*"
],
"peerDependencies": {
"@ni/nimble-components": "^32.2.6",
"@ni/nimble-components": "^32.2.7",
"@ni/nimble-tokens": "^8.3.0",
"cross-env": "^7.0.3",
"rimraf": "^6.0.0"
Expand Down
15 changes: 15 additions & 0 deletions packages/blazor-workspace/SprightBlazor/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/spright-blazor",
"entries": [
{
"date": "Wed, 25 Sep 2024 22:17:40 GMT",
"version": "2.1.7",
"tag": "@ni/spright-blazor_v2.1.7",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-blazor",
"comment": "Bump @ni/spright-components to v4.1.7",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 18 Sep 2024 20:24:09 GMT",
"version": "2.1.6",
Expand Down
10 changes: 9 additions & 1 deletion packages/blazor-workspace/SprightBlazor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/spright-blazor

This log was last generated on Wed, 18 Sep 2024 20:24:09 GMT and should not be manually modified.
This log was last generated on Wed, 25 Sep 2024 22:17:40 GMT and should not be manually modified.

<!-- Start content -->

## 2.1.7

Wed, 25 Sep 2024 22:17:40 GMT

### Patches

- Bump @ni/spright-components to v4.1.7

## 2.1.6

Wed, 18 Sep 2024 20:24:09 GMT
Expand Down
4 changes: 2 additions & 2 deletions packages/blazor-workspace/SprightBlazor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/spright-blazor",
"version": "2.1.6",
"version": "2.1.7",
"description": "Blazor components for Spright",
"scripts": {
"pack": "cross-env-shell dotnet pack -c Release -p:PackageVersion=$npm_package_version --output ../dist",
Expand All @@ -25,7 +25,7 @@
"!*"
],
"peerDependencies": {
"@ni/spright-components": "^4.1.6",
"@ni/spright-components": "^4.1.7",
"cross-env": "^7.0.3",
"rimraf": "^6.0.0"
}
Expand Down
1 change: 0 additions & 1 deletion packages/blazor-workspace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"cross-env": "^7.0.3",
"glob": "^11.0.0",
"playwright": "1.44.0",
"rimraf": "^6.0.0",
"rollup": "^4.12.0"
}
}
15 changes: 15 additions & 0 deletions packages/nimble-components/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/nimble-components",
"entries": [
{
"date": "Wed, 25 Sep 2024 22:17:40 GMT",
"version": "32.2.7",
"tag": "@ni/nimble-components_v32.2.7",
"comments": {
"patch": [
{
"author": "[email protected]",
"package": "@ni/nimble-components",
"commit": "f43d4732ed6245c610030066f7fc6e551b441725",
"comment": "Add styling for readonly number field"
}
]
}
},
{
"date": "Wed, 18 Sep 2024 20:24:09 GMT",
"version": "32.2.6",
Expand Down
10 changes: 9 additions & 1 deletion packages/nimble-components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# Change Log - @ni/nimble-components

This log was last generated on Wed, 18 Sep 2024 20:24:09 GMT and should not be manually modified.
This log was last generated on Wed, 25 Sep 2024 22:17:40 GMT and should not be manually modified.

<!-- Start content -->

## 32.2.7

Wed, 25 Sep 2024 22:17:40 GMT

### Patches

- Add styling for readonly number field ([ni/nimble@f43d473](https://github.com/ni/nimble/commit/f43d4732ed6245c610030066f7fc6e551b441725))

## 32.2.6

Wed, 18 Sep 2024 20:24:09 GMT
Expand Down
14 changes: 7 additions & 7 deletions packages/nimble-components/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@ni/nimble-components",
"version": "32.2.6",
"version": "32.2.7",
"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",
"lint-concurrent": "concurrently --timings --group \"npm:eslint\" \"npm:prettier\"",
"lint-concurrent": "concurrently --pad-prefix --timings --group \"npm:eslint\" \"npm:prettier\"",
"format": "npm run prettier-fix",
"eslint": "eslint .",
"eslint-fix": "eslint . --fix",
Expand Down Expand Up @@ -41,7 +41,7 @@
"test-webkit:debugger": "karma start karma.conf.js --browsers=WebkitDebugging --skip-tags SkipWebkit",
"test-webkit:watch": "karma start karma.conf.headless.js --browsers=WebkitHeadless --skip-tags SkipWebkit --watch-extensions js",
"test-webkit": "karma start karma.conf.headless.js --browsers=WebkitHeadless --single-run --skip-tags SkipWebkit",
"test-concurrent": "concurrently --timings --group \"npm:test-chrome\" \"npm:test-firefox\" \"npm:test-webkit\""
"test-concurrent": "concurrently --pad-prefix --timings --group \"npm:test-chrome\" \"npm:test-firefox\" \"npm:test-webkit\""
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -103,14 +103,14 @@
"devDependencies": {
"@ni-private/eslint-config-nimble": "*",
"@ni/jasmine-parameterized": "^1.0.0",
"@rollup/plugin-commonjs": "^26.0.0",
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^5.0.1",
"@rollup/plugin-replace": "^6.0.0",
"@rollup/plugin-terser": "^0.4.0",
"@types/jasmine": "^5.1.4",
"@types/offscreencanvas": "^2019.7.3",
"@types/webpack-env": "^1.15.2",
"concurrently": "^8.2.2",
"concurrently": "^9.0.0",
"jasmine-core": "^5.1.2",
"karma": "^6.3.0",
"karma-chrome-launcher": "^3.1.0",
Expand All @@ -127,7 +127,7 @@
"prettier-eslint": "^16.3.0",
"prettier-eslint-cli": "^8.0.1",
"rollup": "^4.12.0",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-sourcemaps2": "^0.4.1",
"source-map-loader": "^5.0.0",
"terser-webpack-plugin": "^5.3.10",
"typescript": "~5.4.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/nimble-components/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import commonJS from '@rollup/plugin-commonjs';
import resolve from '@rollup/plugin-node-resolve';
import sourcemaps from 'rollup-plugin-sourcemaps';
import sourcemaps from 'rollup-plugin-sourcemaps2';
import terser from '@rollup/plugin-terser';
import replace from '@rollup/plugin-replace';

Expand Down
Loading

0 comments on commit 6290332

Please sign in to comment.