Skip to content

Commit

Permalink
Merge branch 'main' into renovate/nuget-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
atmgrifter00 authored Mar 5, 2024
2 parents c57f66c + 2f1a774 commit 5df4329
Show file tree
Hide file tree
Showing 26 changed files with 274 additions and 98 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: 🐛 Bug report
name: 🐛 Bug Report
about: Create a report to help us improve
title: ''
labels: 'bug,triage'
Expand Down
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: 🙋 Feature request
name: 🙋 Feature Request
about: Suggest an idea for this project
title: ''
labels: 'enhancement,triage'
Expand All @@ -11,6 +11,8 @@ Thanks for filing an issue 😄! Before you submit, please read the following:
Search open/closed issues before submitting. Someone may have requested the same feature before.
-->

# 🙋 Feature Request

## 😯 Problem to Solve

<!--- Provide a clear and concise description of why this feature is wanted or what problem it solves. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
---
name: 🧑‍💼 Interaction Design (IxD) User story
name: 👈 Interaction Design Request
about: (PO ONLY) A small chunk of work to be done by an Interaction Designer
title: 'nimble-{name} interaction design request'
labels: 'IxD,triage'
labels: 'interaction design,triage'
---

<!-- Ensure the title can be understood without the parent item's context, e.g. "nimble-datepicker interaction design request" rather than just "Interaction Design" -->

# 👈 Interaction Design Request

## 📌 Request Background

<!-- A short description of the request and requester. E.g. Who is the client and how do they expect to use the component? -->
Expand All @@ -33,4 +35,4 @@ labels: 'IxD,triage'

- [ ] Interaction Design Spec submitted (link)
- [ ] Interaction Design Spec reviewed by design team
- [ ] Interaction Design Spec reviewed by dev team
- [ ] Interaction Design Spec reviewed by dev team
9 changes: 5 additions & 4 deletions .github/ISSUE_TEMPLATE/new_component.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
---
name: 💡 New component
name: 💡 New Component
about: (DEV TEAM ONLY) New Nimble component
title: 'nimble-{name} Component'
labels: 'enhancement'
labels: 'new component,enhancement'
---

# 💡 New Component

## 😯 Problem to Solve

<!-- List any clients/contacts that specifically need this component, or note that the component just adds general utility. -->
Expand All @@ -18,8 +20,7 @@ labels: 'enhancement'

## 📋 Tasks

<!-- Refer to [CONTR
IBUTING](https://github.com/ni/nimble/blob/main/packages/nimble-components/CONTRIBUTING.md) for details -->
<!-- Refer to https://github.com/ni/nimble/blob/main/packages/nimble-components/CONTRIBUTING.md for details -->

- [ ] nimble-{name} interaction design issue
- [ ] nimble-{name} interaction design spec
Expand Down
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/tech_debt.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---
name: 🧹 Tech debt
name: 🧹 Tech Debt
about: (DEV TEAM ONLY) Non-user-visible improvement to code or development process
title: ''
labels: 'tech debt,triage'
---
## 🧹 Tech Debt

# 🧹 Tech Debt
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/user_story.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ title: '(Fully descriptive title)'

<!-- Ensure the title can be understood without the parent item's context, e.g. "nimble-button Angular wrapper" rather than just "Angular wrapper" -->

## 📌 User Story
# 📌 User Story
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
---
name: 🧑‍🎨 Visual Design (ViD) User story
name: 🎨 Visual Design Request
about: (DEV TEAM ONLY) A small chunk of work to be done by Visual Designer
title: 'nimble-{name} visual design request'
labels: 'ViD,triage'
labels: 'visual design,triage'
---

<!-- Ensure the title can be understood without the parent item's context, e.g. "nimble-datepicker Visual Design" rather than just "Visual Design" -->

# 🎨 Visual Design Request

## 📌 Request Background

<!-- A short description of the request and requester. E.g. Who is the client and how do they expect to use the component? -->
Expand All @@ -33,4 +35,4 @@ labels: 'ViD,triage'

- [ ] Visual Design Spec submitted (link)
- [ ] Visual Design Spec reviewed by design team
- [ ] Visual Design Spec reviewed by dev team
- [ ] Visual Design Spec reviewed by dev team
9 changes: 7 additions & 2 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"extends": [
"config:base"
],
"enabledManagers": ["npm", "nuget"],
"enabledManagers": ["npm", "nuget", "github-actions"],
"rebaseWhen": "conflicted",
"schedule": [
"monthly"
],
"packageRules": [
{
"matchManagers": ["npm", "nuget"],
"matchManagers": ["npm", "nuget", "github-actions"],
"enabled": false
},
{
Expand All @@ -24,6 +24,11 @@
"groupName": "nuget dependencies",
"matchManagers": ["nuget"],
"enabled": true
},
{
"groupName": "github actions dependencies",
"matchManagers": ["github-actions"],
"enabled": true
}
]
}
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: env.HAS_GITHUBPAGESDEPLOYTOKEN == 'true'
with:
# Required for beachball changelog detection
Expand All @@ -35,19 +35,19 @@ jobs:
# Cannot rely on GITHUB_TOKEN with workflow contents permission
# See: https://github.com/orgs/community/discussions/40971
token: ${{ secrets.GITHUBPAGESDEPLOYTOKEN }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
if: env.HAS_GITHUBPAGESDEPLOYTOKEN == 'false'
with:
# Required for beachball changelog detection
fetch-depth: 0

# Install dependencies
- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
global-json-file: packages/nimble-blazor/global.json
- run: dotnet --info
working-directory: packages/nimble-blazor/
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '20'
registry-url: 'https://registry.npmjs.org'
Expand All @@ -71,7 +71,7 @@ jobs:

# Pack
- run: npm run pack
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: packages
path: |
Expand All @@ -83,14 +83,14 @@ jobs:
# https://github.com/actions/upload-pages-artifact/issues/45
- name: Pages file permission workaround
run: chmod -c -R +rX packages/site/dist
- uses: actions/upload-pages-artifact@v1
- uses: actions/upload-pages-artifact@v3
with:
path: 'packages/site/dist'

# Publish to Chromatic (from any push)
- name: Publish to Chromatic
if: env.HAS_CHROMATIC_PROJECT_TOKEN == 'true' && github.event_name == 'push'
uses: chromaui/action@v1
uses: chromaui/action@v11
with:
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
onlyChanged: "!startsWith(github.ref, 'refs/heads/main')" # Use TurboSnap for PR builds
Expand Down Expand Up @@ -154,4 +154,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4
15 changes: 15 additions & 0 deletions angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/nimble-angular",
"entries": [
{
"date": "Mon, 04 Mar 2024 19:02:52 GMT",
"version": "20.2.17",
"tag": "@ni/nimble-angular_v20.2.17",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@ni/nimble-angular",
"comment": "Bump @ni/nimble-components to v21.8.2",
"commit": "not available"
}
]
}
},
{
"date": "Fri, 01 Mar 2024 23:02:58 GMT",
"version": "20.2.16",
Expand Down
10 changes: 9 additions & 1 deletion angular-workspace/projects/ni/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 Fri, 01 Mar 2024 23:02:58 GMT and should not be manually modified.
This log was last generated on Mon, 04 Mar 2024 19:02:52 GMT and should not be manually modified.

<!-- Start content -->

## 20.2.17

Mon, 04 Mar 2024 19:02:52 GMT

### Patches

- Bump @ni/nimble-components to v21.8.2

## 20.2.16

Fri, 01 Mar 2024 23:02:58 GMT
Expand Down
4 changes: 2 additions & 2 deletions angular-workspace/projects/ni/nimble-angular/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-angular",
"version": "20.2.16",
"version": "20.2.17",
"description": "Angular components for the NI Nimble Design System",
"scripts": {
"invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish"
Expand Down Expand Up @@ -31,7 +31,7 @@
"@angular/forms": "^15.2.10",
"@angular/localize": "^15.2.10",
"@angular/router": "^15.2.10",
"@ni/nimble-components": "^21.8.1"
"@ni/nimble-components": "^21.8.2"
},
"dependencies": {
"tslib": "^2.2.0"
Expand Down
33 changes: 24 additions & 9 deletions package-lock.json

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

15 changes: 15 additions & 0 deletions packages/jasmine-parameterized/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@ni/jasmine-parameterized",
"entries": [
{
"date": "Mon, 04 Mar 2024 17:42:52 GMT",
"version": "0.2.2",
"tag": "@ni/jasmine-parameterized_v0.2.2",
"comments": {
"none": [
{
"author": "[email protected]",
"package": "@ni/jasmine-parameterized",
"commit": "d453002edff85ffcee1b6ab40514625f6c29c2d0",
"comment": "Align playwright version across packages"
}
]
}
},
{
"date": "Wed, 21 Feb 2024 19:48:20 GMT",
"version": "0.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/jasmine-parameterized/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"karma-spec-reporter": "^0.0.36",
"playwright": "^1.30.0",
"playwright": "1.40.0",
"typescript": "~4.8.2"
}
}
2 changes: 1 addition & 1 deletion packages/nimble-blazor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ni/nimble-blazor",
"version": "14.3.13",
"version": "14.3.14",
"description": "Blazor components for the NI Nimble Design System",
"scripts": {
"postinstall": "node build/generate-playwright-version-properties/source/index.js",
Expand Down
Loading

0 comments on commit 5df4329

Please sign in to comment.