From 9364e760b38ecd822ed1b37f764ae000103df706 Mon Sep 17 00:00:00 2001
From: kenk2 <kenny.k.kim@oracle.com>
Date: Wed, 6 Sep 2023 15:43:03 -0700
Subject: [PATCH 1/3] Add workspaces project, remove lerna.

---
 package.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index af847241d23..8c8d665ae70 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,9 @@
     "type": "git",
     "url": "git+https://github.com/cerner/terra-core.git"
   },
+  "workspaces": [
+    "./packages/*"
+  ],
   "keywords": [
     "Cerner",
     "Terra",
@@ -39,15 +42,14 @@
     }
   },
   "scripts": {
-    "bootstrap:hoist": "lerna bootstrap --hoist --nohoist=one-cerner-style-icons",
     "clean": "npm run clean:lib && npm run clean:root",
     "clean:install": "npm run clean && time npm install",
     "clean:lib": "rm -rf packages/**/lib",
-    "clean:root": "$(lerna clean --yes || true) && echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
+    "clean:root": "rm -rf packages/*/node_modules && echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
     "clean:obsolete-snapshots": "npm test -- -u",
     "create-props-markdown": "node scripts/props-table-gen/generatePropsTables.js",
     "compile": "npm run clean:lib && npm run compile:build",
-    "compile:build": "lerna run compile --parallel",
+    "compile:build": "npm run compile --ws --yes --if-present",
     "compile:prod": "rm -rf ./build; webpack --mode=production",
     "compile:lowlight": "rm -rf ./build; THEME=clinical-lowlight-theme webpack --mode=production",
     "compile:fusion": "rm -rf ./build; THEME=orion-fusion-theme webpack --mode=production",
@@ -65,7 +67,7 @@
     "lint:package-json": "terra package-json-lint",
     "lint:scss": "stylelint 'packages/**/src/**/*.scss' --syntax scss",
     "prepare-for-release": "terra prepare-for-release",
-    "postinstall": "npm run bootstrap:hoist && npm run compile",
+    "postinstall": "npm run compile",
     "start": "webpack serve",
     "start:prod": "webpack serve --env disableHotReloading --mode=production",
     "start-static": "npm run compile:prod && terra express-server --site ./build",
@@ -107,7 +109,6 @@
     "glob": "^7.1.2",
     "jest": "^26.6.3",
     "ky": "^0.12.0",
-    "lerna": "^6.4.1",
     "postcss": "8.3.11",
     "react": "^16.8.5",
     "react-dom": "^16.8.5",

From d92fc3f414de99089e4c87d23f0783bb31524d64 Mon Sep 17 00:00:00 2001
From: kenk2 <kenny.k.kim@oracle.com>
Date: Thu, 7 Sep 2023 14:55:36 -0700
Subject: [PATCH 2/3] Remove hoist. Restore lerna. Specify workspaces.

---
 lerna.json   | 1 +
 package.json | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lerna.json b/lerna.json
index a2bb50ba7ca..e1e93b6343c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,6 @@
   "packages": [
     "packages/*"
   ],
+  "useWorkspaces": true,
   "version": "independent"
 }
diff --git a/package.json b/package.json
index 8c8d665ae70..043b62d31c4 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "url": "git+https://github.com/cerner/terra-core.git"
   },
   "workspaces": [
-    "./packages/*"
+    "packages/*"
   ],
   "keywords": [
     "Cerner",
@@ -45,11 +45,11 @@
     "clean": "npm run clean:lib && npm run clean:root",
     "clean:install": "npm run clean && time npm install",
     "clean:lib": "rm -rf packages/**/lib",
-    "clean:root": "rm -rf packages/*/node_modules && echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
+    "clean:root": "$(lerna clean --yes || true) && echo 'removing ./node_modules' && rm -rf node_modules && echo 'removed ./node_modules'",
     "clean:obsolete-snapshots": "npm test -- -u",
     "create-props-markdown": "node scripts/props-table-gen/generatePropsTables.js",
     "compile": "npm run clean:lib && npm run compile:build",
-    "compile:build": "npm run compile --ws --yes --if-present",
+    "compile:build": "lerna run compile",
     "compile:prod": "rm -rf ./build; webpack --mode=production",
     "compile:lowlight": "rm -rf ./build; THEME=clinical-lowlight-theme webpack --mode=production",
     "compile:fusion": "rm -rf ./build; THEME=orion-fusion-theme webpack --mode=production",
@@ -109,6 +109,7 @@
     "glob": "^7.1.2",
     "jest": "^26.6.3",
     "ky": "^0.12.0",
+    "lerna": "^6.4.1",
     "postcss": "8.3.11",
     "react": "^16.8.5",
     "react-dom": "^16.8.5",

From a98d7ffb053ea677cb04bcd2e98ec9902e15c4bf Mon Sep 17 00:00:00 2001
From: kenk2 <kenny.k.kim@oracle.com>
Date: Fri, 8 Sep 2023 13:16:19 -0700
Subject: [PATCH 3/3] Remove NPM v6 from engines

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 043b62d31c4..7737b228526 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "description": "terra-core",
   "engines": {
     "node": "10 || 12 || 14",
-    "npm": "6 || 9"
+    "npm": "9"
   },
   "repository": {
     "type": "git",