Skip to content

Commit

Permalink
Merge branch 'main' into nimble-mapping-empty
Browse files Browse the repository at this point in the history
  • Loading branch information
mollykreis authored May 10, 2024
2 parents 11cb6c2 + 8234266 commit 25b79cb
Show file tree
Hide file tree
Showing 44 changed files with 802 additions and 199 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ This repository uses the following tooling. See below for more info.
1. Write a spec describing the API and behavior of the component. See instructions for [component specs](/specs/README.md).
2. Ensure UX specs are up to date and tokens are generated. See instructions for [contributing to Nimble Tokens](/packages/nimble-tokens/CONTRIBUTING.md).
3. Expose any tokens in the token provider and add web component logic. See instructions for [contributing to Nimble Components](/packages/nimble-components/CONTRIBUTING.md).
4. Add wrappers for each framework. See instructions for [adding Angular wrappers](/packages/angular-workspace/nimble-angular/CONTRIBUTING.md). See instructions for [adding Blazor wrappers](/packages/nimble-blazor/CONTRIBUTING.md).
4. Add wrappers for each framework. See instructions for [adding Angular wrappers](/packages/angular-workspace/nimble-angular/CONTRIBUTING.md). See instructions for [adding Blazor wrappers](/packages/blazor-workspace/NimbleBlazor/CONTRIBUTING.md).
5. Publish and use! 🎉

## Documentation policies
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The Nimble packages contain general-use components implementing the Nimble Desig
[![Nimble Components NPM version and repo link](https://img.shields.io/npm/v/@ni/nimble-components.svg?label=@ni/nimble-components)](https://www.npmjs.com/package/@ni/nimble-components)

- **[`@ni/nimble-angular`](/packages/angular-workspace/nimble-angular/)** - Angular bindings for Nimble components.
- **[`@ni/nimble-blazor`](/packages/blazor-workspace/)** - Blazor bindings for Nimble components.
- **[`@ni/nimble-blazor`](/packages/blazor-workspace/NimbleBlazor/)** - Blazor bindings for Nimble components.
- **[`@ni/nimble-components`](/packages/nimble-components/)** - Nimble components to be used by [any type of application](https://custom-elements-everywhere.com/).

### Spright packages
Expand All @@ -41,7 +41,7 @@ The Spright packages contain components that are built using Nimble technology a
[![Spright Components NPM version and repo link](https://img.shields.io/npm/v/@ni/spright-components.svg?label=@ni/spright-components)](https://www.npmjs.com/package/@ni/spright-components)

- [`@ni/spright-angular`](/packages/angular-workspace/spright-angular/) - Angular bindings for Spright components.
- [`@ni/spright-blazor`](/packages/blazor-workspace/) - Blazor bindings for Spright components.
- [`@ni/spright-blazor`](/packages/blazor-workspace/SprightBlazor/) - Blazor bindings for Spright components.
- [`@ni/spright-components`](/packages/spright-components/) - Spright components to be used by [any type of application](https://custom-elements-everywhere.com/).

### Utility packages
Expand Down
24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions packages/angular-workspace/nimble-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
{
"name": "@ni/nimble-angular",
"entries": [
{
"date": "Thu, 09 May 2024 20:39:47 GMT",
"version": "24.0.7",
"tag": "@ni/nimble-angular_v24.0.7",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v28.1.0",
"commit": "not available"
}
]
}
},
{
"date": "Thu, 09 May 2024 18:40:41 GMT",
"version": "24.0.6",
"tag": "@ni/nimble-angular_v24.0.6",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v28.0.5",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 08 May 2024 22:21:34 GMT",
"version": "24.0.5",
Expand Down
18 changes: 17 additions & 1 deletion packages/angular-workspace/nimble-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
# Change Log - @ni/nimble-angular

This log was last generated on Wed, 08 May 2024 22:21:34 GMT and should not be manually modified.
This log was last generated on Thu, 09 May 2024 20:39:47 GMT and should not be manually modified.

<!-- Start content -->

## 24.0.7

Thu, 09 May 2024 20:39:47 GMT

### Patches

- Bump @ni/nimble-components to v28.1.0

## 24.0.6

Thu, 09 May 2024 18:40:41 GMT

### Patches

- Bump @ni/nimble-components to v28.0.5

## 24.0.5

Wed, 08 May 2024 22:21:34 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": "24.0.5",
"version": "24.0.7",
"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": "^16.2.12",
"@angular/localize": "^16.2.12",
"@angular/router": "^16.2.12",
"@ni/nimble-components": "^28.0.4"
"@ni/nimble-components": "^28.1.0"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
30 changes: 30 additions & 0 deletions packages/angular-workspace/spright-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,36 @@
{
"name": "@ni/spright-angular",
"entries": [
{
"date": "Thu, 09 May 2024 20:39:47 GMT",
"version": "0.1.18",
"tag": "@ni/spright-angular_v0.1.18",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-angular",
"comment": "Bump @ni/spright-components to v0.0.20",
"commit": "not available"
}
]
}
},
{
"date": "Thu, 09 May 2024 18:40:41 GMT",
"version": "0.1.17",
"tag": "@ni/spright-angular_v0.1.17",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/spright-angular",
"comment": "Bump @ni/spright-components to v0.0.19",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 08 May 2024 22:21:34 GMT",
"version": "0.1.16",
Expand Down
18 changes: 17 additions & 1 deletion packages/angular-workspace/spright-angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
# Change Log - @ni/spright-angular

This log was last generated on Wed, 08 May 2024 22:21:34 GMT and should not be manually modified.
This log was last generated on Thu, 09 May 2024 20:39:47 GMT and should not be manually modified.

<!-- Start content -->

## 0.1.18

Thu, 09 May 2024 20:39:47 GMT

### Patches

- Bump @ni/spright-components to v0.0.20

## 0.1.17

Thu, 09 May 2024 18:40:41 GMT

### Patches

- Bump @ni/spright-components to v0.0.19

## 0.1.16

Wed, 08 May 2024 22:21:34 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": "0.1.16",
"version": "0.1.18",
"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": "^16.2.12",
"@angular/core": "^16.2.12",
"@ni/spright-components": "^0.0.18"
"@ni/spright-components": "^0.0.20"
},
"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": "Thu, 09 May 2024 18:40:41 GMT",
"version": "17.0.1",
"tag": "@ni/nimble-blazor_v17.0.1",
"comments": {
"patch": [
{
"author": "7282195+m-akinc@users.noreply.github.com",
"package": "@ni/nimble-blazor",
"commit": "43edba8e90d0c5f414fd2b4cf19eee197b477829",
"comment": "Update Blazor docs for Spright and workspace change"
}
]
}
},
{
"date": "Wed, 08 May 2024 00:06:34 GMT",
"version": "17.0.0",
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 Mon, 06 May 2024 19:00:05 GMT and should not be manually modified.
This log was last generated on Thu, 09 May 2024 18:40:41 GMT and should not be manually modified.

<!-- Start content -->

## 17.0.1

Thu, 09 May 2024 18:40:41 GMT

### Patches

- Update Blazor docs for Spright and workspace change ([ni/nimble@43edba8](https://github.com/ni/nimble/commit/43edba8e90d0c5f414fd2b4cf19eee197b477829))

## 17.0.0

Mon, 06 May 2024 19:00:05 GMT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ When creating a new project in the Blazor workspace, ensure it includes the foll
### Enabling IIS

Click Start, open "Turn Windows features on or off", and configure "Web Management Tools" and "World Wide Web Services" in the following way:
![IIS Feature Configuration](/packages/nimble-blazor/docs/WindowsFeatures-IIS.jpg)
![IIS Feature Configuration](/packages/blazor-workspace/docs/WindowsFeatures-IIS.jpg)
### Running published output

The commandline build will create a published distribution of the Blazor client example app, which can also be tested via IIS:
- Open Internet Information Services (IIS) Manager
- In the left pane, right click "Sites" and click "Add Website..."
- Pick a site name
- Under "Physical Path", click [...] and browse to your `nimble-blazor\dist\blazor-client-app` directory
- Under "Physical Path", click [...] and browse to your `blazor-workspace\dist\blazor-client-app` directory
- Under "Binding", pick a port other than 80 (such as 8080), then click "OK"
- Open http://localhost:8080 (or whatever port you chose)
2 changes: 2 additions & 0 deletions packages/blazor-workspace/NimbleBlazor/NimbleBlazor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<DebugType>embedded</DebugType>
<Authors>NI</Authors>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageProjectUrl>https://github.com/ni/nimble</PackageProjectUrl>
<RepositoryUrl>https://github.com/ni/nimble</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand Down Expand Up @@ -57,6 +58,7 @@
<ItemGroup>
<None Include="package.json" />
<None Include="packages.lock.json" />
<None Include="README.md" Pack="true" PackagePath="\"/>
</ItemGroup>

<Target Name="CopyNimbleResources" BeforeTargets="BeforeBuild">
Expand Down
Loading

0 comments on commit 25b79cb

Please sign in to comment.