Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into next-pwa
Browse files Browse the repository at this point in the history
  • Loading branch information
shrivatsabhat committed Sep 28, 2022
2 parents 2bf5766 + 0923263 commit ce44f7f
Show file tree
Hide file tree
Showing 67 changed files with 4,236 additions and 9,411 deletions.
18 changes: 2 additions & 16 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"extends": [
"plugin:storybook/recommended",
"next/core-web-vitals",
"prettier"
],
"extends": ["next/core-web-vitals", "prettier"],
"rules": {
"no-unused-vars": "warn",
"no-undef": "warn",
Expand All @@ -13,15 +9,5 @@
"react/no-unescaped-entities": "off",
"@next/next/no-page-custom-font": "off",
"no-duplicate-imports": ["error", { "includeExports": true }]
},
"overrides": [
{
"files": ["*.stories.@(ts|tsx|js|jsx|mjs|cjs)"],
"rules": {
"storybook/hierarchy-separator": "error",
"storybook/default-exports": "off",
"import/no-anonymous-default-export": "off"
}
}
]
}
}
17 changes: 7 additions & 10 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
# Storybook
'📝documentation':
- src/stories/**/*
- README.md
- CONTRIBUTING.md
- '*.md'
documentation:
- any: ['docs/**/*', '*.md']

workflow:
- any:
['.github/**/*', '.husky/**/*', '.vscode/**/*', '.github/workflow/**/*']

# Chore
'chore':
- dependencies/**/*
- public/**/*
- package.json
- .github/**/*
- .vscode/**/*
- .storybook/**/*
- '*'

'⚠️BREAKING CHANGES!!!':
'BREAKING CHANGES':
- src/assets/**/*
11 changes: 4 additions & 7 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
<!-- Remove the text block if it is not used or necessary -->

## Description

<!-- Please include a summary of the change or which issue is fixed. -->

-

### Type of change
#### Type of change

- [ ] New feature (non-breaking change which adds functionality)
- [ ] Refactor ( rewrite or restructure code)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-

### Checklist:

Expand All @@ -27,3 +22,5 @@
<!-- any additional information or context -->

- none

<!-- Remove the text block if it is not used or necessary -->
61 changes: 53 additions & 8 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'

categories:
- title: '⚠️Breaking Changes'
labels:
- 'breaking-changes'
- 'BREAKING CHANGES'
- title: '🚀 Features'
labels:
- 'feat'
- 'feature'
- 'enhancement'
- 'chore:pages'
- 'styles'
- title: '🐛 Bug Fixes'
labels:
- 'fix'
- 'bugfix'
- 'bug'
- title: '🧰 Maintenance'
labels:
- 'chore'
- 'styles:global'
- 'source'
- 'refactor'
- 'workflow'
- title: '🧺 Miscellaneous' #Everything except ABAP
labels:
- 'misc'
- 'utils'
- 'assests'
- 'workflow'
collapse-after: 3

change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks.

version-resolver:
major:
labels:
Expand All @@ -37,19 +42,59 @@ version-resolver:
labels:
- 'patch'
default: patch

exclude-labels:
- 'release:changelog'
- 'skip'

template: |
## Changes
## What's Changed
$CHANGES
**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
autolabeler:
- label: 'bug'
branch:
- '/fix\/.+/'
title:
- '/fix/i'

- label: 'chore'
branch:
- '/chore\/.+/'
- '/ci\/.+/'
title:
- '/chore/i'
- '/ci/i'

- label: 'feat'
title:
- '/feat/i'
branch:
- '/feat\/.+/'
body:
- '/\/issues\//'

- label: 'refactor'
branch:
- '/refactor\/.+/'
title:
- '/refactor:/i'

- label: 'style'
branch:
- '/style\/.+/'
title:
- '/style:/i'

- label: 'test'
branch:
- '/test\/.+/'
title:
- '/test/i'

- label: 'workflow'
branch:
- '/ci\/.+/'
title:
- '/ci:/i'
1 change: 1 addition & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
contents: read
pull-requests: write
runs-on: ubuntu-latest
if: ${{ github.ref != 'refs/heads/main' }}
steps:
- uses: actions/labeler@v4
with:
Expand Down
22 changes: 18 additions & 4 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,31 @@ permissions:
contents: read

jobs:
update_release_draft:
auto_labeler:
name: auto-label
runs-on: ubuntu-latest
if: ${{ github.ref != 'refs/heads/main' }}
permissions:
contents: write # for release-drafter/release-drafter to create a github release
pull-requests: write # for release-drafter/release-drafter to add label to PR
steps:
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

update_release_draft:
name: release-drafter
runs-on: ubuntu-latest
if: ${{github.ref == 'refs/heads/main' || github.ref == 'refs/heads/staging'}}
permissions:
contents: write # for release-drafter/release-drafter to create a github release
pull-requests: write # for release-drafter/release-drafter to add label to PR
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- uses: release-drafter/release-drafter@v5
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
# with:
# config-name: my-config.yml
# disable-autolabeler: true
with:
# config-name: my-config.yml
disable-autolabeler: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 2 additions & 1 deletion .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ jobs:
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
commit-message: update changelog
commit-message: 'build: update changelog'
title: Update Changelog
body: Update changelog to reflect release changes
branch: update-changelog
base: main
labels: release:changelog
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# production
/build
/dist
/storybook-static

# misc
.DS_Store
Expand Down
30 changes: 0 additions & 30 deletions .storybook/main.js

This file was deleted.

13 changes: 0 additions & 13 deletions .storybook/manager.js

This file was deleted.

20 changes: 0 additions & 20 deletions .storybook/preview.js

This file was deleted.

14 changes: 0 additions & 14 deletions .storybook/theme.js

This file was deleted.

Loading

0 comments on commit ce44f7f

Please sign in to comment.