From dfa66a4ac193e3ad5daad1f1c7547e2996d91c5c Mon Sep 17 00:00:00 2001 From: Pavithra Kodmad Date: Wed, 5 Jan 2022 18:22:20 +1100 Subject: [PATCH 1/6] Add exports to package.json Try conditional subpaths Change tsconfig files Add package.json hack to drafts --- drafts/package.json | 9 +++++++++ package-lock.json | 12 ++++++++++++ package.json | 11 +++++++++++ src/{drafts.ts => drafts/index.ts} | 0 4 files changed, 32 insertions(+) create mode 100644 drafts/package.json rename src/{drafts.ts => drafts/index.ts} (100%) diff --git a/drafts/package.json b/drafts/package.json new file mode 100644 index 00000000000..3a2ed1c37ae --- /dev/null +++ b/drafts/package.json @@ -0,0 +1,9 @@ +{ + "_comment1": "this is required only for typescript. once this is fixed https://github.com/microsoft/TypeScript/issues/33079 we can remove this hack", + "name": "@primer/react/drafts", + "types": "../lib-esm/drafts/index.d.ts", + "main": "../lib-esm/drafts/index.js", + "type": "module", + "sideEffects": false + } + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 4bda5aff72d..cc49d50b257 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5705,9 +5705,15 @@ } }, "node_modules/@primer/behaviors": { +<<<<<<< HEAD "version": "1.0.3", "resolved": "https://registry.npmjs.org/@primer/behaviors/-/behaviors-1.0.3.tgz", "integrity": "sha512-zh1FKvAXLjKs0rr9Ik9E5M3Q9/npa9hmpuHKmYZn7u9QnSl+X13jFPme3AmtokOlfduFYeHfQyzSIJEhSEVl3w==" +======= + "version": "0.0.0-2022020145740", + "resolved": "https://registry.npmjs.org/@primer/behaviors/-/behaviors-0.0.0-2022020145740.tgz", + "integrity": "sha512-VViqEjOCcgHn+etCVwFR5PXBCTMK8/uFpEgFql4adKK1EG3RAIxvlOVXsBPGFKfbR9JZft2xOnutq32sRFtUAA==" +>>>>>>> e86d01e9 (Add exports to package.json) }, "node_modules/@primer/octicons-react": { "version": "16.1.1", @@ -41394,9 +41400,15 @@ "dev": true }, "@primer/behaviors": { +<<<<<<< HEAD "version": "1.0.3", "resolved": "https://registry.npmjs.org/@primer/behaviors/-/behaviors-1.0.3.tgz", "integrity": "sha512-zh1FKvAXLjKs0rr9Ik9E5M3Q9/npa9hmpuHKmYZn7u9QnSl+X13jFPme3AmtokOlfduFYeHfQyzSIJEhSEVl3w==" +======= + "version": "0.0.0-2022020145740", + "resolved": "https://registry.npmjs.org/@primer/behaviors/-/behaviors-0.0.0-2022020145740.tgz", + "integrity": "sha512-VViqEjOCcgHn+etCVwFR5PXBCTMK8/uFpEgFql4adKK1EG3RAIxvlOVXsBPGFKfbR9JZft2xOnutq32sRFtUAA==" +>>>>>>> e86d01e9 (Add exports to package.json) }, "@primer/octicons-react": { "version": "16.1.1", diff --git a/package.json b/package.json index d0d06f1d81c..83e20750c83 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,16 @@ "description": "An implementation of GitHub's Primer Design System using React", "main": "lib/index.js", "module": "lib-esm/index.js", + "exports": { + ".": { + "node": "./lib/index.js", + "default": "./lib-esm/index.js" + }, + "./drafts": { + "node": "./lib/drafts/index.js", + "default": "./lib-esm/drafts/index.js" + } + }, "typings": "lib/index.d.ts", "sideEffects": false, "scripts": { @@ -34,6 +44,7 @@ "lib", "lib-esm", "index.d.ts", + "drafts/package.json", "!lib/__tests__", "!lib/stories", "!lib-esm/__tests__", diff --git a/src/drafts.ts b/src/drafts/index.ts similarity index 100% rename from src/drafts.ts rename to src/drafts/index.ts From cac704873bdd3c4faae94d6d9143f211ee438a39 Mon Sep 17 00:00:00 2001 From: Pavithra Kodmad Date: Mon, 31 Jan 2022 22:51:22 +1100 Subject: [PATCH 2/6] Add lib-esm deep path to exports --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 83e20750c83..49ab103d39e 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "./drafts": { "node": "./lib/drafts/index.js", "default": "./lib-esm/drafts/index.js" - } + }, + "./lib-esm/*": "./lib-esm/*/*.js" }, "typings": "lib/index.d.ts", "sideEffects": false, From f3f490aea0435a2bf50bf9a15362c5a66fd1fb49 Mon Sep 17 00:00:00 2001 From: Pavithra Kodmad Date: Tue, 1 Feb 2022 18:35:11 +1100 Subject: [PATCH 3/6] This actually works --- package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 49ab103d39e..62f18cea34b 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,10 @@ "node": "./lib/drafts/index.js", "default": "./lib-esm/drafts/index.js" }, - "./lib-esm/*": "./lib-esm/*/*.js" + "./lib-esm/*": { + "node": "./lib/*.js", + "default":"./lib-esm/*.js" + } }, "typings": "lib/index.d.ts", "sideEffects": false, From cb1a3f18d617256b36638dc732f3f5b8dc4e4fcd Mon Sep 17 00:00:00 2001 From: Pavithra Kodmad Date: Tue, 1 Feb 2022 19:43:28 +1100 Subject: [PATCH 4/6] Adjust draft paths --- src/drafts/index.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drafts/index.ts b/src/drafts/index.ts index d3c1c663261..efa9ff196c5 100644 --- a/src/drafts/index.ts +++ b/src/drafts/index.ts @@ -6,8 +6,8 @@ */ // Components -export * from './ActionList2' -export * from './Button2' -export * from './ActionMenu2' -export * from './DropdownMenu2' -export * from './Label2' +export * from '../ActionList2' +export * from '../Button2' +export * from '../ActionMenu2' +export * from '../DropdownMenu2' +export * from '../Label2' From 0dca8eac8a2c51ef3b4595a318bb38b70246ddca Mon Sep 17 00:00:00 2001 From: Pavithra Kodmad Date: Tue, 1 Feb 2022 19:57:47 +1100 Subject: [PATCH 5/6] In case of directories, we need to go to index.js --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 62f18cea34b..c00bbd573b9 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "default": "./lib-esm/drafts/index.js" }, "./lib-esm/*": { - "node": "./lib/*.js", - "default":"./lib-esm/*.js" + "node": ["./lib/*.js","./lib/*/index.js"], + "default": ["./lib-esm/*.js","./lib-esm/*/index.js"] } }, "typings": "lib/index.d.ts", From 40366cfd4722cbe9adbafd92702164edcf2d48ee Mon Sep 17 00:00:00 2001 From: Pavithra Kodmad Date: Tue, 1 Feb 2022 20:05:30 +1100 Subject: [PATCH 6/6] Update documentation to reflect the drafts link --- docs/content/drafts/ActionList2.mdx | 5 +---- docs/content/drafts/ActionMenu2.mdx | 5 +---- docs/content/drafts/Button2.mdx | 5 +---- docs/content/drafts/IconButton.mdx | 4 +--- docs/content/drafts/LinkButton.mdx | 4 +--- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/docs/content/drafts/ActionList2.mdx b/docs/content/drafts/ActionList2.mdx index b5029fe7cdf..bf842be1fe6 100644 --- a/docs/content/drafts/ActionList2.mdx +++ b/docs/content/drafts/ActionList2.mdx @@ -43,10 +43,7 @@ import InlineCode from '@primer/gatsby-theme-doctocat/src/components/inline-code ```js -// ESM -import {ActionList} from '@primer/react/lib-esm/drafts' -// or commonjs: -import {ActionList} from '@primer/react/lib/drafts' +import {ActionList} from '@primer/react/drafts' ``` ## Examples diff --git a/docs/content/drafts/ActionMenu2.mdx b/docs/content/drafts/ActionMenu2.mdx index f91f9c60f6c..4a8a8250ebf 100644 --- a/docs/content/drafts/ActionMenu2.mdx +++ b/docs/content/drafts/ActionMenu2.mdx @@ -43,10 +43,7 @@ import {Props} from '../../src/props'
```js -// ESM -import {ActionMenu} from '@primer/react/lib-esm/drafts' -// or commonjs: -import {ActionMenu} from '@primer/react/lib/drafts' +import {ActionMenu} from '@primer/react/drafts' ```
diff --git a/docs/content/drafts/Button2.mdx b/docs/content/drafts/Button2.mdx index 567fe4353eb..f33d782f723 100644 --- a/docs/content/drafts/Button2.mdx +++ b/docs/content/drafts/Button2.mdx @@ -16,10 +16,7 @@ import {Button, IconButton, LinkButton} from '@primer/react/drafts' ### Installation ```js -// ESM -import {Button} from '@primer/react/lib-esm/drafts' -// or commonjs: -import {Button} from '@primer/react/lib/drafts' +import {Button} from '@primer/react/drafts' ``` ### Default button diff --git a/docs/content/drafts/IconButton.mdx b/docs/content/drafts/IconButton.mdx index 7d00d1f2afc..3d6c9e5c2c6 100644 --- a/docs/content/drafts/IconButton.mdx +++ b/docs/content/drafts/IconButton.mdx @@ -14,9 +14,7 @@ import {ComponentChecklist} from '../../src/component-checklist' ### Installation ```js -import {IconButton} from '@primer/react/lib-esm/drafts' -// or commonjs: -import {IconButton} from '@primer/react/lib/drafts' +import {IconButton} from '@primer/react/drafts' ``` ### Icon only button diff --git a/docs/content/drafts/LinkButton.mdx b/docs/content/drafts/LinkButton.mdx index aed0522dacf..23cad9811a5 100644 --- a/docs/content/drafts/LinkButton.mdx +++ b/docs/content/drafts/LinkButton.mdx @@ -15,9 +15,7 @@ import {ArrowRightIcon} from '@primer/octicons-react' ### Installation ```js -import {LinkButton} from '@primer/react/lib-esm/drafts' -// or commonjs: -import {LinkButton} from '@primer/react/lib/drafts' +import {LinkButton} from '@primer/react/drafts' ``` ### Default