@strapi/cloud-cli 0.0.0-experimental.abc → 0.0.0-experimental.af7e4e2471a04cc7f17b8ed3474530810efc02bc
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 +583 -148
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +582 -144
- package/dist/index.mjs.map +1 -1
- package/dist/src/cloud/command.d.ts +3 -0
- package/dist/src/cloud/command.d.ts.map +1 -0
- package/dist/src/create-project/action.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 +4 -1
- 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/environment/command.d.ts +3 -0
- package/dist/src/environment/command.d.ts.map +1 -0
- package/dist/src/environment/list/action.d.ts +4 -0
- package/dist/src/environment/list/action.d.ts.map +1 -0
- package/dist/src/environment/list/command.d.ts +4 -0
- package/dist/src/environment/list/command.d.ts.map +1 -0
- package/dist/src/environment/list/index.d.ts +7 -0
- package/dist/src/environment/list/index.d.ts.map +1 -0
- package/dist/src/index.d.ts +3 -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/logout/action.d.ts.map +1 -1
- package/dist/src/services/build-logs.d.ts.map +1 -1
- package/dist/src/services/cli-api.d.ts +47 -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 +4 -0
- 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,15 +1,15 @@
|
|
|
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";
|
|
4
|
+
import inquirer from "inquirer";
|
|
3
5
|
import * as path from "path";
|
|
4
6
|
import path__default from "path";
|
|
5
7
|
import chalk from "chalk";
|
|
6
8
|
import axios, { AxiosError } from "axios";
|
|
7
9
|
import * as crypto from "node:crypto";
|
|
8
10
|
import { env } from "@strapi/utils";
|
|
9
|
-
import * as fs from "fs";
|
|
10
11
|
import * as tar from "tar";
|
|
11
12
|
import { minimatch } from "minimatch";
|
|
12
|
-
import inquirer from "inquirer";
|
|
13
13
|
import { defaults, has } from "lodash/fp";
|
|
14
14
|
import os from "os";
|
|
15
15
|
import XDGAppPaths from "xdg-app-paths";
|
|
@@ -18,10 +18,9 @@ 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";
|
|
25
24
|
import { createCommand } from "commander";
|
|
26
25
|
const apiConfig = {
|
|
27
26
|
apiBaseUrl: env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
|
|
@@ -41,23 +40,6 @@ const IGNORED_PATTERNS = [
|
|
|
41
40
|
"**/.idea/**",
|
|
42
41
|
"**/.vscode/**"
|
|
43
42
|
];
|
|
44
|
-
const getFiles = (dirPath, ignorePatterns = [], arrayOfFiles = [], subfolder = "") => {
|
|
45
|
-
const entries = fs.readdirSync(path.join(dirPath, subfolder));
|
|
46
|
-
entries.forEach((entry) => {
|
|
47
|
-
const entryPathFromRoot = path.join(subfolder, entry);
|
|
48
|
-
const entryPath = path.relative(dirPath, entryPathFromRoot);
|
|
49
|
-
const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
|
|
50
|
-
if (isIgnored) {
|
|
51
|
-
return;
|
|
52
|
-
}
|
|
53
|
-
if (fs.statSync(entryPath).isDirectory()) {
|
|
54
|
-
getFiles(dirPath, ignorePatterns, arrayOfFiles, entryPathFromRoot);
|
|
55
|
-
} else {
|
|
56
|
-
arrayOfFiles.push(entryPath);
|
|
57
|
-
}
|
|
58
|
-
});
|
|
59
|
-
return arrayOfFiles;
|
|
60
|
-
};
|
|
61
43
|
const isIgnoredFile = (folderPath, file, ignorePatterns) => {
|
|
62
44
|
ignorePatterns.push(...IGNORED_PATTERNS);
|
|
63
45
|
const relativeFilePath = path.join(folderPath, file);
|
|
@@ -75,16 +57,35 @@ const isIgnoredFile = (folderPath, file, ignorePatterns) => {
|
|
|
75
57
|
}
|
|
76
58
|
return isIgnored;
|
|
77
59
|
};
|
|
78
|
-
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) => {
|
|
79
79
|
const gitignorePath = path.resolve(folderPath, ".gitignore");
|
|
80
|
-
|
|
80
|
+
const pathExist = await fse.pathExists(gitignorePath);
|
|
81
|
+
if (!pathExist)
|
|
81
82
|
return [];
|
|
82
|
-
const gitignoreContent =
|
|
83
|
+
const gitignoreContent = await fse.readFile(gitignorePath, "utf8");
|
|
83
84
|
return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
|
|
84
85
|
};
|
|
85
86
|
const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
|
|
86
|
-
const ignorePatterns = readGitignore(folderToCompress);
|
|
87
|
-
const filesToCompress = getFiles(folderToCompress, ignorePatterns);
|
|
87
|
+
const ignorePatterns = await readGitignore(folderToCompress);
|
|
88
|
+
const filesToCompress = await getFiles(folderToCompress, ignorePatterns);
|
|
88
89
|
return tar.c(
|
|
89
90
|
{
|
|
90
91
|
gzip: true,
|
|
@@ -97,7 +98,7 @@ const APP_FOLDER_NAME = "com.strapi.cli";
|
|
|
97
98
|
const CONFIG_FILENAME = "config.json";
|
|
98
99
|
async function checkDirectoryExists(directoryPath) {
|
|
99
100
|
try {
|
|
100
|
-
const fsStat = await
|
|
101
|
+
const fsStat = await fse__default.lstat(directoryPath);
|
|
101
102
|
return fsStat.isDirectory();
|
|
102
103
|
} catch (e) {
|
|
103
104
|
return false;
|
|
@@ -105,14 +106,14 @@ async function checkDirectoryExists(directoryPath) {
|
|
|
105
106
|
}
|
|
106
107
|
async function getTmpStoragePath() {
|
|
107
108
|
const storagePath = path__default.join(os.tmpdir(), APP_FOLDER_NAME);
|
|
108
|
-
await
|
|
109
|
+
await fse__default.ensureDir(storagePath);
|
|
109
110
|
return storagePath;
|
|
110
111
|
}
|
|
111
112
|
async function getConfigPath() {
|
|
112
113
|
const configDirs = XDGAppPaths(APP_FOLDER_NAME).configDirs();
|
|
113
114
|
const configPath = configDirs.find(checkDirectoryExists);
|
|
114
115
|
if (!configPath) {
|
|
115
|
-
await
|
|
116
|
+
await fse__default.ensureDir(configDirs[0]);
|
|
116
117
|
return configDirs[0];
|
|
117
118
|
}
|
|
118
119
|
return configPath;
|
|
@@ -120,9 +121,9 @@ async function getConfigPath() {
|
|
|
120
121
|
async function getLocalConfig() {
|
|
121
122
|
const configPath = await getConfigPath();
|
|
122
123
|
const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
|
|
123
|
-
await
|
|
124
|
+
await fse__default.ensureFile(configFilePath);
|
|
124
125
|
try {
|
|
125
|
-
return await
|
|
126
|
+
return await fse__default.readJSON(configFilePath, { encoding: "utf8", throws: true });
|
|
126
127
|
} catch (e) {
|
|
127
128
|
return {};
|
|
128
129
|
}
|
|
@@ -130,10 +131,10 @@ async function getLocalConfig() {
|
|
|
130
131
|
async function saveLocalConfig(data) {
|
|
131
132
|
const configPath = await getConfigPath();
|
|
132
133
|
const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
|
|
133
|
-
await
|
|
134
|
+
await fse__default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
|
|
134
135
|
}
|
|
135
136
|
const name = "@strapi/cloud-cli";
|
|
136
|
-
const version = "5.
|
|
137
|
+
const version = "5.3.0";
|
|
137
138
|
const description = "Commands to interact with the Strapi Cloud";
|
|
138
139
|
const keywords = [
|
|
139
140
|
"strapi",
|
|
@@ -174,11 +175,12 @@ const scripts = {
|
|
|
174
175
|
build: "pack-up build",
|
|
175
176
|
clean: "run -T rimraf ./dist",
|
|
176
177
|
lint: "run -T eslint .",
|
|
178
|
+
"test:unit": "run -T jest",
|
|
177
179
|
watch: "pack-up watch"
|
|
178
180
|
};
|
|
179
181
|
const dependencies = {
|
|
180
182
|
"@strapi/utils": "workspace:*",
|
|
181
|
-
axios: "1.
|
|
183
|
+
axios: "1.7.4",
|
|
182
184
|
chalk: "4.1.2",
|
|
183
185
|
"cli-progress": "3.12.0",
|
|
184
186
|
commander: "8.3.0",
|
|
@@ -193,7 +195,7 @@ const dependencies = {
|
|
|
193
195
|
open: "8.4.0",
|
|
194
196
|
ora: "5.4.1",
|
|
195
197
|
"pkg-up": "3.1.0",
|
|
196
|
-
tar: "6.1
|
|
198
|
+
tar: "6.2.1",
|
|
197
199
|
"xdg-app-paths": "8.3.0",
|
|
198
200
|
yup: "0.32.9"
|
|
199
201
|
};
|
|
@@ -206,7 +208,7 @@ const devDependencies = {
|
|
|
206
208
|
tsconfig: "workspace:*"
|
|
207
209
|
};
|
|
208
210
|
const engines = {
|
|
209
|
-
node: ">=18.0.0 <=
|
|
211
|
+
node: ">=18.0.0 <=22.x.x",
|
|
210
212
|
npm: ">=6.0.0"
|
|
211
213
|
};
|
|
212
214
|
const packageJson = {
|
|
@@ -256,7 +258,7 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
256
258
|
deploy({ filePath, project }, { onUploadProgress }) {
|
|
257
259
|
return axiosCloudAPI.post(
|
|
258
260
|
`/deploy/${project.name}`,
|
|
259
|
-
{ file:
|
|
261
|
+
{ file: fse__default.createReadStream(filePath), targetEnvironment: project.targetEnvironment },
|
|
260
262
|
{
|
|
261
263
|
headers: {
|
|
262
264
|
"Content-Type": "multipart/form-data"
|
|
@@ -299,8 +301,61 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
299
301
|
throw error;
|
|
300
302
|
}
|
|
301
303
|
},
|
|
302
|
-
listProjects() {
|
|
303
|
-
|
|
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 listEnvironments({ name: name2 }) {
|
|
333
|
+
try {
|
|
334
|
+
const response = await axiosCloudAPI.get(`/projects/${name2}/environments`);
|
|
335
|
+
if (response.status !== 200) {
|
|
336
|
+
throw new Error("Error fetching cloud environments from the server.");
|
|
337
|
+
}
|
|
338
|
+
return response;
|
|
339
|
+
} catch (error) {
|
|
340
|
+
logger.debug(
|
|
341
|
+
"🥲 Oops! Couldn't retrieve your project's environments from the server. Please try again."
|
|
342
|
+
);
|
|
343
|
+
throw error;
|
|
344
|
+
}
|
|
345
|
+
},
|
|
346
|
+
async getProject({ name: name2 }) {
|
|
347
|
+
try {
|
|
348
|
+
const response = await axiosCloudAPI.get(`/projects/${name2}`);
|
|
349
|
+
if (response.status !== 200) {
|
|
350
|
+
throw new Error("Error fetching project's details.");
|
|
351
|
+
}
|
|
352
|
+
return response;
|
|
353
|
+
} catch (error) {
|
|
354
|
+
logger.debug(
|
|
355
|
+
"🥲 Oops! There was a problem retrieving your project's details. Please try again."
|
|
356
|
+
);
|
|
357
|
+
throw error;
|
|
358
|
+
}
|
|
304
359
|
},
|
|
305
360
|
track(event, payload = {}) {
|
|
306
361
|
return axiosCloudAPI.post("/track", {
|
|
@@ -315,18 +370,18 @@ async function save(data, { directoryPath } = {}) {
|
|
|
315
370
|
const alreadyInFileData = await retrieve({ directoryPath });
|
|
316
371
|
const storedData = { ...alreadyInFileData, ...data };
|
|
317
372
|
const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
318
|
-
await
|
|
319
|
-
await
|
|
373
|
+
await fse__default.ensureDir(path__default.dirname(pathToFile));
|
|
374
|
+
await fse__default.writeJson(pathToFile, storedData, { encoding: "utf8" });
|
|
320
375
|
}
|
|
321
376
|
async function retrieve({
|
|
322
377
|
directoryPath
|
|
323
378
|
} = {}) {
|
|
324
379
|
const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
325
|
-
const pathExists = await
|
|
380
|
+
const pathExists = await fse__default.pathExists(pathToFile);
|
|
326
381
|
if (!pathExists) {
|
|
327
382
|
return {};
|
|
328
383
|
}
|
|
329
|
-
return
|
|
384
|
+
return fse__default.readJSON(pathToFile, { encoding: "utf8" });
|
|
330
385
|
}
|
|
331
386
|
const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
332
387
|
__proto__: null,
|
|
@@ -571,6 +626,56 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
|
|
|
571
626
|
local: strapiInfoSave,
|
|
572
627
|
tokenServiceFactory
|
|
573
628
|
}, Symbol.toStringTag, { value: "Module" }));
|
|
629
|
+
yup.object({
|
|
630
|
+
name: yup.string().required(),
|
|
631
|
+
exports: yup.lazy(
|
|
632
|
+
(value) => yup.object(
|
|
633
|
+
typeof value === "object" ? Object.entries(value).reduce(
|
|
634
|
+
(acc, [key, value2]) => {
|
|
635
|
+
if (typeof value2 === "object") {
|
|
636
|
+
acc[key] = yup.object({
|
|
637
|
+
types: yup.string().optional(),
|
|
638
|
+
source: yup.string().required(),
|
|
639
|
+
module: yup.string().optional(),
|
|
640
|
+
import: yup.string().required(),
|
|
641
|
+
require: yup.string().required(),
|
|
642
|
+
default: yup.string().required()
|
|
643
|
+
}).noUnknown(true);
|
|
644
|
+
} else {
|
|
645
|
+
acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
|
|
646
|
+
}
|
|
647
|
+
return acc;
|
|
648
|
+
},
|
|
649
|
+
{}
|
|
650
|
+
) : void 0
|
|
651
|
+
).optional()
|
|
652
|
+
)
|
|
653
|
+
});
|
|
654
|
+
const loadPkg = async ({ cwd, logger }) => {
|
|
655
|
+
const pkgPath = await pkgUp({ cwd });
|
|
656
|
+
if (!pkgPath) {
|
|
657
|
+
throw new Error("Could not find a package.json in the current directory");
|
|
658
|
+
}
|
|
659
|
+
const buffer = await fse.readFile(pkgPath);
|
|
660
|
+
const pkg = JSON.parse(buffer.toString());
|
|
661
|
+
logger.debug("Loaded package.json:", os.EOL, pkg);
|
|
662
|
+
return pkg;
|
|
663
|
+
};
|
|
664
|
+
async function getProjectNameFromPackageJson(ctx) {
|
|
665
|
+
try {
|
|
666
|
+
const packageJson2 = await loadPkg(ctx);
|
|
667
|
+
return packageJson2.name || "my-strapi-project";
|
|
668
|
+
} catch (e) {
|
|
669
|
+
return "my-strapi-project";
|
|
670
|
+
}
|
|
671
|
+
}
|
|
672
|
+
const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
|
|
673
|
+
try {
|
|
674
|
+
await cloudApiService.track(eventName, eventData);
|
|
675
|
+
} catch (e) {
|
|
676
|
+
ctx.logger.debug(`Failed to track ${eventName}`, e);
|
|
677
|
+
}
|
|
678
|
+
};
|
|
574
679
|
const openModule$1 = import("open");
|
|
575
680
|
async function promptLogin(ctx) {
|
|
576
681
|
const response = await inquirer.prompt([
|
|
@@ -591,13 +696,6 @@ async function loginAction(ctx) {
|
|
|
591
696
|
const tokenService = await tokenServiceFactory(ctx);
|
|
592
697
|
const existingToken = await tokenService.retrieveToken();
|
|
593
698
|
const cloudApiService = await cloudApiFactory(ctx, existingToken || void 0);
|
|
594
|
-
const trackFailedLogin = async () => {
|
|
595
|
-
try {
|
|
596
|
-
await cloudApiService.track("didNotLogin", { loginMethod: "cli" });
|
|
597
|
-
} catch (e) {
|
|
598
|
-
logger.debug("Failed to track failed login", e);
|
|
599
|
-
}
|
|
600
|
-
};
|
|
601
699
|
if (existingToken) {
|
|
602
700
|
const isTokenValid = await tokenService.isTokenValid(existingToken);
|
|
603
701
|
if (isTokenValid) {
|
|
@@ -629,11 +727,7 @@ async function loginAction(ctx) {
|
|
|
629
727
|
logger.debug(e);
|
|
630
728
|
return false;
|
|
631
729
|
}
|
|
632
|
-
|
|
633
|
-
await cloudApiService.track("willLoginAttempt", {});
|
|
634
|
-
} catch (e) {
|
|
635
|
-
logger.debug("Failed to track login attempt", e);
|
|
636
|
-
}
|
|
730
|
+
await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
|
|
637
731
|
logger.debug("🔐 Creating device authentication request...", {
|
|
638
732
|
client_id: cliConfig2.clientId,
|
|
639
733
|
scope: cliConfig2.scope,
|
|
@@ -713,13 +807,13 @@ async function loginAction(ctx) {
|
|
|
713
807
|
"There seems to be a problem with your login information. Please try logging in again."
|
|
714
808
|
);
|
|
715
809
|
spinnerFail();
|
|
716
|
-
await
|
|
810
|
+
await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
|
|
717
811
|
return false;
|
|
718
812
|
}
|
|
719
813
|
if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
|
|
720
814
|
logger.debug(e);
|
|
721
815
|
spinnerFail();
|
|
722
|
-
await
|
|
816
|
+
await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
|
|
723
817
|
return false;
|
|
724
818
|
}
|
|
725
819
|
await new Promise((resolve) => {
|
|
@@ -733,15 +827,50 @@ async function loginAction(ctx) {
|
|
|
733
827
|
"To access your dashboard, please copy and paste the following URL into your web browser:"
|
|
734
828
|
);
|
|
735
829
|
logger.log(chalk.underline(`${apiConfig.dashboardBaseUrl}/projects`));
|
|
736
|
-
|
|
737
|
-
await cloudApiService.track("didLogin", { loginMethod: "cli" });
|
|
738
|
-
} catch (e) {
|
|
739
|
-
logger.debug("Failed to track login", e);
|
|
740
|
-
}
|
|
830
|
+
await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
|
|
741
831
|
};
|
|
742
832
|
await authenticate();
|
|
743
833
|
return isAuthenticated;
|
|
744
834
|
}
|
|
835
|
+
function questionDefaultValuesMapper(questionsMap) {
|
|
836
|
+
return (questions) => {
|
|
837
|
+
return questions.map((question) => {
|
|
838
|
+
const questionName = question.name;
|
|
839
|
+
if (questionName in questionsMap) {
|
|
840
|
+
const questionDefault = questionsMap[questionName];
|
|
841
|
+
if (typeof questionDefault === "function") {
|
|
842
|
+
return {
|
|
843
|
+
...question,
|
|
844
|
+
default: questionDefault(question)
|
|
845
|
+
};
|
|
846
|
+
}
|
|
847
|
+
return {
|
|
848
|
+
...question,
|
|
849
|
+
default: questionDefault
|
|
850
|
+
};
|
|
851
|
+
}
|
|
852
|
+
return question;
|
|
853
|
+
});
|
|
854
|
+
};
|
|
855
|
+
}
|
|
856
|
+
function getDefaultsFromQuestions(questions) {
|
|
857
|
+
return questions.reduce((acc, question) => {
|
|
858
|
+
if (question.default && question.name) {
|
|
859
|
+
return { ...acc, [question.name]: question.default };
|
|
860
|
+
}
|
|
861
|
+
return acc;
|
|
862
|
+
}, {});
|
|
863
|
+
}
|
|
864
|
+
function getProjectNodeVersionDefault(question) {
|
|
865
|
+
const currentNodeVersion = process.versions.node.split(".")[0];
|
|
866
|
+
if (question.type === "list" && Array.isArray(question.choices)) {
|
|
867
|
+
const choice = question.choices.find((choice2) => choice2.value === currentNodeVersion);
|
|
868
|
+
if (choice) {
|
|
869
|
+
return choice.value;
|
|
870
|
+
}
|
|
871
|
+
}
|
|
872
|
+
return question.default;
|
|
873
|
+
}
|
|
745
874
|
async function handleError(ctx, error) {
|
|
746
875
|
const { logger } = ctx;
|
|
747
876
|
logger.debug(error);
|
|
@@ -786,7 +915,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
|
|
|
786
915
|
throw e;
|
|
787
916
|
}
|
|
788
917
|
}
|
|
789
|
-
const action$
|
|
918
|
+
const action$5 = async (ctx) => {
|
|
790
919
|
const { logger } = ctx;
|
|
791
920
|
const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
792
921
|
const token = await getValidToken(ctx, promptLogin);
|
|
@@ -795,7 +924,16 @@ const action$2 = async (ctx) => {
|
|
|
795
924
|
}
|
|
796
925
|
const cloudApi = await cloudApiFactory(ctx, token);
|
|
797
926
|
const { data: config } = await cloudApi.config();
|
|
798
|
-
const
|
|
927
|
+
const projectName = await getProjectNameFromPackageJson(ctx);
|
|
928
|
+
const defaultAnswersMapper = questionDefaultValuesMapper({
|
|
929
|
+
name: projectName,
|
|
930
|
+
nodeVersion: getProjectNodeVersionDefault
|
|
931
|
+
});
|
|
932
|
+
const questions = defaultAnswersMapper(config.projectCreation.questions);
|
|
933
|
+
const defaultValues = {
|
|
934
|
+
...config.projectCreation.defaults,
|
|
935
|
+
...getDefaultsFromQuestions(questions)
|
|
936
|
+
};
|
|
799
937
|
const projectAnswersDefaulted = defaults(defaultValues);
|
|
800
938
|
const projectAnswers = await inquirer.prompt(questions);
|
|
801
939
|
const projectInput = projectAnswersDefaulted(projectAnswers);
|
|
@@ -844,41 +982,6 @@ function notificationServiceFactory({ logger }) {
|
|
|
844
982
|
};
|
|
845
983
|
};
|
|
846
984
|
}
|
|
847
|
-
yup.object({
|
|
848
|
-
name: yup.string().required(),
|
|
849
|
-
exports: yup.lazy(
|
|
850
|
-
(value) => yup.object(
|
|
851
|
-
typeof value === "object" ? Object.entries(value).reduce(
|
|
852
|
-
(acc, [key, value2]) => {
|
|
853
|
-
if (typeof value2 === "object") {
|
|
854
|
-
acc[key] = yup.object({
|
|
855
|
-
types: yup.string().optional(),
|
|
856
|
-
source: yup.string().required(),
|
|
857
|
-
module: yup.string().optional(),
|
|
858
|
-
import: yup.string().required(),
|
|
859
|
-
require: yup.string().required(),
|
|
860
|
-
default: yup.string().required()
|
|
861
|
-
}).noUnknown(true);
|
|
862
|
-
} else {
|
|
863
|
-
acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
|
|
864
|
-
}
|
|
865
|
-
return acc;
|
|
866
|
-
},
|
|
867
|
-
{}
|
|
868
|
-
) : void 0
|
|
869
|
-
).optional()
|
|
870
|
-
)
|
|
871
|
-
});
|
|
872
|
-
const loadPkg = async ({ cwd, logger }) => {
|
|
873
|
-
const pkgPath = await pkgUp({ cwd });
|
|
874
|
-
if (!pkgPath) {
|
|
875
|
-
throw new Error("Could not find a package.json in the current directory");
|
|
876
|
-
}
|
|
877
|
-
const buffer = await fs$1.readFile(pkgPath);
|
|
878
|
-
const pkg = JSON.parse(buffer.toString());
|
|
879
|
-
logger.debug("Loaded package.json:", os.EOL, pkg);
|
|
880
|
-
return pkg;
|
|
881
|
-
};
|
|
882
985
|
const buildLogsServiceFactory = ({ logger }) => {
|
|
883
986
|
return async (url, token, cliConfig2) => {
|
|
884
987
|
const CONN_TIMEOUT = Number(cliConfig2.buildLogsConnectionTimeout);
|
|
@@ -932,6 +1035,7 @@ const buildLogsServiceFactory = ({ logger }) => {
|
|
|
932
1035
|
if (retries > MAX_RETRIES) {
|
|
933
1036
|
spinner.fail("We were unable to connect to the server to get build logs at this time.");
|
|
934
1037
|
es.close();
|
|
1038
|
+
clearExistingTimeout();
|
|
935
1039
|
reject(new Error("Max retries reached"));
|
|
936
1040
|
}
|
|
937
1041
|
};
|
|
@@ -940,6 +1044,32 @@ const buildLogsServiceFactory = ({ logger }) => {
|
|
|
940
1044
|
});
|
|
941
1045
|
};
|
|
942
1046
|
};
|
|
1047
|
+
const QUIT_OPTION$1 = "Quit";
|
|
1048
|
+
async function promptForEnvironment(environments) {
|
|
1049
|
+
const choices = environments.map((env2) => ({ name: env2, value: env2 }));
|
|
1050
|
+
const { selectedEnvironment } = await inquirer.prompt([
|
|
1051
|
+
{
|
|
1052
|
+
type: "list",
|
|
1053
|
+
name: "selectedEnvironment",
|
|
1054
|
+
message: "Select the environment to deploy:",
|
|
1055
|
+
choices: [...choices, { name: chalk.grey(`(${QUIT_OPTION$1})`), value: null }]
|
|
1056
|
+
}
|
|
1057
|
+
]);
|
|
1058
|
+
if (selectedEnvironment === null) {
|
|
1059
|
+
process.exit(1);
|
|
1060
|
+
}
|
|
1061
|
+
const { confirm } = await inquirer.prompt([
|
|
1062
|
+
{
|
|
1063
|
+
type: "confirm",
|
|
1064
|
+
name: "confirm",
|
|
1065
|
+
message: `Do you want to proceed with deployment to ${chalk.cyan(selectedEnvironment)}?`
|
|
1066
|
+
}
|
|
1067
|
+
]);
|
|
1068
|
+
if (!confirm) {
|
|
1069
|
+
process.exit(1);
|
|
1070
|
+
}
|
|
1071
|
+
return selectedEnvironment;
|
|
1072
|
+
}
|
|
943
1073
|
async function upload(ctx, project, token, maxProjectFileSize) {
|
|
944
1074
|
const cloudApi = await cloudApiFactory(ctx, token);
|
|
945
1075
|
try {
|
|
@@ -974,13 +1104,13 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
974
1104
|
process.exit(1);
|
|
975
1105
|
}
|
|
976
1106
|
const tarFilePath = path__default.resolve(storagePath, compressedFilename);
|
|
977
|
-
const fileStats = await
|
|
1107
|
+
const fileStats = await fse__default.stat(tarFilePath);
|
|
978
1108
|
if (fileStats.size > maxProjectFileSize) {
|
|
979
1109
|
ctx.logger.log(
|
|
980
1110
|
"Unable to proceed: Your project is too big to be transferred, please use a git repo instead."
|
|
981
1111
|
);
|
|
982
1112
|
try {
|
|
983
|
-
await
|
|
1113
|
+
await fse__default.remove(tarFilePath);
|
|
984
1114
|
} catch (e) {
|
|
985
1115
|
ctx.logger.log("Unable to remove file: ", tarFilePath);
|
|
986
1116
|
ctx.logger.debug(e);
|
|
@@ -1006,20 +1136,10 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
1006
1136
|
return data.build_id;
|
|
1007
1137
|
} catch (e) {
|
|
1008
1138
|
progressBar.stop();
|
|
1009
|
-
|
|
1010
|
-
if (e.response.status === 404) {
|
|
1011
|
-
ctx.logger.error(
|
|
1012
|
-
`The project does not exist. Remove the ${LOCAL_SAVE_FILENAME} file and try again.`
|
|
1013
|
-
);
|
|
1014
|
-
} else {
|
|
1015
|
-
ctx.logger.error(e.response.data);
|
|
1016
|
-
}
|
|
1017
|
-
} else {
|
|
1018
|
-
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1019
|
-
}
|
|
1139
|
+
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1020
1140
|
ctx.logger.debug(e);
|
|
1021
1141
|
} finally {
|
|
1022
|
-
await
|
|
1142
|
+
await fse__default.remove(tarFilePath);
|
|
1023
1143
|
}
|
|
1024
1144
|
process.exit(0);
|
|
1025
1145
|
} catch (e) {
|
|
@@ -1028,11 +1148,11 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
1028
1148
|
process.exit(1);
|
|
1029
1149
|
}
|
|
1030
1150
|
}
|
|
1031
|
-
async function getProject(ctx) {
|
|
1151
|
+
async function getProject$1(ctx) {
|
|
1032
1152
|
const { project } = await retrieve();
|
|
1033
1153
|
if (!project) {
|
|
1034
1154
|
try {
|
|
1035
|
-
return await action$
|
|
1155
|
+
return await action$5(ctx);
|
|
1036
1156
|
} catch (e) {
|
|
1037
1157
|
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1038
1158
|
ctx.logger.debug(e);
|
|
@@ -1041,25 +1161,75 @@ async function getProject(ctx) {
|
|
|
1041
1161
|
}
|
|
1042
1162
|
return project;
|
|
1043
1163
|
}
|
|
1044
|
-
|
|
1164
|
+
async function getConfig({
|
|
1165
|
+
ctx,
|
|
1166
|
+
cloudApiService
|
|
1167
|
+
}) {
|
|
1168
|
+
try {
|
|
1169
|
+
const { data: cliConfig2 } = await cloudApiService.config();
|
|
1170
|
+
return cliConfig2;
|
|
1171
|
+
} catch (e) {
|
|
1172
|
+
ctx.logger.debug("Failed to get cli config", e);
|
|
1173
|
+
return null;
|
|
1174
|
+
}
|
|
1175
|
+
}
|
|
1176
|
+
const action$4 = async (ctx, opts) => {
|
|
1045
1177
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1046
1178
|
const token = await getValidToken(ctx, promptLogin);
|
|
1047
1179
|
if (!token) {
|
|
1048
1180
|
return;
|
|
1049
1181
|
}
|
|
1050
|
-
const project = await getProject(ctx);
|
|
1182
|
+
const project = await getProject$1(ctx);
|
|
1051
1183
|
if (!project) {
|
|
1052
1184
|
return;
|
|
1053
1185
|
}
|
|
1054
|
-
const cloudApiService = await cloudApiFactory(ctx);
|
|
1186
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1187
|
+
let environments;
|
|
1055
1188
|
try {
|
|
1056
|
-
|
|
1189
|
+
const {
|
|
1190
|
+
data: { data: projectData, metadata }
|
|
1191
|
+
} = await cloudApiService.getProject({ name: project.name });
|
|
1192
|
+
const isProjectSuspended = projectData.suspendedAt;
|
|
1193
|
+
environments = projectData.environments;
|
|
1194
|
+
if (isProjectSuspended) {
|
|
1195
|
+
ctx.logger.log(
|
|
1196
|
+
"\n Oops! This project has been suspended. \n\n Please reactivate it from the dashboard to continue deploying: "
|
|
1197
|
+
);
|
|
1198
|
+
ctx.logger.log(chalk.underline(`${metadata.dashboardUrls.project}`));
|
|
1199
|
+
return;
|
|
1200
|
+
}
|
|
1057
1201
|
} catch (e) {
|
|
1058
|
-
|
|
1202
|
+
if (e instanceof AxiosError && e.response?.data) {
|
|
1203
|
+
if (e.response.status === 404) {
|
|
1204
|
+
ctx.logger.warn(
|
|
1205
|
+
`The project associated with this folder does not exist in Strapi Cloud.
|
|
1206
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1207
|
+
"link"
|
|
1208
|
+
)} command before deploying.`
|
|
1209
|
+
);
|
|
1210
|
+
} else {
|
|
1211
|
+
ctx.logger.error(e.response.data);
|
|
1212
|
+
}
|
|
1213
|
+
} else {
|
|
1214
|
+
ctx.logger.error(
|
|
1215
|
+
"An error occurred while retrieving the project's information. Please try again later."
|
|
1216
|
+
);
|
|
1217
|
+
}
|
|
1218
|
+
ctx.logger.debug(e);
|
|
1219
|
+
return;
|
|
1059
1220
|
}
|
|
1221
|
+
await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
|
|
1222
|
+
projectInternalName: project.name
|
|
1223
|
+
});
|
|
1060
1224
|
const notificationService = notificationServiceFactory(ctx);
|
|
1061
1225
|
const buildLogsService = buildLogsServiceFactory(ctx);
|
|
1062
|
-
const
|
|
1226
|
+
const cliConfig2 = await getConfig({ ctx, cloudApiService });
|
|
1227
|
+
if (!cliConfig2) {
|
|
1228
|
+
ctx.logger.error(
|
|
1229
|
+
"An error occurred while retrieving data from Strapi Cloud. Please check your network or try again later."
|
|
1230
|
+
);
|
|
1231
|
+
return;
|
|
1232
|
+
}
|
|
1063
1233
|
let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
|
|
1064
1234
|
if (Number.isNaN(maxSize)) {
|
|
1065
1235
|
ctx.logger.debug(
|
|
@@ -1067,6 +1237,17 @@ const action$1 = async (ctx) => {
|
|
|
1067
1237
|
);
|
|
1068
1238
|
maxSize = 1e8;
|
|
1069
1239
|
}
|
|
1240
|
+
let targetEnvironment;
|
|
1241
|
+
if (opts.environment) {
|
|
1242
|
+
if (!environments.includes(opts.environment)) {
|
|
1243
|
+
ctx.logger.error(`Environment ${opts.environment} does not exist.`);
|
|
1244
|
+
return;
|
|
1245
|
+
}
|
|
1246
|
+
targetEnvironment = opts.environment;
|
|
1247
|
+
} else {
|
|
1248
|
+
targetEnvironment = environments.length > 1 ? await promptForEnvironment(environments) : environments[0];
|
|
1249
|
+
}
|
|
1250
|
+
project.targetEnvironment = targetEnvironment;
|
|
1070
1251
|
const buildId = await upload(ctx, project, token, maxSize);
|
|
1071
1252
|
if (!buildId) {
|
|
1072
1253
|
return;
|
|
@@ -1081,10 +1262,11 @@ const action$1 = async (ctx) => {
|
|
|
1081
1262
|
chalk.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
|
|
1082
1263
|
);
|
|
1083
1264
|
} catch (e) {
|
|
1265
|
+
ctx.logger.debug(e);
|
|
1084
1266
|
if (e instanceof Error) {
|
|
1085
1267
|
ctx.logger.error(e.message);
|
|
1086
1268
|
} else {
|
|
1087
|
-
|
|
1269
|
+
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1088
1270
|
}
|
|
1089
1271
|
}
|
|
1090
1272
|
};
|
|
@@ -1115,16 +1297,162 @@ const runAction = (name2, action2) => (...args) => {
|
|
|
1115
1297
|
process.exit(1);
|
|
1116
1298
|
});
|
|
1117
1299
|
};
|
|
1118
|
-
const command$
|
|
1119
|
-
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$
|
|
1300
|
+
const command$6 = ({ ctx }) => {
|
|
1301
|
+
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").option("-e, --environment <name>", "Specify the environment to deploy").action((opts) => runAction("deploy", action$4)(ctx, opts));
|
|
1120
1302
|
};
|
|
1121
1303
|
const deployProject = {
|
|
1122
1304
|
name: "deploy-project",
|
|
1123
1305
|
description: "Deploy a Strapi Cloud project",
|
|
1124
|
-
action: action$
|
|
1125
|
-
command: command$
|
|
1306
|
+
action: action$4,
|
|
1307
|
+
command: command$6
|
|
1126
1308
|
};
|
|
1127
|
-
const
|
|
1309
|
+
const QUIT_OPTION = "Quit";
|
|
1310
|
+
async function getExistingConfig(ctx) {
|
|
1311
|
+
try {
|
|
1312
|
+
return await retrieve();
|
|
1313
|
+
} catch (e) {
|
|
1314
|
+
ctx.logger.debug("Failed to get project config", e);
|
|
1315
|
+
ctx.logger.error("An error occurred while retrieving config data from your local project.");
|
|
1316
|
+
return null;
|
|
1317
|
+
}
|
|
1318
|
+
}
|
|
1319
|
+
async function promptForRelink(ctx, cloudApiService, existingConfig) {
|
|
1320
|
+
if (existingConfig && existingConfig.project) {
|
|
1321
|
+
const { shouldRelink } = await inquirer.prompt([
|
|
1322
|
+
{
|
|
1323
|
+
type: "confirm",
|
|
1324
|
+
name: "shouldRelink",
|
|
1325
|
+
message: `A project named ${chalk.cyan(
|
|
1326
|
+
existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
|
|
1327
|
+
)} is already linked to this local folder. Do you want to update the link?`,
|
|
1328
|
+
default: false
|
|
1329
|
+
}
|
|
1330
|
+
]);
|
|
1331
|
+
if (!shouldRelink) {
|
|
1332
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1333
|
+
currentProjectName: existingConfig.project?.name
|
|
1334
|
+
});
|
|
1335
|
+
return false;
|
|
1336
|
+
}
|
|
1337
|
+
}
|
|
1338
|
+
return true;
|
|
1339
|
+
}
|
|
1340
|
+
async function getProjectsList(ctx, cloudApiService, existingConfig) {
|
|
1341
|
+
const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
|
|
1342
|
+
try {
|
|
1343
|
+
const {
|
|
1344
|
+
data: { data: projectList }
|
|
1345
|
+
} = await cloudApiService.listLinkProjects();
|
|
1346
|
+
spinner.succeed();
|
|
1347
|
+
if (!Array.isArray(projectList)) {
|
|
1348
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1349
|
+
return null;
|
|
1350
|
+
}
|
|
1351
|
+
const projects = projectList.filter(
|
|
1352
|
+
(project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
|
|
1353
|
+
).map((project) => {
|
|
1354
|
+
return {
|
|
1355
|
+
name: project.displayName,
|
|
1356
|
+
value: { name: project.name, displayName: project.displayName }
|
|
1357
|
+
};
|
|
1358
|
+
});
|
|
1359
|
+
if (projects.length === 0) {
|
|
1360
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1361
|
+
return null;
|
|
1362
|
+
}
|
|
1363
|
+
return projects;
|
|
1364
|
+
} catch (e) {
|
|
1365
|
+
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1366
|
+
ctx.logger.debug("Failed to list projects", e);
|
|
1367
|
+
return null;
|
|
1368
|
+
}
|
|
1369
|
+
}
|
|
1370
|
+
async function getUserSelection(ctx, projects) {
|
|
1371
|
+
const { logger } = ctx;
|
|
1372
|
+
try {
|
|
1373
|
+
const answer = await inquirer.prompt([
|
|
1374
|
+
{
|
|
1375
|
+
type: "list",
|
|
1376
|
+
name: "linkProject",
|
|
1377
|
+
message: "Which project do you want to link?",
|
|
1378
|
+
choices: [...projects, { name: chalk.grey(`(${QUIT_OPTION})`), value: null }]
|
|
1379
|
+
}
|
|
1380
|
+
]);
|
|
1381
|
+
if (!answer.linkProject) {
|
|
1382
|
+
return null;
|
|
1383
|
+
}
|
|
1384
|
+
return answer;
|
|
1385
|
+
} catch (e) {
|
|
1386
|
+
logger.debug("Failed to get user input", e);
|
|
1387
|
+
logger.error("An error occurred while trying to get your input.");
|
|
1388
|
+
return null;
|
|
1389
|
+
}
|
|
1390
|
+
}
|
|
1391
|
+
const action$3 = async (ctx) => {
|
|
1392
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1393
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1394
|
+
const { logger } = ctx;
|
|
1395
|
+
if (!token) {
|
|
1396
|
+
return;
|
|
1397
|
+
}
|
|
1398
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1399
|
+
const existingConfig = await getExistingConfig(ctx);
|
|
1400
|
+
const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
|
|
1401
|
+
if (!shouldRelink) {
|
|
1402
|
+
return;
|
|
1403
|
+
}
|
|
1404
|
+
await trackEvent(ctx, cloudApiService, "willLinkProject", {});
|
|
1405
|
+
const projects = await getProjectsList(
|
|
1406
|
+
ctx,
|
|
1407
|
+
cloudApiService,
|
|
1408
|
+
existingConfig
|
|
1409
|
+
);
|
|
1410
|
+
if (!projects) {
|
|
1411
|
+
return;
|
|
1412
|
+
}
|
|
1413
|
+
const answer = await getUserSelection(ctx, projects);
|
|
1414
|
+
if (!answer) {
|
|
1415
|
+
return;
|
|
1416
|
+
}
|
|
1417
|
+
try {
|
|
1418
|
+
const { confirmAction } = await inquirer.prompt([
|
|
1419
|
+
{
|
|
1420
|
+
type: "confirm",
|
|
1421
|
+
name: "confirmAction",
|
|
1422
|
+
message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
|
|
1423
|
+
default: false
|
|
1424
|
+
}
|
|
1425
|
+
]);
|
|
1426
|
+
if (!confirmAction) {
|
|
1427
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1428
|
+
cancelledProjectName: answer.linkProject.name,
|
|
1429
|
+
currentProjectName: existingConfig ? existingConfig.project?.name : null
|
|
1430
|
+
});
|
|
1431
|
+
return;
|
|
1432
|
+
}
|
|
1433
|
+
await save({ project: answer.linkProject });
|
|
1434
|
+
logger.log(`Project ${chalk.cyan(answer.linkProject.displayName)} linked successfully.`);
|
|
1435
|
+
await trackEvent(ctx, cloudApiService, "didLinkProject", {
|
|
1436
|
+
projectInternalName: answer.linkProject
|
|
1437
|
+
});
|
|
1438
|
+
} catch (e) {
|
|
1439
|
+
logger.debug("Failed to link project", e);
|
|
1440
|
+
logger.error("An error occurred while linking the project.");
|
|
1441
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1442
|
+
projectInternalName: answer.linkProject
|
|
1443
|
+
});
|
|
1444
|
+
}
|
|
1445
|
+
};
|
|
1446
|
+
const command$5 = ({ command: command2, ctx }) => {
|
|
1447
|
+
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$3)(ctx));
|
|
1448
|
+
};
|
|
1449
|
+
const link = {
|
|
1450
|
+
name: "link-project",
|
|
1451
|
+
description: "Link a local directory to a Strapi Cloud project",
|
|
1452
|
+
action: action$3,
|
|
1453
|
+
command: command$5
|
|
1454
|
+
};
|
|
1455
|
+
const command$4 = ({ ctx }) => {
|
|
1128
1456
|
return createCommand("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
|
|
1129
1457
|
"after",
|
|
1130
1458
|
"\nAfter running this command, you will be prompted to enter your authentication information."
|
|
@@ -1134,10 +1462,10 @@ const login = {
|
|
|
1134
1462
|
name: "login",
|
|
1135
1463
|
description: "Strapi Cloud Login",
|
|
1136
1464
|
action: loginAction,
|
|
1137
|
-
command: command$
|
|
1465
|
+
command: command$4
|
|
1138
1466
|
};
|
|
1139
1467
|
const openModule = import("open");
|
|
1140
|
-
const action = async (ctx) => {
|
|
1468
|
+
const action$2 = async (ctx) => {
|
|
1141
1469
|
const { logger } = ctx;
|
|
1142
1470
|
const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
1143
1471
|
const token = await retrieveToken();
|
|
@@ -1167,37 +1495,147 @@ const action = async (ctx) => {
|
|
|
1167
1495
|
logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
|
|
1168
1496
|
logger.debug(e);
|
|
1169
1497
|
}
|
|
1170
|
-
|
|
1171
|
-
await cloudApiService.track("didLogout", { loginMethod: "cli" });
|
|
1172
|
-
} catch (e) {
|
|
1173
|
-
logger.debug("Failed to track logout event", e);
|
|
1174
|
-
}
|
|
1498
|
+
await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
|
|
1175
1499
|
};
|
|
1176
|
-
const command$
|
|
1177
|
-
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)(ctx));
|
|
1500
|
+
const command$3 = ({ ctx }) => {
|
|
1501
|
+
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$2)(ctx));
|
|
1178
1502
|
};
|
|
1179
1503
|
const logout = {
|
|
1180
1504
|
name: "logout",
|
|
1181
1505
|
description: "Strapi Cloud Logout",
|
|
1182
|
-
action,
|
|
1183
|
-
command: command$
|
|
1506
|
+
action: action$2,
|
|
1507
|
+
command: command$3
|
|
1184
1508
|
};
|
|
1185
|
-
const command = ({ ctx }) => {
|
|
1186
|
-
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$
|
|
1509
|
+
const command$2 = ({ ctx }) => {
|
|
1510
|
+
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$5)(ctx));
|
|
1187
1511
|
};
|
|
1188
1512
|
const createProject = {
|
|
1189
1513
|
name: "create-project",
|
|
1190
1514
|
description: "Create a new project",
|
|
1191
|
-
action: action$
|
|
1515
|
+
action: action$5,
|
|
1516
|
+
command: command$2
|
|
1517
|
+
};
|
|
1518
|
+
const action$1 = async (ctx) => {
|
|
1519
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1520
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1521
|
+
const { logger } = ctx;
|
|
1522
|
+
if (!token) {
|
|
1523
|
+
return;
|
|
1524
|
+
}
|
|
1525
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1526
|
+
const spinner = logger.spinner("Fetching your projects...").start();
|
|
1527
|
+
try {
|
|
1528
|
+
const {
|
|
1529
|
+
data: { data: projectList }
|
|
1530
|
+
} = await cloudApiService.listProjects();
|
|
1531
|
+
spinner.succeed();
|
|
1532
|
+
logger.log(projectList);
|
|
1533
|
+
} catch (e) {
|
|
1534
|
+
ctx.logger.debug("Failed to list projects", e);
|
|
1535
|
+
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1536
|
+
}
|
|
1537
|
+
};
|
|
1538
|
+
const command$1 = ({ command: command2, ctx }) => {
|
|
1539
|
+
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$1)(ctx));
|
|
1540
|
+
};
|
|
1541
|
+
const listProjects = {
|
|
1542
|
+
name: "list-projects",
|
|
1543
|
+
description: "List Strapi Cloud projects",
|
|
1544
|
+
action: action$1,
|
|
1545
|
+
command: command$1
|
|
1546
|
+
};
|
|
1547
|
+
async function getProject(ctx) {
|
|
1548
|
+
const { project } = await retrieve();
|
|
1549
|
+
if (!project) {
|
|
1550
|
+
ctx.logger.warn(
|
|
1551
|
+
`
|
|
1552
|
+
We couldn't find a valid local project config.
|
|
1553
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1554
|
+
"link"
|
|
1555
|
+
)} command`
|
|
1556
|
+
);
|
|
1557
|
+
process.exit(1);
|
|
1558
|
+
}
|
|
1559
|
+
return project;
|
|
1560
|
+
}
|
|
1561
|
+
const action = async (ctx) => {
|
|
1562
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1563
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1564
|
+
const { logger } = ctx;
|
|
1565
|
+
if (!token) {
|
|
1566
|
+
return;
|
|
1567
|
+
}
|
|
1568
|
+
const project = await getProject(ctx);
|
|
1569
|
+
if (!project) {
|
|
1570
|
+
ctx.logger.debug(`No valid local project configuration was found.`);
|
|
1571
|
+
return;
|
|
1572
|
+
}
|
|
1573
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1574
|
+
const spinner = logger.spinner("Fetching environments...").start();
|
|
1575
|
+
await trackEvent(ctx, cloudApiService, "willListEnvironment", {
|
|
1576
|
+
projectInternalName: project.name
|
|
1577
|
+
});
|
|
1578
|
+
try {
|
|
1579
|
+
const {
|
|
1580
|
+
data: { data: environmentsList }
|
|
1581
|
+
} = await cloudApiService.listEnvironments({ name: project.name });
|
|
1582
|
+
spinner.succeed();
|
|
1583
|
+
logger.log(environmentsList);
|
|
1584
|
+
await trackEvent(ctx, cloudApiService, "didListEnvironment", {
|
|
1585
|
+
projectInternalName: project.name
|
|
1586
|
+
});
|
|
1587
|
+
} catch (e) {
|
|
1588
|
+
if (e.response && e.response.status === 404) {
|
|
1589
|
+
spinner.succeed();
|
|
1590
|
+
logger.warn(
|
|
1591
|
+
`
|
|
1592
|
+
The project associated with this folder does not exist in Strapi Cloud.
|
|
1593
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
|
|
1594
|
+
"link"
|
|
1595
|
+
)} command`
|
|
1596
|
+
);
|
|
1597
|
+
} else {
|
|
1598
|
+
spinner.fail("An error occurred while fetching environments data from Strapi Cloud.");
|
|
1599
|
+
logger.debug("Failed to list environments", e);
|
|
1600
|
+
}
|
|
1601
|
+
await trackEvent(ctx, cloudApiService, "didNotListEnvironment", {
|
|
1602
|
+
projectInternalName: project.name
|
|
1603
|
+
});
|
|
1604
|
+
}
|
|
1605
|
+
};
|
|
1606
|
+
function defineCloudNamespace(command2, ctx) {
|
|
1607
|
+
const cloud = command2.command("cloud").description("Manage Strapi Cloud projects");
|
|
1608
|
+
cloud.command("environments").description("Alias for cloud environment list").action(() => runAction("list", action)(ctx));
|
|
1609
|
+
return cloud;
|
|
1610
|
+
}
|
|
1611
|
+
let environmentCmd = null;
|
|
1612
|
+
const initializeEnvironmentCommand = (command2, ctx) => {
|
|
1613
|
+
if (!environmentCmd) {
|
|
1614
|
+
const cloud = defineCloudNamespace(command2, ctx);
|
|
1615
|
+
environmentCmd = cloud.command("environment").description("Manage environments");
|
|
1616
|
+
}
|
|
1617
|
+
return environmentCmd;
|
|
1618
|
+
};
|
|
1619
|
+
const command = ({ command: command2, ctx }) => {
|
|
1620
|
+
const environmentCmd2 = initializeEnvironmentCommand(command2, ctx);
|
|
1621
|
+
environmentCmd2.command("list").description("List Strapi Cloud project environments").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("list", action)(ctx));
|
|
1622
|
+
};
|
|
1623
|
+
const listEnvironments = {
|
|
1624
|
+
name: "list-environments",
|
|
1625
|
+
description: "List Strapi Cloud environments",
|
|
1626
|
+
action,
|
|
1192
1627
|
command
|
|
1193
1628
|
};
|
|
1194
1629
|
const cli = {
|
|
1195
1630
|
deployProject,
|
|
1631
|
+
link,
|
|
1196
1632
|
login,
|
|
1197
1633
|
logout,
|
|
1198
|
-
createProject
|
|
1634
|
+
createProject,
|
|
1635
|
+
listProjects,
|
|
1636
|
+
listEnvironments
|
|
1199
1637
|
};
|
|
1200
|
-
const cloudCommands = [deployProject, login, logout];
|
|
1638
|
+
const cloudCommands = [deployProject, link, login, logout, listProjects, listEnvironments];
|
|
1201
1639
|
async function initCloudCLIConfig() {
|
|
1202
1640
|
const localConfig = await getLocalConfig();
|
|
1203
1641
|
if (!localConfig.deviceId) {
|