From f448bd950d307b652c626e83700aa1eae358e164 Mon Sep 17 00:00:00 2001 From: jenny-s51 Date: Mon, 21 Nov 2022 14:17:19 -0500 Subject: [PATCH 1/3] change base to main --- .../patternfly-docs/patternfly-docs.source.js | 7 +++++-- packages/react-table/package.json | 10 ++++++++++ packages/react-table/src/components/index.ts | 3 +-- .../react-table/src/deprecated/components/index.ts | 1 + packages/react-table/src/deprecated/index.ts | 1 + packages/react-table/tsconfig.json | 6 +++++- 6 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 packages/react-table/src/deprecated/components/index.ts create mode 100644 packages/react-table/src/deprecated/index.ts diff --git a/packages/react-docs/patternfly-docs/patternfly-docs.source.js b/packages/react-docs/patternfly-docs/patternfly-docs.source.js index cef684a62b4..587a7672ce1 100644 --- a/packages/react-docs/patternfly-docs/patternfly-docs.source.js +++ b/packages/react-docs/patternfly-docs/patternfly-docs.source.js @@ -44,9 +44,12 @@ module.exports = (baseSourceMD, sourceProps) => { sourceMD(path.join(reactCorePath, '/**/demos/**/*.md'), 'react-demos'); // React-table MD - sourceMD(path.join(reactTablePath, '/**/TableComposable/examples/*.md'), 'react-composable'); - sourceMD(path.join(reactTablePath, '/**/demos/*.md'), 'react-demos'); + sourceMD(path.join(reactTablePath, '/**/TableComposable/examples/*.md'), 'react'); sourceMD(path.join(reactTablePath, '/**/Table/examples/*.md'), 'react-legacy'); + // TODO: uncomment once https://github.com/patternfly/patternfly-react/pull/3291 is reviewed + merged + // sourceMD(path.join(reactTablePath, + // sourceMD(path.join(reactTablePath, '/deprecated/components/**/examples/*.md'), 'react-deprecated'); + sourceMD(path.join(reactTablePath, '/**/demos/*.md'), 'react-demos'); // Charts MD (no demos yet) sourceMD(path.join(reactChartsPath, '/**/examples/*.md'), 'react'); diff --git a/packages/react-table/package.json b/packages/react-table/package.json index 642ec34b316..e8e7901c285 100644 --- a/packages/react-table/package.json +++ b/packages/react-table/package.json @@ -5,6 +5,16 @@ "main": "dist/js/index.js", "module": "dist/esm/index.js", "types": "dist/esm/index.d.ts", + "exports": { + ".": "./dist/esm/index.js", + "./deprecated": "./dist/esm/deprecated/index.js", + "./package.json": "./package.json" + }, + "typesVersions": { + "*": { + "deprecated": ["dist/esm/deprecated/index.d.ts"] + } + }, "patternfly:src": "src/", "sideEffects": false, "publishConfig": { diff --git a/packages/react-table/src/components/index.ts b/packages/react-table/src/components/index.ts index 676493ae1c1..b13bb4eb87d 100644 --- a/packages/react-table/src/components/index.ts +++ b/packages/react-table/src/components/index.ts @@ -1,2 +1 @@ -export * from './Table'; -export * from './TableComposable'; +export * from './'; diff --git a/packages/react-table/src/deprecated/components/index.ts b/packages/react-table/src/deprecated/components/index.ts new file mode 100644 index 00000000000..b13bb4eb87d --- /dev/null +++ b/packages/react-table/src/deprecated/components/index.ts @@ -0,0 +1 @@ +export * from './'; diff --git a/packages/react-table/src/deprecated/index.ts b/packages/react-table/src/deprecated/index.ts new file mode 100644 index 00000000000..07635cbbc8e --- /dev/null +++ b/packages/react-table/src/deprecated/index.ts @@ -0,0 +1 @@ +export * from './components'; diff --git a/packages/react-table/tsconfig.json b/packages/react-table/tsconfig.json index f08aeb83272..91adec36e9e 100644 --- a/packages/react-table/tsconfig.json +++ b/packages/react-table/tsconfig.json @@ -3,7 +3,11 @@ "compilerOptions": { "rootDir": "./src", "outDir": "./dist/esm", - "tsBuildInfoFile": "dist/esm.tsbuildinfo" + "tsBuildInfoFile": "dist/esm.tsbuildinfo", + "baseUrl": ".", + "paths": { + "*/deprecated": ["./src/deprecated"], + } }, "include": [ "./src/*", From 8bfaca968712a45e9e33f2419b45585e6af85bcd Mon Sep 17 00:00:00 2001 From: jenny-s51 Date: Mon, 21 Nov 2022 14:20:09 -0500 Subject: [PATCH 2/3] revert index.ts change --- packages/react-table/src/components/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/react-table/src/components/index.ts b/packages/react-table/src/components/index.ts index b13bb4eb87d..676493ae1c1 100644 --- a/packages/react-table/src/components/index.ts +++ b/packages/react-table/src/components/index.ts @@ -1 +1,2 @@ -export * from './'; +export * from './Table'; +export * from './TableComposable'; From 2186d91541c263892418add8bc3d791ca7e76fb0 Mon Sep 17 00:00:00 2001 From: Jenny <32821331+jenny-s51@users.noreply.github.com> Date: Wed, 30 Nov 2022 13:16:05 -0500 Subject: [PATCH 3/3] Update patternfly-docs.source.js --- packages/react-docs/patternfly-docs/patternfly-docs.source.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-docs/patternfly-docs/patternfly-docs.source.js b/packages/react-docs/patternfly-docs/patternfly-docs.source.js index 587a7672ce1..47ca8345a66 100644 --- a/packages/react-docs/patternfly-docs/patternfly-docs.source.js +++ b/packages/react-docs/patternfly-docs/patternfly-docs.source.js @@ -46,7 +46,7 @@ module.exports = (baseSourceMD, sourceProps) => { // React-table MD sourceMD(path.join(reactTablePath, '/**/TableComposable/examples/*.md'), 'react'); sourceMD(path.join(reactTablePath, '/**/Table/examples/*.md'), 'react-legacy'); - // TODO: uncomment once https://github.com/patternfly/patternfly-react/pull/3291 is reviewed + merged + // TODO: uncomment once https://github.com/patternfly/patternfly-org/pull/3291 is reviewed + merged // sourceMD(path.join(reactTablePath, // sourceMD(path.join(reactTablePath, '/deprecated/components/**/examples/*.md'), 'react-deprecated'); sourceMD(path.join(reactTablePath, '/**/demos/*.md'), 'react-demos');