dotcom-tool-kit 2.3.5 → 2.4.0

package/lib/config.d.ts

@@ -23,7 +23,7 @@ export interface RawConfig {
         [id: string]: PluginOptions | Conflict<PluginOptions> | undefined;
     };
     hooks: {
-        [id: string]: Hook | Conflict<Hook>;
+        [id: string]: Hook<unknown> | Conflict<Hook<unknown>>;
     };
 }
 export declare type ValidPluginsConfig = Omit<RawConfig, 'plugins'> & {
@@ -42,7 +42,7 @@ export interface ValidConfig extends ValidPluginsConfig {
         [id: string]: PluginOptions;
     };
     hooks: {
-        [id: string]: Hook;
+        [id: string]: Hook<unknown>;
     };
 }
 export declare const createConfig: () => RawConfig;

package/lib/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAA+C,MAAM,YAAY,CAAA;AAElF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAgB,MAAM,EAAmB,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAY1G,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;KAAE,CAAA;IAC5C,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAA;KAAE,CAAA;IACxD,SAAS,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAA;IAC1D,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,SAAS,CAAA;KAAE,CAAA;IAC9E,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;KAAE,CAAA;CAC/C;AAED,oBAAY,kBAAkB,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG;IAC5D,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAClC,CAAA;AAED,MAAM,WAAW,WAAY,SAAQ,kBAAkB;IACrD,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IAClC,SAAS,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAA;IACrC,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAA;IACxC,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAC9B;AAID,eAAO,MAAM,YAAY,QAAO,SAQ9B,CAAA;AAQF,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,CAuFxF;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAKhF;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrE;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAC/F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAErC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEtC,OAAO,EAAE,QAAQ,EAA+C,MAAM,YAAY,CAAA;AAElF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAgB,MAAM,EAAmB,SAAS,EAAE,MAAM,wBAAwB,CAAA;AAY1G,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;KAAE,CAAA;IAC5C,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAA;KAAE,CAAA;IACxD,SAAS,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;KAAE,CAAA;IAC1D,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,SAAS,CAAA;KAAE,CAAA;IAC9E,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAA;KAAE,CAAA;CACjE;AAED,oBAAY,kBAAkB,GAAG,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG;IAC5D,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CAClC,CAAA;AAED,MAAM,WAAW,WAAY,SAAQ,kBAAkB;IACrD,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAA;IAClC,SAAS,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAA;IACrC,OAAO,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAA;IACxC,KAAK,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAA;KAAE,CAAA;CACvC;AAID,eAAO,MAAM,YAAY,QAAO,SAQ9B,CAAA;AAQF,wBAAgB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,CAuFxF;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAKhF;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAWrE;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,IAAI,CAAA;CAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAC/F,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA"}

package/lib/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACrC,OAAO,EAAc,WAAW,EAAE,MAAM,UAAU,CAAA;AAGlD,wBAA8B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAqC/E"}
+{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACrC,OAAO,EAAc,WAAW,EAAE,MAAM,UAAU,CAAA;AAalD,wBAA8B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CA2D/E"}

package/lib/install.js

@@ -1,25 +1,59 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const error_1 = require("@dotcom-tool-kit/error");
 const options_1 = require("@dotcom-tool-kit/options");
+const groupBy_1 = (0, tslib_1.__importDefault)(require("lodash/groupBy"));
 const config_1 = require("./config");
 const postInstall_1 = require("./postInstall");
+// implementation of the Array.some method that supports asynchronous predicates
+async function asyncSome(arr, pred) {
+    for (const val of arr) {
+        if (await pred(val)) {
+            return true;
+        }
+    }
+    return false;
+}
 async function installHooks(logger) {
     const config = await (0, config_1.loadConfig)(logger);
-    const tasks = Object.values(config.hooks).map((hook) => async () => {
-        if (!(await hook.check())) {
-            await hook.install();
-        }
-    });
     for (const pluginOptions of Object.values(config.options)) {
         if (pluginOptions.forPlugin) {
             (0, options_1.setOptions)(pluginOptions.forPlugin.id, pluginOptions.options);
         }
     }
     const errors = [];
-    for (const task of tasks) {
+    // HACK: achieve backwards compatibility with older versions of the circleci
+    // plugin that required a postinstall function to run instead of the new
+    // commitInstall method. remove in major update of cli.
+    let usesNewCircleCIGroup = false;
+    // group hooks without an installGroup separately so that their check()
+    // method runs independently
+    const groups = (0, groupBy_1.default)(config.hooks, (hook) => { var _a; return (_a = hook.installGroup) !== null && _a !== void 0 ? _a : '__' + hook.id; });
+    for (const [groupId, group] of Object.entries(groups)) {
         try {
-            await task();
+            if (await asyncSome(group, async (hook) => !(await hook.check()))) {
+                let state = undefined;
+                for (const hook of group) {
+                    state = await hook.install(state);
+                }
+                if (state) {
+                    if (groupId === 'circleci') {
+                        usesNewCircleCIGroup = true;
+                    }
+                    try {
+                        await group[0].commitInstall(state);
+                    }
+                    catch (err) {
+                        if (err instanceof Error) {
+                            errors.push(err);
+                        }
+                        else {
+                            throw err;
+                        }
+                    }
+                }
+            }
         }
         catch (err) {
             if (err instanceof Error) {
@@ -30,8 +64,9 @@ async function installHooks(logger) {
             }
         }
     }
-    // Hack: for now we will do a postinstall, later we shall refactor circleciconfighook so we dont need to postinstall
-    await (0, postInstall_1.postInstall)(logger);
+    if (!usesNewCircleCIGroup) {
+        await (0, postInstall_1.postInstall)(logger);
+    }
     if (errors.length) {
         const error = new error_1.ToolKitError('could not automatically install hooks:');
         error.details = errors.map((error) => `- ${error.message}`).join('\n');

package/lib/messages.d.ts

@@ -3,12 +3,12 @@ import type { Conflict } from './conflict';
 import type { HookTask } from './hook';
 import type { Plugin, Hook, TaskClass } from '@dotcom-tool-kit/types';
 export declare const formatTaskConflicts: (conflicts: Conflict<TaskClass>[]) => string;
-export declare const formatHookConflicts: (conflicts: Conflict<Hook>[]) => string;
+export declare const formatHookConflicts: (conflicts: Conflict<Hook<unknown>>[]) => string;
 export declare const formatHookTaskConflicts: (conflicts: Conflict<HookTask>[]) => string;
 export declare const formatOptionConflicts: (conflicts: Conflict<PluginOptions>[]) => string;
 export declare const formatUndefinedHookTasks: (undefinedHooks: HookTask[], definedHooks: string[]) => string;
 export declare const formatUnusedOptions: (unusedOptions: string[], definedPlugins: string[]) => string;
-export declare const formatUninstalledHooks: (uninstalledHooks: Hook[]) => string;
+export declare const formatUninstalledHooks: (uninstalledHooks: Hook<unknown>[]) => string;
 declare type Missing = {
     hook: HookTask;
     tasks: string[];

package/lib/messages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEtC,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AASrE,eAAO,MAAM,mBAAmB,cAAe,SAAS,SAAS,CAAC,EAAE,KAAG,MAKE,CAAA;AASzE,eAAO,MAAM,mBAAmB,cAAe,SAAS,IAAI,CAAC,EAAE,KAAG,MAKO,CAAA;AAazE,eAAO,MAAM,uBAAuB,cAAe,SAAS,QAAQ,CAAC,EAAE,KAAG,MAQzE,CAAA;AAOD,eAAO,MAAM,qBAAqB,cAAe,SAAS,aAAa,CAAC,EAAE,KAAG,MAU5E,CAAA;AAMD,eAAO,MAAM,wBAAwB,mBACnB,QAAQ,EAAE,gBACZ,MAAM,EAAE,KACrB,MAWF,CAAA;AAED,eAAO,MAAM,mBAAmB,kBACf,MAAM,EAAE,kBACP,MAAM,EAAE,KACvB,MAWF,CAAA;AAED,eAAO,MAAM,sBAAsB,qBACf,IAAI,EAAE,KACvB,MAKF,CAAA;AAED,aAAK,OAAO,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAOlD,eAAO,MAAM,kBAAkB,iBACf,OAAO,EAAE,SAChB,MAAM,EAAE,KACd,MAOF,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAezD"}
+{"version":3,"file":"messages.d.ts","sourceRoot":"","sources":["../src/messages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEtC,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AASrE,eAAO,MAAM,mBAAmB,cAAe,SAAS,SAAS,CAAC,EAAE,KAAG,MAKE,CAAA;AASzE,eAAO,MAAM,mBAAmB,cAAe,SAAS,KAAK,OAAO,CAAC,CAAC,EAAE,KAAG,MAKF,CAAA;AAazE,eAAO,MAAM,uBAAuB,cAAe,SAAS,QAAQ,CAAC,EAAE,KAAG,MAQzE,CAAA;AAOD,eAAO,MAAM,qBAAqB,cAAe,SAAS,aAAa,CAAC,EAAE,KAAG,MAU5E,CAAA;AAMD,eAAO,MAAM,wBAAwB,mBACnB,QAAQ,EAAE,gBACZ,MAAM,EAAE,KACrB,MAWF,CAAA;AAED,eAAO,MAAM,mBAAmB,kBACf,MAAM,EAAE,kBACP,MAAM,EAAE,KACvB,MAWF,CAAA;AAED,eAAO,MAAM,sBAAsB,qBACf,KAAK,OAAO,CAAC,EAAE,KAChC,MAKF,CAAA;AAED,aAAK,OAAO,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAA;AAOlD,eAAO,MAAM,kBAAkB,iBACf,OAAO,EAAE,SAChB,MAAM,EAAE,KACd,MAOF,CAAA;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAezD"}

package/lib/plugin.js

@@ -4,7 +4,7 @@ exports.resolvePlugin = exports.loadPlugin = exports.validatePlugin = void 0;
 const tslib_1 = require("tslib");
 const logger_1 = require("@dotcom-tool-kit/logger");
 const types_1 = require("@dotcom-tool-kit/types");
-const lodash_isplainobject_1 = (0, tslib_1.__importDefault)(require("lodash.isplainobject"));
+const isPlainObject_1 = (0, tslib_1.__importDefault)(require("lodash/isPlainObject"));
 const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
 const conflict_1 = require("./conflict");
 const rc_file_1 = require("./rc-file");
@@ -38,7 +38,7 @@ function validatePlugin(plugin) {
         }
     }
     if (rawPlugin.hooks) {
-        if (!(0, lodash_isplainobject_1.default)(rawPlugin.hooks)) {
+        if (!(0, isPlainObject_1.default)(rawPlugin.hooks)) {
             errors.push(`the exported ${logger_1.styles.code('hooks')} value from this plugin is not an object`);
         }
         else {

package/lib/postInstall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postInstall.d.ts","sourceRoot":"","sources":["../src/postInstall.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAGrC;;;GAGG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgC/D"}
+{"version":3,"file":"postInstall.d.ts","sourceRoot":"","sources":["../src/postInstall.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAGrC;;;GAGG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuC/D"}

package/lib/postInstall.js

@@ -6,7 +6,7 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const fs_1 = require("fs");
 const npm_1 = require("@dotcom-tool-kit/types/lib/npm");
 const YAML = (0, tslib_1.__importStar)(require("yaml"));
-const lodash_merge_1 = (0, tslib_1.__importDefault)(require("lodash.merge"));
+const merge_1 = (0, tslib_1.__importDefault)(require("lodash/merge"));
 const circleci_1 = require("@dotcom-tool-kit/types/lib/circleci");
 /**
  * This step adds the tags only filter to rest of the jobs in the workflow if there is a job that contains the semverRegex.
@@ -16,7 +16,9 @@ async function postInstall(logger) {
     const circleConfigPath = path_1.default.resolve(process.cwd(), '.circleci/config.yml');
     try {
         const rawCircleConfig = await fs_1.promises.readFile(circleConfigPath, 'utf8');
-        if (rawCircleConfig && rawCircleConfig.includes(npm_1.semVerRegex.source) && rawCircleConfig.startsWith(circleci_1.automatedComment)) {
+        if (rawCircleConfig &&
+            rawCircleConfig.includes(npm_1.semVerRegex.source) &&
+            rawCircleConfig.startsWith(circleci_1.automatedComment)) {
             logger.verbose('running postInstall step');
             const yml = YAML.parseDocument(rawCircleConfig);
             const workflows = yml.get('workflows');
@@ -24,14 +26,15 @@ async function postInstall(logger) {
             const jobs = toolkitWorkflow.get('jobs');
             jobs === null || jobs === void 0 ? void 0 : jobs.items.forEach((jobItem, index) => {
                 const tagsFilterConfig = { filters: { tags: { only: `${npm_1.semVerRegex}` } } };
-                if (jobItem.type === 'PLAIN') { // eg. - checkout
+                if (jobItem.type === 'PLAIN') {
+                    // eg. - checkout
                     const node = YAML.createNode({ [jobItem.value]: tagsFilterConfig });
                     jobs.items[index] = node;
                 }
                 else {
                     const job = jobItem.items[0];
                     const existingFilter = job.value.items.filter((item) => item.key.value === 'filters')[0];
-                    const merged = existingFilter ? (0, lodash_merge_1.default)(existingFilter.toJSON(), tagsFilterConfig) : tagsFilterConfig;
+                    const merged = existingFilter ? (0, merge_1.default)(existingFilter.toJSON(), tagsFilterConfig) : tagsFilterConfig;
                     const node = YAML.createNode(merged['filters']);
                     job.value.set('filters', node);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotcom-tool-kit",
-  "version": "2.3.5",
+  "version": "2.4.0",
   "description": "modern, maintainable, modular developer tooling for FT.com projects",
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "MIT",
@@ -21,35 +21,37 @@
   },
   "devDependencies": {
     "@jest/globals": "^27.4.6",
+    "@types/lodash.groupby": "^4.6.7",
     "@types/lodash.merge": "^4.6.6",
     "@types/node": "^12.20.24",
-    "@dotcom-tool-kit/backend-app": "^2.0.11",
-    "@dotcom-tool-kit/heroku": "^2.0.10",
-    "@dotcom-tool-kit/webpack": "^2.1.7",
-    "@dotcom-tool-kit/babel": "^2.0.8",
-    "@dotcom-tool-kit/circleci": "^2.1.6",
-    "@dotcom-tool-kit/npm": "^2.0.9",
-    "@dotcom-tool-kit/circleci-heroku": "^2.0.11",
-    "@dotcom-tool-kit/frontend-app": "^2.1.9",
-    "@dotcom-tool-kit/eslint": "^2.2.1",
-    "@dotcom-tool-kit/mocha": "^2.1.5",
-    "@dotcom-tool-kit/n-test": "^2.1.3",
+    "@dotcom-tool-kit/backend-app": "^2.0.13",
+    "@dotcom-tool-kit/heroku": "^2.1.1",
+    "@dotcom-tool-kit/webpack": "^2.1.9",
+    "@dotcom-tool-kit/babel": "^2.0.10",
+    "@dotcom-tool-kit/circleci": "^3.0.0",
+    "@dotcom-tool-kit/npm": "^2.0.11",
+    "@dotcom-tool-kit/circleci-heroku": "^2.1.0",
+    "@dotcom-tool-kit/frontend-app": "^2.1.11",
+    "@dotcom-tool-kit/eslint": "^2.2.3",
+    "@dotcom-tool-kit/mocha": "^2.1.7",
+    "@dotcom-tool-kit/n-test": "^2.1.5",
     "chai": "^4.3.4",
     "globby": "^10.0.2",
     "ts-node": "^8.10.2",
     "winston": "^3.5.1"
   },
   "dependencies": {
-    "@dotcom-tool-kit/error": "^2.0.0",
-    "@dotcom-tool-kit/logger": "^2.1.1",
-    "@dotcom-tool-kit/options": "^2.0.8",
-    "@dotcom-tool-kit/types": "^2.6.1",
-    "@dotcom-tool-kit/wait-for-ok": "^2.0.0",
+    "@dotcom-tool-kit/error": "^2.0.1",
+    "@dotcom-tool-kit/logger": "^2.1.2",
+    "@dotcom-tool-kit/options": "^2.0.10",
+    "@dotcom-tool-kit/types": "^2.7.0",
+    "@dotcom-tool-kit/wait-for-ok": "^2.0.1",
     "cosmiconfig": "^7.0.0",
+    "lodash.groupby": "^4.6.0",
     "lodash.merge": "^4.6.2",
     "minimist": "^1.2.5",
     "resolve-from": "^5.0.0",
-    "tslib": "^1.14.1",
+    "tslib": "^2.3.1",
     "yaml": "^1.10.2"
   },
   "engines": {