From a480089b1fa6243cf95647306fc373cf0a337354 Mon Sep 17 00:00:00 2001
From: Sean Perkins <sean@ionic.io>
Date: Mon, 29 Jan 2024 21:54:02 -0500
Subject: [PATCH] chore: dependency resolution for @ionic/core

---
 packages/react/test/README.md                   | 6 ++++++
 packages/react/test/apps/react17/package.json   | 2 +-
 packages/react/test/apps/react17/pnpm-lock.yaml | 6 +++---
 packages/react/test/apps/react18/package.json   | 2 +-
 packages/react/test/apps/react18/pnpm-lock.yaml | 6 +++---
 packages/react/test/build.sh                    | 4 ++++
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/react/test/README.md b/packages/react/test/README.md
index e0b8efa371..ff62967bc3 100644
--- a/packages/react/test/README.md
+++ b/packages/react/test/README.md
@@ -39,6 +39,12 @@ To add new tests, components, or pages, modify the `base` project. This ensures
 
 If you want to add a version-specific change, add the change inside of the appropriate projects in `apps`. Be sure to replicate the directory structure. For example, if you are adding a new E2E test file called `test.e2e.ts` in `apps/react17`, make sure you place the file in `apps/react17/tests/e2e/test.e2e.ts`.
 
+If you are updating dependencies in the `base` project, you can update the lock file without installing dependencies by running the following command:
+
+```
+pnpm install --lockfile-only
+```
+
 ### Version-specific tests
 
 If you need to add E2E tests that are only run on a specific version of the JS Framework, replicate the `VersionTest` component on each partial application. This ensures that tests for framework version X do not get run for framework version Y.
diff --git a/packages/react/test/apps/react17/package.json b/packages/react/test/apps/react17/package.json
index fdbb931b3c..d78fe0c536 100644
--- a/packages/react/test/apps/react17/package.json
+++ b/packages/react/test/apps/react17/package.json
@@ -63,7 +63,7 @@
   "pnpm": {
     "overrides": {
       "@types/react": "^17.0.53",
-      "@ionic/core": "workspace:../../../../core",
+      "@ionic/core": "workspace:../../core",
       "react": "^17.0.2"
     }
   }
diff --git a/packages/react/test/apps/react17/pnpm-lock.yaml b/packages/react/test/apps/react17/pnpm-lock.yaml
index e30ab7aaeb..307f10acfb 100644
--- a/packages/react/test/apps/react17/pnpm-lock.yaml
+++ b/packages/react/test/apps/react17/pnpm-lock.yaml
@@ -6,7 +6,7 @@ settings:
 
 overrides:
   '@types/react': ^17.0.53
-  '@ionic/core': workspace:../../../../core
+  '@ionic/core': workspace:../../core
   react: ^17.0.2
 
 importers:
@@ -87,8 +87,8 @@ importers:
   ../../..:
     dependencies:
       '@ionic/core':
-        specifier: workspace:../../../../core
-        version: link:../../../../core
+        specifier: workspace:../../core
+        version: link:../../core
       ionicons:
         specifier: ^7.0.0
         version: 7.2.2
diff --git a/packages/react/test/apps/react18/package.json b/packages/react/test/apps/react18/package.json
index a1fdd78f40..8154b71682 100644
--- a/packages/react/test/apps/react18/package.json
+++ b/packages/react/test/apps/react18/package.json
@@ -49,7 +49,7 @@
   "pnpm": {
     "overrides": {
       "@types/react": "^18.0.27",
-      "@ionic/core": "workspace:../../../../core",
+      "@ionic/core": "workspace:../../core",
       "react": "^18.2.0"
     }
   }
diff --git a/packages/react/test/apps/react18/pnpm-lock.yaml b/packages/react/test/apps/react18/pnpm-lock.yaml
index 1c03fb3d3e..9932ab1d2b 100644
--- a/packages/react/test/apps/react18/pnpm-lock.yaml
+++ b/packages/react/test/apps/react18/pnpm-lock.yaml
@@ -6,7 +6,7 @@ settings:
 
 overrides:
   '@types/react': ^18.0.27
-  '@ionic/core': workspace:../../../../core
+  '@ionic/core': workspace:../../core
   react: ^18.2.0
 
 importers:
@@ -99,8 +99,8 @@ importers:
   ../../..:
     dependencies:
       '@ionic/core':
-        specifier: workspace:../../../../core
-        version: link:../../../../core
+        specifier: workspace:../../core
+        version: link:../../core
       ionicons:
         specifier: ^7.0.0
         version: 7.2.2
diff --git a/packages/react/test/build.sh b/packages/react/test/build.sh
index 16078c34e2..91f0712d56 100755
--- a/packages/react/test/build.sh
+++ b/packages/react/test/build.sh
@@ -22,6 +22,10 @@ FULL_BASE_DIR="${BASE_DIR}/."
 # The full path to the built application.
 BUILD_APP_DIR="${BUILD_DIR}/${APP_DIR}/"
 
+# Delete any node_modules directory from running
+# pnpm install in the base application.
+rm -rf $FULL_APP_DIR/node_modules
+
 # Make the build directory if it does not already exist.
 mkdir -p $BUILD_DIR