From c63fe57bce30189b83fdf9d3098dbf6e49263fab Mon Sep 17 00:00:00 2001 From: Ivo Murrell Date: Tue, 7 Mar 2023 14:45:20 +0000 Subject: [PATCH] chore: require latest cli version for all plugins The latest version of @dotcom-tool-kit/cli adds support for zod schemas. In doing so, we moved the handling of default values for options from a line in the Task constructor to using zod's built-in support for default values during parsing. This means that if we do not use zod's options parsing then we are no longer setting default values for options. To avoid this we need to bump the range that plugins allow for the dotcom-tool-kit package peer dependency to make sure we're definitely installing a version with support for zod. I wouldn't consider this a breaking change any more than bumping any Tool Kit dependency is. --- package-lock.json | 58 ++++++++++++------------ plugins/babel/package.json | 2 +- plugins/backend-app/package.json | 2 +- plugins/backend-heroku-app/package.json | 2 +- plugins/circleci-deploy/package.json | 2 +- plugins/circleci-heroku/package.json | 2 +- plugins/circleci-npm/package.json | 2 +- plugins/circleci/package.json | 2 +- plugins/component/package.json | 2 +- plugins/cypress/package.json | 2 +- plugins/eslint/package.json | 2 +- plugins/frontend-app/package.json | 2 +- plugins/heroku/package.json | 2 +- plugins/husky-npm/package.json | 2 +- plugins/jest/package.json | 2 +- plugins/lint-staged-npm/package.json | 2 +- plugins/lint-staged/package.json | 2 +- plugins/mocha/package.json | 2 +- plugins/n-test/package.json | 2 +- plugins/next-router/package.json | 2 +- plugins/node/package.json | 2 +- plugins/nodemon/package.json | 2 +- plugins/npm/package.json | 2 +- plugins/pa11y/package.json | 2 +- plugins/prettier/package.json | 2 +- plugins/secret-squirrel/package.json | 2 +- plugins/serverless/package.json | 2 +- plugins/typescript/package.json | 2 +- plugins/upload-assets-to-s3/package.json | 2 +- plugins/webpack/package.json | 2 +- 30 files changed, 58 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index c6a4c6293..16af35ec5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26695,7 +26695,7 @@ }, "peerDependencies": { "@babel/core": "7.x", - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/babel/node_modules/tslib": { @@ -26711,7 +26711,7 @@ "@dotcom-tool-kit/backend-heroku-app": "^1.0.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/backend-heroku-app": { @@ -26727,7 +26727,7 @@ "@dotcom-tool-kit/secret-squirrel": "^1.0.12" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/circleci": { @@ -26752,7 +26752,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/circleci-deploy": { @@ -26767,7 +26767,7 @@ "type-fest": "^3.6.0" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/circleci-deploy/node_modules/tslib": { @@ -26797,7 +26797,7 @@ "tslib": "^2.3.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/circleci-heroku/node_modules/tslib": { @@ -26816,7 +26816,7 @@ "tslib": "^2.3.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/circleci-npm/node_modules/tslib": { @@ -26859,7 +26859,7 @@ "@dotcom-tool-kit/secret-squirrel": "^1.0.12" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/cypress": { @@ -26867,7 +26867,7 @@ "version": "2.0.1", "license": "ISC", "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/eslint": { @@ -26887,7 +26887,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "eslint": "7.x || 8.x" } }, @@ -27097,7 +27097,7 @@ "@dotcom-tool-kit/webpack": "^2.1.12" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/heroku": { @@ -27127,7 +27127,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/heroku/node_modules/tslib": { @@ -27144,7 +27144,7 @@ "tslib": "^2.3.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "husky": "4.x" } }, @@ -27167,7 +27167,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "jest-cli": "27.x" } }, @@ -27188,7 +27188,7 @@ "tslib": "^2.3.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/lint-staged-npm": { @@ -27202,7 +27202,7 @@ "tslib": "^2.3.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/lint-staged-npm/node_modules/tslib": { @@ -27283,7 +27283,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "mocha": ">=6.x <=10.x" } }, @@ -27309,7 +27309,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/n-test/node_modules/tslib": { @@ -27331,7 +27331,7 @@ "tslib": "^2.3.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/next-router/node_modules/tslib": { @@ -27353,7 +27353,7 @@ "wait-port": "^0.2.9" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/node/node_modules/tslib": { @@ -27377,7 +27377,7 @@ "@types/nodemon": "^1.19.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "nodemon": "2.x" } }, @@ -27409,7 +27409,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/npm/node_modules/@npmcli/git": { @@ -27563,7 +27563,7 @@ "@types/pa11y": "^5.3.4" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/pa11y/node_modules/tslib": { @@ -27592,7 +27592,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/prettier/node_modules/tslib": { @@ -27611,7 +27611,7 @@ }, "peerDependencies": { "@financial-times/secret-squirrel": "2.x", - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/secret-squirrel/node_modules/tslib": { @@ -27633,7 +27633,7 @@ "wait-port": "^0.2.9" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "serverless-offline": "^12.0.4" } }, @@ -27656,7 +27656,7 @@ "winston": "^3.8.2" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "typescript": "3.x || 4.x" } }, @@ -27868,7 +27868,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } }, "plugins/upload-assets-to-s3/node_modules/tslib": { @@ -27894,7 +27894,7 @@ "winston": "^3.5.1" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "webpack": "4.x.x || 5.x.x" } }, diff --git a/plugins/babel/package.json b/plugins/babel/package.json index 641a353ef..3b5ea2f1f 100644 --- a/plugins/babel/package.json +++ b/plugins/babel/package.json @@ -37,6 +37,6 @@ }, "peerDependencies": { "@babel/core": "7.x", - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/backend-app/package.json b/plugins/backend-app/package.json index 501029b0a..416d780b6 100644 --- a/plugins/backend-app/package.json +++ b/plugins/backend-app/package.json @@ -17,6 +17,6 @@ "bugs": "https://github.com/financial-times/dotcom-tool-kit/issues", "homepage": "https://github.com/financial-times/dotcom-tool-kit/tree/main/plugins/backend-app", "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/backend-heroku-app/package.json b/plugins/backend-heroku-app/package.json index 50a713844..ea9695d5e 100644 --- a/plugins/backend-heroku-app/package.json +++ b/plugins/backend-heroku-app/package.json @@ -22,6 +22,6 @@ "bugs": "https://github.com/financial-times/dotcom-tool-kit/issues", "homepage": "https://github.com/financial-times/dotcom-tool-kit/tree/main/plugins/backend-heroku-app", "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/circleci-deploy/package.json b/plugins/circleci-deploy/package.json index e108dfc29..d03df7de4 100644 --- a/plugins/circleci-deploy/package.json +++ b/plugins/circleci-deploy/package.json @@ -28,7 +28,7 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" }, "devDependencies": { "type-fest": "^3.6.0" diff --git a/plugins/circleci-heroku/package.json b/plugins/circleci-heroku/package.json index 6bbe32372..785ea83dd 100644 --- a/plugins/circleci-heroku/package.json +++ b/plugins/circleci-heroku/package.json @@ -29,6 +29,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/circleci-npm/package.json b/plugins/circleci-npm/package.json index cb08b4ff5..a120e72ea 100644 --- a/plugins/circleci-npm/package.json +++ b/plugins/circleci-npm/package.json @@ -27,6 +27,6 @@ ".toolkitrc.yml" ], "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json index 46a43249f..01c05f70a 100644 --- a/plugins/circleci/package.json +++ b/plugins/circleci/package.json @@ -41,6 +41,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/component/package.json b/plugins/component/package.json index e2e537be9..c32b494f7 100644 --- a/plugins/component/package.json +++ b/plugins/component/package.json @@ -17,7 +17,7 @@ ".toolkitrc.yml" ], "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" }, "dependencies": { "@dotcom-tool-kit/circleci-npm": "^4.0.0", diff --git a/plugins/cypress/package.json b/plugins/cypress/package.json index e7aa3cf95..f18582f9d 100644 --- a/plugins/cypress/package.json +++ b/plugins/cypress/package.json @@ -21,6 +21,6 @@ ".toolkitrc.yml" ], "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/eslint/package.json b/plugins/eslint/package.json index 4bed4f02b..d8e8cf702 100644 --- a/plugins/eslint/package.json +++ b/plugins/eslint/package.json @@ -36,7 +36,7 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "eslint": "7.x || 8.x" } } diff --git a/plugins/frontend-app/package.json b/plugins/frontend-app/package.json index 51d8e1f67..5b26aff3c 100644 --- a/plugins/frontend-app/package.json +++ b/plugins/frontend-app/package.json @@ -21,6 +21,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/heroku/package.json b/plugins/heroku/package.json index fb9167817..01999e5b9 100644 --- a/plugins/heroku/package.json +++ b/plugins/heroku/package.json @@ -46,6 +46,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/husky-npm/package.json b/plugins/husky-npm/package.json index f43986ec8..c15423538 100644 --- a/plugins/husky-npm/package.json +++ b/plugins/husky-npm/package.json @@ -15,7 +15,7 @@ }, "peerDependencies": { "husky": "4.x", - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" }, "repository": { "type": "git", diff --git a/plugins/jest/package.json b/plugins/jest/package.json index e6264c131..d39e4a4b8 100644 --- a/plugins/jest/package.json +++ b/plugins/jest/package.json @@ -16,7 +16,7 @@ }, "peerDependencies": { "jest-cli": "27.x", - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" }, "repository": { "type": "git", diff --git a/plugins/lint-staged-npm/package.json b/plugins/lint-staged-npm/package.json index cc39a16e9..5cea16e75 100644 --- a/plugins/lint-staged-npm/package.json +++ b/plugins/lint-staged-npm/package.json @@ -30,6 +30,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/lint-staged/package.json b/plugins/lint-staged/package.json index d4f334e7f..fb57ac2c2 100644 --- a/plugins/lint-staged/package.json +++ b/plugins/lint-staged/package.json @@ -31,6 +31,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/mocha/package.json b/plugins/mocha/package.json index 4d00fb01a..18a40de4a 100644 --- a/plugins/mocha/package.json +++ b/plugins/mocha/package.json @@ -37,7 +37,7 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "mocha": ">=6.x <=10.x" } } diff --git a/plugins/n-test/package.json b/plugins/n-test/package.json index 755c8c2e2..72af5d144 100644 --- a/plugins/n-test/package.json +++ b/plugins/n-test/package.json @@ -36,6 +36,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/next-router/package.json b/plugins/next-router/package.json index 0c27f3910..5c22bc16d 100644 --- a/plugins/next-router/package.json +++ b/plugins/next-router/package.json @@ -30,6 +30,6 @@ ".toolkitrc.yml" ], "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/node/package.json b/plugins/node/package.json index ad9637b30..5b9b3f648 100644 --- a/plugins/node/package.json +++ b/plugins/node/package.json @@ -30,6 +30,6 @@ ".toolkitrc.yml" ], "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/nodemon/package.json b/plugins/nodemon/package.json index 8d8e50d55..5d0f5fe88 100644 --- a/plugins/nodemon/package.json +++ b/plugins/nodemon/package.json @@ -19,7 +19,7 @@ }, "peerDependencies": { "nodemon": "2.x", - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" }, "repository": { "type": "git", diff --git a/plugins/npm/package.json b/plugins/npm/package.json index 9ad6cf16e..e32c7ad92 100644 --- a/plugins/npm/package.json +++ b/plugins/npm/package.json @@ -42,6 +42,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/pa11y/package.json b/plugins/pa11y/package.json index 3930f10df..bb592f79a 100644 --- a/plugins/pa11y/package.json +++ b/plugins/pa11y/package.json @@ -28,7 +28,7 @@ ".toolkitrc.yml" ], "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" }, "devDependencies": { "@types/pa11y": "^5.3.4" diff --git a/plugins/prettier/package.json b/plugins/prettier/package.json index 9e917034e..5a28a1a05 100644 --- a/plugins/prettier/package.json +++ b/plugins/prettier/package.json @@ -40,6 +40,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/secret-squirrel/package.json b/plugins/secret-squirrel/package.json index eb3cccd2c..2bf7c01a1 100644 --- a/plugins/secret-squirrel/package.json +++ b/plugins/secret-squirrel/package.json @@ -22,7 +22,7 @@ ], "peerDependencies": { "@financial-times/secret-squirrel": "2.x", - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" }, "dependencies": { "@dotcom-tool-kit/logger": "^2.2.1", diff --git a/plugins/serverless/package.json b/plugins/serverless/package.json index 92578b426..0c7bdb3a6 100644 --- a/plugins/serverless/package.json +++ b/plugins/serverless/package.json @@ -21,7 +21,7 @@ ".toolkitrc.yml" ], "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "serverless-offline": "^12.0.4" }, "dependencies": { diff --git a/plugins/typescript/package.json b/plugins/typescript/package.json index e79976e9a..681fcb5b8 100644 --- a/plugins/typescript/package.json +++ b/plugins/typescript/package.json @@ -21,7 +21,7 @@ ".toolkitrc.yml" ], "peerDependencies": { - "dotcom-tool-kit": "2.x", + "dotcom-tool-kit": "^2.6.0", "typescript": "3.x || 4.x" }, "dependencies": { diff --git a/plugins/upload-assets-to-s3/package.json b/plugins/upload-assets-to-s3/package.json index a116757d3..8b816fecc 100644 --- a/plugins/upload-assets-to-s3/package.json +++ b/plugins/upload-assets-to-s3/package.json @@ -41,6 +41,6 @@ "extends": "../../package.json" }, "peerDependencies": { - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" } } diff --git a/plugins/webpack/package.json b/plugins/webpack/package.json index de9186d63..c8ed2263c 100644 --- a/plugins/webpack/package.json +++ b/plugins/webpack/package.json @@ -25,7 +25,7 @@ }, "peerDependencies": { "webpack": "4.x.x || 5.x.x", - "dotcom-tool-kit": "2.x" + "dotcom-tool-kit": "^2.6.0" }, "devDependencies": { "@jest/globals": "^27.4.6",