Skip to content

Commit 8701588

Browse files
authored
Merge branch 'main' into fix-keypaths-type
2 parents 1cf322a + 1088ee3 commit 8701588

File tree

9 files changed

+46
-23
lines changed

9 files changed

+46
-23
lines changed

docs/content/drafts/ActionList2.mdx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ import InlineCode from '@primer/gatsby-theme-doctocat/src/components/inline-code
4343
</Box>
4444

4545
```js
46-
// ESM
47-
import {ActionList} from '@primer/react/lib-esm/drafts'
48-
// or commonjs:
49-
import {ActionList} from '@primer/react/lib/drafts'
46+
import {ActionList} from '@primer/react/drafts'
5047
```
5148

5249
## Examples

docs/content/drafts/ActionMenu2.mdx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@ import {Props} from '../../src/props'
4343
<br />
4444

4545
```js
46-
// ESM
47-
import {ActionMenu} from '@primer/react/lib-esm/drafts'
48-
// or commonjs:
49-
import {ActionMenu} from '@primer/react/lib/drafts'
46+
import {ActionMenu} from '@primer/react/drafts'
5047
```
5148

5249
<br />

docs/content/drafts/Button2.mdx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ import {Button, IconButton, LinkButton} from '@primer/react/drafts'
1616
### Installation
1717

1818
```js
19-
// ESM
20-
import {Button} from '@primer/react/lib-esm/drafts'
21-
// or commonjs:
22-
import {Button} from '@primer/react/lib/drafts'
19+
import {Button} from '@primer/react/drafts'
2320
```
2421

2522
### Default button

docs/content/drafts/IconButton.mdx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ import {ComponentChecklist} from '../../src/component-checklist'
1414
### Installation
1515

1616
```js
17-
import {IconButton} from '@primer/react/lib-esm/drafts'
18-
// or commonjs:
19-
import {IconButton} from '@primer/react/lib/drafts'
17+
import {IconButton} from '@primer/react/drafts'
2018
```
2119

2220
### Icon only button

docs/content/drafts/LinkButton.mdx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import {ArrowRightIcon} from '@primer/octicons-react'
1515
### Installation
1616

1717
```js
18-
import {LinkButton} from '@primer/react/lib-esm/drafts'
19-
// or commonjs:
20-
import {LinkButton} from '@primer/react/lib/drafts'
18+
import {LinkButton} from '@primer/react/drafts'
2119
```
2220

2321
### Default

drafts/package.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"_comment1": "this is required only for typescript. once this is fixed https://github.com/microsoft/TypeScript/issues/33079 we can remove this hack",
3+
"name": "@primer/react/drafts",
4+
"types": "../lib-esm/drafts/index.d.ts",
5+
"main": "../lib-esm/drafts/index.js",
6+
"type": "module",
7+
"sideEffects": false
8+
}
9+

package-lock.json

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@
44
"description": "An implementation of GitHub's Primer Design System using React",
55
"main": "lib/index.js",
66
"module": "lib-esm/index.js",
7+
"exports": {
8+
".": {
9+
"node": "./lib/index.js",
10+
"default": "./lib-esm/index.js"
11+
},
12+
"./drafts": {
13+
"node": "./lib/drafts/index.js",
14+
"default": "./lib-esm/drafts/index.js"
15+
},
16+
"./lib-esm/*": {
17+
"node": ["./lib/*.js","./lib/*/index.js"],
18+
"default": ["./lib-esm/*.js","./lib-esm/*/index.js"]
19+
}
20+
},
721
"typings": "lib/index.d.ts",
822
"sideEffects": false,
923
"scripts": {
@@ -34,6 +48,7 @@
3448
"lib",
3549
"lib-esm",
3650
"index.d.ts",
51+
"drafts/package.json",
3752
"!lib/__tests__",
3853
"!lib/stories",
3954
"!lib-esm/__tests__",

src/drafts.ts renamed to src/drafts/index.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
// Components
9-
export * from './ActionList2'
10-
export * from './Button2'
11-
export * from './ActionMenu2'
12-
export * from './DropdownMenu2'
13-
export * from './Label2'
9+
export * from '../ActionList2'
10+
export * from '../Button2'
11+
export * from '../ActionMenu2'
12+
export * from '../DropdownMenu2'
13+
export * from '../Label2'

0 commit comments

Comments
 (0)