Skip to content

Commit

Permalink
Merge branch '6870-nr-vabutton' of github.com:department-of-veterans-…
Browse files Browse the repository at this point in the history
…affairs/va-mobile-library into 6870-nr-vabutton
  • Loading branch information
narin committed Nov 9, 2023
2 parents 5bee594 + 2dcccdd commit 47d78c5
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 2 deletions.
58 changes: 58 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<!-- Preferred branch and PR naming convention:
'[Issue type]/[Issue #]-[Your name]-[Summary of issue]',
where Issue type = bug, feature, spike, CU (code upkeep), etc.-->

<!-- Update w/ ticket number to cross-repo link PR and ticket; ZenHub URL does not work -->
**[Ticket # ](https://github.com/department-of-veterans-affairs/va-mobile-app/issues/# )**

## Description of Change
<!-- Describe the change and context with which it was made beyond ACs unless straightforward.
Consider:
- What is relevant to code reviewer(s) and not in the ticket?
- What context may be relevant to a future dev or you in 6 months about this PR?
- Did the course of work lead to notable dead ends? If so, why didn't they pan out?
- Did the change add new dependencies? Why?
- Were there important sources to link? Examples: an open bug with a dependency project, an article of someone else solving the same problem that was partially or wholly copied, external documentation relevant to solution -->

#### Testing Packages
<!-- List or range of alpha/beta packages published in association with this PR, if any -->

### Screenshots/Video
<!-- Add screenshots or video as needed; before/after recommended if appropriate.
Convenience side-by-side formatting:
Before/after: <img src="" width="49%" />&nbsp;&nbsp;<img src="" width="49%" />
Accordion before/after: <details><summary>Before/after</summary><img src="" width="49%" />&nbsp;&nbsp;<img src="" width="49%" /></details>
-->

## Testing
<!-- Describe testing conducted to validate changes.
Consider highlighting:
- What testing was not explicitly done and may be relevant for QA?
- Edge cases validated
- Special situations that could not be tested
- Any testing performed in a consuming app -->

- [ ] Tested on iOS <!-- simulator is fine -->
- [ ] Tested on Android <!-- simulator is fine -->
- [ ] Tested on Web

## PR Checklist
Code reviewer validation:
- General
- [ ] PR is linked to ticket(s)
- [ ] Acceptance criteria:
- All satisfied _or_
- Documented reason for not being performed _or_
- Split to separate ticket and ticket is linked by relevant AC(s)
- [ ] Above PR sections adequately filled out
- [ ] If any breaking changes, in accordance with the [pre-1.0.0 versioning guidelines](https://github.com/department-of-veterans-affairs/va-mobile-library#versioning-policy): a CU ticket has been created for the VA Mobile App detailing necessary adjustments with the package version that will be published by this ticket
- Code
- [ ] Tests are included if appropriate (or split to separate ticket)
- [ ] New functions have proper TSDoc annotations

## Publish
<!-- Most changes entail a version increment; section can be removed for PRs exclusively within non-ship-relevant files (e.g. unit tests, Storybook stories) -->
If changes warrant a new version [per the versioning guidelines](https://github.com/department-of-veterans-affairs/va-mobile-library#versioning-policy) and the PR is approved and ready to merge:
- [ ] Merge `main` into branch
- [ ] [Publish new version](https://github.com/department-of-veterans-affairs/va-mobile-library/actions/workflows/publish.yml)
- [ ] Merge branch to `main`
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@department-of-veterans-affairs/mobile-component-library",
"version": "0.1.1-alpha.4",
"version": "0.1.1-alpha.5",
"description": "VA Design System Mobile Component Library",
"main": "src/index.tsx",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@department-of-veterans-affairs/mobile-tokens",
"version": "0.1.0",
"version": "0.1.1-alpha.0",
"description": "VA Design System Mobile Token Library",
"main": "dist/js/tokens.js",
"types": "dist/index.d.ts",
Expand Down

0 comments on commit 47d78c5

Please sign in to comment.