Skip to content

Commit 5e4572b

Browse files
committed
chore: fix merge conflitcts
2 parents 4134dcd + 1668f8c commit 5e4572b

File tree

393 files changed

+87651
-29765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

393 files changed

+87651
-29765
lines changed

.babelrc

Lines changed: 0 additions & 11 deletions
This file was deleted.

.eslintignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
11
lint-staged.config.js
22
jest.config.js
3+
babel.config.js
4+
plopfile.mjs
5+
coverage/
6+
dist/
7+
docs/
8+
es/
9+
lib/
10+
node_modules/

.eslintrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
2-
"plugins": ["jest"],
2+
"plugins": ["jest", "jsx-a11y"],
33
"extends": [
44
"@doist/eslint-config/recommended-requiring-type-checking",
55
"@doist/eslint-config/react",
6-
"react-app",
76
"plugin:jest/recommended"
87
],
98
"parser": "@typescript-eslint/parser",

.github/ISSUE_TEMPLATE/Feature.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ Provide an example for how this feature would be used.
2121

2222
### Possible implementations
2323

24-
If possible, describe how this feature could be implemented. See [CONTRIBUTING.md](https://github.com/Doist/reactist/blob/dev/.github/CONTRIBUTING.md).
24+
If possible, describe how this feature could be implemented. See [CONTRIBUTING.md](https://github.com/Doist/reactist/blob/main/.github/CONTRIBUTING.md).

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ Closes #...
66

77
## Short description
88

9+
<!--
910
Please describe your implementation and any details that we should keep in mind during review.
11+
-->
1012

1113
## PR Checklist
1214

@@ -16,14 +18,8 @@ Feel free to leave unchecked or remove the lines that are not applicable.
1618

1719
- [ ] Added tests for bugs / new features
1820
- [ ] Updated docs (storybooks, readme)
19-
- [ ] Executed `npm run validate` and made sure no errors / warnings were shown
20-
- [ ] Described changes in `CHANGELOG.md`
21-
- [ ] Bumped version in `package.json` and `package-lock.json` (`npm --no-git-tag-version version <major|minor|patch>`) [ref](https://docs.npmjs.com/cli/v6/commands/npm-version)
22-
- [ ] Updated all static build artifacts (`npm run build-all`)
23-
24-
## Versioning
21+
- [ ] Reviewed and approved Chromatic visual regression tests in CI
2522

2623
<!--
27-
Please state if this is a breaking change, a new feature, a bug fix, or if it
28-
does not require a new version being published at all (e.g. README update, etc.)
24+
_Note:_ versioning is handled by [release-please](https://github.com/googleapis/release-please) action, based on the PR title.
2925
-->

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
3+
updates:
4+
- package-ecosystem: npm
5+
directory: /
6+
interval: daily
7+
commit-message:
8+
prefix: 'build(deps):'

.github/release-please-config.json

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"packages": {
3+
".": {
4+
"changelog-path": "CHANGELOG.md"
5+
}
6+
},
7+
"release-type": "node",
8+
"include-component-in-tag": false,
9+
"changelog-sections": [
10+
{
11+
"section": "🚀 Features",
12+
"type": "feat",
13+
"hidden": false
14+
},
15+
{
16+
"section": "🐛 Bug Fixes",
17+
"type": "fix",
18+
"hidden": false
19+
},
20+
{
21+
"section": "🐛 Bug Fixes",
22+
"type": "style",
23+
"hidden": false
24+
},
25+
{
26+
"section": "🐛 Bug Fixes",
27+
"type": "perf",
28+
"hidden": false
29+
},
30+
{
31+
"section": "🧰 Maintenance",
32+
"type": "refactor",
33+
"hidden": false
34+
},
35+
{
36+
"section": "🧰 Maintenance",
37+
"type": "test",
38+
"hidden": false
39+
},
40+
{
41+
"section": "🧰 Maintenance",
42+
"type": "build",
43+
"hidden": false
44+
},
45+
{
46+
"section": "🧰 Maintenance",
47+
"type": "docs",
48+
"hidden": false
49+
},
50+
{
51+
"section": "🧰 Maintenance",
52+
"type": "ci",
53+
"hidden": false
54+
},
55+
{
56+
"section": "🧰 Maintenance",
57+
"type": "revert",
58+
"hidden": false
59+
}
60+
],
61+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
62+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "27.2.2"
3+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Semantic Pull Request
2+
3+
on:
4+
pull_request:
5+
types:
6+
- edited
7+
- opened
8+
- synchronize
9+
push:
10+
branches:
11+
- gh-readonly-queue/main/**
12+
13+
jobs:
14+
validate-title:
15+
name: Validate Title
16+
runs-on: ubuntu-latest
17+
18+
env:
19+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
20+
timeout-minutes: 5
21+
steps:
22+
- name: Validate pull request title
23+
uses: amannn/action-semantic-pull-request@db6e259b93f286e3416eef27aaae88935d16cf2e
24+
with:
25+
validateSingleCommit: true

.github/workflows/chromatic.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: 'Chromatic'
2+
3+
on: push
4+
5+
jobs:
6+
chromatic-deployment:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Checkout repository
10+
uses: actions/checkout@v4
11+
with:
12+
fetch-depth: 0
13+
14+
- name: Prepare Node.js environment
15+
uses: actions/setup-node@v3
16+
with:
17+
node-version-file: '.nvmrc'
18+
registry-url: https://npm.pkg.github.com
19+
scope: '@doist'
20+
21+
- name: Install dependencies
22+
run: npm install
23+
24+
- name: Publish to Chromatic
25+
uses: chromaui/action@v1
26+
with:
27+
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
28+
skip: dependabot/**
29+
onlyChanged: true

0 commit comments

Comments
 (0)