@strapi/cloud-cli 0.0.0-next.84f5cfd43cfdb85f000d388b196a36d874382dab → 0.0.0-next.a237dfc081ee4788ee5abb71a735161aebec0ee5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/index.js +397 -134
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.mjs +397 -131
  4. package/dist/index.mjs.map +1 -1
  5. package/dist/src/create-project/action.d.ts.map +1 -1
  6. package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts +3 -0
  7. package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts.map +1 -0
  8. package/dist/src/create-project/utils/project-questions.utils.d.ts +20 -0
  9. package/dist/src/create-project/utils/project-questions.utils.d.ts.map +1 -0
  10. package/dist/src/deploy-project/action.d.ts.map +1 -1
  11. package/dist/src/index.d.ts +2 -0
  12. package/dist/src/index.d.ts.map +1 -1
  13. package/dist/src/link/action.d.ts +4 -0
  14. package/dist/src/link/action.d.ts.map +1 -0
  15. package/dist/src/link/command.d.ts +7 -0
  16. package/dist/src/link/command.d.ts.map +1 -0
  17. package/dist/src/link/index.d.ts +7 -0
  18. package/dist/src/link/index.d.ts.map +1 -0
  19. package/dist/src/list-projects/action.d.ts +4 -0
  20. package/dist/src/list-projects/action.d.ts.map +1 -0
  21. package/dist/src/list-projects/command.d.ts +7 -0
  22. package/dist/src/list-projects/command.d.ts.map +1 -0
  23. package/dist/src/list-projects/index.d.ts +7 -0
  24. package/dist/src/list-projects/index.d.ts.map +1 -0
  25. package/dist/src/login/action.d.ts.map +1 -1
  26. package/dist/src/logout/action.d.ts.map +1 -1
  27. package/dist/src/services/build-logs.d.ts.map +1 -1
  28. package/dist/src/services/cli-api.d.ts +19 -7
  29. package/dist/src/services/cli-api.d.ts.map +1 -1
  30. package/dist/src/services/strapi-info-save.d.ts +1 -1
  31. package/dist/src/services/strapi-info-save.d.ts.map +1 -1
  32. package/dist/src/types.d.ts +1 -0
  33. package/dist/src/types.d.ts.map +1 -1
  34. package/dist/src/utils/analytics.d.ts +4 -0
  35. package/dist/src/utils/analytics.d.ts.map +1 -0
  36. package/dist/src/utils/compress-files.d.ts.map +1 -1
  37. package/dist/src/utils/pkg.d.ts.map +1 -1
  38. package/package.json +6 -5
  39. package/dist/src/utils/tests/compress-files.test.d.ts +0 -2
  40. package/dist/src/utils/tests/compress-files.test.d.ts.map +0 -1
package/dist/index.js CHANGED
@@ -29,7 +29,6 @@ const chalk = require("chalk");
29
29
  const axios = require("axios");
30
30
  const crypto = require("node:crypto");
31
31
  const utils = require("@strapi/utils");
32
- const fs = require("fs");
33
32
  const tar = require("tar");
34
33
  const minimatch = require("minimatch");
35
34
  const inquirer = require("inquirer");
@@ -41,10 +40,9 @@ const jwt = require("jsonwebtoken");
41
40
  const stringify = require("fast-safe-stringify");
42
41
  const ora = require("ora");
43
42
  const cliProgress = require("cli-progress");
44
- const EventSource = require("eventsource");
45
- const fs$1 = require("fs/promises");
46
43
  const pkgUp = require("pkg-up");
47
44
  const yup = require("yup");
45
+ const EventSource = require("eventsource");
48
46
  const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
49
47
  function _interopNamespace(e) {
50
48
  if (e && e.__esModule)
@@ -65,12 +63,11 @@ function _interopNamespace(e) {
65
63
  return Object.freeze(n);
66
64
  }
67
65
  const crypto__default = /* @__PURE__ */ _interopDefault(crypto$1);
68
- const fse__default = /* @__PURE__ */ _interopDefault(fse);
66
+ const fse__namespace = /* @__PURE__ */ _interopNamespace(fse);
69
67
  const path__namespace = /* @__PURE__ */ _interopNamespace(path);
70
68
  const chalk__default = /* @__PURE__ */ _interopDefault(chalk);
71
69
  const axios__default = /* @__PURE__ */ _interopDefault(axios);
72
70
  const crypto__namespace = /* @__PURE__ */ _interopNamespace(crypto);
73
- const fs__namespace = /* @__PURE__ */ _interopNamespace(fs);
74
71
  const tar__namespace = /* @__PURE__ */ _interopNamespace(tar);
75
72
  const inquirer__default = /* @__PURE__ */ _interopDefault(inquirer);
76
73
  const os__default = /* @__PURE__ */ _interopDefault(os);
@@ -80,10 +77,9 @@ const jwt__default = /* @__PURE__ */ _interopDefault(jwt);
80
77
  const stringify__default = /* @__PURE__ */ _interopDefault(stringify);
81
78
  const ora__default = /* @__PURE__ */ _interopDefault(ora);
82
79
  const cliProgress__namespace = /* @__PURE__ */ _interopNamespace(cliProgress);
83
- const EventSource__default = /* @__PURE__ */ _interopDefault(EventSource);
84
- const fs__default = /* @__PURE__ */ _interopDefault(fs$1);
85
80
  const pkgUp__default = /* @__PURE__ */ _interopDefault(pkgUp);
86
81
  const yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
82
+ const EventSource__default = /* @__PURE__ */ _interopDefault(EventSource);
87
83
  const apiConfig = {
88
84
  apiBaseUrl: utils.env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
89
85
  dashboardBaseUrl: utils.env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
@@ -102,23 +98,6 @@ const IGNORED_PATTERNS = [
102
98
  "**/.idea/**",
103
99
  "**/.vscode/**"
104
100
  ];
105
- const getFiles = (dirPath, ignorePatterns = [], arrayOfFiles = [], subfolder = "") => {
106
- const entries = fs__namespace.readdirSync(path__namespace.join(dirPath, subfolder));
107
- entries.forEach((entry) => {
108
- const entryPathFromRoot = path__namespace.join(subfolder, entry);
109
- const entryPath = path__namespace.relative(dirPath, entryPathFromRoot);
110
- const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
111
- if (isIgnored) {
112
- return;
113
- }
114
- if (fs__namespace.statSync(entryPath).isDirectory()) {
115
- getFiles(dirPath, ignorePatterns, arrayOfFiles, entryPathFromRoot);
116
- } else {
117
- arrayOfFiles.push(entryPath);
118
- }
119
- });
120
- return arrayOfFiles;
121
- };
122
101
  const isIgnoredFile = (folderPath, file, ignorePatterns) => {
123
102
  ignorePatterns.push(...IGNORED_PATTERNS);
124
103
  const relativeFilePath = path__namespace.join(folderPath, file);
@@ -136,16 +115,35 @@ const isIgnoredFile = (folderPath, file, ignorePatterns) => {
136
115
  }
137
116
  return isIgnored;
138
117
  };
139
- const readGitignore = (folderPath) => {
118
+ const getFiles = async (dirPath, ignorePatterns = [], subfolder = "") => {
119
+ const arrayOfFiles = [];
120
+ const entries = await fse__namespace.readdir(path__namespace.join(dirPath, subfolder));
121
+ for (const entry of entries) {
122
+ const entryPathFromRoot = path__namespace.join(subfolder, entry);
123
+ const entryPath = path__namespace.relative(dirPath, entryPathFromRoot);
124
+ const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
125
+ if (!isIgnored) {
126
+ if (fse__namespace.statSync(entryPath).isDirectory()) {
127
+ const subFiles = await getFiles(dirPath, ignorePatterns, entryPathFromRoot);
128
+ arrayOfFiles.push(...subFiles);
129
+ } else {
130
+ arrayOfFiles.push(entryPath);
131
+ }
132
+ }
133
+ }
134
+ return arrayOfFiles;
135
+ };
136
+ const readGitignore = async (folderPath) => {
140
137
  const gitignorePath = path__namespace.resolve(folderPath, ".gitignore");
141
- if (!fs__namespace.existsSync(gitignorePath))
138
+ const pathExist = await fse__namespace.pathExists(gitignorePath);
139
+ if (!pathExist)
142
140
  return [];
143
- const gitignoreContent = fs__namespace.readFileSync(gitignorePath, "utf8");
141
+ const gitignoreContent = await fse__namespace.readFile(gitignorePath, "utf8");
144
142
  return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
145
143
  };
146
144
  const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
147
- const ignorePatterns = readGitignore(folderToCompress);
148
- const filesToCompress = getFiles(folderToCompress, ignorePatterns);
145
+ const ignorePatterns = await readGitignore(folderToCompress);
146
+ const filesToCompress = await getFiles(folderToCompress, ignorePatterns);
149
147
  return tar__namespace.c(
150
148
  {
151
149
  gzip: true,
@@ -158,7 +156,7 @@ const APP_FOLDER_NAME = "com.strapi.cli";
158
156
  const CONFIG_FILENAME = "config.json";
159
157
  async function checkDirectoryExists(directoryPath) {
160
158
  try {
161
- const fsStat = await fse__default.default.lstat(directoryPath);
159
+ const fsStat = await fse__namespace.default.lstat(directoryPath);
162
160
  return fsStat.isDirectory();
163
161
  } catch (e) {
164
162
  return false;
@@ -166,14 +164,14 @@ async function checkDirectoryExists(directoryPath) {
166
164
  }
167
165
  async function getTmpStoragePath() {
168
166
  const storagePath = path__namespace.default.join(os__default.default.tmpdir(), APP_FOLDER_NAME);
169
- await fse__default.default.ensureDir(storagePath);
167
+ await fse__namespace.default.ensureDir(storagePath);
170
168
  return storagePath;
171
169
  }
172
170
  async function getConfigPath() {
173
171
  const configDirs = XDGAppPaths__default.default(APP_FOLDER_NAME).configDirs();
174
172
  const configPath = configDirs.find(checkDirectoryExists);
175
173
  if (!configPath) {
176
- await fse__default.default.ensureDir(configDirs[0]);
174
+ await fse__namespace.default.ensureDir(configDirs[0]);
177
175
  return configDirs[0];
178
176
  }
179
177
  return configPath;
@@ -181,9 +179,9 @@ async function getConfigPath() {
181
179
  async function getLocalConfig() {
182
180
  const configPath = await getConfigPath();
183
181
  const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
184
- await fse__default.default.ensureFile(configFilePath);
182
+ await fse__namespace.default.ensureFile(configFilePath);
185
183
  try {
186
- return await fse__default.default.readJSON(configFilePath, { encoding: "utf8", throws: true });
184
+ return await fse__namespace.default.readJSON(configFilePath, { encoding: "utf8", throws: true });
187
185
  } catch (e) {
188
186
  return {};
189
187
  }
@@ -191,10 +189,10 @@ async function getLocalConfig() {
191
189
  async function saveLocalConfig(data) {
192
190
  const configPath = await getConfigPath();
193
191
  const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
194
- await fse__default.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
192
+ await fse__namespace.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
195
193
  }
196
194
  const name = "@strapi/cloud-cli";
197
- const version = "4.25.1";
195
+ const version = "4.25.8";
198
196
  const description = "Commands to interact with the Strapi Cloud";
199
197
  const keywords = [
200
198
  "strapi",
@@ -235,10 +233,11 @@ const scripts = {
235
233
  build: "pack-up build",
236
234
  clean: "run -T rimraf ./dist",
237
235
  lint: "run -T eslint .",
236
+ "test:unit": "run -T jest",
238
237
  watch: "pack-up watch"
239
238
  };
240
239
  const dependencies = {
241
- "@strapi/utils": "4.25.1",
240
+ "@strapi/utils": "4.25.8",
242
241
  axios: "1.6.0",
243
242
  chalk: "4.1.2",
244
243
  "cli-progress": "3.12.0",
@@ -263,8 +262,8 @@ const devDependencies = {
263
262
  "@types/cli-progress": "3.11.5",
264
263
  "@types/eventsource": "1.1.15",
265
264
  "@types/lodash": "^4.14.191",
266
- "eslint-config-custom": "4.25.1",
267
- tsconfig: "4.25.1"
265
+ "eslint-config-custom": "4.25.8",
266
+ tsconfig: "4.25.8"
268
267
  };
269
268
  const engines = {
270
269
  node: ">=18.0.0 <=20.x.x",
@@ -317,7 +316,7 @@ async function cloudApiFactory({ logger }, token) {
317
316
  deploy({ filePath, project }, { onUploadProgress }) {
318
317
  return axiosCloudAPI.post(
319
318
  `/deploy/${project.name}`,
320
- { file: fse__default.default.createReadStream(filePath) },
319
+ { file: fse__namespace.default.createReadStream(filePath) },
321
320
  {
322
321
  headers: {
323
322
  "Content-Type": "multipart/form-data"
@@ -360,8 +359,33 @@ async function cloudApiFactory({ logger }, token) {
360
359
  throw error;
361
360
  }
362
361
  },
363
- listProjects() {
364
- return axiosCloudAPI.get("/projects");
362
+ async listProjects() {
363
+ try {
364
+ const response = await axiosCloudAPI.get("/projects");
365
+ if (response.status !== 200) {
366
+ throw new Error("Error fetching cloud projects from the server.");
367
+ }
368
+ return response;
369
+ } catch (error) {
370
+ logger.debug(
371
+ "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
372
+ );
373
+ throw error;
374
+ }
375
+ },
376
+ async listLinkProjects() {
377
+ try {
378
+ const response = await axiosCloudAPI.get("/projects/linkable");
379
+ if (response.status !== 200) {
380
+ throw new Error("Error fetching cloud projects from the server.");
381
+ }
382
+ return response;
383
+ } catch (error) {
384
+ logger.debug(
385
+ "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
386
+ );
387
+ throw error;
388
+ }
365
389
  },
366
390
  track(event, payload = {}) {
367
391
  return axiosCloudAPI.post("/track", {
@@ -376,18 +400,18 @@ async function save(data, { directoryPath } = {}) {
376
400
  const alreadyInFileData = await retrieve({ directoryPath });
377
401
  const storedData = { ...alreadyInFileData, ...data };
378
402
  const pathToFile = path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
379
- await fse__default.default.ensureDir(path__namespace.default.dirname(pathToFile));
380
- await fse__default.default.writeJson(pathToFile, storedData, { encoding: "utf8" });
403
+ await fse__namespace.default.ensureDir(path__namespace.default.dirname(pathToFile));
404
+ await fse__namespace.default.writeJson(pathToFile, storedData, { encoding: "utf8" });
381
405
  }
382
406
  async function retrieve({
383
407
  directoryPath
384
408
  } = {}) {
385
409
  const pathToFile = path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
386
- const pathExists = await fse__default.default.pathExists(pathToFile);
410
+ const pathExists = await fse__namespace.default.pathExists(pathToFile);
387
411
  if (!pathExists) {
388
412
  return {};
389
413
  }
390
- return fse__default.default.readJSON(pathToFile, { encoding: "utf8" });
414
+ return fse__namespace.default.readJSON(pathToFile, { encoding: "utf8" });
391
415
  }
392
416
  const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
393
417
  __proto__: null,
@@ -632,6 +656,53 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
632
656
  local: strapiInfoSave,
633
657
  tokenServiceFactory
634
658
  }, Symbol.toStringTag, { value: "Module" }));
659
+ yup__namespace.object({
660
+ name: yup__namespace.string().required(),
661
+ exports: yup__namespace.lazy(
662
+ (value) => yup__namespace.object(
663
+ typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
664
+ if (typeof value2 === "object") {
665
+ acc[key] = yup__namespace.object({
666
+ types: yup__namespace.string().optional(),
667
+ source: yup__namespace.string().required(),
668
+ module: yup__namespace.string().optional(),
669
+ import: yup__namespace.string().required(),
670
+ require: yup__namespace.string().required(),
671
+ default: yup__namespace.string().required()
672
+ }).noUnknown(true);
673
+ } else {
674
+ acc[key] = yup__namespace.string().matches(/^\.\/.*\.json$/).required();
675
+ }
676
+ return acc;
677
+ }, {}) : void 0
678
+ ).optional()
679
+ )
680
+ });
681
+ const loadPkg = async ({ cwd, logger }) => {
682
+ const pkgPath = await pkgUp__default.default({ cwd });
683
+ if (!pkgPath) {
684
+ throw new Error("Could not find a package.json in the current directory");
685
+ }
686
+ const buffer = await fse__namespace.readFile(pkgPath);
687
+ const pkg = JSON.parse(buffer.toString());
688
+ logger.debug("Loaded package.json:", os__default.default.EOL, pkg);
689
+ return pkg;
690
+ };
691
+ async function getProjectNameFromPackageJson(ctx) {
692
+ try {
693
+ const packageJson2 = await loadPkg(ctx);
694
+ return packageJson2.name || "my-strapi-project";
695
+ } catch (e) {
696
+ return "my-strapi-project";
697
+ }
698
+ }
699
+ const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
700
+ try {
701
+ await cloudApiService.track(eventName, eventData);
702
+ } catch (e) {
703
+ ctx.logger.debug(`Failed to track ${eventName}`, e);
704
+ }
705
+ };
635
706
  const openModule$1 = import("open");
636
707
  async function promptLogin(ctx) {
637
708
  const response = await inquirer__default.default.prompt([
@@ -652,13 +723,6 @@ async function loginAction(ctx) {
652
723
  const tokenService = await tokenServiceFactory(ctx);
653
724
  const existingToken = await tokenService.retrieveToken();
654
725
  const cloudApiService = await cloudApiFactory(ctx, existingToken || void 0);
655
- const trackFailedLogin = async () => {
656
- try {
657
- await cloudApiService.track("didNotLogin", { loginMethod: "cli" });
658
- } catch (e) {
659
- logger.debug("Failed to track failed login", e);
660
- }
661
- };
662
726
  if (existingToken) {
663
727
  const isTokenValid = await tokenService.isTokenValid(existingToken);
664
728
  if (isTokenValid) {
@@ -690,11 +754,7 @@ async function loginAction(ctx) {
690
754
  logger.debug(e);
691
755
  return false;
692
756
  }
693
- try {
694
- await cloudApiService.track("willLoginAttempt", {});
695
- } catch (e) {
696
- logger.debug("Failed to track login attempt", e);
697
- }
757
+ await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
698
758
  logger.debug("🔐 Creating device authentication request...", {
699
759
  client_id: cliConfig2.clientId,
700
760
  scope: cliConfig2.scope,
@@ -774,13 +834,13 @@ async function loginAction(ctx) {
774
834
  "There seems to be a problem with your login information. Please try logging in again."
775
835
  );
776
836
  spinnerFail();
777
- await trackFailedLogin();
837
+ await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
778
838
  return false;
779
839
  }
780
840
  if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
781
841
  logger.debug(e);
782
842
  spinnerFail();
783
- await trackFailedLogin();
843
+ await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
784
844
  return false;
785
845
  }
786
846
  await new Promise((resolve) => {
@@ -794,15 +854,50 @@ async function loginAction(ctx) {
794
854
  "To access your dashboard, please copy and paste the following URL into your web browser:"
795
855
  );
796
856
  logger.log(chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects`));
797
- try {
798
- await cloudApiService.track("didLogin", { loginMethod: "cli" });
799
- } catch (e) {
800
- logger.debug("Failed to track login", e);
801
- }
857
+ await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
802
858
  };
803
859
  await authenticate();
804
860
  return isAuthenticated;
805
861
  }
862
+ function questionDefaultValuesMapper(questionsMap) {
863
+ return (questions) => {
864
+ return questions.map((question) => {
865
+ const questionName = question.name;
866
+ if (questionName in questionsMap) {
867
+ const questionDefault = questionsMap[questionName];
868
+ if (typeof questionDefault === "function") {
869
+ return {
870
+ ...question,
871
+ default: questionDefault(question)
872
+ };
873
+ }
874
+ return {
875
+ ...question,
876
+ default: questionDefault
877
+ };
878
+ }
879
+ return question;
880
+ });
881
+ };
882
+ }
883
+ function getDefaultsFromQuestions(questions) {
884
+ return questions.reduce((acc, question) => {
885
+ if (question.default && question.name) {
886
+ return { ...acc, [question.name]: question.default };
887
+ }
888
+ return acc;
889
+ }, {});
890
+ }
891
+ function getProjectNodeVersionDefault(question) {
892
+ const currentNodeVersion = process.versions.node.split(".")[0];
893
+ if (question.type === "list" && Array.isArray(question.choices)) {
894
+ const choice = question.choices.find((choice2) => choice2.value === currentNodeVersion);
895
+ if (choice) {
896
+ return choice.value;
897
+ }
898
+ }
899
+ return question.default;
900
+ }
806
901
  async function handleError(ctx, error) {
807
902
  const { logger } = ctx;
808
903
  logger.debug(error);
@@ -847,7 +942,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
847
942
  throw e;
848
943
  }
849
944
  }
850
- const action$2 = async (ctx) => {
945
+ const action$4 = async (ctx) => {
851
946
  const { logger } = ctx;
852
947
  const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
853
948
  const token = await getValidToken(ctx, promptLogin);
@@ -856,7 +951,16 @@ const action$2 = async (ctx) => {
856
951
  }
857
952
  const cloudApi = await cloudApiFactory(ctx, token);
858
953
  const { data: config } = await cloudApi.config();
859
- const { questions, defaults: defaultValues } = config.projectCreation;
954
+ const projectName = await getProjectNameFromPackageJson(ctx);
955
+ const defaultAnswersMapper = questionDefaultValuesMapper({
956
+ name: projectName,
957
+ nodeVersion: getProjectNodeVersionDefault
958
+ });
959
+ const questions = defaultAnswersMapper(config.projectCreation.questions);
960
+ const defaultValues = {
961
+ ...config.projectCreation.defaults,
962
+ ...getDefaultsFromQuestions(questions)
963
+ };
860
964
  const projectAnswersDefaulted = fp.defaults(defaultValues);
861
965
  const projectAnswers = await inquirer__default.default.prompt(questions);
862
966
  const projectInput = projectAnswersDefaulted(projectAnswers);
@@ -905,38 +1009,6 @@ function notificationServiceFactory({ logger }) {
905
1009
  };
906
1010
  };
907
1011
  }
908
- yup__namespace.object({
909
- name: yup__namespace.string().required(),
910
- exports: yup__namespace.lazy(
911
- (value) => yup__namespace.object(
912
- typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
913
- if (typeof value2 === "object") {
914
- acc[key] = yup__namespace.object({
915
- types: yup__namespace.string().optional(),
916
- source: yup__namespace.string().required(),
917
- module: yup__namespace.string().optional(),
918
- import: yup__namespace.string().required(),
919
- require: yup__namespace.string().required(),
920
- default: yup__namespace.string().required()
921
- }).noUnknown(true);
922
- } else {
923
- acc[key] = yup__namespace.string().matches(/^\.\/.*\.json$/).required();
924
- }
925
- return acc;
926
- }, {}) : void 0
927
- ).optional()
928
- )
929
- });
930
- const loadPkg = async ({ cwd, logger }) => {
931
- const pkgPath = await pkgUp__default.default({ cwd });
932
- if (!pkgPath) {
933
- throw new Error("Could not find a package.json in the current directory");
934
- }
935
- const buffer = await fs__default.default.readFile(pkgPath);
936
- const pkg = JSON.parse(buffer.toString());
937
- logger.debug("Loaded package.json:", os__default.default.EOL, pkg);
938
- return pkg;
939
- };
940
1012
  const buildLogsServiceFactory = ({ logger }) => {
941
1013
  return async (url, token, cliConfig2) => {
942
1014
  const CONN_TIMEOUT = Number(cliConfig2.buildLogsConnectionTimeout);
@@ -990,6 +1062,7 @@ const buildLogsServiceFactory = ({ logger }) => {
990
1062
  if (retries > MAX_RETRIES) {
991
1063
  spinner.fail("We were unable to connect to the server to get build logs at this time.");
992
1064
  es.close();
1065
+ clearExistingTimeout();
993
1066
  reject(new Error("Max retries reached"));
994
1067
  }
995
1068
  };
@@ -1032,13 +1105,13 @@ async function upload(ctx, project, token, maxProjectFileSize) {
1032
1105
  process.exit(1);
1033
1106
  }
1034
1107
  const tarFilePath = path__namespace.default.resolve(storagePath, compressedFilename);
1035
- const fileStats = await fse__default.default.stat(tarFilePath);
1108
+ const fileStats = await fse__namespace.default.stat(tarFilePath);
1036
1109
  if (fileStats.size > maxProjectFileSize) {
1037
1110
  ctx.logger.log(
1038
1111
  "Unable to proceed: Your project is too big to be transferred, please use a git repo instead."
1039
1112
  );
1040
1113
  try {
1041
- await fse__default.default.remove(tarFilePath);
1114
+ await fse__namespace.default.remove(tarFilePath);
1042
1115
  } catch (e) {
1043
1116
  ctx.logger.log("Unable to remove file: ", tarFilePath);
1044
1117
  ctx.logger.debug(e);
@@ -1066,8 +1139,8 @@ async function upload(ctx, project, token, maxProjectFileSize) {
1066
1139
  progressBar.stop();
1067
1140
  if (e instanceof axios.AxiosError && e.response?.data) {
1068
1141
  if (e.response.status === 404) {
1069
- ctx.logger.error(
1070
- `The project does not exist. Remove the ${LOCAL_SAVE_FILENAME} file and try again.`
1142
+ ctx.logger.warn(
1143
+ `The project does not exist. Please link your local project to a Strapi Cloud project using the link command.`
1071
1144
  );
1072
1145
  } else {
1073
1146
  ctx.logger.error(e.response.data);
@@ -1077,7 +1150,7 @@ async function upload(ctx, project, token, maxProjectFileSize) {
1077
1150
  }
1078
1151
  ctx.logger.debug(e);
1079
1152
  } finally {
1080
- await fse__default.default.remove(tarFilePath);
1153
+ await fse__namespace.default.remove(tarFilePath);
1081
1154
  }
1082
1155
  process.exit(0);
1083
1156
  } catch (e) {
@@ -1090,7 +1163,7 @@ async function getProject(ctx) {
1090
1163
  const { project } = await retrieve();
1091
1164
  if (!project) {
1092
1165
  try {
1093
- return await action$2(ctx);
1166
+ return await action$4(ctx);
1094
1167
  } catch (e) {
1095
1168
  ctx.logger.error("An error occurred while deploying the project. Please try again later.");
1096
1169
  ctx.logger.debug(e);
@@ -1099,7 +1172,19 @@ async function getProject(ctx) {
1099
1172
  }
1100
1173
  return project;
1101
1174
  }
1102
- const action$1 = async (ctx) => {
1175
+ async function getConfig({
1176
+ ctx,
1177
+ cloudApiService
1178
+ }) {
1179
+ try {
1180
+ const { data: cliConfig2 } = await cloudApiService.config();
1181
+ return cliConfig2;
1182
+ } catch (e) {
1183
+ ctx.logger.debug("Failed to get cli config", e);
1184
+ return null;
1185
+ }
1186
+ }
1187
+ const action$3 = async (ctx) => {
1103
1188
  const { getValidToken } = await tokenServiceFactory(ctx);
1104
1189
  const token = await getValidToken(ctx, promptLogin);
1105
1190
  if (!token) {
@@ -1110,14 +1195,18 @@ const action$1 = async (ctx) => {
1110
1195
  return;
1111
1196
  }
1112
1197
  const cloudApiService = await cloudApiFactory(ctx);
1113
- try {
1114
- await cloudApiService.track("willDeployWithCLI", { projectInternalName: project.name });
1115
- } catch (e) {
1116
- ctx.logger.debug("Failed to track willDeploy", e);
1117
- }
1198
+ await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
1199
+ projectInternalName: project.name
1200
+ });
1118
1201
  const notificationService = notificationServiceFactory(ctx);
1119
1202
  const buildLogsService = buildLogsServiceFactory(ctx);
1120
- const { data: cliConfig2 } = await cloudApiService.config();
1203
+ const cliConfig2 = await getConfig({ ctx, cloudApiService });
1204
+ if (!cliConfig2) {
1205
+ ctx.logger.error(
1206
+ "An error occurred while retrieving data from Strapi Cloud. Please try check your network or again later."
1207
+ );
1208
+ return;
1209
+ }
1121
1210
  let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
1122
1211
  if (Number.isNaN(maxSize)) {
1123
1212
  ctx.logger.debug(
@@ -1139,10 +1228,11 @@ const action$1 = async (ctx) => {
1139
1228
  chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
1140
1229
  );
1141
1230
  } catch (e) {
1231
+ ctx.logger.debug(e);
1142
1232
  if (e instanceof Error) {
1143
1233
  ctx.logger.error(e.message);
1144
1234
  } else {
1145
- throw e;
1235
+ ctx.logger.error("An error occurred while deploying the project. Please try again later.");
1146
1236
  }
1147
1237
  }
1148
1238
  };
@@ -1173,16 +1263,162 @@ const runAction = (name2, action2) => (...args) => {
1173
1263
  process.exit(1);
1174
1264
  });
1175
1265
  };
1176
- const command$3 = ({ command: command2, ctx }) => {
1177
- 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$1)(ctx));
1266
+ const command$5 = ({ command: command2, ctx }) => {
1267
+ 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));
1178
1268
  };
1179
1269
  const deployProject = {
1180
1270
  name: "deploy-project",
1181
1271
  description: "Deploy a Strapi Cloud project",
1182
- action: action$1,
1183
- command: command$3
1272
+ action: action$3,
1273
+ command: command$5
1184
1274
  };
1185
- const command$2 = ({ command: command2, ctx }) => {
1275
+ const QUIT_OPTION = "Quit";
1276
+ async function getExistingConfig(ctx) {
1277
+ try {
1278
+ return await retrieve();
1279
+ } catch (e) {
1280
+ ctx.logger.debug("Failed to get project config", e);
1281
+ ctx.logger.error("An error occurred while retrieving config data from your local project.");
1282
+ return null;
1283
+ }
1284
+ }
1285
+ async function promptForRelink(ctx, cloudApiService, existingConfig) {
1286
+ if (existingConfig && existingConfig.project) {
1287
+ const { shouldRelink } = await inquirer__default.default.prompt([
1288
+ {
1289
+ type: "confirm",
1290
+ name: "shouldRelink",
1291
+ message: `A project named ${chalk__default.default.cyan(
1292
+ existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
1293
+ )} is already linked to this local folder. Do you want to update the link?`,
1294
+ default: false
1295
+ }
1296
+ ]);
1297
+ if (!shouldRelink) {
1298
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1299
+ currentProjectName: existingConfig.project?.name
1300
+ });
1301
+ return false;
1302
+ }
1303
+ }
1304
+ return true;
1305
+ }
1306
+ async function getProjectsList(ctx, cloudApiService, existingConfig) {
1307
+ const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
1308
+ try {
1309
+ const {
1310
+ data: { data: projectList }
1311
+ } = await cloudApiService.listLinkProjects();
1312
+ spinner.succeed();
1313
+ if (!Array.isArray(projectList)) {
1314
+ ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
1315
+ return null;
1316
+ }
1317
+ const projects = projectList.filter(
1318
+ (project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
1319
+ ).map((project) => {
1320
+ return {
1321
+ name: project.displayName,
1322
+ value: { name: project.name, displayName: project.displayName }
1323
+ };
1324
+ });
1325
+ if (projects.length === 0) {
1326
+ ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
1327
+ return null;
1328
+ }
1329
+ return projects;
1330
+ } catch (e) {
1331
+ spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
1332
+ ctx.logger.debug("Failed to list projects", e);
1333
+ return null;
1334
+ }
1335
+ }
1336
+ async function getUserSelection(ctx, projects) {
1337
+ const { logger } = ctx;
1338
+ try {
1339
+ const answer = await inquirer__default.default.prompt([
1340
+ {
1341
+ type: "list",
1342
+ name: "linkProject",
1343
+ message: "Which project do you want to link?",
1344
+ choices: [...projects, { name: chalk__default.default.grey(`(${QUIT_OPTION})`), value: null }]
1345
+ }
1346
+ ]);
1347
+ if (!answer.linkProject) {
1348
+ return null;
1349
+ }
1350
+ return answer;
1351
+ } catch (e) {
1352
+ logger.debug("Failed to get user input", e);
1353
+ logger.error("An error occurred while trying to get your input.");
1354
+ return null;
1355
+ }
1356
+ }
1357
+ const action$2 = async (ctx) => {
1358
+ const { getValidToken } = await tokenServiceFactory(ctx);
1359
+ const token = await getValidToken(ctx, promptLogin);
1360
+ const { logger } = ctx;
1361
+ if (!token) {
1362
+ return;
1363
+ }
1364
+ const cloudApiService = await cloudApiFactory(ctx, token);
1365
+ const existingConfig = await getExistingConfig(ctx);
1366
+ const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
1367
+ if (!shouldRelink) {
1368
+ return;
1369
+ }
1370
+ await trackEvent(ctx, cloudApiService, "willLinkProject", {});
1371
+ const projects = await getProjectsList(
1372
+ ctx,
1373
+ cloudApiService,
1374
+ existingConfig
1375
+ );
1376
+ if (!projects) {
1377
+ return;
1378
+ }
1379
+ const answer = await getUserSelection(ctx, projects);
1380
+ if (!answer) {
1381
+ return;
1382
+ }
1383
+ try {
1384
+ const { confirmAction } = await inquirer__default.default.prompt([
1385
+ {
1386
+ type: "confirm",
1387
+ name: "confirmAction",
1388
+ message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
1389
+ default: false
1390
+ }
1391
+ ]);
1392
+ if (!confirmAction) {
1393
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1394
+ cancelledProjectName: answer.linkProject.name,
1395
+ currentProjectName: existingConfig ? existingConfig.project?.name : null
1396
+ });
1397
+ return;
1398
+ }
1399
+ await save({ project: answer.linkProject });
1400
+ logger.log(`Project ${chalk__default.default.cyan(answer.linkProject.displayName)} linked successfully.`);
1401
+ await trackEvent(ctx, cloudApiService, "didLinkProject", {
1402
+ projectInternalName: answer.linkProject
1403
+ });
1404
+ } catch (e) {
1405
+ logger.debug("Failed to link project", e);
1406
+ logger.error("An error occurred while linking the project.");
1407
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1408
+ projectInternalName: answer.linkProject
1409
+ });
1410
+ }
1411
+ };
1412
+ const command$4 = ({ command: command2, ctx }) => {
1413
+ command2.command("cloud:link").alias("link").description("Link a local directory to a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("link", action$2)(ctx));
1414
+ };
1415
+ const link = {
1416
+ name: "link-project",
1417
+ description: "Link a local directory to a Strapi Cloud project",
1418
+ action: action$2,
1419
+ command: command$4
1420
+ };
1421
+ const command$3 = ({ command: command2, ctx }) => {
1186
1422
  command2.command("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
1187
1423
  "after",
1188
1424
  "\nAfter running this command, you will be prompted to enter your authentication information."
@@ -1192,10 +1428,10 @@ const login = {
1192
1428
  name: "login",
1193
1429
  description: "Strapi Cloud Login",
1194
1430
  action: loginAction,
1195
- command: command$2
1431
+ command: command$3
1196
1432
  };
1197
1433
  const openModule = import("open");
1198
- const action = async (ctx) => {
1434
+ const action$1 = async (ctx) => {
1199
1435
  const { logger } = ctx;
1200
1436
  const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
1201
1437
  const token = await retrieveToken();
@@ -1225,37 +1461,64 @@ const action = async (ctx) => {
1225
1461
  logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
1226
1462
  logger.debug(e);
1227
1463
  }
1228
- try {
1229
- await cloudApiService.track("didLogout", { loginMethod: "cli" });
1230
- } catch (e) {
1231
- logger.debug("Failed to track logout event", e);
1232
- }
1464
+ await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
1233
1465
  };
1234
- const command$1 = ({ command: command2, ctx }) => {
1235
- 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)(ctx));
1466
+ const command$2 = ({ command: command2, ctx }) => {
1467
+ 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));
1236
1468
  };
1237
1469
  const logout = {
1238
1470
  name: "logout",
1239
1471
  description: "Strapi Cloud Logout",
1240
- action,
1241
- command: command$1
1472
+ action: action$1,
1473
+ command: command$2
1242
1474
  };
1243
- const command = ({ command: command2, ctx }) => {
1244
- 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$2)(ctx));
1475
+ const command$1 = ({ command: command2, ctx }) => {
1476
+ 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));
1245
1477
  };
1246
1478
  const createProject = {
1247
1479
  name: "create-project",
1248
1480
  description: "Create a new project",
1249
- action: action$2,
1481
+ action: action$4,
1482
+ command: command$1
1483
+ };
1484
+ const action = async (ctx) => {
1485
+ const { getValidToken } = await tokenServiceFactory(ctx);
1486
+ const token = await getValidToken(ctx, promptLogin);
1487
+ const { logger } = ctx;
1488
+ if (!token) {
1489
+ return;
1490
+ }
1491
+ const cloudApiService = await cloudApiFactory(ctx, token);
1492
+ const spinner = logger.spinner("Fetching your projects...").start();
1493
+ try {
1494
+ const {
1495
+ data: { data: projectList }
1496
+ } = await cloudApiService.listProjects();
1497
+ spinner.succeed();
1498
+ logger.log(projectList);
1499
+ } catch (e) {
1500
+ ctx.logger.debug("Failed to list projects", e);
1501
+ spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
1502
+ }
1503
+ };
1504
+ const command = ({ command: command2, ctx }) => {
1505
+ command2.command("cloud:projects").alias("projects").description("List Strapi Cloud projects").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("projects", action)(ctx));
1506
+ };
1507
+ const listProjects = {
1508
+ name: "list-projects",
1509
+ description: "List Strapi Cloud projects",
1510
+ action,
1250
1511
  command
1251
1512
  };
1252
1513
  const cli = {
1253
1514
  deployProject,
1515
+ link,
1254
1516
  login,
1255
1517
  logout,
1256
- createProject
1518
+ createProject,
1519
+ listProjects
1257
1520
  };
1258
- const cloudCommands = [deployProject, login, logout];
1521
+ const cloudCommands = [deployProject, link, login, logout, listProjects];
1259
1522
  async function initCloudCLIConfig() {
1260
1523
  const localConfig = await getLocalConfig();
1261
1524
  if (!localConfig.deviceId) {