dotcom-tool-kit 3.0.0 → 3.1.1

package/lib/config.js

@@ -25,7 +25,6 @@ async function asyncFilter(items, predicate) {
     return results.filter(({ keep }) => keep).map(({ item }) => item);
 }
 function validateConfig(config, logger) {
-    var _a;
     const validConfig = config;
     const hookTaskConflicts = (0, conflict_1.findConflicts)(Object.values(config.hookTasks));
     const hookConflicts = (0, conflict_1.findConflicts)(Object.values(config.hooks));
@@ -82,7 +81,7 @@ function validateConfig(config, logger) {
             logger.silly(`skipping validation of ${pluginId} plugin as no schema can be found`);
             continue;
         }
-        const result = pluginSchema.safeParse((_a = pluginOptions === null || pluginOptions === void 0 ? void 0 : pluginOptions.options) !== null && _a !== void 0 ? _a : {});
+        const result = pluginSchema.safeParse(pluginOptions?.options ?? {});
         if (result.success) {
             // Set up options entry for plugins that don't have options specified
             // explicitly. They could still have default options that are set by zod.

package/lib/index.js

@@ -77,7 +77,7 @@ exports.runTasks = runTasks;
 async function listPlugins(logger) {
     const config = await (0, config_1.loadConfig)(logger, { validate: false });
     const rootPlugin = config.plugins['app root'];
-    if (rootPlugin === null || rootPlugin === void 0 ? void 0 : rootPlugin.valid) {
+    if (rootPlugin?.valid) {
         logger.info((0, messages_1.formatPluginTree)(rootPlugin.value).join('\n'));
     }
 }

package/lib/install.js

@@ -29,7 +29,7 @@ async function installHooks(logger) {
     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; });
+    const groups = (0, groupBy_1.default)(config.hooks, (hook) => hook.installGroup ?? '__' + hook.id);
     for (const [groupId, group] of Object.entries(groups)) {
         try {
             if (await asyncSome(group, async (hook) => !(await hook.check()))) {

package/lib/messages.js

@@ -91,10 +91,9 @@ Available tasks are: ${tasks.map(logger_1.styles.task).join(', ')}.
 `;
 exports.formatMissingTasks = formatMissingTasks;
 function formatPluginTree(plugin) {
-    var _a;
     return [
         logger_1.styles.plugin(plugin.id),
-        ...((_a = plugin.children) !== null && _a !== void 0 ? _a : []).flatMap((child, childIndex, children) => formatPluginTree(child).map((line, lineIndex) => lineIndex === 0
+        ...(plugin.children ?? []).flatMap((child, childIndex, children) => formatPluginTree(child).map((line, lineIndex) => lineIndex === 0
             ? childIndex === children.length - 1
                 ? `└ ${line}`
                 : `├ ${line}`

package/lib/plugin.js

@@ -21,7 +21,6 @@ function isDescendent(possibleAncestor, possibleDescendent) {
 }
 const indentReasons = (reasons) => reasons.replace(/\n/g, '\n  ');
 function validatePlugin(plugin) {
-    var _a, _b;
     const errors = [];
     const rawPlugin = plugin;
     if (rawPlugin.tasks) {
@@ -54,7 +53,7 @@ function validatePlugin(plugin) {
         return { valid: false, reasons: errors };
     }
     else {
-        const pluginModule = { tasks: (_a = rawPlugin.tasks) !== null && _a !== void 0 ? _a : [], hooks: (_b = rawPlugin.hooks) !== null && _b !== void 0 ? _b : {} };
+        const pluginModule = { tasks: rawPlugin.tasks ?? [], hooks: rawPlugin.hooks ?? {} };
         return { valid: true, value: pluginModule };
     }
 }

package/lib/postInstall.js

@@ -24,7 +24,7 @@ async function postInstall(logger) {
             const workflows = yml.get('workflows');
             const toolkitWorkflow = workflows.get('tool-kit');
             const jobs = toolkitWorkflow.get('jobs');
-            jobs === null || jobs === void 0 ? void 0 : jobs.items.forEach((jobItem, index) => {
+            jobs?.items.forEach((jobItem, index) => {
                 const tagsFilterConfig = { filters: { tags: { only: `${npm_1.semVerRegex}` } } };
                 if (jobItem.type === 'PLAIN') {
                     // eg. - checkout

package/lib/rc-file.js

@@ -9,9 +9,8 @@ exports.explorer = (0, cosmiconfig_1.cosmiconfig)('toolkit', { ignoreEmptySearch
 const emptyConfig = { plugins: [], hooks: {}, options: {} };
 let rootConfig;
 async function loadToolKitRC(logger, root, isAppRoot) {
-    var _a, _b, _c;
     const result = await exports.explorer.search(root);
-    if (!(result === null || result === void 0 ? void 0 : result.config)) {
+    if (!result?.config) {
         return emptyConfig;
     }
     if (isAppRoot) {
@@ -26,9 +25,9 @@ async function loadToolKitRC(logger, root, isAppRoot) {
     }
     const config = result.config;
     return {
-        plugins: (_a = config.plugins) !== null && _a !== void 0 ? _a : [],
-        hooks: (_b = config.hooks) !== null && _b !== void 0 ? _b : {},
-        options: (_c = config.options) !== null && _c !== void 0 ? _c : {}
+        plugins: config.plugins ?? [],
+        hooks: config.hooks ?? {},
+        options: config.options ?? {}
     };
 }
 exports.loadToolKitRC = loadToolKitRC;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotcom-tool-kit",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "description": "modern, maintainable, modular developer tooling for FT.com projects",
   "author": "FT.com Platforms Team <platforms-team.customer-products@ft.com>",
   "license": "MIT",
@@ -20,17 +20,17 @@
     "test": "cd ../../ ; npx jest --silent --projects core/cli"
   },
   "devDependencies": {
-    "@dotcom-tool-kit/babel": "^3.0.0",
-    "@dotcom-tool-kit/backend-heroku-app": "^2.0.0",
-    "@dotcom-tool-kit/circleci": "^5.0.0",
-    "@dotcom-tool-kit/circleci-deploy": "^3.0.0",
-    "@dotcom-tool-kit/eslint": "^3.0.0",
-    "@dotcom-tool-kit/frontend-app": "^3.0.0",
-    "@dotcom-tool-kit/heroku": "^3.0.0",
-    "@dotcom-tool-kit/mocha": "^3.0.0",
-    "@dotcom-tool-kit/n-test": "^3.0.0",
-    "@dotcom-tool-kit/npm": "^3.0.0",
-    "@dotcom-tool-kit/webpack": "^3.0.0",
+    "@dotcom-tool-kit/babel": "^3.1.0",
+    "@dotcom-tool-kit/backend-heroku-app": "^2.1.1",
+    "@dotcom-tool-kit/circleci": "^5.1.1",
+    "@dotcom-tool-kit/circleci-deploy": "^3.1.1",
+    "@dotcom-tool-kit/eslint": "^3.1.0",
+    "@dotcom-tool-kit/frontend-app": "^3.1.1",
+    "@dotcom-tool-kit/heroku": "^3.1.0",
+    "@dotcom-tool-kit/mocha": "^3.1.0",
+    "@dotcom-tool-kit/n-test": "^3.1.0",
+    "@dotcom-tool-kit/npm": "^3.1.0",
+    "@dotcom-tool-kit/webpack": "^3.1.0",
     "@jest/globals": "^27.4.6",
     "@types/lodash": "^4.14.185",
     "@types/node": "^16.18.23",
@@ -40,11 +40,11 @@
     "winston": "^3.5.1"
   },
   "dependencies": {
-    "@dotcom-tool-kit/error": "^3.0.0",
-    "@dotcom-tool-kit/logger": "^3.0.0",
-    "@dotcom-tool-kit/options": "^3.0.0",
-    "@dotcom-tool-kit/types": "^3.0.0",
-    "@dotcom-tool-kit/wait-for-ok": "^3.0.0",
+    "@dotcom-tool-kit/error": "^3.1.0",
+    "@dotcom-tool-kit/logger": "^3.1.0",
+    "@dotcom-tool-kit/options": "^3.1.0",
+    "@dotcom-tool-kit/types": "^3.1.0",
+    "@dotcom-tool-kit/wait-for-ok": "^3.1.0",
     "cosmiconfig": "^7.0.0",
     "lodash": "^4.17.21",
     "minimist": "^1.2.5",
@@ -54,7 +54,8 @@
     "zod-validation-error": "^0.3.0"
   },
   "engines": {
-    "node": "16.x"
+    "node": "16.x || 18.x",
+    "npm": "7.x || 8.x || 9.x"
   },
   "files": [
     "/bin",