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..3608620e5 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,21 @@ "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" + } + } + }, + "resolutions": { + "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..e292ac28b 100644 --- a/packages/create-flex-plugin/package.json +++ b/packages/create-flex-plugin/package.json @@ -54,7 +54,24 @@ "@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" + } + } + }, + "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 3d91a7efd..273706db4 100644 --- a/packages/flex-dev-utils/package.json +++ b/packages/flex-dev-utils/package.json @@ -32,6 +32,21 @@ "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" + } + } + }, + "resolutions": { + "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..92ea0b7d3 100644 --- a/packages/flex-plugin-e2e-tests/package.json +++ b/packages/flex-plugin-e2e-tests/package.json @@ -47,6 +47,21 @@ "@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" + } + } + }, + "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 ced623377..7351dd4ee 100644 --- a/packages/flex-plugin-scripts/package.json +++ b/packages/flex-plugin-scripts/package.json @@ -49,6 +49,21 @@ "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" + } + } + }, + "resolutions": { + "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..80ba77672 100644 --- a/packages/flex-plugin-test/package.json +++ b/packages/flex-plugin-test/package.json @@ -53,7 +53,19 @@ "react-dom": "^16", "react-test-renderer": "^16" }, - "resolutions": { + "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" }, "devDependencies": { diff --git a/packages/flex-plugin-utils-jest/package.json b/packages/flex-plugin-utils-jest/package.json index 206658a71..90f510df8 100644 --- a/packages/flex-plugin-utils-jest/package.json +++ b/packages/flex-plugin-utils-jest/package.json @@ -32,6 +32,21 @@ "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" + } + } + }, + "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 59a00479f..c5d5776e4 100644 --- a/packages/flex-plugin-webpack/package.json +++ b/packages/flex-plugin-webpack/package.json @@ -80,6 +80,21 @@ "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" + } + } + }, + "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 d7da9db89..78b73f5a3 100644 --- a/packages/flex-plugin/package.json +++ b/packages/flex-plugin/package.json @@ -36,6 +36,21 @@ "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" + } + } + }, + "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 7531398f3..4f7e6a050 100644 --- a/packages/flex-plugins-api-client/package.json +++ b/packages/flex-plugins-api-client/package.json @@ -29,6 +29,21 @@ "files": [ "dist" ], + "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" + }, "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..c0fa6cedf 100644 --- a/packages/flex-plugins-utils-env/package.json +++ b/packages/flex-plugins-utils-env/package.json @@ -26,6 +26,21 @@ "files": [ "dist" ], + "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" + }, "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..6387c58c7 100644 --- a/packages/flex-plugins-utils-exception/package.json +++ b/packages/flex-plugins-utils-exception/package.json @@ -26,6 +26,21 @@ "files": [ "dist" ], + "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" + }, "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..81149966c 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": "npm install npm-force-resolutions --location=global", "lint": "eslint --ext ts src/", "lint:fix": "npm run lint -- --fix", "prepack": "./bin/prepack", @@ -44,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", @@ -59,6 +61,21 @@ "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" + } + } + }, + "resolutions": { + "cheerio": "1.0.0-rc.12" + }, "devDependencies": { "@oclif/dev-cli": "^1.26.5", "@types/lodash.startcase": "^4.4.6",