@strapi/cloud-cli 0.0.0-next.7466630056657c483fb286557dda890490597807 → 0.0.0-next.7f1333f1967e625c57ab16648c057aea08c9dddb

package/dist/index.mjs

@@ -20,8 +20,8 @@ import ora from "ora";
 import * as cliProgress from "cli-progress";
 import pkgUp from "pkg-up";
 import * as yup from "yup";
-import _ from "lodash";
 import EventSource from "eventsource";
+import { createCommand } from "commander";
 const apiConfig = {
   apiBaseUrl: env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
   dashboardBaseUrl: env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
@@ -134,7 +134,7 @@ async function saveLocalConfig(data) {
   await fse__default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
 }
 const name = "@strapi/cloud-cli";
-const version = "4.25.7";
+const version = "5.0.2-beta.0";
 const description = "Commands to interact with the Strapi Cloud";
 const keywords = [
   "strapi",
@@ -179,14 +179,14 @@ const scripts = {
   watch: "pack-up watch"
 };
 const dependencies = {
-  "@strapi/utils": "4.25.7",
-  axios: "1.6.0",
+  "@strapi/utils": "workspace:*",
+  axios: "1.7.4",
   chalk: "4.1.2",
   "cli-progress": "3.12.0",
   commander: "8.3.0",
   eventsource: "2.0.2",
   "fast-safe-stringify": "2.1.1",
-  "fs-extra": "10.0.0",
+  "fs-extra": "11.2.0",
   inquirer: "8.2.5",
   jsonwebtoken: "9.0.0",
   "jwks-rsa": "3.1.0",
@@ -195,7 +195,7 @@ const dependencies = {
   open: "8.4.0",
   ora: "5.4.1",
   "pkg-up": "3.1.0",
-  tar: "6.1.13",
+  tar: "6.2.1",
   "xdg-app-paths": "8.3.0",
   yup: "0.32.9"
 };
@@ -204,8 +204,8 @@ const devDependencies = {
   "@types/cli-progress": "3.11.5",
   "@types/eventsource": "1.1.15",
   "@types/lodash": "^4.14.191",
-  "eslint-config-custom": "4.25.7",
-  tsconfig: "4.25.7"
+  "eslint-config-custom": "workspace:*",
+  tsconfig: "workspace:*"
 };
 const engines = {
   node: ">=18.0.0 <=20.x.x",
@@ -317,7 +317,7 @@ async function cloudApiFactory({ logger }, token) {
     },
     async listLinkProjects() {
       try {
-        const response = await axiosCloudAPI.get("/projects/linkable");
+        const response = await axiosCloudAPI.get("/projects-linkable");
         if (response.status !== 200) {
           throw new Error("Error fetching cloud projects from the server.");
         }
@@ -329,6 +329,20 @@ async function cloudApiFactory({ logger }, token) {
         throw error;
       }
     },
+    async getProject({ name: name2 }) {
+      try {
+        const response = await axiosCloudAPI.get(`/projects/${name2}`);
+        if (response.status !== 200) {
+          throw new Error("Error fetching project's details.");
+        }
+        return response;
+      } catch (error) {
+        logger.debug(
+          "🥲 Oops! There was a problem retrieving your project's details. Please try again."
+        );
+        throw error;
+      }
+    },
     track(event, payload = {}) {
       return axiosCloudAPI.post("/track", {
         event,
@@ -602,21 +616,24 @@ yup.object({
   name: yup.string().required(),
   exports: yup.lazy(
     (value) => yup.object(
-      typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
-        if (typeof value2 === "object") {
-          acc[key] = yup.object({
-            types: yup.string().optional(),
-            source: yup.string().required(),
-            module: yup.string().optional(),
-            import: yup.string().required(),
-            require: yup.string().required(),
-            default: yup.string().required()
-          }).noUnknown(true);
-        } else {
-          acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
-        }
-        return acc;
-      }, {}) : void 0
+      typeof value === "object" ? Object.entries(value).reduce(
+        (acc, [key, value2]) => {
+          if (typeof value2 === "object") {
+            acc[key] = yup.object({
+              types: yup.string().optional(),
+              source: yup.string().required(),
+              module: yup.string().optional(),
+              import: yup.string().required(),
+              require: yup.string().required(),
+              default: yup.string().required()
+            }).noUnknown(true);
+          } else {
+            acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
+          }
+          return acc;
+        },
+        {}
+      ) : void 0
     ).optional()
   )
 });
@@ -638,18 +655,6 @@ async function getProjectNameFromPackageJson(ctx) {
     return "my-strapi-project";
   }
 }
-function applyDefaultName(newDefaultName, questions, defaultValues) {
-  const newDefaultValues = _.cloneDeep(defaultValues);
-  newDefaultValues.name = newDefaultName;
-  const newQuestions = questions.map((question) => {
-    const questionCopy = _.cloneDeep(question);
-    if (questionCopy.name === "name") {
-      questionCopy.default = newDefaultName;
-    }
-    return questionCopy;
-  });
-  return { newQuestions, newDefaultValues };
-}
 const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
   try {
     await cloudApiService.track(eventName, eventData);
@@ -813,6 +818,45 @@ async function loginAction(ctx) {
   await authenticate();
   return isAuthenticated;
 }
+function questionDefaultValuesMapper(questionsMap) {
+  return (questions) => {
+    return questions.map((question) => {
+      const questionName = question.name;
+      if (questionName in questionsMap) {
+        const questionDefault = questionsMap[questionName];
+        if (typeof questionDefault === "function") {
+          return {
+            ...question,
+            default: questionDefault(question)
+          };
+        }
+        return {
+          ...question,
+          default: questionDefault
+        };
+      }
+      return question;
+    });
+  };
+}
+function getDefaultsFromQuestions(questions) {
+  return questions.reduce((acc, question) => {
+    if (question.default && question.name) {
+      return { ...acc, [question.name]: question.default };
+    }
+    return acc;
+  }, {});
+}
+function getProjectNodeVersionDefault(question) {
+  const currentNodeVersion = process.versions.node.split(".")[0];
+  if (question.type === "list" && Array.isArray(question.choices)) {
+    const choice = question.choices.find((choice2) => choice2.value === currentNodeVersion);
+    if (choice) {
+      return choice.value;
+    }
+  }
+  return question.default;
+}
 async function handleError(ctx, error) {
   const { logger } = ctx;
   logger.debug(error);
@@ -866,11 +910,16 @@ const action$4 = async (ctx) => {
   }
   const cloudApi = await cloudApiFactory(ctx, token);
   const { data: config } = await cloudApi.config();
-  const { newQuestions: questions, newDefaultValues: defaultValues } = applyDefaultName(
-    await getProjectNameFromPackageJson(ctx),
-    config.projectCreation.questions,
-    config.projectCreation.defaults
-  );
+  const projectName = await getProjectNameFromPackageJson(ctx);
+  const defaultAnswersMapper = questionDefaultValuesMapper({
+    name: projectName,
+    nodeVersion: getProjectNodeVersionDefault
+  });
+  const questions = defaultAnswersMapper(config.projectCreation.questions);
+  const defaultValues = {
+    ...config.projectCreation.defaults,
+    ...getDefaultsFromQuestions(questions)
+  };
   const projectAnswersDefaulted = defaults(defaultValues);
   const projectAnswers = await inquirer.prompt(questions);
   const projectInput = projectAnswersDefaulted(projectAnswers);
@@ -1047,17 +1096,7 @@ async function upload(ctx, project, token, maxProjectFileSize) {
       return data.build_id;
     } catch (e) {
       progressBar.stop();
-      if (e instanceof AxiosError && e.response?.data) {
-        if (e.response.status === 404) {
-          ctx.logger.warn(
-            `The project does not exist. Please link your local project to a Strapi Cloud project using the link command.`
-          );
-        } else {
-          ctx.logger.error(e.response.data);
-        }
-      } else {
-        ctx.logger.error("An error occurred while deploying the project. Please try again later.");
-      }
+      ctx.logger.error("An error occurred while deploying the project. Please try again later.");
       ctx.logger.debug(e);
     } finally {
       await fse__default.remove(tarFilePath);
@@ -1104,7 +1143,39 @@ const action$3 = async (ctx) => {
   if (!project) {
     return;
   }
-  const cloudApiService = await cloudApiFactory(ctx);
+  const cloudApiService = await cloudApiFactory(ctx, token);
+  try {
+    const {
+      data: { data: projectData, metadata }
+    } = await cloudApiService.getProject({ name: project.name });
+    const isProjectSuspended = projectData.suspendedAt;
+    if (isProjectSuspended) {
+      ctx.logger.log(
+        "\n Oops! This project has been suspended. \n\n Please reactivate it from the dashboard to continue deploying: "
+      );
+      ctx.logger.log(chalk.underline(`${metadata.dashboardUrls.project}`));
+      return;
+    }
+  } catch (e) {
+    if (e instanceof AxiosError && e.response?.data) {
+      if (e.response.status === 404) {
+        ctx.logger.warn(
+          `The project associated with this folder does not exist in Strapi Cloud. 
+Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
+            "link"
+          )} command before deploying.`
+        );
+      } else {
+        ctx.logger.error(e.response.data);
+      }
+    } else {
+      ctx.logger.error(
+        "An error occurred while retrieving the project's information. Please try again later."
+      );
+    }
+    ctx.logger.debug(e);
+    return;
+  }
   await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
     projectInternalName: project.name
   });
@@ -1113,7 +1184,7 @@ const action$3 = async (ctx) => {
   const cliConfig2 = await getConfig({ ctx, cloudApiService });
   if (!cliConfig2) {
     ctx.logger.error(
-      "An error occurred while retrieving data from Strapi Cloud. Please try check your network or again later."
+      "An error occurred while retrieving data from Strapi Cloud. Please check your network or try again later."
     );
     return;
   }
@@ -1173,8 +1244,8 @@ const runAction = (name2, action2) => (...args) => {
     process.exit(1);
   });
 };
-const command$5 = ({ command: command2, ctx }) => {
-  command2.command("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("deploy", action$3)(ctx));
+const command$5 = ({ ctx }) => {
+  return createCommand("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("deploy", action$3)(ctx));
 };
 const deployProject = {
   name: "deploy-project",
@@ -1328,8 +1399,8 @@ const link = {
   action: action$2,
   command: command$4
 };
-const command$3 = ({ command: command2, ctx }) => {
-  command2.command("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
+const command$3 = ({ ctx }) => {
+  return createCommand("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
     "after",
     "\nAfter running this command, you will be prompted to enter your authentication information."
   ).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", loginAction)(ctx));
@@ -1373,8 +1444,8 @@ const action$1 = async (ctx) => {
   }
   await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
 };
-const command$2 = ({ command: command2, ctx }) => {
-  command2.command("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action$1)(ctx));
+const command$2 = ({ ctx }) => {
+  return createCommand("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action$1)(ctx));
 };
 const logout = {
   name: "logout",
@@ -1382,8 +1453,8 @@ const logout = {
   action: action$1,
   command: command$2
 };
-const command$1 = ({ command: command2, ctx }) => {
-  command2.command("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$4)(ctx));
+const command$1 = ({ ctx }) => {
+  return createCommand("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$4)(ctx));
 };
 const createProject = {
   name: "create-project",
@@ -1444,7 +1515,10 @@ async function buildStrapiCloudCommands({
   await initCloudCLIConfig();
   for (const cloudCommand of cloudCommands) {
     try {
-      await cloudCommand.command({ command: command2, ctx, argv });
+      const subCommand = await cloudCommand.command({ command: command2, ctx, argv });
+      if (subCommand) {
+        command2.addCommand(subCommand);
+      }
     } catch (e) {
       console.error(`Failed to load command ${cloudCommand.name}`, e);
     }