From eff96fc7f314be4f1bd843508f70af5a1b816561 Mon Sep 17 00:00:00 2001
From: sanand <sanand@twilio.com>
Date: Wed, 11 Jun 2025 21:57:21 +0530
Subject: [PATCH 1/8] add overides

---
 .github/workflows/pr_e2e.yaml                      |  2 +-
 .github/workflows/pr_workflow.yaml                 |  2 +-
 .github/workflows/~reusable_e2e_by_OS.yaml         |  2 +-
 .github/workflows/~reusable_public_publish.yaml    |  2 +-
 .github/workflows/~reusable_publish.yaml           |  2 +-
 package.json                                       | 12 ++++++++++++
 packages/create-flex-plugin/package.json           | 14 ++++++++++++++
 packages/flex-dev-utils/package.json               | 12 ++++++++++++
 packages/flex-plugin-e2e-tests/package.json        | 12 ++++++++++++
 packages/flex-plugin-scripts/package.json          | 12 ++++++++++++
 packages/flex-plugin-test/package.json             | 12 ++++++++++++
 packages/flex-plugin-utils-jest/package.json       | 12 ++++++++++++
 packages/flex-plugin-webpack/package.json          | 12 ++++++++++++
 packages/flex-plugin/package.json                  | 12 ++++++++++++
 packages/flex-plugins-api-client/package.json      | 12 ++++++++++++
 packages/flex-plugins-utils-env/package.json       | 12 ++++++++++++
 packages/flex-plugins-utils-exception/package.json | 12 ++++++++++++
 packages/plugin-flex/package.json                  | 12 ++++++++++++
 18 files changed, 163 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pr_e2e.yaml b/.github/workflows/pr_e2e.yaml
index e4ee21ae1..a0a9018f0 100644
--- a/.github/workflows/pr_e2e.yaml
+++ b/.github/workflows/pr_e2e.yaml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: '22'
+          node-version: '18.17.0'
       - name: Extract branch name
         run: |
           echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}"
diff --git a/.github/workflows/pr_workflow.yaml b/.github/workflows/pr_workflow.yaml
index 4ad6546d1..9ec11b7ed 100644
--- a/.github/workflows/pr_workflow.yaml
+++ b/.github/workflows/pr_workflow.yaml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: '22'
+          node-version: '18.17.0'
       - name: Install project dependencies
         run: |
           echo "Starting npm ci with a 10-minute timeout"
diff --git a/.github/workflows/~reusable_e2e_by_OS.yaml b/.github/workflows/~reusable_e2e_by_OS.yaml
index 4a062ce40..5cad863fd 100644
--- a/.github/workflows/~reusable_e2e_by_OS.yaml
+++ b/.github/workflows/~reusable_e2e_by_OS.yaml
@@ -96,7 +96,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: '22'
+          node-version: '18.17.0'
       - name: Install project dependencies (Linux)
         if: ${{ inputs.OS == 'ubuntu-22.04' }}
         run: |
diff --git a/.github/workflows/~reusable_public_publish.yaml b/.github/workflows/~reusable_public_publish.yaml
index bb44b8f00..eeae53930 100644
--- a/.github/workflows/~reusable_public_publish.yaml
+++ b/.github/workflows/~reusable_public_publish.yaml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: '22'
+          node-version: '18.17.0'
           registry-url: 'https://registry.npmjs.org'
       - name: Install dependencies
         run: |
diff --git a/.github/workflows/~reusable_publish.yaml b/.github/workflows/~reusable_publish.yaml
index 8ce1f3736..11700eca2 100644
--- a/.github/workflows/~reusable_publish.yaml
+++ b/.github/workflows/~reusable_publish.yaml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: "22"
+          node-version: "18.17.0"
           registry-url: "https://registry.npmjs.org"
       - name: Install dependencies
         run: |
diff --git a/package.json b/package.json
index 383665aae..3beaa8b75 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,18 @@
     "test:one": "npm run test -- $@",
     "test:watch": "npm run test -- --watchAll"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
     "@babel/core": "^7.16.0",
diff --git a/packages/create-flex-plugin/package.json b/packages/create-flex-plugin/package.json
index aa8fe8c0b..fe95d94df 100644
--- a/packages/create-flex-plugin/package.json
+++ b/packages/create-flex-plugin/package.json
@@ -54,7 +54,21 @@
     "@types/tmp": "^0.2.1",
     "@types/yargs": "^16.0.4"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "publishConfig": {
     "access": "public"
   }
 }
+
+
diff --git a/packages/flex-dev-utils/package.json b/packages/flex-dev-utils/package.json
index 3d91a7efd..8db0530c4 100644
--- a/packages/flex-dev-utils/package.json
+++ b/packages/flex-dev-utils/package.json
@@ -32,6 +32,18 @@
     "test": "cd ../.. && jest packages/flex-dev-utils --color",
     "test:watch": "cd ../.. && jest packages/flex-dev-utils --watch --color"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "dependencies": {
     "@k88/pipe-compose": "^2.5.0",
     "@segment/analytics-node": "^1.3.0",
diff --git a/packages/flex-plugin-e2e-tests/package.json b/packages/flex-plugin-e2e-tests/package.json
index 5542848e5..b35bc871f 100644
--- a/packages/flex-plugin-e2e-tests/package.json
+++ b/packages/flex-plugin-e2e-tests/package.json
@@ -47,6 +47,18 @@
     "@types/lodash": "4.14.177",
     "@types/semver": "^7.3.9"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "engines": {
     "node": "^16 || ^18 || ^20 || ^22"
   },
diff --git a/packages/flex-plugin-scripts/package.json b/packages/flex-plugin-scripts/package.json
index ced623377..5946f9ce7 100644
--- a/packages/flex-plugin-scripts/package.json
+++ b/packages/flex-plugin-scripts/package.json
@@ -49,6 +49,18 @@
     "prop-types": "^15.7.2",
     "querystring": "^0.2.1"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "devDependencies": {
     "@types/enzyme": "^3.10.10",
     "@types/jest": "^27.0.0",
diff --git a/packages/flex-plugin-test/package.json b/packages/flex-plugin-test/package.json
index b8d0a4c7f..82505563c 100644
--- a/packages/flex-plugin-test/package.json
+++ b/packages/flex-plugin-test/package.json
@@ -53,6 +53,18 @@
     "react-dom": "^16",
     "react-test-renderer": "^16"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "resolutions": {
     "cheerio": "1.0.0-rc.12"
   },
diff --git a/packages/flex-plugin-utils-jest/package.json b/packages/flex-plugin-utils-jest/package.json
index 206658a71..36e5ad71c 100644
--- a/packages/flex-plugin-utils-jest/package.json
+++ b/packages/flex-plugin-utils-jest/package.json
@@ -32,6 +32,18 @@
     "lint:fix": "npm run lint -- --fix",
     "test": "exit 0"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "devDependencies": {
     "jest-matcher-utils": "^26.6.2"
   },
diff --git a/packages/flex-plugin-webpack/package.json b/packages/flex-plugin-webpack/package.json
index 59a00479f..05cc6b05d 100644
--- a/packages/flex-plugin-webpack/package.json
+++ b/packages/flex-plugin-webpack/package.json
@@ -80,6 +80,18 @@
     "express-serve-static-core": "^0.1.1",
     "typescript": "^4.2.3"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "engines": {
     "node": "^16 || ^18 || ^20 || ^22"
   },
diff --git a/packages/flex-plugin/package.json b/packages/flex-plugin/package.json
index d7da9db89..675cfd01d 100644
--- a/packages/flex-plugin/package.json
+++ b/packages/flex-plugin/package.json
@@ -36,6 +36,18 @@
     "test": "cd ../.. && jest packages/flex-plugin --color",
     "test:watch": "cd ../.. && jest packages/flex-plugin --watch --color"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "devDependencies": {
     "@twilio/flex-ui": "^1"
   },
diff --git a/packages/flex-plugins-api-client/package.json b/packages/flex-plugins-api-client/package.json
index 7531398f3..fa8458dd9 100644
--- a/packages/flex-plugins-api-client/package.json
+++ b/packages/flex-plugins-api-client/package.json
@@ -29,6 +29,18 @@
   "files": [
     "dist"
   ],
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "scripts": {
     "prebuild": "npm run clean",
     "build": "cd ../.. && tsc -p \"packages/flex-plugins-api-client/tsconfig.json\"",
diff --git a/packages/flex-plugins-utils-env/package.json b/packages/flex-plugins-utils-env/package.json
index 61a8bef54..7f570215e 100644
--- a/packages/flex-plugins-utils-env/package.json
+++ b/packages/flex-plugins-utils-env/package.json
@@ -26,6 +26,18 @@
   "files": [
     "dist"
   ],
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "scripts": {
     "prebuild": "npm run clean",
     "build": "cd ../.. && tsc -p \"packages/flex-plugins-utils-env/tsconfig.json\"",
diff --git a/packages/flex-plugins-utils-exception/package.json b/packages/flex-plugins-utils-exception/package.json
index fa74f27fa..03347d577 100644
--- a/packages/flex-plugins-utils-exception/package.json
+++ b/packages/flex-plugins-utils-exception/package.json
@@ -26,6 +26,18 @@
   "files": [
     "dist"
   ],
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "scripts": {
     "prebuild": "npm run clean",
     "build": "cd ../.. && tsc -p \"packages/flex-plugins-utils-exception/tsconfig.json\"",
diff --git a/packages/plugin-flex/package.json b/packages/plugin-flex/package.json
index 8975b03d1..8b178f712 100644
--- a/packages/plugin-flex/package.json
+++ b/packages/plugin-flex/package.json
@@ -59,6 +59,18 @@
     "rimraf": "^4.0.0",
     "yargs": "^16.2.0"
   },
+"overrides": {
+    "@twilio/flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    },
+    "flex-plugin-test": {
+      "enzyme": {
+        "cheerio": "1.0.0-rc.12"
+      }
+    }
+  },
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.5",
     "@types/lodash.startcase": "^4.4.6",

From b5abb2b5f0faa7ee9b750b2669b7b6c69c6df9e6 Mon Sep 17 00:00:00 2001
From: sanand <sanand@twilio.com>
Date: Wed, 11 Jun 2025 22:46:10 +0530
Subject: [PATCH 2/8] add overides

---
 packages/create-flex-plugin/package.json           | 6 +++++-
 packages/flex-dev-utils/package.json               | 6 +++++-
 packages/flex-plugin-e2e-tests/package.json        | 6 +++++-
 packages/flex-plugin-scripts/package.json          | 6 +++++-
 packages/flex-plugin-test/package.json             | 5 +++--
 packages/flex-plugin-utils-jest/package.json       | 6 +++++-
 packages/flex-plugin-webpack/package.json          | 6 +++++-
 packages/flex-plugin/package.json                  | 6 +++++-
 packages/flex-plugins-api-client/package.json      | 6 +++++-
 packages/flex-plugins-utils-env/package.json       | 6 +++++-
 packages/flex-plugins-utils-exception/package.json | 6 +++++-
 packages/plugin-flex/package.json                  | 6 +++++-
 12 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/packages/create-flex-plugin/package.json b/packages/create-flex-plugin/package.json
index fe95d94df..b579321ab 100644
--- a/packages/create-flex-plugin/package.json
+++ b/packages/create-flex-plugin/package.json
@@ -54,7 +54,7 @@
     "@types/tmp": "^0.2.1",
     "@types/yargs": "^16.0.4"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -66,6 +66,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "publishConfig": {
     "access": "public"
   }
diff --git a/packages/flex-dev-utils/package.json b/packages/flex-dev-utils/package.json
index 8db0530c4..1167e12ea 100644
--- a/packages/flex-dev-utils/package.json
+++ b/packages/flex-dev-utils/package.json
@@ -32,7 +32,7 @@
     "test": "cd ../.. && jest packages/flex-dev-utils --color",
     "test:watch": "cd ../.. && jest packages/flex-dev-utils --watch --color"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -44,6 +44,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "dependencies": {
     "@k88/pipe-compose": "^2.5.0",
     "@segment/analytics-node": "^1.3.0",
diff --git a/packages/flex-plugin-e2e-tests/package.json b/packages/flex-plugin-e2e-tests/package.json
index b35bc871f..5ce3c8053 100644
--- a/packages/flex-plugin-e2e-tests/package.json
+++ b/packages/flex-plugin-e2e-tests/package.json
@@ -47,7 +47,7 @@
     "@types/lodash": "4.14.177",
     "@types/semver": "^7.3.9"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -59,6 +59,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "engines": {
     "node": "^16 || ^18 || ^20 || ^22"
   },
diff --git a/packages/flex-plugin-scripts/package.json b/packages/flex-plugin-scripts/package.json
index 5946f9ce7..2ccb2308c 100644
--- a/packages/flex-plugin-scripts/package.json
+++ b/packages/flex-plugin-scripts/package.json
@@ -49,7 +49,7 @@
     "prop-types": "^15.7.2",
     "querystring": "^0.2.1"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -61,6 +61,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "devDependencies": {
     "@types/enzyme": "^3.10.10",
     "@types/jest": "^27.0.0",
diff --git a/packages/flex-plugin-test/package.json b/packages/flex-plugin-test/package.json
index 82505563c..74c992b68 100644
--- a/packages/flex-plugin-test/package.json
+++ b/packages/flex-plugin-test/package.json
@@ -53,7 +53,7 @@
     "react-dom": "^16",
     "react-test-renderer": "^16"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -66,7 +66,8 @@
     }
   },
   "resolutions": {
-    "cheerio": "1.0.0-rc.12"
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@jest/types": "^27.0.0"
diff --git a/packages/flex-plugin-utils-jest/package.json b/packages/flex-plugin-utils-jest/package.json
index 36e5ad71c..d9dcf6e43 100644
--- a/packages/flex-plugin-utils-jest/package.json
+++ b/packages/flex-plugin-utils-jest/package.json
@@ -32,7 +32,7 @@
     "lint:fix": "npm run lint -- --fix",
     "test": "exit 0"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -44,6 +44,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "devDependencies": {
     "jest-matcher-utils": "^26.6.2"
   },
diff --git a/packages/flex-plugin-webpack/package.json b/packages/flex-plugin-webpack/package.json
index 05cc6b05d..22c131bc1 100644
--- a/packages/flex-plugin-webpack/package.json
+++ b/packages/flex-plugin-webpack/package.json
@@ -80,7 +80,7 @@
     "express-serve-static-core": "^0.1.1",
     "typescript": "^4.2.3"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -92,6 +92,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "engines": {
     "node": "^16 || ^18 || ^20 || ^22"
   },
diff --git a/packages/flex-plugin/package.json b/packages/flex-plugin/package.json
index 675cfd01d..17efe55ca 100644
--- a/packages/flex-plugin/package.json
+++ b/packages/flex-plugin/package.json
@@ -36,7 +36,7 @@
     "test": "cd ../.. && jest packages/flex-plugin --color",
     "test:watch": "cd ../.. && jest packages/flex-plugin --watch --color"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -48,6 +48,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "devDependencies": {
     "@twilio/flex-ui": "^1"
   },
diff --git a/packages/flex-plugins-api-client/package.json b/packages/flex-plugins-api-client/package.json
index fa8458dd9..c79338996 100644
--- a/packages/flex-plugins-api-client/package.json
+++ b/packages/flex-plugins-api-client/package.json
@@ -29,7 +29,7 @@
   "files": [
     "dist"
   ],
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -41,6 +41,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "scripts": {
     "prebuild": "npm run clean",
     "build": "cd ../.. && tsc -p \"packages/flex-plugins-api-client/tsconfig.json\"",
diff --git a/packages/flex-plugins-utils-env/package.json b/packages/flex-plugins-utils-env/package.json
index 7f570215e..648f7be14 100644
--- a/packages/flex-plugins-utils-env/package.json
+++ b/packages/flex-plugins-utils-env/package.json
@@ -26,7 +26,7 @@
   "files": [
     "dist"
   ],
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -38,6 +38,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "scripts": {
     "prebuild": "npm run clean",
     "build": "cd ../.. && tsc -p \"packages/flex-plugins-utils-env/tsconfig.json\"",
diff --git a/packages/flex-plugins-utils-exception/package.json b/packages/flex-plugins-utils-exception/package.json
index 03347d577..2a4e9a2f6 100644
--- a/packages/flex-plugins-utils-exception/package.json
+++ b/packages/flex-plugins-utils-exception/package.json
@@ -26,7 +26,7 @@
   "files": [
     "dist"
   ],
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -38,6 +38,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "scripts": {
     "prebuild": "npm run clean",
     "build": "cd ../.. && tsc -p \"packages/flex-plugins-utils-exception/tsconfig.json\"",
diff --git a/packages/plugin-flex/package.json b/packages/plugin-flex/package.json
index 8b178f712..c5ab8f85a 100644
--- a/packages/plugin-flex/package.json
+++ b/packages/plugin-flex/package.json
@@ -59,7 +59,7 @@
     "rimraf": "^4.0.0",
     "yargs": "^16.2.0"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -71,6 +71,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.5",
     "@types/lodash.startcase": "^4.4.6",

From 904978ae52d4504c252193c8d25dc0459d0f4939 Mon Sep 17 00:00:00 2001
From: sanand <sanand@twilio.com>
Date: Wed, 11 Jun 2025 22:49:00 +0530
Subject: [PATCH 3/8] add overides

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

diff --git a/package.json b/package.json
index 3beaa8b75..5a8fc34be 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "test:one": "npm run test -- $@",
     "test:watch": "npm run test -- --watchAll"
   },
-"overrides": {
+  "overrides": {
     "@twilio/flex-plugin-test": {
       "enzyme": {
         "cheerio": "1.0.0-rc.12"
@@ -53,6 +53,10 @@
       }
     }
   },
+  "resolutions": {
+    "enzyme/cheerio": "1.0.0-rc.12",
+    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+  },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
     "@babel/core": "^7.16.0",

From 187c818a4212bf55916bbbcefa5a85bad2e888b4 Mon Sep 17 00:00:00 2001
From: sanand <sanand@twilio.com>
Date: Wed, 11 Jun 2025 23:15:38 +0530
Subject: [PATCH 4/8] add overides

---
 package.json                                       | 5 ++---
 packages/create-flex-plugin/package.json           | 5 ++---
 packages/flex-dev-utils/package.json               | 5 ++---
 packages/flex-plugin-e2e-tests/package.json        | 5 ++---
 packages/flex-plugin-scripts/package.json          | 5 ++---
 packages/flex-plugin-test/package.json             | 5 ++---
 packages/flex-plugin-utils-jest/package.json       | 5 ++---
 packages/flex-plugin-webpack/package.json          | 5 ++---
 packages/flex-plugin/package.json                  | 5 ++---
 packages/flex-plugins-api-client/package.json      | 5 ++---
 packages/flex-plugins-utils-env/package.json       | 5 ++---
 packages/flex-plugins-utils-exception/package.json | 5 ++---
 packages/plugin-flex/package.json                  | 3 +--
 13 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 5a8fc34be..957478756 100644
--- a/package.json
+++ b/package.json
@@ -53,9 +53,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
diff --git a/packages/create-flex-plugin/package.json b/packages/create-flex-plugin/package.json
index b579321ab..f170f55fb 100644
--- a/packages/create-flex-plugin/package.json
+++ b/packages/create-flex-plugin/package.json
@@ -66,9 +66,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/flex-dev-utils/package.json b/packages/flex-dev-utils/package.json
index 1167e12ea..cd95b7e99 100644
--- a/packages/flex-dev-utils/package.json
+++ b/packages/flex-dev-utils/package.json
@@ -44,9 +44,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "dependencies": {
     "@k88/pipe-compose": "^2.5.0",
diff --git a/packages/flex-plugin-e2e-tests/package.json b/packages/flex-plugin-e2e-tests/package.json
index 5ce3c8053..fd3831437 100644
--- a/packages/flex-plugin-e2e-tests/package.json
+++ b/packages/flex-plugin-e2e-tests/package.json
@@ -59,9 +59,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "engines": {
     "node": "^16 || ^18 || ^20 || ^22"
diff --git a/packages/flex-plugin-scripts/package.json b/packages/flex-plugin-scripts/package.json
index 2ccb2308c..b0264d122 100644
--- a/packages/flex-plugin-scripts/package.json
+++ b/packages/flex-plugin-scripts/package.json
@@ -61,9 +61,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@types/enzyme": "^3.10.10",
diff --git a/packages/flex-plugin-test/package.json b/packages/flex-plugin-test/package.json
index 74c992b68..1bf7aec88 100644
--- a/packages/flex-plugin-test/package.json
+++ b/packages/flex-plugin-test/package.json
@@ -65,9 +65,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@jest/types": "^27.0.0"
diff --git a/packages/flex-plugin-utils-jest/package.json b/packages/flex-plugin-utils-jest/package.json
index d9dcf6e43..9f52da559 100644
--- a/packages/flex-plugin-utils-jest/package.json
+++ b/packages/flex-plugin-utils-jest/package.json
@@ -44,9 +44,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "jest-matcher-utils": "^26.6.2"
diff --git a/packages/flex-plugin-webpack/package.json b/packages/flex-plugin-webpack/package.json
index 22c131bc1..98318105f 100644
--- a/packages/flex-plugin-webpack/package.json
+++ b/packages/flex-plugin-webpack/package.json
@@ -92,9 +92,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "engines": {
     "node": "^16 || ^18 || ^20 || ^22"
diff --git a/packages/flex-plugin/package.json b/packages/flex-plugin/package.json
index 17efe55ca..b9d76c770 100644
--- a/packages/flex-plugin/package.json
+++ b/packages/flex-plugin/package.json
@@ -48,9 +48,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@twilio/flex-ui": "^1"
diff --git a/packages/flex-plugins-api-client/package.json b/packages/flex-plugins-api-client/package.json
index c79338996..061afbc06 100644
--- a/packages/flex-plugins-api-client/package.json
+++ b/packages/flex-plugins-api-client/package.json
@@ -41,9 +41,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "scripts": {
     "prebuild": "npm run clean",
diff --git a/packages/flex-plugins-utils-env/package.json b/packages/flex-plugins-utils-env/package.json
index 648f7be14..b725db433 100644
--- a/packages/flex-plugins-utils-env/package.json
+++ b/packages/flex-plugins-utils-env/package.json
@@ -38,9 +38,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "scripts": {
     "prebuild": "npm run clean",
diff --git a/packages/flex-plugins-utils-exception/package.json b/packages/flex-plugins-utils-exception/package.json
index 2a4e9a2f6..68179aa22 100644
--- a/packages/flex-plugins-utils-exception/package.json
+++ b/packages/flex-plugins-utils-exception/package.json
@@ -38,9 +38,8 @@
       }
     }
   },
-  "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "resolutions": {
+    "**/cheerio": "1.0.0-rc.12"
   },
   "scripts": {
     "prebuild": "npm run clean",
diff --git a/packages/plugin-flex/package.json b/packages/plugin-flex/package.json
index c5ab8f85a..3f7177cc4 100644
--- a/packages/plugin-flex/package.json
+++ b/packages/plugin-flex/package.json
@@ -72,8 +72,7 @@
     }
   },
   "resolutions": {
-    "enzyme/cheerio": "1.0.0-rc.12",
-    "@twilio/flex-plugin-scripts/**/cheerio": "1.0.0-rc.12"
+    "**/cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.5",

From ab5ff1ed737ee2117d647b25a90e083c9da1223f Mon Sep 17 00:00:00 2001
From: sanand <sanand@twilio.com>
Date: Wed, 11 Jun 2025 23:37:26 +0530
Subject: [PATCH 5/8] add overides

---
 package.json                                       | 2 +-
 packages/create-flex-plugin/package.json           | 2 +-
 packages/flex-dev-utils/package.json               | 2 +-
 packages/flex-plugin-e2e-tests/package.json        | 2 +-
 packages/flex-plugin-scripts/package.json          | 2 +-
 packages/flex-plugin-test/package.json             | 2 +-
 packages/flex-plugin-utils-jest/package.json       | 2 +-
 packages/flex-plugin-webpack/package.json          | 2 +-
 packages/flex-plugin/package.json                  | 2 +-
 packages/flex-plugins-api-client/package.json      | 2 +-
 packages/flex-plugins-utils-env/package.json       | 2 +-
 packages/flex-plugins-utils-exception/package.json | 2 +-
 packages/plugin-flex/package.json                  | 3 ++-
 13 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 957478756..3608620e5 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@babel/cli": "^7.16.0",
diff --git a/packages/create-flex-plugin/package.json b/packages/create-flex-plugin/package.json
index f170f55fb..e292ac28b 100644
--- a/packages/create-flex-plugin/package.json
+++ b/packages/create-flex-plugin/package.json
@@ -67,7 +67,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/flex-dev-utils/package.json b/packages/flex-dev-utils/package.json
index cd95b7e99..273706db4 100644
--- a/packages/flex-dev-utils/package.json
+++ b/packages/flex-dev-utils/package.json
@@ -45,7 +45,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "dependencies": {
     "@k88/pipe-compose": "^2.5.0",
diff --git a/packages/flex-plugin-e2e-tests/package.json b/packages/flex-plugin-e2e-tests/package.json
index fd3831437..92ea0b7d3 100644
--- a/packages/flex-plugin-e2e-tests/package.json
+++ b/packages/flex-plugin-e2e-tests/package.json
@@ -60,7 +60,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "engines": {
     "node": "^16 || ^18 || ^20 || ^22"
diff --git a/packages/flex-plugin-scripts/package.json b/packages/flex-plugin-scripts/package.json
index b0264d122..7351dd4ee 100644
--- a/packages/flex-plugin-scripts/package.json
+++ b/packages/flex-plugin-scripts/package.json
@@ -62,7 +62,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@types/enzyme": "^3.10.10",
diff --git a/packages/flex-plugin-test/package.json b/packages/flex-plugin-test/package.json
index 1bf7aec88..80ba77672 100644
--- a/packages/flex-plugin-test/package.json
+++ b/packages/flex-plugin-test/package.json
@@ -66,7 +66,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@jest/types": "^27.0.0"
diff --git a/packages/flex-plugin-utils-jest/package.json b/packages/flex-plugin-utils-jest/package.json
index 9f52da559..90f510df8 100644
--- a/packages/flex-plugin-utils-jest/package.json
+++ b/packages/flex-plugin-utils-jest/package.json
@@ -45,7 +45,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "jest-matcher-utils": "^26.6.2"
diff --git a/packages/flex-plugin-webpack/package.json b/packages/flex-plugin-webpack/package.json
index 98318105f..c5d5776e4 100644
--- a/packages/flex-plugin-webpack/package.json
+++ b/packages/flex-plugin-webpack/package.json
@@ -93,7 +93,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "engines": {
     "node": "^16 || ^18 || ^20 || ^22"
diff --git a/packages/flex-plugin/package.json b/packages/flex-plugin/package.json
index b9d76c770..78b73f5a3 100644
--- a/packages/flex-plugin/package.json
+++ b/packages/flex-plugin/package.json
@@ -49,7 +49,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@twilio/flex-ui": "^1"
diff --git a/packages/flex-plugins-api-client/package.json b/packages/flex-plugins-api-client/package.json
index 061afbc06..4f7e6a050 100644
--- a/packages/flex-plugins-api-client/package.json
+++ b/packages/flex-plugins-api-client/package.json
@@ -42,7 +42,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "scripts": {
     "prebuild": "npm run clean",
diff --git a/packages/flex-plugins-utils-env/package.json b/packages/flex-plugins-utils-env/package.json
index b725db433..c0fa6cedf 100644
--- a/packages/flex-plugins-utils-env/package.json
+++ b/packages/flex-plugins-utils-env/package.json
@@ -39,7 +39,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "scripts": {
     "prebuild": "npm run clean",
diff --git a/packages/flex-plugins-utils-exception/package.json b/packages/flex-plugins-utils-exception/package.json
index 68179aa22..6387c58c7 100644
--- a/packages/flex-plugins-utils-exception/package.json
+++ b/packages/flex-plugins-utils-exception/package.json
@@ -39,7 +39,7 @@
     }
   },
     "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "scripts": {
     "prebuild": "npm run clean",
diff --git a/packages/plugin-flex/package.json b/packages/plugin-flex/package.json
index 3f7177cc4..95f9eb61f 100644
--- a/packages/plugin-flex/package.json
+++ b/packages/plugin-flex/package.json
@@ -34,6 +34,7 @@
     "build": "cd ../.. && tsc -p \"packages/plugin-flex/tsconfig.json\"",
     "clean": "rm -rf dist",
     "link": "twilio plugins:link .",
+    "preinstall": "npx npm-force-resolutions",
     "lint": "eslint --ext ts src/",
     "lint:fix": "npm run lint -- --fix",
     "prepack": "./bin/prepack",
@@ -72,7 +73,7 @@
     }
   },
   "resolutions": {
-    "**/cheerio": "1.0.0-rc.12"
+    "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.5",

From d4bfeb3db4962e8a5dd3ce797f4e6f0d24832218 Mon Sep 17 00:00:00 2001
From: sanand <sanand@twilio.com>
Date: Wed, 11 Jun 2025 23:49:58 +0530
Subject: [PATCH 6/8] add overides

---
 lerna.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lerna.json b/lerna.json
index 633ada454..b2db51fcc 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,4 @@
 {
   "packages": ["packages/*"],
-  "version": "7.1.1",
-  "useWorkspaces": true
+  "version": "7.1.1"
 }

From 59bfa271623252e3b21dc4b10015e0cc309fc12f Mon Sep 17 00:00:00 2001
From: sanand <sanand@twilio.com>
Date: Thu, 12 Jun 2025 00:02:53 +0530
Subject: [PATCH 7/8] add overides

---
 packages/plugin-flex/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/plugin-flex/package.json b/packages/plugin-flex/package.json
index 95f9eb61f..81149966c 100644
--- a/packages/plugin-flex/package.json
+++ b/packages/plugin-flex/package.json
@@ -34,7 +34,7 @@
     "build": "cd ../.. && tsc -p \"packages/plugin-flex/tsconfig.json\"",
     "clean": "rm -rf dist",
     "link": "twilio plugins:link .",
-    "preinstall": "npx npm-force-resolutions",
+    "preinstall": "npm install npm-force-resolutions --location=global",
     "lint": "eslint --ext ts src/",
     "lint:fix": "npm run lint -- --fix",
     "prepack": "./bin/prepack",
@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "@oclif/command": "1.8.0",
+    "npm-force-resolutions": "^0.0.10",
     "@oclif/config": "^1.18.1",
     "@oclif/errors": "^1.3.5",
     "@oclif/parser": "^3.8.5",

From eb6549f0aff5b770445f91eb0bba316d31184fe8 Mon Sep 17 00:00:00 2001
From: sanand <sanand@twilio.com>
Date: Thu, 12 Jun 2025 00:15:58 +0530
Subject: [PATCH 8/8] add overides

---
 lerna.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index b2db51fcc..633ada454 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,5 @@
 {
   "packages": ["packages/*"],
-  "version": "7.1.1"
+  "version": "7.1.1",
+  "useWorkspaces": true
 }