@takeshape/cli 10.2.0 → 10.2.4

package/dist/commands/branch/commands/merge.js

@@ -72,7 +72,7 @@ const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, par
         projectId,
         ...baseInput
       });
-      if (!(baseQueryResult !== null && baseQueryResult !== void 0 && baseQueryResult.latestVersion)) {
+      if (!baseQueryResult?.latestVersion) {
         return (0, _fatalError.fatalError)('Base branch does not exist');
       }
       const {
@@ -88,7 +88,7 @@ const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, par
         projectId,
         ...head
       });
-      if (!(parentQueryResult !== null && parentQueryResult !== void 0 && parentQueryResult.parentVersion)) {
+      if (!parentQueryResult?.parentVersion) {
         return (0, _fatalError.fatalError)('Head branch does not exist');
       }
       base = parentQueryResult.parentVersion;
@@ -101,7 +101,7 @@ const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, par
       ...base
     };
     const branchQueryResult = await getBranchQuery(client, targetParams);
-    if (!(branchQueryResult !== null && branchQueryResult !== void 0 && branchQueryResult.latestVersion)) {
+    if (!branchQueryResult?.latestVersion) {
       return (0, _fatalError.fatalError)('Target branch does not exist');
     }
     const target = branchQueryResult.latestVersion;

package/dist/commands/link.js

@@ -20,9 +20,8 @@ var _default = (0, _linkedCommand.loggedInCommand)(async (_, params) => {
     const sites = await (0, _data.fetchSites)(params, project.value);
     let site;
     if (sites.length) {
-      var _site;
       site = await (0, _prompt.promptList)('Select a site:', sites);
-      if (((_site = site) === null || _site === void 0 ? void 0 : _site.value) === 'NONE') {
+      if (site?.value === 'NONE') {
         site = undefined;
       }
     }

package/dist/commands/validate.js

@@ -35,7 +35,6 @@ const validate = async (cli, params) => {
     let project;
     if (params.authToken) {
       try {
-        var _response$data;
         const client = (0, _graphql.createAdminConnector)(params, params.authToken, {
           environment: 'PRODUCTION',
           projectId: schema.projectId
@@ -46,7 +45,7 @@ const validate = async (cli, params) => {
             id: schema.projectId
           }
         });
-        project = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.project;
+        project = response.data?.project;
       } catch {
         // Eat the error and use default entitlements
       }

package/dist/config.js

@@ -75,8 +75,8 @@ async function writeLinkedProjectConfig(params, linkedApiKey, project, site) {
   const graphqlEndpoint = (0, _graphql.getGraphQLEndpoint)(params, project.value);
   const takeshaperc = {
     projectId: project.value,
-    siteId: site === null || site === void 0 ? void 0 : site.value,
-    siteName: site === null || site === void 0 ? void 0 : site.name,
+    siteId: site?.value,
+    siteName: site?.name,
     endpoint: params.endpoint,
     appUrl: params.appUrl,
     projectName: project.name,

package/dist/util/api.js

@@ -33,11 +33,10 @@ function getAuthHeader(authToken) {
   };
 }
 async function api(params, method, path, body) {
-  var _params$linkedApiKey;
   const requestParams = {
     method,
     headers: {
-      ...getAuthHeader(params.authToken ?? ((_params$linkedApiKey = params.linkedApiKey) === null || _params$linkedApiKey === void 0 ? void 0 : _params$linkedApiKey.apiKey)),
+      ...getAuthHeader(params.authToken ?? params.linkedApiKey?.apiKey),
       'Content-Type': 'application/json'
     }
   };

package/dist/util/connector.js

@@ -12,5 +12,5 @@ function createConnector(params, branchParams, options) {
     ...branchParams,
     projectId: params.projectId
   }, options));
-  return options !== null && options !== void 0 && options.cache ? (0, _cachedConnector.connectorWithCache)(connector) : connector;
+  return options?.cache ? (0, _cachedConnector.connectorWithCache)(connector) : connector;
 }

package/dist/util/data.js

@@ -55,7 +55,7 @@ async function fetchProjects(params) {
     } = await client({
       query: projectListQuery
     });
-    return data.projects.filter(p => (p === null || p === void 0 ? void 0 : p.invite) === null);
+    return data.projects.filter(p => p?.invite === null);
   } catch (e) {
     throw (0, _errors.formatErrorMessage)(e, 'fetching your projects');
   }

package/dist/util/runner.js

@@ -22,7 +22,7 @@ function createRunner(name, task) {
         const {
           warnings
         } = stats;
-        if (warnings !== null && warnings !== void 0 && warnings.length) {
+        if (warnings?.length) {
           (0, _log.default)(`${name} - ` + _chalk.default.yellow('Warnings:'));
           warnings.forEach(warning => {
             (0, _log.default)(_chalk.default.yellow(`${warning.source}: ${warning.message}`));

package/dist/util/spin.js

@@ -19,7 +19,7 @@ async function spin(spinQuery) {
     case 'timeout':
       throw new Error('Export timed out');
     case 'error':
-      if (res !== null && res !== void 0 && res.message) {
+      if (res?.message) {
         throw new Error(res.message);
       } else {
         throw new Error('An unknown error occurred');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/cli",
-  "version": "10.2.0",
+  "version": "10.2.4",
   "description": "TakeShape CLI",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -54,15 +54,15 @@
     "semver": "^6.3.0",
     "stream-to-promise": "^2.2.0",
     "tmp": "^0.0.33",
-    "@takeshape/branches": "10.2.0",
-    "@takeshape/ssg": "10.2.0",
-    "@takeshape/schema": "10.2.0",
-    "@takeshape/streams": "10.2.0",
-    "@takeshape/util": "10.2.0"
+    "@takeshape/branches": "10.2.4",
+    "@takeshape/schema": "10.2.4",
+    "@takeshape/ssg": "10.2.4",
+    "@takeshape/streams": "10.2.4",
+    "@takeshape/util": "10.2.4"
   },
   "devDependencies": {
     "@types/archiver": "^3.1.0",
-    "@types/async-retry": "^1.4.2",
+    "@types/async-retry": "^1.4.8",
     "@types/fs-extra": "^8.1.0",
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^7.3.1",
@@ -80,10 +80,10 @@
     "graphql": "16.6.0",
     "nock": "^13.2.9",
     "unzipper": "^0.10.11",
-    "@takeshape/typescript-jest-junit-reporter": "10.2.0"
+    "@takeshape/typescript-jest-junit-reporter": "10.2.4"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:js && pnpm build:copy",