From 7ba8ae83c1c42d247d44de044c3e443358746fd3 Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Tue, 21 Mar 2023 12:23:15 -0400
Subject: [PATCH 01/10] feat(infrastructure): Added ability import components
 directly to support fed modules tree-shacking of shared packages.

feat(infrastructure): Added ability import components directly to support fed modules tree-shacking of shared packages.
---
 package.json                       |  3 +-
 packages/react-charts/package.json |  3 +-
 packages/react-core/package.json   |  1 +
 packages/react-table/package.json  |  1 +
 scripts/build-single-packages.js   | 70 ++++++++++++++++++++++++++++++
 5 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 scripts/build-single-packages.js

diff --git a/package.json b/package.json
index 942212aaf4c..485284dfeff 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "typescript": "^4.7.4"
   },
   "scripts": {
-    "build": "yarn clean && yarn build:generate && yarn build:esm && yarn build:subpaths && yarn build:cjs",
+    "build": "yarn clean && yarn build:generate && yarn build:esm && yarn build:subpaths && yarn build:cjs && yarn build:fed:packages",
     "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",
@@ -75,6 +75,7 @@
     "build:generate": "lerna run generate --parallel --stream",
     "build:subpaths": "lerna run subpaths --parallel --stream",
     "build:umd": "lerna run build:umd --parallel --stream",
+    "build:fed:packages": "lerna run build:fed:packages",
     "clean": "yarn clean:build && lerna run clean --parallel",
     "clean:build": "rimraf .cache .eslintcache coverage",
     "generate": "yarn plop",
diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json
index a29c91e2222..305ac1baca7 100644
--- a/packages/react-charts/package.json
+++ b/packages/react-charts/package.json
@@ -56,7 +56,8 @@
     "react-dom": "^17 || ^18"
   },
   "scripts": {
-    "clean": "rimraf dist"
+    "clean": "rimraf dist",
+    "build:fed:packages" : "node ../../scripts/build-single-packages.js -- --packageName @patternfly/react-charts"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.157",
diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index 8df886b4ea4..8d5fdfdfda3 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -40,6 +40,7 @@
   "homepage": "https://github.com/patternfly/patternfly-react#readme",
   "scripts": {
     "build:umd": "rollup -c --environment IS_PRODUCTION",
+    "build:fed:packages" : "node ../../scripts/build-single-packages.js --packageName @patternfly/react-core",
     "clean": "rimraf dist",
     "generate": "node scripts/copyStyles.js",
     "subpaths": "node scripts/createSubpaths.js"
diff --git a/packages/react-table/package.json b/packages/react-table/package.json
index b021f5dae48..529331a7476 100644
--- a/packages/react-table/package.json
+++ b/packages/react-table/package.json
@@ -35,6 +35,7 @@
   "homepage": "https://github.com/patternfly/patternfly-react/tree/main/packages/react-table#readme",
   "scripts": {
     "build:umd": "rollup -c --environment IS_PRODUCTION",
+    "build:fed:packages" : "node ../../scripts/build-single-packages.js -- --packageName @patternfly/react-table",
     "clean": "rimraf dist",
     "subpaths": "node scripts/createSubpaths.js"
   },
diff --git a/scripts/build-single-packages.js b/scripts/build-single-packages.js
new file mode 100644
index 00000000000..25d21f1e34f
--- /dev/null
+++ b/scripts/build-single-packages.js
@@ -0,0 +1,70 @@
+const fse = require('fs-extra');
+const glob = require('glob');
+
+const root = process.cwd();
+const packageJson = require(`${root}/package.json`);
+
+const foldersBlackList = [`${root}/dist/esm/deprecated/index.js`];
+const esmComponents = glob
+  .sync(`${root}/dist/esm/**/**/index.js`)
+  .filter((item) => !foldersBlackList.some((name) => item.includes(name)))
+  .map((name) => name.replace(/\/$/, ''));
+
+const cjsComponents = glob
+  .sync(`${root}/dist/js/**/**/index.js`)
+  .filter((item) => !foldersBlackList.some((name) => item.includes(name)))
+  .map((name) => name.replace(/\/$/, ''));
+
+async function createPackage(component, dist) {
+  const cmds = [];
+  const destFile = component.replace(/index.js/g, 'package.json');
+  const pathAsArray = component.split('/');
+  const esmRelative = `.${component.split(`${root}`)[1]}`;
+  const packageNameIndex = process.argv.indexOf('--packageName');
+  
+  let packageName = '';
+  if(packageNameIndex + 1 < process.argv.length) {
+     packageName=process.argv[packageNameIndex + 1];
+  } else {
+    process.exit(1);
+  }
+
+  let componentName = pathAsArray[pathAsArray.length - 2];
+  if (pathAsArray.includes("next")) {
+    componentName = `${componentName.toLowerCase()}-next-${dist}`;
+  } else if (pathAsArray.includes("deprecated")) {
+    componentName = `${componentName.toLowerCase()}-deprecated-${dist}`;
+  } else {
+    componentName = `${componentName.toLowerCase()}-${dist}`;
+  }
+
+  const content = {
+    name: `${packageName}-${componentName}`,
+    main: 'index.js',
+    module: esmRelative,
+    typings: 'index.d.ts',
+    version: packageJson.version
+  };
+
+  cmds.push(fse.writeJSON(destFile, content));
+
+  return Promise.all(cmds);
+}
+
+async function generatePackages(components, dist) {
+  const cmds = components.map((component) => createPackage(component, dist));
+  return Promise.all(cmds);
+}
+
+async function run(components, dist) {
+  try {
+    await generatePackages(components, dist);
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    process.exit(1);
+  }
+}
+
+run(esmComponents, 'esm');
+run(cjsComponents, 'cjs')

From 9a2c421ab27cfffa1be50da92f28fdc472f62736 Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Thu, 23 Mar 2023 12:57:48 -0400
Subject: [PATCH 02/10] Updated code to take a configuration file to generate
 packages.

---
 .../react-charts/build-single-packages.json   | 17 ++++++++
 packages/react-charts/package.json            |  2 +-
 .../react-core/build-single-packages.json     | 33 +++++++++++++++
 packages/react-core/package.json              |  2 +-
 .../react-table/build-single-packages.json    | 21 ++++++++++
 packages/react-table/package.json             |  2 +-
 scripts/build-single-packages.js              | 41 +++++++++++--------
 7 files changed, 97 insertions(+), 21 deletions(-)
 create mode 100644 packages/react-charts/build-single-packages.json
 create mode 100644 packages/react-core/build-single-packages.json
 create mode 100644 packages/react-table/build-single-packages.json

diff --git a/packages/react-charts/build-single-packages.json b/packages/react-charts/build-single-packages.json
new file mode 100644
index 00000000000..74e960c2869
--- /dev/null
+++ b/packages/react-charts/build-single-packages.json
@@ -0,0 +1,17 @@
+{
+    "packageName": "@patternfly/react-charts",
+    "modules": [ 
+        {
+            "module": "dist/esm",
+            "moduleType": "esm"
+        },
+        {
+            "module": "dist/js",
+            "moduleType": "cjs"
+        }
+    ],
+    "blackList": [
+        "dist/esm/deprecated/index.js",
+        "dist/esm/next/index.js"
+    ]
+}
\ No newline at end of file
diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json
index 305ac1baca7..3e7ac38a0b6 100644
--- a/packages/react-charts/package.json
+++ b/packages/react-charts/package.json
@@ -57,7 +57,7 @@
   },
   "scripts": {
     "clean": "rimraf dist",
-    "build:fed:packages" : "node ../../scripts/build-single-packages.js -- --packageName @patternfly/react-charts"
+    "build:fed:packages" : "node ../../scripts/build-single-packages.js --config build-single-packages.json"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.157",
diff --git a/packages/react-core/build-single-packages.json b/packages/react-core/build-single-packages.json
new file mode 100644
index 00000000000..37862b4298a
--- /dev/null
+++ b/packages/react-core/build-single-packages.json
@@ -0,0 +1,33 @@
+{
+    "packageName": "@patternfly/react-core",
+    "modules": [ 
+        {
+            "module": "components",
+            "moduleType": "esm"
+        },
+        {
+            "module": "deprecated",
+            "moduleType": "esm"
+        },
+        {
+            "module": "layouts",
+            "moduleType": "esm"
+        },
+        {
+            "module": "next",
+            "moduleType": "esm"
+        },
+        {
+            "module": "helpers",
+            "moduleType": "esm"
+        },
+        {
+            "module": "dist/js",
+            "moduleType": "cjs"
+        }
+    ],
+    "blackList": [
+        "dist/esm/deprecated/index.js",
+        "dist/esm/next/index.js"
+    ]
+}
\ No newline at end of file
diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index 8d5fdfdfda3..c617a0067ec 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -40,7 +40,7 @@
   "homepage": "https://github.com/patternfly/patternfly-react#readme",
   "scripts": {
     "build:umd": "rollup -c --environment IS_PRODUCTION",
-    "build:fed:packages" : "node ../../scripts/build-single-packages.js --packageName @patternfly/react-core",
+    "build:fed:packages" : "node ../../scripts/build-single-packages.js --config build-single-packages.json",
     "clean": "rimraf dist",
     "generate": "node scripts/copyStyles.js",
     "subpaths": "node scripts/createSubpaths.js"
diff --git a/packages/react-table/build-single-packages.json b/packages/react-table/build-single-packages.json
new file mode 100644
index 00000000000..d35b11507fb
--- /dev/null
+++ b/packages/react-table/build-single-packages.json
@@ -0,0 +1,21 @@
+{
+    "packageName": "@patternfly/react-core",
+    "modules": [ 
+        {
+            "module": "components",
+            "moduleType": "esm"
+        },
+        {
+            "module": "deprecated",
+            "moduleType": "esm"
+        },
+        {
+            "module": "dist/js",
+            "moduleType": "cjs"
+        }
+    ],
+    "blackList": [
+        "dist/esm/deprecated/index.js",
+        "dist/esm/next/index.js"
+    ]
+}
\ No newline at end of file
diff --git a/packages/react-table/package.json b/packages/react-table/package.json
index 529331a7476..65d9e95ddeb 100644
--- a/packages/react-table/package.json
+++ b/packages/react-table/package.json
@@ -35,7 +35,7 @@
   "homepage": "https://github.com/patternfly/patternfly-react/tree/main/packages/react-table#readme",
   "scripts": {
     "build:umd": "rollup -c --environment IS_PRODUCTION",
-    "build:fed:packages" : "node ../../scripts/build-single-packages.js -- --packageName @patternfly/react-table",
+    "build:fed:packages" : "node ../../scripts/build-single-packages.js --config build-single-packages.json",
     "clean": "rimraf dist",
     "subpaths": "node scripts/createSubpaths.js"
   },
diff --git a/scripts/build-single-packages.js b/scripts/build-single-packages.js
index 25d21f1e34f..d19f9d126bc 100644
--- a/scripts/build-single-packages.js
+++ b/scripts/build-single-packages.js
@@ -1,31 +1,35 @@
+/* eslint-disable no-console */
 const fse = require('fs-extra');
 const glob = require('glob');
 
 const root = process.cwd();
 const packageJson = require(`${root}/package.json`);
+const configJson = require(process.argv[process.argv.indexOf('--config') + 1]);
 
-const foldersBlackList = [`${root}/dist/esm/deprecated/index.js`];
-const esmComponents = glob
-  .sync(`${root}/dist/esm/**/**/index.js`)
-  .filter((item) => !foldersBlackList.some((name) => item.includes(name)))
-  .map((name) => name.replace(/\/$/, ''));
+const foldersBlackList = configJson.blackList ? configJson.blackList : []
 
-const cjsComponents = glob
-  .sync(`${root}/dist/js/**/**/index.js`)
-  .filter((item) => !foldersBlackList.some((name) => item.includes(name)))
-  .map((name) => name.replace(/\/$/, ''));
+if (!configJson.modules && configJson.modules.length !== 0) {
+  console.log('modules are required');
+  process.exit(1);
+}
+
+const components = configJson.modules.map(module => ({
+    files: glob
+      .sync(`${root}/${module.module}/**/**/index.js`)
+      .filter((item) => !foldersBlackList.some((name) => item.includes(name)))
+      .map((name) => name.replace(/\/$/, '')),
+    moduleType: module.moduleType
+  }));
 
 async function createPackage(component, dist) {
   const cmds = [];
   const destFile = component.replace(/index.js/g, 'package.json');
   const pathAsArray = component.split('/');
   const esmRelative = `.${component.split(`${root}`)[1]}`;
-  const packageNameIndex = process.argv.indexOf('--packageName');
-  
-  let packageName = '';
-  if(packageNameIndex + 1 < process.argv.length) {
-     packageName=process.argv[packageNameIndex + 1];
-  } else {
+
+  const packageName = configJson.packageName;
+  if (!packageName) {
+    console.log("packageName is required!")
     process.exit(1);
   }
 
@@ -60,11 +64,12 @@ async function run(components, dist) {
   try {
     await generatePackages(components, dist);
   } catch (error) {
-    // eslint-disable-next-line no-console
     console.log(error)
     process.exit(1);
   }
 }
 
-run(esmComponents, 'esm');
-run(cjsComponents, 'cjs')
+components.forEach(component => {
+  run(component.files, component.moduleType);
+});
+

From 5d31708abe1e375bda822477c3e0fde0ed17bb01 Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Mon, 27 Mar 2023 10:42:02 -0400
Subject: [PATCH 03/10] Fixed issue with not using root.

---
 scripts/build-single-packages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-single-packages.js b/scripts/build-single-packages.js
index d19f9d126bc..77249a108c3 100644
--- a/scripts/build-single-packages.js
+++ b/scripts/build-single-packages.js
@@ -4,7 +4,7 @@ const glob = require('glob');
 
 const root = process.cwd();
 const packageJson = require(`${root}/package.json`);
-const configJson = require(process.argv[process.argv.indexOf('--config') + 1]);
+const configJson = require(`${root}/${process.argv[process.argv.indexOf('--config') + 1]}`);
 
 const foldersBlackList = configJson.blackList ? configJson.blackList : []
 

From 43227172532439e46c1c8a95d3e8cdeb56970144 Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Mon, 27 Mar 2023 11:03:03 -0400
Subject: [PATCH 04/10] Fixed typo

---
 packages/react-table/build-single-packages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-table/build-single-packages.json b/packages/react-table/build-single-packages.json
index d35b11507fb..bbefee50bc0 100644
--- a/packages/react-table/build-single-packages.json
+++ b/packages/react-table/build-single-packages.json
@@ -1,5 +1,5 @@
 {
-    "packageName": "@patternfly/react-core",
+    "packageName": "@patternfly/react-table",
     "modules": [ 
         {
             "module": "components",

From eead8ce2f47d9ca8864e47b38e118a06211290f4 Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Wed, 5 Apr 2023 13:16:52 -0400
Subject: [PATCH 05/10] Updated with changes from main.

---
 .../react-core/build-single-packages.json     | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/packages/react-core/build-single-packages.json b/packages/react-core/build-single-packages.json
index 37862b4298a..cc038fdd557 100644
--- a/packages/react-core/build-single-packages.json
+++ b/packages/react-core/build-single-packages.json
@@ -2,23 +2,7 @@
     "packageName": "@patternfly/react-core",
     "modules": [ 
         {
-            "module": "components",
-            "moduleType": "esm"
-        },
-        {
-            "module": "deprecated",
-            "moduleType": "esm"
-        },
-        {
-            "module": "layouts",
-            "moduleType": "esm"
-        },
-        {
-            "module": "next",
-            "moduleType": "esm"
-        },
-        {
-            "module": "helpers",
+            "module": "dist/esm",
             "moduleType": "esm"
         },
         {
@@ -26,8 +10,5 @@
             "moduleType": "cjs"
         }
     ],
-    "blackList": [
-        "dist/esm/deprecated/index.js",
-        "dist/esm/next/index.js"
-    ]
+    "blackList": []
 }
\ No newline at end of file

From 1d74ec2a07cfd1241362f4548bd89d16fc95ec0a Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Fri, 7 Apr 2023 08:56:30 -0400
Subject: [PATCH 06/10] Updated with reveiew comments.

---
 scripts/build-single-packages.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/build-single-packages.js b/scripts/build-single-packages.js
index 77249a108c3..b456c3b9a30 100644
--- a/scripts/build-single-packages.js
+++ b/scripts/build-single-packages.js
@@ -4,11 +4,17 @@ const glob = require('glob');
 
 const root = process.cwd();
 const packageJson = require(`${root}/package.json`);
+
+if (!(!process.argv.includes('--config')  && process.argv.indexOf('--config') + 1 === process.argv.length)) {
+  console.log('--config is required followed by the config file name');
+  process.exit(1);
+}
+
 const configJson = require(`${root}/${process.argv[process.argv.indexOf('--config') + 1]}`);
 
 const foldersBlackList = configJson.blackList ? configJson.blackList : []
 
-if (!configJson.modules && configJson.modules.length !== 0) {
+if (!configJson.modules || configJson.modules.length === 0) {
   console.log('modules are required');
   process.exit(1);
 }

From bcb78b25ae8abe07b4d0433b4680bc25b979aa70 Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Tue, 11 Apr 2023 10:53:55 -0400
Subject: [PATCH 07/10] Fixed logic issue.

---
 package.json                                                  | 4 ++--
 packages/react-charts/package.json                            | 2 +-
 ...build-single-packages.json => single-packages.config.json} | 0
 packages/react-core/package.json                              | 2 +-
 ...build-single-packages.json => single-packages.config.json} | 0
 packages/react-table/package.json                             | 2 +-
 ...build-single-packages.json => single-packages.config.json} | 0
 scripts/build-single-packages.js                              | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/react-charts/{build-single-packages.json => single-packages.config.json} (100%)
 rename packages/react-core/{build-single-packages.json => single-packages.config.json} (100%)
 rename packages/react-table/{build-single-packages.json => single-packages.config.json} (100%)

diff --git a/package.json b/package.json
index 485284dfeff..b473b43e99e 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "typescript": "^4.7.4"
   },
   "scripts": {
-    "build": "yarn clean && yarn build:generate && yarn build:esm && yarn build:subpaths && yarn build:cjs && yarn build:fed:packages",
+    "build": "yarn clean && yarn build:generate && yarn build:esm && yarn build:subpaths && yarn build:cjs && yarn build:single:packages",
     "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",
@@ -75,7 +75,7 @@
     "build:generate": "lerna run generate --parallel --stream",
     "build:subpaths": "lerna run subpaths --parallel --stream",
     "build:umd": "lerna run build:umd --parallel --stream",
-    "build:fed:packages": "lerna run build:fed:packages",
+    "build:single:packages": "lerna run build:single:packages",
     "clean": "yarn clean:build && lerna run clean --parallel",
     "clean:build": "rimraf .cache .eslintcache coverage",
     "generate": "yarn plop",
diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json
index 3e7ac38a0b6..fd386a6264e 100644
--- a/packages/react-charts/package.json
+++ b/packages/react-charts/package.json
@@ -57,7 +57,7 @@
   },
   "scripts": {
     "clean": "rimraf dist",
-    "build:fed:packages" : "node ../../scripts/build-single-packages.js --config build-single-packages.json"
+    "build:single:packages" : "node ../../scripts/build-single-packages.js --config single-packages.config.json"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.157",
diff --git a/packages/react-charts/build-single-packages.json b/packages/react-charts/single-packages.config.json
similarity index 100%
rename from packages/react-charts/build-single-packages.json
rename to packages/react-charts/single-packages.config.json
diff --git a/packages/react-core/package.json b/packages/react-core/package.json
index c617a0067ec..862793ca575 100644
--- a/packages/react-core/package.json
+++ b/packages/react-core/package.json
@@ -40,7 +40,7 @@
   "homepage": "https://github.com/patternfly/patternfly-react#readme",
   "scripts": {
     "build:umd": "rollup -c --environment IS_PRODUCTION",
-    "build:fed:packages" : "node ../../scripts/build-single-packages.js --config build-single-packages.json",
+    "build:single:packages" : "node ../../scripts/build-single-packages.js --config single-packages.config.json",
     "clean": "rimraf dist",
     "generate": "node scripts/copyStyles.js",
     "subpaths": "node scripts/createSubpaths.js"
diff --git a/packages/react-core/build-single-packages.json b/packages/react-core/single-packages.config.json
similarity index 100%
rename from packages/react-core/build-single-packages.json
rename to packages/react-core/single-packages.config.json
diff --git a/packages/react-table/package.json b/packages/react-table/package.json
index 65d9e95ddeb..f20170e3f94 100644
--- a/packages/react-table/package.json
+++ b/packages/react-table/package.json
@@ -35,7 +35,7 @@
   "homepage": "https://github.com/patternfly/patternfly-react/tree/main/packages/react-table#readme",
   "scripts": {
     "build:umd": "rollup -c --environment IS_PRODUCTION",
-    "build:fed:packages" : "node ../../scripts/build-single-packages.js --config build-single-packages.json",
+    "build:single:packages" : "node ../../scripts/build-single-packages.js --config single-packages.config.json",
     "clean": "rimraf dist",
     "subpaths": "node scripts/createSubpaths.js"
   },
diff --git a/packages/react-table/build-single-packages.json b/packages/react-table/single-packages.config.json
similarity index 100%
rename from packages/react-table/build-single-packages.json
rename to packages/react-table/single-packages.config.json
diff --git a/scripts/build-single-packages.js b/scripts/build-single-packages.js
index b456c3b9a30..eefcbf89c0c 100644
--- a/scripts/build-single-packages.js
+++ b/scripts/build-single-packages.js
@@ -5,7 +5,7 @@ const glob = require('glob');
 const root = process.cwd();
 const packageJson = require(`${root}/package.json`);
 
-if (!(!process.argv.includes('--config')  && process.argv.indexOf('--config') + 1 === process.argv.length)) {
+if (!(process.argv.includes('--config')  && process.argv.indexOf('--config') + 1 < process.argv.length)) {
   console.log('--config is required followed by the config file name');
   process.exit(1);
 }

From 98bbf564120f45f1270629a8aed40f8dbc990611 Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Thu, 13 Apr 2023 08:22:44 -0400
Subject: [PATCH 08/10] Comment updates.

---
 packages/react-charts/single-packages.config.json | 4 ++--
 packages/react-core/single-packages.config.json   | 4 ++--
 packages/react-table/single-packages.config.json  | 6 +++---
 scripts/build-single-packages.js                  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/react-charts/single-packages.config.json b/packages/react-charts/single-packages.config.json
index 74e960c2869..af29bde1f73 100644
--- a/packages/react-charts/single-packages.config.json
+++ b/packages/react-charts/single-packages.config.json
@@ -3,11 +3,11 @@
     "modules": [ 
         {
             "module": "dist/esm",
-            "moduleType": "esm"
+            "type": "esm"
         },
         {
             "module": "dist/js",
-            "moduleType": "cjs"
+            "type": "cjs"
         }
     ],
     "blackList": [
diff --git a/packages/react-core/single-packages.config.json b/packages/react-core/single-packages.config.json
index cc038fdd557..46b70339957 100644
--- a/packages/react-core/single-packages.config.json
+++ b/packages/react-core/single-packages.config.json
@@ -3,11 +3,11 @@
     "modules": [ 
         {
             "module": "dist/esm",
-            "moduleType": "esm"
+            "type": "esm"
         },
         {
             "module": "dist/js",
-            "moduleType": "cjs"
+            "type": "cjs"
         }
     ],
     "blackList": []
diff --git a/packages/react-table/single-packages.config.json b/packages/react-table/single-packages.config.json
index bbefee50bc0..01be81a7657 100644
--- a/packages/react-table/single-packages.config.json
+++ b/packages/react-table/single-packages.config.json
@@ -3,15 +3,15 @@
     "modules": [ 
         {
             "module": "components",
-            "moduleType": "esm"
+            "type": "esm"
         },
         {
             "module": "deprecated",
-            "moduleType": "esm"
+            "type": "esm"
         },
         {
             "module": "dist/js",
-            "moduleType": "cjs"
+            "type": "cjs"
         }
     ],
     "blackList": [
diff --git a/scripts/build-single-packages.js b/scripts/build-single-packages.js
index eefcbf89c0c..bf28d98662c 100644
--- a/scripts/build-single-packages.js
+++ b/scripts/build-single-packages.js
@@ -24,7 +24,7 @@ const components = configJson.modules.map(module => ({
       .sync(`${root}/${module.module}/**/**/index.js`)
       .filter((item) => !foldersBlackList.some((name) => item.includes(name)))
       .map((name) => name.replace(/\/$/, '')),
-    moduleType: module.moduleType
+    type: module.type
   }));
 
 async function createPackage(component, dist) {
@@ -76,6 +76,6 @@ async function run(components, dist) {
 }
 
 components.forEach(component => {
-  run(component.files, component.moduleType);
+  run(component.files, component.type);
 });
 

From fe0fbf272f3d78eebdf92e5d72e543524ff99520 Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Thu, 13 Apr 2023 08:25:53 -0400
Subject: [PATCH 09/10] Comment updates.

---
 packages/react-charts/single-packages.config.json | 2 +-
 packages/react-core/single-packages.config.json   | 2 +-
 packages/react-table/single-packages.config.json  | 2 +-
 scripts/build-single-packages.js                  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/react-charts/single-packages.config.json b/packages/react-charts/single-packages.config.json
index af29bde1f73..2105f5cfadf 100644
--- a/packages/react-charts/single-packages.config.json
+++ b/packages/react-charts/single-packages.config.json
@@ -10,7 +10,7 @@
             "type": "cjs"
         }
     ],
-    "blackList": [
+    "exclude": [
         "dist/esm/deprecated/index.js",
         "dist/esm/next/index.js"
     ]
diff --git a/packages/react-core/single-packages.config.json b/packages/react-core/single-packages.config.json
index 46b70339957..05a47ff8281 100644
--- a/packages/react-core/single-packages.config.json
+++ b/packages/react-core/single-packages.config.json
@@ -10,5 +10,5 @@
             "type": "cjs"
         }
     ],
-    "blackList": []
+    "exclude": []
 }
\ No newline at end of file
diff --git a/packages/react-table/single-packages.config.json b/packages/react-table/single-packages.config.json
index 01be81a7657..547992c8d9a 100644
--- a/packages/react-table/single-packages.config.json
+++ b/packages/react-table/single-packages.config.json
@@ -14,7 +14,7 @@
             "type": "cjs"
         }
     ],
-    "blackList": [
+    "exclude": [
         "dist/esm/deprecated/index.js",
         "dist/esm/next/index.js"
     ]
diff --git a/scripts/build-single-packages.js b/scripts/build-single-packages.js
index bf28d98662c..013eb9c0c23 100644
--- a/scripts/build-single-packages.js
+++ b/scripts/build-single-packages.js
@@ -12,7 +12,7 @@ if (!(process.argv.includes('--config')  && process.argv.indexOf('--config') + 1
 
 const configJson = require(`${root}/${process.argv[process.argv.indexOf('--config') + 1]}`);
 
-const foldersBlackList = configJson.blackList ? configJson.blackList : []
+const foldersexclude = configJson.exclude ? configJson.exclude : []
 
 if (!configJson.modules || configJson.modules.length === 0) {
   console.log('modules are required');
@@ -22,7 +22,7 @@ if (!configJson.modules || configJson.modules.length === 0) {
 const components = configJson.modules.map(module => ({
     files: glob
       .sync(`${root}/${module.module}/**/**/index.js`)
-      .filter((item) => !foldersBlackList.some((name) => item.includes(name)))
+      .filter((item) => !foldersexclude.some((name) => item.includes(name)))
       .map((name) => name.replace(/\/$/, '')),
     type: module.type
   }));

From b7654c2e2ced9875225920be138bc4c30165488e Mon Sep 17 00:00:00 2001
From: Donald Labaj <dlabaj@redhat.com>
Date: Thu, 13 Apr 2023 08:33:08 -0400
Subject: [PATCH 10/10] Updated with review comments.

---
 packages/react-charts/single-packages.config.json | 4 ++--
 packages/react-core/single-packages.config.json   | 4 ++--
 packages/react-table/single-packages.config.json  | 6 +++---
 scripts/build-single-packages.js                  | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/react-charts/single-packages.config.json b/packages/react-charts/single-packages.config.json
index 2105f5cfadf..48b94f6e0ac 100644
--- a/packages/react-charts/single-packages.config.json
+++ b/packages/react-charts/single-packages.config.json
@@ -2,11 +2,11 @@
     "packageName": "@patternfly/react-charts",
     "modules": [ 
         {
-            "module": "dist/esm",
+            "name": "dist/esm",
             "type": "esm"
         },
         {
-            "module": "dist/js",
+            "name": "dist/js",
             "type": "cjs"
         }
     ],
diff --git a/packages/react-core/single-packages.config.json b/packages/react-core/single-packages.config.json
index 05a47ff8281..6a2037a71f9 100644
--- a/packages/react-core/single-packages.config.json
+++ b/packages/react-core/single-packages.config.json
@@ -2,11 +2,11 @@
     "packageName": "@patternfly/react-core",
     "modules": [ 
         {
-            "module": "dist/esm",
+            "name": "dist/esm",
             "type": "esm"
         },
         {
-            "module": "dist/js",
+            "name": "dist/js",
             "type": "cjs"
         }
     ],
diff --git a/packages/react-table/single-packages.config.json b/packages/react-table/single-packages.config.json
index 547992c8d9a..60a8e59fd87 100644
--- a/packages/react-table/single-packages.config.json
+++ b/packages/react-table/single-packages.config.json
@@ -2,15 +2,15 @@
     "packageName": "@patternfly/react-table",
     "modules": [ 
         {
-            "module": "components",
+            "name": "components",
             "type": "esm"
         },
         {
-            "module": "deprecated",
+            "name": "deprecated",
             "type": "esm"
         },
         {
-            "module": "dist/js",
+            "name": "dist/js",
             "type": "cjs"
         }
     ],
diff --git a/scripts/build-single-packages.js b/scripts/build-single-packages.js
index 013eb9c0c23..af71e19524d 100644
--- a/scripts/build-single-packages.js
+++ b/scripts/build-single-packages.js
@@ -21,7 +21,7 @@ if (!configJson.modules || configJson.modules.length === 0) {
 
 const components = configJson.modules.map(module => ({
     files: glob
-      .sync(`${root}/${module.module}/**/**/index.js`)
+      .sync(`${root}/${module.name}/**/**/index.js`)
       .filter((item) => !foldersexclude.some((name) => item.includes(name)))
       .map((name) => name.replace(/\/$/, '')),
     type: module.type