Skip to content
This repository has been archived by the owner on Dec 15, 2023. It is now read-only.

feat(datepicker): documentation #1035

Merged
merged 5 commits into from
Jun 23, 2023
Merged

Conversation

iropolo
Copy link
Contributor

@iropolo iropolo commented Jun 23, 2023

Datepicker Documentation

πŸ› οΈ Type Of Change

  • Documentation

πŸ“– Description

https://dialpad.atlassian.net/browse/DLT-1122

This add documentation to the Docs section of the component in storybook

@github-actions
Copy link

Thanks for contributing to Dialtone Vue! Please read below for some important info regarding Vue 3 compatibility.

Currently we need to maintain two branches in Dialtone Vue, one for Vue 2, one for Vue 3.

This means you must create two PRs for every feature change you make. One into staging and one into staging-vue3.

Many times the change you have made in Vue 2 will be identical to the change you need to make in Vue 3. To make this easier we have made a script that can copy your changes from this branch to a new branch off of staging-vue3 suffixed with -vue3.

run ./copy_pr_vue3.sh from the root dialtone-vue directory.

Once the new branch is created, you will need to look at your code to make sure it still makes sense and test that your changes all work in vue 3. If everything is good you can push it and create a PR into staging-vue3.

It is a required check for every PR to have a corresponding branch called yourbranch-vue3 so that we do not forget to do it. In the special case that you need to make a change to vue2 without making it in vue3, you can set the label vue2-only on this PR.

I got "commit SHA is a merge but no -m option was given."

This happens if there are merge commits in your branch. It's no problem, you can simply skip them with git cherry-pick --skip. We don't want to copy merge commits to the Vue 3 branch.

What if I make more changes to my vue 2 branch after running ./copy_pr_vue3.sh?

You can copy these to the existing -vue3 branch by running the script with a git SHA param like so:

./copy_pr_vue3.sh 2a78db7

where 2a78db7 is the last commit from your branch that was copied to the other branch (all commits after this will be copied)

If it's just one or two commits, you may prefer to just manually use git cherry-pick which will work fine as well.

What if I get a conflict?

It's possible to get a conflict when running copy_pr_vue3.sh as there are differences in Vue 2 and Vue 3 code. If this happens you can manually fix the conflict, commit it and do git cherry-pick --continue.

Copy link
Contributor

@braddialpad braddialpad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@dialpad dialpad deleted a comment from github-actions bot Jun 23, 2023
@dialpad dialpad deleted a comment from github-actions bot Jun 23, 2023
@github-actions
Copy link

βœ”οΈ Deploy Preview ready!
😎 Browse the preview: https://vue.dialpad.design/deploy-previews/pr-1035/
πŸ”¨ If you experience an SSL issue then wait 2 minutes and try again.

@iropolo iropolo merged commit e77a12c into staging Jun 23, 2023
@iropolo iropolo deleted the DLT-1122-datepicker-documentation branch June 23, 2023 19:45
braddialpad pushed a commit that referenced this pull request Jun 23, 2023
# [2.88.0](v2.87.0...v2.88.0) (2023-06-23)

### Bug Fixes

* **General Row:** overlapping text ([#1036](#1036)) ([79a6e3a](79a6e3a))
* **List Item:** border radius ([#1038](#1038)) ([cebc536](cebc536))
* **Rich Text Editor:** fix v-model not working ([#1033](#1033)) ([a7b0904](a7b0904))

### Features

* **Datepicker:** documentation ([#1035](#1035)) ([e77a12c](e77a12c))
* **Datepicker:** keyboard navigation ([#1025](#1025)) ([498bff1](498bff1))
* **Datepicker:** tests ([#1032](#1032)) ([a037c09](a037c09))
@github-actions
Copy link

πŸŽ‰ This PR is included in version 2.88.0 πŸŽ‰

The release is available on GitHub release

Your semantic-release bot πŸ“¦πŸš€

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants