From e9c761a8d41096c677841b238962d4dc22b9e3fe Mon Sep 17 00:00:00 2001
From: Jeff Puzzo <jpuzzo@redhat.com>
Date: Fri, 9 Dec 2022 09:44:25 -0500
Subject: [PATCH 1/2] fix: Remove package exports and replace subpaths script

---
 package.json                                 |  3 ++-
 packages/react-core/.gitignore               |  2 ++
 packages/react-core/package.json             | 10 ++--------
 packages/react-core/scripts/copySubpaths.js  | 12 ++++++++++++
 packages/react-table/.gitignore              |  1 +
 packages/react-table/package.json            |  8 ++------
 packages/react-table/scripts/copySubpaths.js | 12 ++++++++++++
 7 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 packages/react-core/.gitignore
 create mode 100644 packages/react-core/scripts/copySubpaths.js
 create mode 100644 packages/react-table/.gitignore
 create mode 100644 packages/react-table/scripts/copySubpaths.js

diff --git a/package.json b/package.json
index 1ddbb6d63ae..bd2f42601d8 100644
--- a/package.json
+++ b/package.json
@@ -67,12 +67,13 @@
     "typescript": "^4.0.0"
   },
   "scripts": {
-    "build": "yarn build:generate && yarn build:esm && yarn build:cjs",
+    "build": "yarn build:generate && yarn build:esm && yarn build:subpaths && yarn build:cjs",
     "build:cjs": "tsc --build --verbose packages/tsconfig.cjs.json",
     "build:esm": "tsc --build --verbose packages/tsconfig.json",
     "build:integration": "lerna run build:demo-app --stream",
     "build:docs": "yarn workspace @patternfly/react-docs build:docs",
     "build:generate": "lerna run generate --parallel --stream",
+    "build:subpaths": "lerna run subpaths --parallel --stream",
     "build:umd": "lerna run build:umd --parallel --stream",
     "clean": "yarn clean:build && lerna run clean --parallel",
     "clean:build": "rimraf .cache .eslintcache coverage",
diff --git a/packages/react-core/.gitignore b/packages/react-core/.gitignore
new file mode 100644
index 00000000000..3cda65828bc
--- /dev/null
+++ b/packages/react-core/.gitignore
@@ -0,0 +1,2 @@
+/next
+/deprecated
\ No newline at end of file
diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index a88e0c86a39..cf6b761e36a 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -5,13 +5,6 @@
   "main": "dist/js/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",
-  "exports": {
-    ".": "./dist/esm/index.js",
-    "./dist/*": "./dist/*",
-    "./next": "./dist/esm/next",
-    "./deprecated": "./dist/esm/deprecated",
-    "./package.json": "./package.json"
-  },
   "typesVersions": {
     "*": {
       "next": [
@@ -48,7 +41,8 @@
   "scripts": {
     "build:umd": "rollup -c --environment IS_PRODUCTION",
     "clean": "rimraf dist",
-    "generate": "node scripts/copyStyles.js"
+    "generate": "node scripts/copyStyles.js",
+    "subpaths": "node scripts/copySubpaths.js"
   },
   "dependencies": {
     "@patternfly/react-icons": "^4.93.3",
diff --git a/packages/react-core/scripts/copySubpaths.js b/packages/react-core/scripts/copySubpaths.js
new file mode 100644
index 00000000000..2ad60908b2b
--- /dev/null
+++ b/packages/react-core/scripts/copySubpaths.js
@@ -0,0 +1,12 @@
+/**
+ * Copy subpath modules into the package root directory for ease of access.
+ */
+const { copySync } = require('fs-extra');
+const { resolve, dirname } = require('path');
+
+['next', 'deprecated'].forEach(subPathName => {
+  const source = dirname(require.resolve(`@patternfly/react-core/dist/esm/${subPathName}`));
+  const destination = resolve(__dirname, `../${subPathName}`);
+
+  copySync(source, destination);
+});
diff --git a/packages/react-table/.gitignore b/packages/react-table/.gitignore
new file mode 100644
index 00000000000..58e6c2cdbc3
--- /dev/null
+++ b/packages/react-table/.gitignore
@@ -0,0 +1 @@
+/deprecated
\ No newline at end of file
diff --git a/packages/react-table/package.json b/packages/react-table/package.json
index 75d4ac7ea49..3d9cff1624f 100644
--- a/packages/react-table/package.json
+++ b/packages/react-table/package.json
@@ -5,11 +5,6 @@
   "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": [
@@ -40,7 +35,8 @@
   "homepage": "https://github.com/patternfly/patternfly-react/tree/main/packages/react-table#readme",
   "scripts": {
     "build:umd": "rollup -c --environment IS_PRODUCTION",
-    "clean": "rimraf dist"
+    "clean": "rimraf dist",
+    "subpaths": "node scripts/copySubpaths.js"
   },
   "dependencies": {
     "@patternfly/react-core": "^4.267.4",
diff --git a/packages/react-table/scripts/copySubpaths.js b/packages/react-table/scripts/copySubpaths.js
new file mode 100644
index 00000000000..7100acb9911
--- /dev/null
+++ b/packages/react-table/scripts/copySubpaths.js
@@ -0,0 +1,12 @@
+/**
+ * Copy subpath modules into the package root directory for ease of access.
+ */
+const { copySync } = require('fs-extra');
+const { resolve, dirname } = require('path');
+
+['deprecated'].forEach(subPathName => {
+  const source = dirname(require.resolve(`@patternfly/react-table/dist/esm/${subPathName}`));
+  const destination = resolve(__dirname, `../${subPathName}`);
+
+  copySync(source, destination);
+});

From 6629580a1efbff1cf4842b4eda4ee60185db35a4 Mon Sep 17 00:00:00 2001
From: Jeff Puzzo <jpuzzo@redhat.com>
Date: Mon, 12 Dec 2022 13:12:33 -0500
Subject: [PATCH 2/2] adding more subpaths in the event 'next' or 'deprecated'
 have relative paths

---
 packages/react-core/.gitignore               | 5 ++++-
 packages/react-core/scripts/copySubpaths.js  | 2 +-
 packages/react-core/tsconfig.json            | 9 +++------
 packages/react-table/.gitignore              | 3 ++-
 packages/react-table/scripts/copySubpaths.js | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/react-core/.gitignore b/packages/react-core/.gitignore
index 3cda65828bc..77cfc55e590 100644
--- a/packages/react-core/.gitignore
+++ b/packages/react-core/.gitignore
@@ -1,2 +1,5 @@
 /next
-/deprecated
\ No newline at end of file
+/deprecated
+/components
+/layouts
+/helpers
\ No newline at end of file
diff --git a/packages/react-core/scripts/copySubpaths.js b/packages/react-core/scripts/copySubpaths.js
index 2ad60908b2b..cffb00dd7ce 100644
--- a/packages/react-core/scripts/copySubpaths.js
+++ b/packages/react-core/scripts/copySubpaths.js
@@ -4,7 +4,7 @@
 const { copySync } = require('fs-extra');
 const { resolve, dirname } = require('path');
 
-['next', 'deprecated'].forEach(subPathName => {
+['next', 'deprecated', 'components', 'layouts', 'helpers'].forEach(subPathName => {
   const source = dirname(require.resolve(`@patternfly/react-core/dist/esm/${subPathName}`));
   const destination = resolve(__dirname, `../${subPathName}`);
 
diff --git a/packages/react-core/tsconfig.json b/packages/react-core/tsconfig.json
index 0debb1580c3..3a4be05f922 100644
--- a/packages/react-core/tsconfig.json
+++ b/packages/react-core/tsconfig.json
@@ -7,14 +7,11 @@
     "tsBuildInfoFile": "dist/esm.tsbuildinfo",
     "baseUrl": ".",
     "paths": {
-      "*/next": ["./src/next"],
-      "*/deprecated": ["./src/deprecated"],
+      "./next": ["./src/next"],
+      "./deprecated": ["./src/deprecated"]
     }
   },
-  "include": [
-    "./src/*",
-    "./src/**/*"
-  ],
+  "include": ["./src/*", "./src/**/*"],
   "references": [
     {
       "path": "../react-styles"
diff --git a/packages/react-table/.gitignore b/packages/react-table/.gitignore
index 58e6c2cdbc3..480a54dbfce 100644
--- a/packages/react-table/.gitignore
+++ b/packages/react-table/.gitignore
@@ -1 +1,2 @@
-/deprecated
\ No newline at end of file
+/deprecated
+/components
\ No newline at end of file
diff --git a/packages/react-table/scripts/copySubpaths.js b/packages/react-table/scripts/copySubpaths.js
index 7100acb9911..ff6ef28fc38 100644
--- a/packages/react-table/scripts/copySubpaths.js
+++ b/packages/react-table/scripts/copySubpaths.js
@@ -4,7 +4,7 @@
 const { copySync } = require('fs-extra');
 const { resolve, dirname } = require('path');
 
-['deprecated'].forEach(subPathName => {
+['deprecated', 'components'].forEach(subPathName => {
   const source = dirname(require.resolve(`@patternfly/react-table/dist/esm/${subPathName}`));
   const destination = resolve(__dirname, `../${subPathName}`);