@strapi/cloud-cli 0.0.0-next.84f5cfd43cfdb85f000d388b196a36d874382dab → 0.0.0-next.959c5589d0d3efa25d7ca014656d9ff48c173399
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.
- package/dist/index.js +452 -146
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +452 -143
- package/dist/index.mjs.map +1 -1
- package/dist/src/create-project/action.d.ts.map +1 -1
- package/dist/src/create-project/command.d.ts.map +1 -1
- package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts +3 -0
- package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts.map +1 -0
- package/dist/src/create-project/utils/project-questions.utils.d.ts +20 -0
- package/dist/src/create-project/utils/project-questions.utils.d.ts.map +1 -0
- package/dist/src/deploy-project/action.d.ts.map +1 -1
- package/dist/src/deploy-project/command.d.ts.map +1 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/link/action.d.ts +4 -0
- package/dist/src/link/action.d.ts.map +1 -0
- package/dist/src/link/command.d.ts +7 -0
- package/dist/src/link/command.d.ts.map +1 -0
- package/dist/src/link/index.d.ts +7 -0
- package/dist/src/link/index.d.ts.map +1 -0
- package/dist/src/list-projects/action.d.ts +4 -0
- package/dist/src/list-projects/action.d.ts.map +1 -0
- package/dist/src/list-projects/command.d.ts +7 -0
- package/dist/src/list-projects/command.d.ts.map +1 -0
- package/dist/src/list-projects/index.d.ts +7 -0
- package/dist/src/list-projects/index.d.ts.map +1 -0
- package/dist/src/login/action.d.ts.map +1 -1
- package/dist/src/login/command.d.ts.map +1 -1
- package/dist/src/logout/action.d.ts.map +1 -1
- package/dist/src/logout/command.d.ts.map +1 -1
- package/dist/src/services/build-logs.d.ts.map +1 -1
- package/dist/src/services/cli-api.d.ts +35 -7
- package/dist/src/services/cli-api.d.ts.map +1 -1
- package/dist/src/services/strapi-info-save.d.ts +1 -1
- package/dist/src/services/strapi-info-save.d.ts.map +1 -1
- package/dist/src/types.d.ts +2 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/utils/analytics.d.ts +4 -0
- package/dist/src/utils/analytics.d.ts.map +1 -0
- package/dist/src/utils/compress-files.d.ts.map +1 -1
- package/dist/src/utils/pkg.d.ts.map +1 -1
- package/package.json +9 -8
package/dist/index.mjs
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import crypto$1 from "crypto";
|
|
2
|
-
import fse from "fs-extra";
|
|
2
|
+
import * as fse from "fs-extra";
|
|
3
|
+
import fse__default from "fs-extra";
|
|
3
4
|
import * as path from "path";
|
|
4
5
|
import path__default from "path";
|
|
5
6
|
import chalk from "chalk";
|
|
6
7
|
import axios, { AxiosError } from "axios";
|
|
7
8
|
import * as crypto from "node:crypto";
|
|
8
9
|
import { env } from "@strapi/utils";
|
|
9
|
-
import * as fs from "fs";
|
|
10
10
|
import * as tar from "tar";
|
|
11
11
|
import { minimatch } from "minimatch";
|
|
12
12
|
import inquirer from "inquirer";
|
|
@@ -18,10 +18,10 @@ import jwt from "jsonwebtoken";
|
|
|
18
18
|
import stringify from "fast-safe-stringify";
|
|
19
19
|
import ora from "ora";
|
|
20
20
|
import * as cliProgress from "cli-progress";
|
|
21
|
-
import EventSource from "eventsource";
|
|
22
|
-
import fs$1 from "fs/promises";
|
|
23
21
|
import pkgUp from "pkg-up";
|
|
24
22
|
import * as yup from "yup";
|
|
23
|
+
import EventSource from "eventsource";
|
|
24
|
+
import { createCommand } from "commander";
|
|
25
25
|
const apiConfig = {
|
|
26
26
|
apiBaseUrl: env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
|
|
27
27
|
dashboardBaseUrl: env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
|
|
@@ -40,23 +40,6 @@ const IGNORED_PATTERNS = [
|
|
|
40
40
|
"**/.idea/**",
|
|
41
41
|
"**/.vscode/**"
|
|
42
42
|
];
|
|
43
|
-
const getFiles = (dirPath, ignorePatterns = [], arrayOfFiles = [], subfolder = "") => {
|
|
44
|
-
const entries = fs.readdirSync(path.join(dirPath, subfolder));
|
|
45
|
-
entries.forEach((entry) => {
|
|
46
|
-
const entryPathFromRoot = path.join(subfolder, entry);
|
|
47
|
-
const entryPath = path.relative(dirPath, entryPathFromRoot);
|
|
48
|
-
const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
|
|
49
|
-
if (isIgnored) {
|
|
50
|
-
return;
|
|
51
|
-
}
|
|
52
|
-
if (fs.statSync(entryPath).isDirectory()) {
|
|
53
|
-
getFiles(dirPath, ignorePatterns, arrayOfFiles, entryPathFromRoot);
|
|
54
|
-
} else {
|
|
55
|
-
arrayOfFiles.push(entryPath);
|
|
56
|
-
}
|
|
57
|
-
});
|
|
58
|
-
return arrayOfFiles;
|
|
59
|
-
};
|
|
60
43
|
const isIgnoredFile = (folderPath, file, ignorePatterns) => {
|
|
61
44
|
ignorePatterns.push(...IGNORED_PATTERNS);
|
|
62
45
|
const relativeFilePath = path.join(folderPath, file);
|
|
@@ -74,16 +57,35 @@ const isIgnoredFile = (folderPath, file, ignorePatterns) => {
|
|
|
74
57
|
}
|
|
75
58
|
return isIgnored;
|
|
76
59
|
};
|
|
77
|
-
const
|
|
60
|
+
const getFiles = async (dirPath, ignorePatterns = [], subfolder = "") => {
|
|
61
|
+
const arrayOfFiles = [];
|
|
62
|
+
const entries = await fse.readdir(path.join(dirPath, subfolder));
|
|
63
|
+
for (const entry of entries) {
|
|
64
|
+
const entryPathFromRoot = path.join(subfolder, entry);
|
|
65
|
+
const entryPath = path.relative(dirPath, entryPathFromRoot);
|
|
66
|
+
const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
|
|
67
|
+
if (!isIgnored) {
|
|
68
|
+
if (fse.statSync(entryPath).isDirectory()) {
|
|
69
|
+
const subFiles = await getFiles(dirPath, ignorePatterns, entryPathFromRoot);
|
|
70
|
+
arrayOfFiles.push(...subFiles);
|
|
71
|
+
} else {
|
|
72
|
+
arrayOfFiles.push(entryPath);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
return arrayOfFiles;
|
|
77
|
+
};
|
|
78
|
+
const readGitignore = async (folderPath) => {
|
|
78
79
|
const gitignorePath = path.resolve(folderPath, ".gitignore");
|
|
79
|
-
|
|
80
|
+
const pathExist = await fse.pathExists(gitignorePath);
|
|
81
|
+
if (!pathExist)
|
|
80
82
|
return [];
|
|
81
|
-
const gitignoreContent =
|
|
83
|
+
const gitignoreContent = await fse.readFile(gitignorePath, "utf8");
|
|
82
84
|
return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
|
|
83
85
|
};
|
|
84
86
|
const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
|
|
85
|
-
const ignorePatterns = readGitignore(folderToCompress);
|
|
86
|
-
const filesToCompress = getFiles(folderToCompress, ignorePatterns);
|
|
87
|
+
const ignorePatterns = await readGitignore(folderToCompress);
|
|
88
|
+
const filesToCompress = await getFiles(folderToCompress, ignorePatterns);
|
|
87
89
|
return tar.c(
|
|
88
90
|
{
|
|
89
91
|
gzip: true,
|
|
@@ -96,7 +98,7 @@ const APP_FOLDER_NAME = "com.strapi.cli";
|
|
|
96
98
|
const CONFIG_FILENAME = "config.json";
|
|
97
99
|
async function checkDirectoryExists(directoryPath) {
|
|
98
100
|
try {
|
|
99
|
-
const fsStat = await
|
|
101
|
+
const fsStat = await fse__default.lstat(directoryPath);
|
|
100
102
|
return fsStat.isDirectory();
|
|
101
103
|
} catch (e) {
|
|
102
104
|
return false;
|
|
@@ -104,14 +106,14 @@ async function checkDirectoryExists(directoryPath) {
|
|
|
104
106
|
}
|
|
105
107
|
async function getTmpStoragePath() {
|
|
106
108
|
const storagePath = path__default.join(os.tmpdir(), APP_FOLDER_NAME);
|
|
107
|
-
await
|
|
109
|
+
await fse__default.ensureDir(storagePath);
|
|
108
110
|
return storagePath;
|
|
109
111
|
}
|
|
110
112
|
async function getConfigPath() {
|
|
111
113
|
const configDirs = XDGAppPaths(APP_FOLDER_NAME).configDirs();
|
|
112
114
|
const configPath = configDirs.find(checkDirectoryExists);
|
|
113
115
|
if (!configPath) {
|
|
114
|
-
await
|
|
116
|
+
await fse__default.ensureDir(configDirs[0]);
|
|
115
117
|
return configDirs[0];
|
|
116
118
|
}
|
|
117
119
|
return configPath;
|
|
@@ -119,9 +121,9 @@ async function getConfigPath() {
|
|
|
119
121
|
async function getLocalConfig() {
|
|
120
122
|
const configPath = await getConfigPath();
|
|
121
123
|
const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
|
|
122
|
-
await
|
|
124
|
+
await fse__default.ensureFile(configFilePath);
|
|
123
125
|
try {
|
|
124
|
-
return await
|
|
126
|
+
return await fse__default.readJSON(configFilePath, { encoding: "utf8", throws: true });
|
|
125
127
|
} catch (e) {
|
|
126
128
|
return {};
|
|
127
129
|
}
|
|
@@ -129,10 +131,10 @@ async function getLocalConfig() {
|
|
|
129
131
|
async function saveLocalConfig(data) {
|
|
130
132
|
const configPath = await getConfigPath();
|
|
131
133
|
const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
|
|
132
|
-
await
|
|
134
|
+
await fse__default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
|
|
133
135
|
}
|
|
134
136
|
const name = "@strapi/cloud-cli";
|
|
135
|
-
const version = "
|
|
137
|
+
const version = "5.0.2-beta.0";
|
|
136
138
|
const description = "Commands to interact with the Strapi Cloud";
|
|
137
139
|
const keywords = [
|
|
138
140
|
"strapi",
|
|
@@ -173,17 +175,18 @@ const scripts = {
|
|
|
173
175
|
build: "pack-up build",
|
|
174
176
|
clean: "run -T rimraf ./dist",
|
|
175
177
|
lint: "run -T eslint .",
|
|
178
|
+
"test:unit": "run -T jest",
|
|
176
179
|
watch: "pack-up watch"
|
|
177
180
|
};
|
|
178
181
|
const dependencies = {
|
|
179
|
-
"@strapi/utils": "
|
|
180
|
-
axios: "1.
|
|
182
|
+
"@strapi/utils": "workspace:*",
|
|
183
|
+
axios: "1.7.4",
|
|
181
184
|
chalk: "4.1.2",
|
|
182
185
|
"cli-progress": "3.12.0",
|
|
183
186
|
commander: "8.3.0",
|
|
184
187
|
eventsource: "2.0.2",
|
|
185
188
|
"fast-safe-stringify": "2.1.1",
|
|
186
|
-
"fs-extra": "
|
|
189
|
+
"fs-extra": "11.2.0",
|
|
187
190
|
inquirer: "8.2.5",
|
|
188
191
|
jsonwebtoken: "9.0.0",
|
|
189
192
|
"jwks-rsa": "3.1.0",
|
|
@@ -192,7 +195,7 @@ const dependencies = {
|
|
|
192
195
|
open: "8.4.0",
|
|
193
196
|
ora: "5.4.1",
|
|
194
197
|
"pkg-up": "3.1.0",
|
|
195
|
-
tar: "6.1
|
|
198
|
+
tar: "6.2.1",
|
|
196
199
|
"xdg-app-paths": "8.3.0",
|
|
197
200
|
yup: "0.32.9"
|
|
198
201
|
};
|
|
@@ -201,8 +204,8 @@ const devDependencies = {
|
|
|
201
204
|
"@types/cli-progress": "3.11.5",
|
|
202
205
|
"@types/eventsource": "1.1.15",
|
|
203
206
|
"@types/lodash": "^4.14.191",
|
|
204
|
-
"eslint-config-custom": "
|
|
205
|
-
tsconfig: "
|
|
207
|
+
"eslint-config-custom": "workspace:*",
|
|
208
|
+
tsconfig: "workspace:*"
|
|
206
209
|
};
|
|
207
210
|
const engines = {
|
|
208
211
|
node: ">=18.0.0 <=20.x.x",
|
|
@@ -255,7 +258,7 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
255
258
|
deploy({ filePath, project }, { onUploadProgress }) {
|
|
256
259
|
return axiosCloudAPI.post(
|
|
257
260
|
`/deploy/${project.name}`,
|
|
258
|
-
{ file:
|
|
261
|
+
{ file: fse__default.createReadStream(filePath) },
|
|
259
262
|
{
|
|
260
263
|
headers: {
|
|
261
264
|
"Content-Type": "multipart/form-data"
|
|
@@ -298,8 +301,47 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
298
301
|
throw error;
|
|
299
302
|
}
|
|
300
303
|
},
|
|
301
|
-
listProjects() {
|
|
302
|
-
|
|
304
|
+
async listProjects() {
|
|
305
|
+
try {
|
|
306
|
+
const response = await axiosCloudAPI.get("/projects");
|
|
307
|
+
if (response.status !== 200) {
|
|
308
|
+
throw new Error("Error fetching cloud projects from the server.");
|
|
309
|
+
}
|
|
310
|
+
return response;
|
|
311
|
+
} catch (error) {
|
|
312
|
+
logger.debug(
|
|
313
|
+
"🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
|
|
314
|
+
);
|
|
315
|
+
throw error;
|
|
316
|
+
}
|
|
317
|
+
},
|
|
318
|
+
async listLinkProjects() {
|
|
319
|
+
try {
|
|
320
|
+
const response = await axiosCloudAPI.get("/projects-linkable");
|
|
321
|
+
if (response.status !== 200) {
|
|
322
|
+
throw new Error("Error fetching cloud projects from the server.");
|
|
323
|
+
}
|
|
324
|
+
return response;
|
|
325
|
+
} catch (error) {
|
|
326
|
+
logger.debug(
|
|
327
|
+
"🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
|
|
328
|
+
);
|
|
329
|
+
throw error;
|
|
330
|
+
}
|
|
331
|
+
},
|
|
332
|
+
async getProject({ name: name2 }) {
|
|
333
|
+
try {
|
|
334
|
+
const response = await axiosCloudAPI.get(`/projects/${name2}`);
|
|
335
|
+
if (response.status !== 200) {
|
|
336
|
+
throw new Error("Error fetching project's details.");
|
|
337
|
+
}
|
|
338
|
+
return response;
|
|
339
|
+
} catch (error) {
|
|
340
|
+
logger.debug(
|
|
341
|
+
"🥲 Oops! There was a problem retrieving your project's details. Please try again."
|
|
342
|
+
);
|
|
343
|
+
throw error;
|
|
344
|
+
}
|
|
303
345
|
},
|
|
304
346
|
track(event, payload = {}) {
|
|
305
347
|
return axiosCloudAPI.post("/track", {
|
|
@@ -314,18 +356,18 @@ async function save(data, { directoryPath } = {}) {
|
|
|
314
356
|
const alreadyInFileData = await retrieve({ directoryPath });
|
|
315
357
|
const storedData = { ...alreadyInFileData, ...data };
|
|
316
358
|
const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
317
|
-
await
|
|
318
|
-
await
|
|
359
|
+
await fse__default.ensureDir(path__default.dirname(pathToFile));
|
|
360
|
+
await fse__default.writeJson(pathToFile, storedData, { encoding: "utf8" });
|
|
319
361
|
}
|
|
320
362
|
async function retrieve({
|
|
321
363
|
directoryPath
|
|
322
364
|
} = {}) {
|
|
323
365
|
const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
324
|
-
const pathExists = await
|
|
366
|
+
const pathExists = await fse__default.pathExists(pathToFile);
|
|
325
367
|
if (!pathExists) {
|
|
326
368
|
return {};
|
|
327
369
|
}
|
|
328
|
-
return
|
|
370
|
+
return fse__default.readJSON(pathToFile, { encoding: "utf8" });
|
|
329
371
|
}
|
|
330
372
|
const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
331
373
|
__proto__: null,
|
|
@@ -570,6 +612,56 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
|
|
|
570
612
|
local: strapiInfoSave,
|
|
571
613
|
tokenServiceFactory
|
|
572
614
|
}, Symbol.toStringTag, { value: "Module" }));
|
|
615
|
+
yup.object({
|
|
616
|
+
name: yup.string().required(),
|
|
617
|
+
exports: yup.lazy(
|
|
618
|
+
(value) => yup.object(
|
|
619
|
+
typeof value === "object" ? Object.entries(value).reduce(
|
|
620
|
+
(acc, [key, value2]) => {
|
|
621
|
+
if (typeof value2 === "object") {
|
|
622
|
+
acc[key] = yup.object({
|
|
623
|
+
types: yup.string().optional(),
|
|
624
|
+
source: yup.string().required(),
|
|
625
|
+
module: yup.string().optional(),
|
|
626
|
+
import: yup.string().required(),
|
|
627
|
+
require: yup.string().required(),
|
|
628
|
+
default: yup.string().required()
|
|
629
|
+
}).noUnknown(true);
|
|
630
|
+
} else {
|
|
631
|
+
acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
|
|
632
|
+
}
|
|
633
|
+
return acc;
|
|
634
|
+
},
|
|
635
|
+
{}
|
|
636
|
+
) : void 0
|
|
637
|
+
).optional()
|
|
638
|
+
)
|
|
639
|
+
});
|
|
640
|
+
const loadPkg = async ({ cwd, logger }) => {
|
|
641
|
+
const pkgPath = await pkgUp({ cwd });
|
|
642
|
+
if (!pkgPath) {
|
|
643
|
+
throw new Error("Could not find a package.json in the current directory");
|
|
644
|
+
}
|
|
645
|
+
const buffer = await fse.readFile(pkgPath);
|
|
646
|
+
const pkg = JSON.parse(buffer.toString());
|
|
647
|
+
logger.debug("Loaded package.json:", os.EOL, pkg);
|
|
648
|
+
return pkg;
|
|
649
|
+
};
|
|
650
|
+
async function getProjectNameFromPackageJson(ctx) {
|
|
651
|
+
try {
|
|
652
|
+
const packageJson2 = await loadPkg(ctx);
|
|
653
|
+
return packageJson2.name || "my-strapi-project";
|
|
654
|
+
} catch (e) {
|
|
655
|
+
return "my-strapi-project";
|
|
656
|
+
}
|
|
657
|
+
}
|
|
658
|
+
const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
|
|
659
|
+
try {
|
|
660
|
+
await cloudApiService.track(eventName, eventData);
|
|
661
|
+
} catch (e) {
|
|
662
|
+
ctx.logger.debug(`Failed to track ${eventName}`, e);
|
|
663
|
+
}
|
|
664
|
+
};
|
|
573
665
|
const openModule$1 = import("open");
|
|
574
666
|
async function promptLogin(ctx) {
|
|
575
667
|
const response = await inquirer.prompt([
|
|
@@ -590,13 +682,6 @@ async function loginAction(ctx) {
|
|
|
590
682
|
const tokenService = await tokenServiceFactory(ctx);
|
|
591
683
|
const existingToken = await tokenService.retrieveToken();
|
|
592
684
|
const cloudApiService = await cloudApiFactory(ctx, existingToken || void 0);
|
|
593
|
-
const trackFailedLogin = async () => {
|
|
594
|
-
try {
|
|
595
|
-
await cloudApiService.track("didNotLogin", { loginMethod: "cli" });
|
|
596
|
-
} catch (e) {
|
|
597
|
-
logger.debug("Failed to track failed login", e);
|
|
598
|
-
}
|
|
599
|
-
};
|
|
600
685
|
if (existingToken) {
|
|
601
686
|
const isTokenValid = await tokenService.isTokenValid(existingToken);
|
|
602
687
|
if (isTokenValid) {
|
|
@@ -628,11 +713,7 @@ async function loginAction(ctx) {
|
|
|
628
713
|
logger.debug(e);
|
|
629
714
|
return false;
|
|
630
715
|
}
|
|
631
|
-
|
|
632
|
-
await cloudApiService.track("willLoginAttempt", {});
|
|
633
|
-
} catch (e) {
|
|
634
|
-
logger.debug("Failed to track login attempt", e);
|
|
635
|
-
}
|
|
716
|
+
await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
|
|
636
717
|
logger.debug("🔐 Creating device authentication request...", {
|
|
637
718
|
client_id: cliConfig2.clientId,
|
|
638
719
|
scope: cliConfig2.scope,
|
|
@@ -712,13 +793,13 @@ async function loginAction(ctx) {
|
|
|
712
793
|
"There seems to be a problem with your login information. Please try logging in again."
|
|
713
794
|
);
|
|
714
795
|
spinnerFail();
|
|
715
|
-
await
|
|
796
|
+
await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
|
|
716
797
|
return false;
|
|
717
798
|
}
|
|
718
799
|
if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
|
|
719
800
|
logger.debug(e);
|
|
720
801
|
spinnerFail();
|
|
721
|
-
await
|
|
802
|
+
await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
|
|
722
803
|
return false;
|
|
723
804
|
}
|
|
724
805
|
await new Promise((resolve) => {
|
|
@@ -732,15 +813,50 @@ async function loginAction(ctx) {
|
|
|
732
813
|
"To access your dashboard, please copy and paste the following URL into your web browser:"
|
|
733
814
|
);
|
|
734
815
|
logger.log(chalk.underline(`${apiConfig.dashboardBaseUrl}/projects`));
|
|
735
|
-
|
|
736
|
-
await cloudApiService.track("didLogin", { loginMethod: "cli" });
|
|
737
|
-
} catch (e) {
|
|
738
|
-
logger.debug("Failed to track login", e);
|
|
739
|
-
}
|
|
816
|
+
await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
|
|
740
817
|
};
|
|
741
818
|
await authenticate();
|
|
742
819
|
return isAuthenticated;
|
|
743
820
|
}
|
|
821
|
+
function questionDefaultValuesMapper(questionsMap) {
|
|
822
|
+
return (questions) => {
|
|
823
|
+
return questions.map((question) => {
|
|
824
|
+
const questionName = question.name;
|
|
825
|
+
if (questionName in questionsMap) {
|
|
826
|
+
const questionDefault = questionsMap[questionName];
|
|
827
|
+
if (typeof questionDefault === "function") {
|
|
828
|
+
return {
|
|
829
|
+
...question,
|
|
830
|
+
default: questionDefault(question)
|
|
831
|
+
};
|
|
832
|
+
}
|
|
833
|
+
return {
|
|
834
|
+
...question,
|
|
835
|
+
default: questionDefault
|
|
836
|
+
};
|
|
837
|
+
}
|
|
838
|
+
return question;
|
|
839
|
+
});
|
|
840
|
+
};
|
|
841
|
+
}
|
|
842
|
+
function getDefaultsFromQuestions(questions) {
|
|
843
|
+
return questions.reduce((acc, question) => {
|
|
844
|
+
if (question.default && question.name) {
|
|
845
|
+
return { ...acc, [question.name]: question.default };
|
|
846
|
+
}
|
|
847
|
+
return acc;
|
|
848
|
+
}, {});
|
|
849
|
+
}
|
|
850
|
+
function getProjectNodeVersionDefault(question) {
|
|
851
|
+
const currentNodeVersion = process.versions.node.split(".")[0];
|
|
852
|
+
if (question.type === "list" && Array.isArray(question.choices)) {
|
|
853
|
+
const choice = question.choices.find((choice2) => choice2.value === currentNodeVersion);
|
|
854
|
+
if (choice) {
|
|
855
|
+
return choice.value;
|
|
856
|
+
}
|
|
857
|
+
}
|
|
858
|
+
return question.default;
|
|
859
|
+
}
|
|
744
860
|
async function handleError(ctx, error) {
|
|
745
861
|
const { logger } = ctx;
|
|
746
862
|
logger.debug(error);
|
|
@@ -785,7 +901,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
|
|
|
785
901
|
throw e;
|
|
786
902
|
}
|
|
787
903
|
}
|
|
788
|
-
const action$
|
|
904
|
+
const action$4 = async (ctx) => {
|
|
789
905
|
const { logger } = ctx;
|
|
790
906
|
const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
791
907
|
const token = await getValidToken(ctx, promptLogin);
|
|
@@ -794,7 +910,16 @@ const action$2 = async (ctx) => {
|
|
|
794
910
|
}
|
|
795
911
|
const cloudApi = await cloudApiFactory(ctx, token);
|
|
796
912
|
const { data: config } = await cloudApi.config();
|
|
797
|
-
const
|
|
913
|
+
const projectName = await getProjectNameFromPackageJson(ctx);
|
|
914
|
+
const defaultAnswersMapper = questionDefaultValuesMapper({
|
|
915
|
+
name: projectName,
|
|
916
|
+
nodeVersion: getProjectNodeVersionDefault
|
|
917
|
+
});
|
|
918
|
+
const questions = defaultAnswersMapper(config.projectCreation.questions);
|
|
919
|
+
const defaultValues = {
|
|
920
|
+
...config.projectCreation.defaults,
|
|
921
|
+
...getDefaultsFromQuestions(questions)
|
|
922
|
+
};
|
|
798
923
|
const projectAnswersDefaulted = defaults(defaultValues);
|
|
799
924
|
const projectAnswers = await inquirer.prompt(questions);
|
|
800
925
|
const projectInput = projectAnswersDefaulted(projectAnswers);
|
|
@@ -843,38 +968,6 @@ function notificationServiceFactory({ logger }) {
|
|
|
843
968
|
};
|
|
844
969
|
};
|
|
845
970
|
}
|
|
846
|
-
yup.object({
|
|
847
|
-
name: yup.string().required(),
|
|
848
|
-
exports: yup.lazy(
|
|
849
|
-
(value) => yup.object(
|
|
850
|
-
typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
|
|
851
|
-
if (typeof value2 === "object") {
|
|
852
|
-
acc[key] = yup.object({
|
|
853
|
-
types: yup.string().optional(),
|
|
854
|
-
source: yup.string().required(),
|
|
855
|
-
module: yup.string().optional(),
|
|
856
|
-
import: yup.string().required(),
|
|
857
|
-
require: yup.string().required(),
|
|
858
|
-
default: yup.string().required()
|
|
859
|
-
}).noUnknown(true);
|
|
860
|
-
} else {
|
|
861
|
-
acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
|
|
862
|
-
}
|
|
863
|
-
return acc;
|
|
864
|
-
}, {}) : void 0
|
|
865
|
-
).optional()
|
|
866
|
-
)
|
|
867
|
-
});
|
|
868
|
-
const loadPkg = async ({ cwd, logger }) => {
|
|
869
|
-
const pkgPath = await pkgUp({ cwd });
|
|
870
|
-
if (!pkgPath) {
|
|
871
|
-
throw new Error("Could not find a package.json in the current directory");
|
|
872
|
-
}
|
|
873
|
-
const buffer = await fs$1.readFile(pkgPath);
|
|
874
|
-
const pkg = JSON.parse(buffer.toString());
|
|
875
|
-
logger.debug("Loaded package.json:", os.EOL, pkg);
|
|
876
|
-
return pkg;
|
|
877
|
-
};
|
|
878
971
|
const buildLogsServiceFactory = ({ logger }) => {
|
|
879
972
|
return async (url, token, cliConfig2) => {
|
|
880
973
|
const CONN_TIMEOUT = Number(cliConfig2.buildLogsConnectionTimeout);
|
|
@@ -928,6 +1021,7 @@ const buildLogsServiceFactory = ({ logger }) => {
|
|
|
928
1021
|
if (retries > MAX_RETRIES) {
|
|
929
1022
|
spinner.fail("We were unable to connect to the server to get build logs at this time.");
|
|
930
1023
|
es.close();
|
|
1024
|
+
clearExistingTimeout();
|
|
931
1025
|
reject(new Error("Max retries reached"));
|
|
932
1026
|
}
|
|
933
1027
|
};
|
|
@@ -970,13 +1064,13 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
970
1064
|
process.exit(1);
|
|
971
1065
|
}
|
|
972
1066
|
const tarFilePath = path__default.resolve(storagePath, compressedFilename);
|
|
973
|
-
const fileStats = await
|
|
1067
|
+
const fileStats = await fse__default.stat(tarFilePath);
|
|
974
1068
|
if (fileStats.size > maxProjectFileSize) {
|
|
975
1069
|
ctx.logger.log(
|
|
976
1070
|
"Unable to proceed: Your project is too big to be transferred, please use a git repo instead."
|
|
977
1071
|
);
|
|
978
1072
|
try {
|
|
979
|
-
await
|
|
1073
|
+
await fse__default.remove(tarFilePath);
|
|
980
1074
|
} catch (e) {
|
|
981
1075
|
ctx.logger.log("Unable to remove file: ", tarFilePath);
|
|
982
1076
|
ctx.logger.debug(e);
|
|
@@ -1002,20 +1096,10 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
1002
1096
|
return data.build_id;
|
|
1003
1097
|
} catch (e) {
|
|
1004
1098
|
progressBar.stop();
|
|
1005
|
-
|
|
1006
|
-
if (e.response.status === 404) {
|
|
1007
|
-
ctx.logger.error(
|
|
1008
|
-
`The project does not exist. Remove the ${LOCAL_SAVE_FILENAME} file and try again.`
|
|
1009
|
-
);
|
|
1010
|
-
} else {
|
|
1011
|
-
ctx.logger.error(e.response.data);
|
|
1012
|
-
}
|
|
1013
|
-
} else {
|
|
1014
|
-
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1015
|
-
}
|
|
1099
|
+
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1016
1100
|
ctx.logger.debug(e);
|
|
1017
1101
|
} finally {
|
|
1018
|
-
await
|
|
1102
|
+
await fse__default.remove(tarFilePath);
|
|
1019
1103
|
}
|
|
1020
1104
|
process.exit(0);
|
|
1021
1105
|
} catch (e) {
|
|
@@ -1028,7 +1112,7 @@ async function getProject(ctx) {
|
|
|
1028
1112
|
const { project } = await retrieve();
|
|
1029
1113
|
if (!project) {
|
|
1030
1114
|
try {
|
|
1031
|
-
return await action$
|
|
1115
|
+
return await action$4(ctx);
|
|
1032
1116
|
} catch (e) {
|
|
1033
1117
|
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1034
1118
|
ctx.logger.debug(e);
|
|
@@ -1037,7 +1121,19 @@ async function getProject(ctx) {
|
|
|
1037
1121
|
}
|
|
1038
1122
|
return project;
|
|
1039
1123
|
}
|
|
1040
|
-
|
|
1124
|
+
async function getConfig({
|
|
1125
|
+
ctx,
|
|
1126
|
+
cloudApiService
|
|
1127
|
+
}) {
|
|
1128
|
+
try {
|
|
1129
|
+
const { data: cliConfig2 } = await cloudApiService.config();
|
|
1130
|
+
return cliConfig2;
|
|
1131
|
+
} catch (e) {
|
|
1132
|
+
ctx.logger.debug("Failed to get cli config", e);
|
|
1133
|
+
return null;
|
|
1134
|
+
}
|
|
1135
|
+
}
|
|
1136
|
+
const action$3 = async (ctx) => {
|
|
1041
1137
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1042
1138
|
const token = await getValidToken(ctx, promptLogin);
|
|
1043
1139
|
if (!token) {
|
|
@@ -1047,15 +1143,51 @@ const action$1 = async (ctx) => {
|
|
|
1047
1143
|
if (!project) {
|
|
1048
1144
|
return;
|
|
1049
1145
|
}
|
|
1050
|
-
const cloudApiService = await cloudApiFactory(ctx);
|
|
1146
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1051
1147
|
try {
|
|
1052
|
-
|
|
1148
|
+
const {
|
|
1149
|
+
data: { data: projectData, metadata }
|
|
1150
|
+
} = await cloudApiService.getProject({ name: project.name });
|
|
1151
|
+
const isProjectSuspended = projectData.suspendedAt;
|
|
1152
|
+
if (isProjectSuspended) {
|
|
1153
|
+
ctx.logger.log(
|
|
1154
|
+
"\n Oops! This project has been suspended. \n\n Please reactivate it from the dashboard to continue deploying: "
|
|
1155
|
+
);
|
|
1156
|
+
ctx.logger.log(chalk.underline(`${metadata.dashboardUrls.project}`));
|
|
1157
|
+
return;
|
|
1158
|
+
}
|
|
1053
1159
|
} catch (e) {
|
|
1054
|
-
|
|
1160
|
+
if (e instanceof AxiosError && e.response?.data) {
|
|
1161
|
+
if (e.response.status === 404) {
|
|
1162
|
+
ctx.logger.warn(
|
|
1163
|
+
`The project associated with this folder does not exist in Strapi Cloud.
|
|
1164
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1165
|
+
"link"
|
|
1166
|
+
)} command before deploying.`
|
|
1167
|
+
);
|
|
1168
|
+
} else {
|
|
1169
|
+
ctx.logger.error(e.response.data);
|
|
1170
|
+
}
|
|
1171
|
+
} else {
|
|
1172
|
+
ctx.logger.error(
|
|
1173
|
+
"An error occurred while retrieving the project's information. Please try again later."
|
|
1174
|
+
);
|
|
1175
|
+
}
|
|
1176
|
+
ctx.logger.debug(e);
|
|
1177
|
+
return;
|
|
1055
1178
|
}
|
|
1179
|
+
await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
|
|
1180
|
+
projectInternalName: project.name
|
|
1181
|
+
});
|
|
1056
1182
|
const notificationService = notificationServiceFactory(ctx);
|
|
1057
1183
|
const buildLogsService = buildLogsServiceFactory(ctx);
|
|
1058
|
-
const
|
|
1184
|
+
const cliConfig2 = await getConfig({ ctx, cloudApiService });
|
|
1185
|
+
if (!cliConfig2) {
|
|
1186
|
+
ctx.logger.error(
|
|
1187
|
+
"An error occurred while retrieving data from Strapi Cloud. Please check your network or try again later."
|
|
1188
|
+
);
|
|
1189
|
+
return;
|
|
1190
|
+
}
|
|
1059
1191
|
let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
|
|
1060
1192
|
if (Number.isNaN(maxSize)) {
|
|
1061
1193
|
ctx.logger.debug(
|
|
@@ -1077,10 +1209,11 @@ const action$1 = async (ctx) => {
|
|
|
1077
1209
|
chalk.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
|
|
1078
1210
|
);
|
|
1079
1211
|
} catch (e) {
|
|
1212
|
+
ctx.logger.debug(e);
|
|
1080
1213
|
if (e instanceof Error) {
|
|
1081
1214
|
ctx.logger.error(e.message);
|
|
1082
1215
|
} else {
|
|
1083
|
-
|
|
1216
|
+
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1084
1217
|
}
|
|
1085
1218
|
}
|
|
1086
1219
|
};
|
|
@@ -1111,17 +1244,163 @@ const runAction = (name2, action2) => (...args) => {
|
|
|
1111
1244
|
process.exit(1);
|
|
1112
1245
|
});
|
|
1113
1246
|
};
|
|
1114
|
-
const command$
|
|
1115
|
-
|
|
1247
|
+
const command$5 = ({ ctx }) => {
|
|
1248
|
+
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));
|
|
1116
1249
|
};
|
|
1117
1250
|
const deployProject = {
|
|
1118
1251
|
name: "deploy-project",
|
|
1119
1252
|
description: "Deploy a Strapi Cloud project",
|
|
1120
|
-
action: action$
|
|
1121
|
-
command: command$
|
|
1253
|
+
action: action$3,
|
|
1254
|
+
command: command$5
|
|
1255
|
+
};
|
|
1256
|
+
const QUIT_OPTION = "Quit";
|
|
1257
|
+
async function getExistingConfig(ctx) {
|
|
1258
|
+
try {
|
|
1259
|
+
return await retrieve();
|
|
1260
|
+
} catch (e) {
|
|
1261
|
+
ctx.logger.debug("Failed to get project config", e);
|
|
1262
|
+
ctx.logger.error("An error occurred while retrieving config data from your local project.");
|
|
1263
|
+
return null;
|
|
1264
|
+
}
|
|
1265
|
+
}
|
|
1266
|
+
async function promptForRelink(ctx, cloudApiService, existingConfig) {
|
|
1267
|
+
if (existingConfig && existingConfig.project) {
|
|
1268
|
+
const { shouldRelink } = await inquirer.prompt([
|
|
1269
|
+
{
|
|
1270
|
+
type: "confirm",
|
|
1271
|
+
name: "shouldRelink",
|
|
1272
|
+
message: `A project named ${chalk.cyan(
|
|
1273
|
+
existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
|
|
1274
|
+
)} is already linked to this local folder. Do you want to update the link?`,
|
|
1275
|
+
default: false
|
|
1276
|
+
}
|
|
1277
|
+
]);
|
|
1278
|
+
if (!shouldRelink) {
|
|
1279
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1280
|
+
currentProjectName: existingConfig.project?.name
|
|
1281
|
+
});
|
|
1282
|
+
return false;
|
|
1283
|
+
}
|
|
1284
|
+
}
|
|
1285
|
+
return true;
|
|
1286
|
+
}
|
|
1287
|
+
async function getProjectsList(ctx, cloudApiService, existingConfig) {
|
|
1288
|
+
const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
|
|
1289
|
+
try {
|
|
1290
|
+
const {
|
|
1291
|
+
data: { data: projectList }
|
|
1292
|
+
} = await cloudApiService.listLinkProjects();
|
|
1293
|
+
spinner.succeed();
|
|
1294
|
+
if (!Array.isArray(projectList)) {
|
|
1295
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1296
|
+
return null;
|
|
1297
|
+
}
|
|
1298
|
+
const projects = projectList.filter(
|
|
1299
|
+
(project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
|
|
1300
|
+
).map((project) => {
|
|
1301
|
+
return {
|
|
1302
|
+
name: project.displayName,
|
|
1303
|
+
value: { name: project.name, displayName: project.displayName }
|
|
1304
|
+
};
|
|
1305
|
+
});
|
|
1306
|
+
if (projects.length === 0) {
|
|
1307
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1308
|
+
return null;
|
|
1309
|
+
}
|
|
1310
|
+
return projects;
|
|
1311
|
+
} catch (e) {
|
|
1312
|
+
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1313
|
+
ctx.logger.debug("Failed to list projects", e);
|
|
1314
|
+
return null;
|
|
1315
|
+
}
|
|
1316
|
+
}
|
|
1317
|
+
async function getUserSelection(ctx, projects) {
|
|
1318
|
+
const { logger } = ctx;
|
|
1319
|
+
try {
|
|
1320
|
+
const answer = await inquirer.prompt([
|
|
1321
|
+
{
|
|
1322
|
+
type: "list",
|
|
1323
|
+
name: "linkProject",
|
|
1324
|
+
message: "Which project do you want to link?",
|
|
1325
|
+
choices: [...projects, { name: chalk.grey(`(${QUIT_OPTION})`), value: null }]
|
|
1326
|
+
}
|
|
1327
|
+
]);
|
|
1328
|
+
if (!answer.linkProject) {
|
|
1329
|
+
return null;
|
|
1330
|
+
}
|
|
1331
|
+
return answer;
|
|
1332
|
+
} catch (e) {
|
|
1333
|
+
logger.debug("Failed to get user input", e);
|
|
1334
|
+
logger.error("An error occurred while trying to get your input.");
|
|
1335
|
+
return null;
|
|
1336
|
+
}
|
|
1337
|
+
}
|
|
1338
|
+
const action$2 = async (ctx) => {
|
|
1339
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1340
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1341
|
+
const { logger } = ctx;
|
|
1342
|
+
if (!token) {
|
|
1343
|
+
return;
|
|
1344
|
+
}
|
|
1345
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1346
|
+
const existingConfig = await getExistingConfig(ctx);
|
|
1347
|
+
const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
|
|
1348
|
+
if (!shouldRelink) {
|
|
1349
|
+
return;
|
|
1350
|
+
}
|
|
1351
|
+
await trackEvent(ctx, cloudApiService, "willLinkProject", {});
|
|
1352
|
+
const projects = await getProjectsList(
|
|
1353
|
+
ctx,
|
|
1354
|
+
cloudApiService,
|
|
1355
|
+
existingConfig
|
|
1356
|
+
);
|
|
1357
|
+
if (!projects) {
|
|
1358
|
+
return;
|
|
1359
|
+
}
|
|
1360
|
+
const answer = await getUserSelection(ctx, projects);
|
|
1361
|
+
if (!answer) {
|
|
1362
|
+
return;
|
|
1363
|
+
}
|
|
1364
|
+
try {
|
|
1365
|
+
const { confirmAction } = await inquirer.prompt([
|
|
1366
|
+
{
|
|
1367
|
+
type: "confirm",
|
|
1368
|
+
name: "confirmAction",
|
|
1369
|
+
message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
|
|
1370
|
+
default: false
|
|
1371
|
+
}
|
|
1372
|
+
]);
|
|
1373
|
+
if (!confirmAction) {
|
|
1374
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1375
|
+
cancelledProjectName: answer.linkProject.name,
|
|
1376
|
+
currentProjectName: existingConfig ? existingConfig.project?.name : null
|
|
1377
|
+
});
|
|
1378
|
+
return;
|
|
1379
|
+
}
|
|
1380
|
+
await save({ project: answer.linkProject });
|
|
1381
|
+
logger.log(`Project ${chalk.cyan(answer.linkProject.displayName)} linked successfully.`);
|
|
1382
|
+
await trackEvent(ctx, cloudApiService, "didLinkProject", {
|
|
1383
|
+
projectInternalName: answer.linkProject
|
|
1384
|
+
});
|
|
1385
|
+
} catch (e) {
|
|
1386
|
+
logger.debug("Failed to link project", e);
|
|
1387
|
+
logger.error("An error occurred while linking the project.");
|
|
1388
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1389
|
+
projectInternalName: answer.linkProject
|
|
1390
|
+
});
|
|
1391
|
+
}
|
|
1392
|
+
};
|
|
1393
|
+
const command$4 = ({ command: command2, ctx }) => {
|
|
1394
|
+
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));
|
|
1122
1395
|
};
|
|
1123
|
-
const
|
|
1124
|
-
|
|
1396
|
+
const link = {
|
|
1397
|
+
name: "link-project",
|
|
1398
|
+
description: "Link a local directory to a Strapi Cloud project",
|
|
1399
|
+
action: action$2,
|
|
1400
|
+
command: command$4
|
|
1401
|
+
};
|
|
1402
|
+
const command$3 = ({ ctx }) => {
|
|
1403
|
+
return createCommand("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
|
|
1125
1404
|
"after",
|
|
1126
1405
|
"\nAfter running this command, you will be prompted to enter your authentication information."
|
|
1127
1406
|
).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", loginAction)(ctx));
|
|
@@ -1130,10 +1409,10 @@ const login = {
|
|
|
1130
1409
|
name: "login",
|
|
1131
1410
|
description: "Strapi Cloud Login",
|
|
1132
1411
|
action: loginAction,
|
|
1133
|
-
command: command$
|
|
1412
|
+
command: command$3
|
|
1134
1413
|
};
|
|
1135
1414
|
const openModule = import("open");
|
|
1136
|
-
const action = async (ctx) => {
|
|
1415
|
+
const action$1 = async (ctx) => {
|
|
1137
1416
|
const { logger } = ctx;
|
|
1138
1417
|
const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
1139
1418
|
const token = await retrieveToken();
|
|
@@ -1163,37 +1442,64 @@ const action = async (ctx) => {
|
|
|
1163
1442
|
logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
|
|
1164
1443
|
logger.debug(e);
|
|
1165
1444
|
}
|
|
1166
|
-
|
|
1167
|
-
await cloudApiService.track("didLogout", { loginMethod: "cli" });
|
|
1168
|
-
} catch (e) {
|
|
1169
|
-
logger.debug("Failed to track logout event", e);
|
|
1170
|
-
}
|
|
1445
|
+
await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
|
|
1171
1446
|
};
|
|
1172
|
-
const command$
|
|
1173
|
-
|
|
1447
|
+
const command$2 = ({ ctx }) => {
|
|
1448
|
+
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));
|
|
1174
1449
|
};
|
|
1175
1450
|
const logout = {
|
|
1176
1451
|
name: "logout",
|
|
1177
1452
|
description: "Strapi Cloud Logout",
|
|
1178
|
-
action,
|
|
1179
|
-
command: command$
|
|
1453
|
+
action: action$1,
|
|
1454
|
+
command: command$2
|
|
1180
1455
|
};
|
|
1181
|
-
const command = ({
|
|
1182
|
-
|
|
1456
|
+
const command$1 = ({ ctx }) => {
|
|
1457
|
+
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));
|
|
1183
1458
|
};
|
|
1184
1459
|
const createProject = {
|
|
1185
1460
|
name: "create-project",
|
|
1186
1461
|
description: "Create a new project",
|
|
1187
|
-
action: action$
|
|
1462
|
+
action: action$4,
|
|
1463
|
+
command: command$1
|
|
1464
|
+
};
|
|
1465
|
+
const action = async (ctx) => {
|
|
1466
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1467
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1468
|
+
const { logger } = ctx;
|
|
1469
|
+
if (!token) {
|
|
1470
|
+
return;
|
|
1471
|
+
}
|
|
1472
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1473
|
+
const spinner = logger.spinner("Fetching your projects...").start();
|
|
1474
|
+
try {
|
|
1475
|
+
const {
|
|
1476
|
+
data: { data: projectList }
|
|
1477
|
+
} = await cloudApiService.listProjects();
|
|
1478
|
+
spinner.succeed();
|
|
1479
|
+
logger.log(projectList);
|
|
1480
|
+
} catch (e) {
|
|
1481
|
+
ctx.logger.debug("Failed to list projects", e);
|
|
1482
|
+
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1483
|
+
}
|
|
1484
|
+
};
|
|
1485
|
+
const command = ({ command: command2, ctx }) => {
|
|
1486
|
+
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));
|
|
1487
|
+
};
|
|
1488
|
+
const listProjects = {
|
|
1489
|
+
name: "list-projects",
|
|
1490
|
+
description: "List Strapi Cloud projects",
|
|
1491
|
+
action,
|
|
1188
1492
|
command
|
|
1189
1493
|
};
|
|
1190
1494
|
const cli = {
|
|
1191
1495
|
deployProject,
|
|
1496
|
+
link,
|
|
1192
1497
|
login,
|
|
1193
1498
|
logout,
|
|
1194
|
-
createProject
|
|
1499
|
+
createProject,
|
|
1500
|
+
listProjects
|
|
1195
1501
|
};
|
|
1196
|
-
const cloudCommands = [deployProject, login, logout];
|
|
1502
|
+
const cloudCommands = [deployProject, link, login, logout, listProjects];
|
|
1197
1503
|
async function initCloudCLIConfig() {
|
|
1198
1504
|
const localConfig = await getLocalConfig();
|
|
1199
1505
|
if (!localConfig.deviceId) {
|
|
@@ -1209,7 +1515,10 @@ async function buildStrapiCloudCommands({
|
|
|
1209
1515
|
await initCloudCLIConfig();
|
|
1210
1516
|
for (const cloudCommand of cloudCommands) {
|
|
1211
1517
|
try {
|
|
1212
|
-
await cloudCommand.command({ command: command2, ctx, argv });
|
|
1518
|
+
const subCommand = await cloudCommand.command({ command: command2, ctx, argv });
|
|
1519
|
+
if (subCommand) {
|
|
1520
|
+
command2.addCommand(subCommand);
|
|
1521
|
+
}
|
|
1213
1522
|
} catch (e) {
|
|
1214
1523
|
console.error(`Failed to load command ${cloudCommand.name}`, e);
|
|
1215
1524
|
}
|