Skip to content

Commit 63d0e3d

Browse files
authored
Merge branch 'main' into bs-ts-avatar
2 parents 4b3622b + cc3266c commit 63d0e3d

31 files changed

+202
-158
lines changed

.changeset/funny-kangaroos-worry.md renamed to .changeset/dull-cheetahs-applaud.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
"@primer/components": patch
33
---
44

5-
Migrate `Label` to TypeScript
5+
Migrate `Flash` to TypeScript

.changeset/flat-moose-guess.md

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

.changeset/fluffy-peaches-study.md

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

.changeset/lovely-walls-cover.md

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

.changeset/mighty-pumpkins-behave.md

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

.changeset/sharp-pugs-tap.md

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

.changeset/slimy-rats-mix.md

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

.eslintrc.json

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
{
2-
"parser": "@babel/eslint-parser",
3-
"extends": [
4-
"plugin:github/recommended",
5-
"plugin:github/browser",
6-
"plugin:react/recommended",
7-
"plugin:jsx-a11y/recommended",
8-
"plugin:react-hooks/recommended"
9-
],
2+
"parser": "@typescript-eslint/parser",
3+
"extends": ["plugin:react/recommended", "plugin:jsx-a11y/recommended", "plugin:react-hooks/recommended"],
104
"globals": {
115
"__DEV__": "readonly"
126
},
@@ -17,24 +11,34 @@
1711
"jest": true,
1812
"node": true
1913
},
14+
"settings": {
15+
"react": {
16+
"version": "detect"
17+
}
18+
},
19+
// rules which apply to JS, TS, etc.
2020
"rules": {
2121
"react/prop-types": 0,
2222
"react/display-name": 0,
23-
"import/no-namespace": 0,
24-
"no-shadow": 0,
25-
"no-unused-vars": [
26-
"error",
27-
{
28-
"ignoreRestSiblings": true
29-
}
30-
],
31-
"eslint-comments/no-use": 0,
3223
"react-hooks/exhaustive-deps": "error",
33-
"jsx-a11y/label-has-for": [
34-
2,
35-
{
36-
"components": []
24+
"jsx-a11y/label-has-for": [2, {"components": []}]
25+
},
26+
"overrides": [
27+
// rules which apply only to JS
28+
{
29+
"files": ["**/*.js", "**/*.jsx"],
30+
"extends": ["plugin:github/recommended", "plugin:github/browser"],
31+
"rules": {
32+
"eslint-comments/no-use": 0,
33+
"import/no-namespace": 0,
34+
"no-shadow": 0,
35+
"no-unused-vars": ["error", {"ignoreRestSiblings": true}]
3736
}
38-
]
39-
}
37+
},
38+
// rules which apply only to TS
39+
{
40+
"files": ["**/*.ts", "**/*.tsx"],
41+
"extends": ["plugin:@typescript-eslint/recommended"]
42+
}
43+
]
4044
}

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
id: changesets
2727
uses: changesets/action@master
2828
with:
29+
title: Release Tracking
2930
# This expects you to have a script called release which does a build for your packages and calls changeset publish
3031
publish: yarn release
3132
env:

CHANGELOG.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# @primer/components
2+
3+
## 23.0.2
4+
### Patch Changes
5+
6+
7+
8+
- [`7128403c`](https://github.com/primer/components/commit/7128403c488a2cfefda3743d7f92be8142071bc8) [#979](https://github.com/primer/components/pull/979) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `Text` to TypeScript
9+
10+
11+
12+
- [`fe16e21c`](https://github.com/primer/components/commit/fe16e21cb3a67d424cdbb663ea2d13e2397eb42c) [#982](https://github.com/primer/components/pull/982) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `BaseStyles` to TypeScript
13+
14+
15+
16+
- [`ee806857`](https://github.com/primer/components/commit/ee8068579106d34309faa1a0c44e1ed25edafb59) [#975](https://github.com/primer/components/pull/975) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `Heading` to TypeScript
17+
18+
19+
20+
- [`25315571`](https://github.com/primer/components/commit/2531557171cd2e39b980a456d42e15880e16256f) [#976](https://github.com/primer/components/pull/976) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `Label` to TypeScript
21+
22+
23+
24+
- [`4076bf4e`](https://github.com/primer/components/commit/4076bf4e173d997c46ba1130c5f0f86f04952790) [#986](https://github.com/primer/components/pull/986) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `Flex` to TypeScript
25+
26+
27+
28+
- [`397a46fe`](https://github.com/primer/components/commit/397a46fe1edee9c2bb71e6ceedafff8dc4e76cb2) [#976](https://github.com/primer/components/pull/976) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `LabelGroup` to TypeScript
29+
30+
31+
32+
- [`e841e158`](https://github.com/primer/components/commit/e841e158dcc557169fce19c78d5d90af5fef6af6) [#983](https://github.com/primer/components/pull/983) Thanks [@shiftkey](https://github.com/shiftkey)! - Add supported `htmlFor` prop to `FormGroupLabelProps` type definition
33+
34+
35+
36+
- [`dc0df4b2`](https://github.com/primer/components/commit/dc0df4b209d952b121f04fc86d0f2984a6e661cf) [#973](https://github.com/primer/components/pull/973) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `BorderBox` to TypeScript
37+
38+
39+
40+
- [`0cac0042`](https://github.com/primer/components/commit/0cac00426d4d29c51d9f110f091aac06c49ec054) [#974](https://github.com/primer/components/pull/974) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `BranchName` to TypeScript
41+
42+
43+
44+
- [`755a1a5c`](https://github.com/primer/components/commit/755a1a5c19f6d6298f9c6785b50fed71aaea59ad) [#977](https://github.com/primer/components/pull/977) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `Pagehead` to TypeScript
45+
46+
47+
48+
- [`34ff4885`](https://github.com/primer/components/commit/34ff4885311686699fbb6d2e3fab0337bad3d016) [#989](https://github.com/primer/components/pull/989) Thanks [@colebemis](https://github.com/colebemis)! - Migrate `Grid` to TypeScript

0 commit comments

Comments
 (0)