@strapi/cloud-cli 0.0.0-next.48485bcb4aa83c14d6d2cb99cbd47676d0d31b97 → 0.0.0-next.506c866896b405bfee0715be82ad4b0f8da1d26b

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 +365 -132
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.mjs +364 -129
  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/apply-default-name.d.ts +7 -0
  7. package/dist/src/create-project/utils/apply-default-name.d.ts.map +1 -0
  8. package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts +3 -0
  9. package/dist/src/create-project/utils/get-project-name-from-pkg.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,10 @@ 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 _ = require("lodash");
46
+ const EventSource = require("eventsource");
48
47
  const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
49
48
  function _interopNamespace(e) {
50
49
  if (e && e.__esModule)
@@ -65,12 +64,11 @@ function _interopNamespace(e) {
65
64
  return Object.freeze(n);
66
65
  }
67
66
  const crypto__default = /* @__PURE__ */ _interopDefault(crypto$1);
68
- const fse__default = /* @__PURE__ */ _interopDefault(fse);
67
+ const fse__namespace = /* @__PURE__ */ _interopNamespace(fse);
69
68
  const path__namespace = /* @__PURE__ */ _interopNamespace(path);
70
69
  const chalk__default = /* @__PURE__ */ _interopDefault(chalk);
71
70
  const axios__default = /* @__PURE__ */ _interopDefault(axios);
72
71
  const crypto__namespace = /* @__PURE__ */ _interopNamespace(crypto);
73
- const fs__namespace = /* @__PURE__ */ _interopNamespace(fs);
74
72
  const tar__namespace = /* @__PURE__ */ _interopNamespace(tar);
75
73
  const inquirer__default = /* @__PURE__ */ _interopDefault(inquirer);
76
74
  const os__default = /* @__PURE__ */ _interopDefault(os);
@@ -80,10 +78,10 @@ const jwt__default = /* @__PURE__ */ _interopDefault(jwt);
80
78
  const stringify__default = /* @__PURE__ */ _interopDefault(stringify);
81
79
  const ora__default = /* @__PURE__ */ _interopDefault(ora);
82
80
  const cliProgress__namespace = /* @__PURE__ */ _interopNamespace(cliProgress);
83
- const EventSource__default = /* @__PURE__ */ _interopDefault(EventSource);
84
- const fs__default = /* @__PURE__ */ _interopDefault(fs$1);
85
81
  const pkgUp__default = /* @__PURE__ */ _interopDefault(pkgUp);
86
82
  const yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
83
+ const ___default = /* @__PURE__ */ _interopDefault(_);
84
+ const EventSource__default = /* @__PURE__ */ _interopDefault(EventSource);
87
85
  const apiConfig = {
88
86
  apiBaseUrl: utils.env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
89
87
  dashboardBaseUrl: utils.env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
@@ -102,23 +100,6 @@ const IGNORED_PATTERNS = [
102
100
  "**/.idea/**",
103
101
  "**/.vscode/**"
104
102
  ];
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
103
  const isIgnoredFile = (folderPath, file, ignorePatterns) => {
123
104
  ignorePatterns.push(...IGNORED_PATTERNS);
124
105
  const relativeFilePath = path__namespace.join(folderPath, file);
@@ -136,16 +117,35 @@ const isIgnoredFile = (folderPath, file, ignorePatterns) => {
136
117
  }
137
118
  return isIgnored;
138
119
  };
139
- const readGitignore = (folderPath) => {
120
+ const getFiles = async (dirPath, ignorePatterns = [], subfolder = "") => {
121
+ const arrayOfFiles = [];
122
+ const entries = await fse__namespace.readdir(path__namespace.join(dirPath, subfolder));
123
+ for (const entry of entries) {
124
+ const entryPathFromRoot = path__namespace.join(subfolder, entry);
125
+ const entryPath = path__namespace.relative(dirPath, entryPathFromRoot);
126
+ const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
127
+ if (!isIgnored) {
128
+ if (fse__namespace.statSync(entryPath).isDirectory()) {
129
+ const subFiles = await getFiles(dirPath, ignorePatterns, entryPathFromRoot);
130
+ arrayOfFiles.push(...subFiles);
131
+ } else {
132
+ arrayOfFiles.push(entryPath);
133
+ }
134
+ }
135
+ }
136
+ return arrayOfFiles;
137
+ };
138
+ const readGitignore = async (folderPath) => {
140
139
  const gitignorePath = path__namespace.resolve(folderPath, ".gitignore");
141
- if (!fs__namespace.existsSync(gitignorePath))
140
+ const pathExist = await fse__namespace.pathExists(gitignorePath);
141
+ if (!pathExist)
142
142
  return [];
143
- const gitignoreContent = fs__namespace.readFileSync(gitignorePath, "utf8");
143
+ const gitignoreContent = await fse__namespace.readFile(gitignorePath, "utf8");
144
144
  return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
145
145
  };
146
146
  const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
147
- const ignorePatterns = readGitignore(folderToCompress);
148
- const filesToCompress = getFiles(folderToCompress, ignorePatterns);
147
+ const ignorePatterns = await readGitignore(folderToCompress);
148
+ const filesToCompress = await getFiles(folderToCompress, ignorePatterns);
149
149
  return tar__namespace.c(
150
150
  {
151
151
  gzip: true,
@@ -158,7 +158,7 @@ const APP_FOLDER_NAME = "com.strapi.cli";
158
158
  const CONFIG_FILENAME = "config.json";
159
159
  async function checkDirectoryExists(directoryPath) {
160
160
  try {
161
- const fsStat = await fse__default.default.lstat(directoryPath);
161
+ const fsStat = await fse__namespace.default.lstat(directoryPath);
162
162
  return fsStat.isDirectory();
163
163
  } catch (e) {
164
164
  return false;
@@ -166,14 +166,14 @@ async function checkDirectoryExists(directoryPath) {
166
166
  }
167
167
  async function getTmpStoragePath() {
168
168
  const storagePath = path__namespace.default.join(os__default.default.tmpdir(), APP_FOLDER_NAME);
169
- await fse__default.default.ensureDir(storagePath);
169
+ await fse__namespace.default.ensureDir(storagePath);
170
170
  return storagePath;
171
171
  }
172
172
  async function getConfigPath() {
173
173
  const configDirs = XDGAppPaths__default.default(APP_FOLDER_NAME).configDirs();
174
174
  const configPath = configDirs.find(checkDirectoryExists);
175
175
  if (!configPath) {
176
- await fse__default.default.ensureDir(configDirs[0]);
176
+ await fse__namespace.default.ensureDir(configDirs[0]);
177
177
  return configDirs[0];
178
178
  }
179
179
  return configPath;
@@ -181,9 +181,9 @@ async function getConfigPath() {
181
181
  async function getLocalConfig() {
182
182
  const configPath = await getConfigPath();
183
183
  const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
184
- await fse__default.default.ensureFile(configFilePath);
184
+ await fse__namespace.default.ensureFile(configFilePath);
185
185
  try {
186
- return await fse__default.default.readJSON(configFilePath, { encoding: "utf8", throws: true });
186
+ return await fse__namespace.default.readJSON(configFilePath, { encoding: "utf8", throws: true });
187
187
  } catch (e) {
188
188
  return {};
189
189
  }
@@ -191,10 +191,10 @@ async function getLocalConfig() {
191
191
  async function saveLocalConfig(data) {
192
192
  const configPath = await getConfigPath();
193
193
  const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
194
- await fse__default.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
194
+ await fse__namespace.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
195
195
  }
196
196
  const name = "@strapi/cloud-cli";
197
- const version = "4.25.1";
197
+ const version = "4.25.5";
198
198
  const description = "Commands to interact with the Strapi Cloud";
199
199
  const keywords = [
200
200
  "strapi",
@@ -235,10 +235,11 @@ const scripts = {
235
235
  build: "pack-up build",
236
236
  clean: "run -T rimraf ./dist",
237
237
  lint: "run -T eslint .",
238
+ "test:unit": "run -T jest",
238
239
  watch: "pack-up watch"
239
240
  };
240
241
  const dependencies = {
241
- "@strapi/utils": "4.25.1",
242
+ "@strapi/utils": "4.25.5",
242
243
  axios: "1.6.0",
243
244
  chalk: "4.1.2",
244
245
  "cli-progress": "3.12.0",
@@ -263,8 +264,8 @@ const devDependencies = {
263
264
  "@types/cli-progress": "3.11.5",
264
265
  "@types/eventsource": "1.1.15",
265
266
  "@types/lodash": "^4.14.191",
266
- "eslint-config-custom": "4.25.1",
267
- tsconfig: "4.25.1"
267
+ "eslint-config-custom": "4.25.5",
268
+ tsconfig: "4.25.5"
268
269
  };
269
270
  const engines = {
270
271
  node: ">=18.0.0 <=20.x.x",
@@ -317,7 +318,7 @@ async function cloudApiFactory({ logger }, token) {
317
318
  deploy({ filePath, project }, { onUploadProgress }) {
318
319
  return axiosCloudAPI.post(
319
320
  `/deploy/${project.name}`,
320
- { file: fse__default.default.createReadStream(filePath) },
321
+ { file: fse__namespace.default.createReadStream(filePath) },
321
322
  {
322
323
  headers: {
323
324
  "Content-Type": "multipart/form-data"
@@ -360,8 +361,33 @@ async function cloudApiFactory({ logger }, token) {
360
361
  throw error;
361
362
  }
362
363
  },
363
- listProjects() {
364
- return axiosCloudAPI.get("/projects");
364
+ async listProjects() {
365
+ try {
366
+ const response = await axiosCloudAPI.get("/projects");
367
+ if (response.status !== 200) {
368
+ throw new Error("Error fetching cloud projects from the server.");
369
+ }
370
+ return response;
371
+ } catch (error) {
372
+ logger.debug(
373
+ "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
374
+ );
375
+ throw error;
376
+ }
377
+ },
378
+ async listLinkProjects() {
379
+ try {
380
+ const response = await axiosCloudAPI.get("/projects/linkable");
381
+ if (response.status !== 200) {
382
+ throw new Error("Error fetching cloud projects from the server.");
383
+ }
384
+ return response;
385
+ } catch (error) {
386
+ logger.debug(
387
+ "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
388
+ );
389
+ throw error;
390
+ }
365
391
  },
366
392
  track(event, payload = {}) {
367
393
  return axiosCloudAPI.post("/track", {
@@ -376,18 +402,18 @@ async function save(data, { directoryPath } = {}) {
376
402
  const alreadyInFileData = await retrieve({ directoryPath });
377
403
  const storedData = { ...alreadyInFileData, ...data };
378
404
  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" });
405
+ await fse__namespace.default.ensureDir(path__namespace.default.dirname(pathToFile));
406
+ await fse__namespace.default.writeJson(pathToFile, storedData, { encoding: "utf8" });
381
407
  }
382
408
  async function retrieve({
383
409
  directoryPath
384
410
  } = {}) {
385
411
  const pathToFile = path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
386
- const pathExists = await fse__default.default.pathExists(pathToFile);
412
+ const pathExists = await fse__namespace.default.pathExists(pathToFile);
387
413
  if (!pathExists) {
388
414
  return {};
389
415
  }
390
- return fse__default.default.readJSON(pathToFile, { encoding: "utf8" });
416
+ return fse__namespace.default.readJSON(pathToFile, { encoding: "utf8" });
391
417
  }
392
418
  const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
393
419
  __proto__: null,
@@ -632,6 +658,65 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
632
658
  local: strapiInfoSave,
633
659
  tokenServiceFactory
634
660
  }, Symbol.toStringTag, { value: "Module" }));
661
+ yup__namespace.object({
662
+ name: yup__namespace.string().required(),
663
+ exports: yup__namespace.lazy(
664
+ (value) => yup__namespace.object(
665
+ typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
666
+ if (typeof value2 === "object") {
667
+ acc[key] = yup__namespace.object({
668
+ types: yup__namespace.string().optional(),
669
+ source: yup__namespace.string().required(),
670
+ module: yup__namespace.string().optional(),
671
+ import: yup__namespace.string().required(),
672
+ require: yup__namespace.string().required(),
673
+ default: yup__namespace.string().required()
674
+ }).noUnknown(true);
675
+ } else {
676
+ acc[key] = yup__namespace.string().matches(/^\.\/.*\.json$/).required();
677
+ }
678
+ return acc;
679
+ }, {}) : void 0
680
+ ).optional()
681
+ )
682
+ });
683
+ const loadPkg = async ({ cwd, logger }) => {
684
+ const pkgPath = await pkgUp__default.default({ cwd });
685
+ if (!pkgPath) {
686
+ throw new Error("Could not find a package.json in the current directory");
687
+ }
688
+ const buffer = await fse__namespace.readFile(pkgPath);
689
+ const pkg = JSON.parse(buffer.toString());
690
+ logger.debug("Loaded package.json:", os__default.default.EOL, pkg);
691
+ return pkg;
692
+ };
693
+ async function getProjectNameFromPackageJson(ctx) {
694
+ try {
695
+ const packageJson2 = await loadPkg(ctx);
696
+ return packageJson2.name || "my-strapi-project";
697
+ } catch (e) {
698
+ return "my-strapi-project";
699
+ }
700
+ }
701
+ function applyDefaultName(newDefaultName, questions, defaultValues) {
702
+ const newDefaultValues = ___default.default.cloneDeep(defaultValues);
703
+ newDefaultValues.name = newDefaultName;
704
+ const newQuestions = questions.map((question) => {
705
+ const questionCopy = ___default.default.cloneDeep(question);
706
+ if (questionCopy.name === "name") {
707
+ questionCopy.default = newDefaultName;
708
+ }
709
+ return questionCopy;
710
+ });
711
+ return { newQuestions, newDefaultValues };
712
+ }
713
+ const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
714
+ try {
715
+ await cloudApiService.track(eventName, eventData);
716
+ } catch (e) {
717
+ ctx.logger.debug(`Failed to track ${eventName}`, e);
718
+ }
719
+ };
635
720
  const openModule$1 = import("open");
636
721
  async function promptLogin(ctx) {
637
722
  const response = await inquirer__default.default.prompt([
@@ -652,13 +737,6 @@ async function loginAction(ctx) {
652
737
  const tokenService = await tokenServiceFactory(ctx);
653
738
  const existingToken = await tokenService.retrieveToken();
654
739
  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
740
  if (existingToken) {
663
741
  const isTokenValid = await tokenService.isTokenValid(existingToken);
664
742
  if (isTokenValid) {
@@ -690,11 +768,7 @@ async function loginAction(ctx) {
690
768
  logger.debug(e);
691
769
  return false;
692
770
  }
693
- try {
694
- await cloudApiService.track("willLoginAttempt", {});
695
- } catch (e) {
696
- logger.debug("Failed to track login attempt", e);
697
- }
771
+ await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
698
772
  logger.debug("🔐 Creating device authentication request...", {
699
773
  client_id: cliConfig2.clientId,
700
774
  scope: cliConfig2.scope,
@@ -774,13 +848,13 @@ async function loginAction(ctx) {
774
848
  "There seems to be a problem with your login information. Please try logging in again."
775
849
  );
776
850
  spinnerFail();
777
- await trackFailedLogin();
851
+ await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
778
852
  return false;
779
853
  }
780
854
  if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
781
855
  logger.debug(e);
782
856
  spinnerFail();
783
- await trackFailedLogin();
857
+ await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
784
858
  return false;
785
859
  }
786
860
  await new Promise((resolve) => {
@@ -794,11 +868,7 @@ async function loginAction(ctx) {
794
868
  "To access your dashboard, please copy and paste the following URL into your web browser:"
795
869
  );
796
870
  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
- }
871
+ await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
802
872
  };
803
873
  await authenticate();
804
874
  return isAuthenticated;
@@ -847,7 +917,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
847
917
  throw e;
848
918
  }
849
919
  }
850
- const action$2 = async (ctx) => {
920
+ const action$4 = async (ctx) => {
851
921
  const { logger } = ctx;
852
922
  const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
853
923
  const token = await getValidToken(ctx, promptLogin);
@@ -856,7 +926,11 @@ const action$2 = async (ctx) => {
856
926
  }
857
927
  const cloudApi = await cloudApiFactory(ctx, token);
858
928
  const { data: config } = await cloudApi.config();
859
- const { questions, defaults: defaultValues } = config.projectCreation;
929
+ const { newQuestions: questions, newDefaultValues: defaultValues } = applyDefaultName(
930
+ await getProjectNameFromPackageJson(ctx),
931
+ config.projectCreation.questions,
932
+ config.projectCreation.defaults
933
+ );
860
934
  const projectAnswersDefaulted = fp.defaults(defaultValues);
861
935
  const projectAnswers = await inquirer__default.default.prompt(questions);
862
936
  const projectInput = projectAnswersDefaulted(projectAnswers);
@@ -905,38 +979,6 @@ function notificationServiceFactory({ logger }) {
905
979
  };
906
980
  };
907
981
  }
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
982
  const buildLogsServiceFactory = ({ logger }) => {
941
983
  return async (url, token, cliConfig2) => {
942
984
  const CONN_TIMEOUT = Number(cliConfig2.buildLogsConnectionTimeout);
@@ -990,6 +1032,7 @@ const buildLogsServiceFactory = ({ logger }) => {
990
1032
  if (retries > MAX_RETRIES) {
991
1033
  spinner.fail("We were unable to connect to the server to get build logs at this time.");
992
1034
  es.close();
1035
+ clearExistingTimeout();
993
1036
  reject(new Error("Max retries reached"));
994
1037
  }
995
1038
  };
@@ -1032,13 +1075,13 @@ async function upload(ctx, project, token, maxProjectFileSize) {
1032
1075
  process.exit(1);
1033
1076
  }
1034
1077
  const tarFilePath = path__namespace.default.resolve(storagePath, compressedFilename);
1035
- const fileStats = await fse__default.default.stat(tarFilePath);
1078
+ const fileStats = await fse__namespace.default.stat(tarFilePath);
1036
1079
  if (fileStats.size > maxProjectFileSize) {
1037
1080
  ctx.logger.log(
1038
1081
  "Unable to proceed: Your project is too big to be transferred, please use a git repo instead."
1039
1082
  );
1040
1083
  try {
1041
- await fse__default.default.remove(tarFilePath);
1084
+ await fse__namespace.default.remove(tarFilePath);
1042
1085
  } catch (e) {
1043
1086
  ctx.logger.log("Unable to remove file: ", tarFilePath);
1044
1087
  ctx.logger.debug(e);
@@ -1077,7 +1120,7 @@ async function upload(ctx, project, token, maxProjectFileSize) {
1077
1120
  }
1078
1121
  ctx.logger.debug(e);
1079
1122
  } finally {
1080
- await fse__default.default.remove(tarFilePath);
1123
+ await fse__namespace.default.remove(tarFilePath);
1081
1124
  }
1082
1125
  process.exit(0);
1083
1126
  } catch (e) {
@@ -1090,7 +1133,7 @@ async function getProject(ctx) {
1090
1133
  const { project } = await retrieve();
1091
1134
  if (!project) {
1092
1135
  try {
1093
- return await action$2(ctx);
1136
+ return await action$4(ctx);
1094
1137
  } catch (e) {
1095
1138
  ctx.logger.error("An error occurred while deploying the project. Please try again later.");
1096
1139
  ctx.logger.debug(e);
@@ -1099,7 +1142,19 @@ async function getProject(ctx) {
1099
1142
  }
1100
1143
  return project;
1101
1144
  }
1102
- const action$1 = async (ctx) => {
1145
+ async function getConfig({
1146
+ ctx,
1147
+ cloudApiService
1148
+ }) {
1149
+ try {
1150
+ const { data: cliConfig2 } = await cloudApiService.config();
1151
+ return cliConfig2;
1152
+ } catch (e) {
1153
+ ctx.logger.debug("Failed to get cli config", e);
1154
+ return null;
1155
+ }
1156
+ }
1157
+ const action$3 = async (ctx) => {
1103
1158
  const { getValidToken } = await tokenServiceFactory(ctx);
1104
1159
  const token = await getValidToken(ctx, promptLogin);
1105
1160
  if (!token) {
@@ -1110,14 +1165,18 @@ const action$1 = async (ctx) => {
1110
1165
  return;
1111
1166
  }
1112
1167
  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
- }
1168
+ await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
1169
+ projectInternalName: project.name
1170
+ });
1118
1171
  const notificationService = notificationServiceFactory(ctx);
1119
1172
  const buildLogsService = buildLogsServiceFactory(ctx);
1120
- const { data: cliConfig2 } = await cloudApiService.config();
1173
+ const cliConfig2 = await getConfig({ ctx, cloudApiService });
1174
+ if (!cliConfig2) {
1175
+ ctx.logger.error(
1176
+ "An error occurred while retrieving data from Strapi Cloud. Please try check your network or again later."
1177
+ );
1178
+ return;
1179
+ }
1121
1180
  let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
1122
1181
  if (Number.isNaN(maxSize)) {
1123
1182
  ctx.logger.debug(
@@ -1139,10 +1198,11 @@ const action$1 = async (ctx) => {
1139
1198
  chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
1140
1199
  );
1141
1200
  } catch (e) {
1201
+ ctx.logger.debug(e);
1142
1202
  if (e instanceof Error) {
1143
1203
  ctx.logger.error(e.message);
1144
1204
  } else {
1145
- throw e;
1205
+ ctx.logger.error("An error occurred while deploying the project. Please try again later.");
1146
1206
  }
1147
1207
  }
1148
1208
  };
@@ -1173,16 +1233,162 @@ const runAction = (name2, action2) => (...args) => {
1173
1233
  process.exit(1);
1174
1234
  });
1175
1235
  };
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));
1236
+ const command$5 = ({ command: command2, ctx }) => {
1237
+ 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
1238
  };
1179
1239
  const deployProject = {
1180
1240
  name: "deploy-project",
1181
1241
  description: "Deploy a Strapi Cloud project",
1182
- action: action$1,
1183
- command: command$3
1242
+ action: action$3,
1243
+ command: command$5
1184
1244
  };
1185
- const command$2 = ({ command: command2, ctx }) => {
1245
+ const QUIT_OPTION = "Quit";
1246
+ async function getExistingConfig(ctx) {
1247
+ try {
1248
+ return await retrieve();
1249
+ } catch (e) {
1250
+ ctx.logger.debug("Failed to get project config", e);
1251
+ ctx.logger.error("An error occurred while retrieving config data from your local project.");
1252
+ return null;
1253
+ }
1254
+ }
1255
+ async function promptForRelink(ctx, cloudApiService, existingConfig) {
1256
+ if (existingConfig && existingConfig.project) {
1257
+ const { shouldRelink } = await inquirer__default.default.prompt([
1258
+ {
1259
+ type: "confirm",
1260
+ name: "shouldRelink",
1261
+ message: `A project named ${chalk__default.default.cyan(
1262
+ existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
1263
+ )} is already linked to this local folder. Do you want to update the link?`,
1264
+ default: false
1265
+ }
1266
+ ]);
1267
+ if (!shouldRelink) {
1268
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1269
+ currentProjectName: existingConfig.project?.name
1270
+ });
1271
+ return false;
1272
+ }
1273
+ }
1274
+ return true;
1275
+ }
1276
+ async function getProjectsList(ctx, cloudApiService, existingConfig) {
1277
+ const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
1278
+ try {
1279
+ const {
1280
+ data: { data: projectList }
1281
+ } = await cloudApiService.listLinkProjects();
1282
+ spinner.succeed();
1283
+ if (!Array.isArray(projectList)) {
1284
+ ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
1285
+ return null;
1286
+ }
1287
+ const projects = projectList.filter(
1288
+ (project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
1289
+ ).map((project) => {
1290
+ return {
1291
+ name: project.displayName,
1292
+ value: { name: project.name, displayName: project.displayName }
1293
+ };
1294
+ });
1295
+ if (projects.length === 0) {
1296
+ ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
1297
+ return null;
1298
+ }
1299
+ return projects;
1300
+ } catch (e) {
1301
+ spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
1302
+ ctx.logger.debug("Failed to list projects", e);
1303
+ return null;
1304
+ }
1305
+ }
1306
+ async function getUserSelection(ctx, projects) {
1307
+ const { logger } = ctx;
1308
+ try {
1309
+ const answer = await inquirer__default.default.prompt([
1310
+ {
1311
+ type: "list",
1312
+ name: "linkProject",
1313
+ message: "Which project do you want to link?",
1314
+ choices: [...projects, { name: chalk__default.default.grey(`(${QUIT_OPTION})`), value: null }]
1315
+ }
1316
+ ]);
1317
+ if (!answer.linkProject) {
1318
+ return null;
1319
+ }
1320
+ return answer;
1321
+ } catch (e) {
1322
+ logger.debug("Failed to get user input", e);
1323
+ logger.error("An error occurred while trying to get your input.");
1324
+ return null;
1325
+ }
1326
+ }
1327
+ const action$2 = async (ctx) => {
1328
+ const { getValidToken } = await tokenServiceFactory(ctx);
1329
+ const token = await getValidToken(ctx, promptLogin);
1330
+ const { logger } = ctx;
1331
+ if (!token) {
1332
+ return;
1333
+ }
1334
+ const cloudApiService = await cloudApiFactory(ctx, token);
1335
+ const existingConfig = await getExistingConfig(ctx);
1336
+ const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
1337
+ if (!shouldRelink) {
1338
+ return;
1339
+ }
1340
+ await trackEvent(ctx, cloudApiService, "willLinkProject", {});
1341
+ const projects = await getProjectsList(
1342
+ ctx,
1343
+ cloudApiService,
1344
+ existingConfig
1345
+ );
1346
+ if (!projects) {
1347
+ return;
1348
+ }
1349
+ const answer = await getUserSelection(ctx, projects);
1350
+ if (!answer) {
1351
+ return;
1352
+ }
1353
+ try {
1354
+ const { confirmAction } = await inquirer__default.default.prompt([
1355
+ {
1356
+ type: "confirm",
1357
+ name: "confirmAction",
1358
+ message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
1359
+ default: false
1360
+ }
1361
+ ]);
1362
+ if (!confirmAction) {
1363
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1364
+ cancelledProjectName: answer.linkProject.name,
1365
+ currentProjectName: existingConfig ? existingConfig.project?.name : null
1366
+ });
1367
+ return;
1368
+ }
1369
+ await save({ project: answer.linkProject });
1370
+ logger.log(`Project ${chalk__default.default.cyan(answer.linkProject.displayName)} linked successfully.`);
1371
+ await trackEvent(ctx, cloudApiService, "didLinkProject", {
1372
+ projectInternalName: answer.linkProject
1373
+ });
1374
+ } catch (e) {
1375
+ logger.debug("Failed to link project", e);
1376
+ logger.error("An error occurred while linking the project.");
1377
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1378
+ projectInternalName: answer.linkProject
1379
+ });
1380
+ }
1381
+ };
1382
+ const command$4 = ({ command: command2, ctx }) => {
1383
+ 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));
1384
+ };
1385
+ const link = {
1386
+ name: "link-project",
1387
+ description: "Link a local directory to a Strapi Cloud project",
1388
+ action: action$2,
1389
+ command: command$4
1390
+ };
1391
+ const command$3 = ({ command: command2, ctx }) => {
1186
1392
  command2.command("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
1187
1393
  "after",
1188
1394
  "\nAfter running this command, you will be prompted to enter your authentication information."
@@ -1192,10 +1398,10 @@ const login = {
1192
1398
  name: "login",
1193
1399
  description: "Strapi Cloud Login",
1194
1400
  action: loginAction,
1195
- command: command$2
1401
+ command: command$3
1196
1402
  };
1197
1403
  const openModule = import("open");
1198
- const action = async (ctx) => {
1404
+ const action$1 = async (ctx) => {
1199
1405
  const { logger } = ctx;
1200
1406
  const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
1201
1407
  const token = await retrieveToken();
@@ -1225,37 +1431,64 @@ const action = async (ctx) => {
1225
1431
  logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
1226
1432
  logger.debug(e);
1227
1433
  }
1228
- try {
1229
- await cloudApiService.track("didLogout", { loginMethod: "cli" });
1230
- } catch (e) {
1231
- logger.debug("Failed to track logout event", e);
1232
- }
1434
+ await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
1233
1435
  };
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));
1436
+ const command$2 = ({ command: command2, ctx }) => {
1437
+ 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
1438
  };
1237
1439
  const logout = {
1238
1440
  name: "logout",
1239
1441
  description: "Strapi Cloud Logout",
1240
- action,
1241
- command: command$1
1442
+ action: action$1,
1443
+ command: command$2
1242
1444
  };
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));
1445
+ const command$1 = ({ command: command2, ctx }) => {
1446
+ 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
1447
  };
1246
1448
  const createProject = {
1247
1449
  name: "create-project",
1248
1450
  description: "Create a new project",
1249
- action: action$2,
1451
+ action: action$4,
1452
+ command: command$1
1453
+ };
1454
+ const action = async (ctx) => {
1455
+ const { getValidToken } = await tokenServiceFactory(ctx);
1456
+ const token = await getValidToken(ctx, promptLogin);
1457
+ const { logger } = ctx;
1458
+ if (!token) {
1459
+ return;
1460
+ }
1461
+ const cloudApiService = await cloudApiFactory(ctx, token);
1462
+ const spinner = logger.spinner("Fetching your projects...").start();
1463
+ try {
1464
+ const {
1465
+ data: { data: projectList }
1466
+ } = await cloudApiService.listProjects();
1467
+ spinner.succeed();
1468
+ logger.log(projectList);
1469
+ } catch (e) {
1470
+ ctx.logger.debug("Failed to list projects", e);
1471
+ spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
1472
+ }
1473
+ };
1474
+ const command = ({ command: command2, ctx }) => {
1475
+ 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));
1476
+ };
1477
+ const listProjects = {
1478
+ name: "list-projects",
1479
+ description: "List Strapi Cloud projects",
1480
+ action,
1250
1481
  command
1251
1482
  };
1252
1483
  const cli = {
1253
1484
  deployProject,
1485
+ link,
1254
1486
  login,
1255
1487
  logout,
1256
- createProject
1488
+ createProject,
1489
+ listProjects
1257
1490
  };
1258
- const cloudCommands = [deployProject, login, logout];
1491
+ const cloudCommands = [deployProject, link, login, logout, listProjects];
1259
1492
  async function initCloudCLIConfig() {
1260
1493
  const localConfig = await getLocalConfig();
1261
1494
  if (!localConfig.deviceId) {