From f00162ef1d3ff680c108ab5151a8c5df0dbe12f7 Mon Sep 17 00:00:00 2001 From: saroy Date: Thu, 12 Jun 2025 03:39:25 +0530 Subject: [PATCH 1/2] patch-it --- .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 +- package.json | 8 +++++++- patches/enzyme+3.11.0.patch | 13 +++++++++++++ 6 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 patches/enzyme+3.11.0.patch 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/package.json b/package.json index 383665aae..a52fe6671 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "lint:fix": "lerna run lint:fix", "preinstall": "npm install npm-force-resolutions --location=global", "postbootstrap": "npm run build", - "postinstall": "npm run bootstrap", + "postinstall": "npm run bootstrap && patch-package", "prepare": "husky install", "pretesst": "rimraf -rf coverage", "publish:alpha": "./bin/publish alpha $1", @@ -41,6 +41,9 @@ "test:one": "npm run test -- $@", "test:watch": "npm run test -- --watchAll" }, + "dependencies": { + "cheerio": "1.0.0-rc.12" + }, "devDependencies": { "@babel/cli": "^7.16.0", "@babel/core": "^7.16.0", @@ -64,5 +67,8 @@ "ts-jest": "^27.0.0", "typescript": "4.3.5", "ultra-runner": "^3.10.5" + }, + "overrides": { + "cheerio": "1.0.0-rc.12" } } diff --git a/patches/enzyme+3.11.0.patch b/patches/enzyme+3.11.0.patch new file mode 100644 index 000000000..9a78a8ed7 --- /dev/null +++ b/patches/enzyme+3.11.0.patch @@ -0,0 +1,13 @@ +diff --git a/node_modules/enzyme/package.json b/node_modules/enzyme/package.json +index 3e1a54f..4e8bc76 100644 +--- a/node_modules/enzyme/package.json ++++ b/node_modules/enzyme/package.json +@@ -33,7 +33,7 @@ + "array.prototype.flat": "^1.2.3", + "chalk": "^2.4.2", + "classnames": "^2.2.6", +- "cheerio": "^1.0.0-rc.3", ++ "cheerio": "1.0.0-rc.12", + "function.prototype.name": "^1.1.0", + "has": "^1.0.3", + "is-subset": "^0.1.1", From 825a1fb1edc899f4e76acf700ed0eb3efd3c16d9 Mon Sep 17 00:00:00 2001 From: saroy Date: Thu, 12 Jun 2025 03:43:35 +0530 Subject: [PATCH 2/2] patch-it --- 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" }