@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.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 EventSource = require("eventsource");
|
|
46
|
+
const commander = require("commander");
|
|
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
|
|
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,9 @@ 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 EventSource__default = /* @__PURE__ */ _interopDefault(EventSource);
|
|
87
84
|
const apiConfig = {
|
|
88
85
|
apiBaseUrl: utils.env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
|
|
89
86
|
dashboardBaseUrl: utils.env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
|
|
@@ -102,23 +99,6 @@ const IGNORED_PATTERNS = [
|
|
|
102
99
|
"**/.idea/**",
|
|
103
100
|
"**/.vscode/**"
|
|
104
101
|
];
|
|
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
102
|
const isIgnoredFile = (folderPath, file, ignorePatterns) => {
|
|
123
103
|
ignorePatterns.push(...IGNORED_PATTERNS);
|
|
124
104
|
const relativeFilePath = path__namespace.join(folderPath, file);
|
|
@@ -136,16 +116,35 @@ const isIgnoredFile = (folderPath, file, ignorePatterns) => {
|
|
|
136
116
|
}
|
|
137
117
|
return isIgnored;
|
|
138
118
|
};
|
|
139
|
-
const
|
|
119
|
+
const getFiles = async (dirPath, ignorePatterns = [], subfolder = "") => {
|
|
120
|
+
const arrayOfFiles = [];
|
|
121
|
+
const entries = await fse__namespace.readdir(path__namespace.join(dirPath, subfolder));
|
|
122
|
+
for (const entry of entries) {
|
|
123
|
+
const entryPathFromRoot = path__namespace.join(subfolder, entry);
|
|
124
|
+
const entryPath = path__namespace.relative(dirPath, entryPathFromRoot);
|
|
125
|
+
const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
|
|
126
|
+
if (!isIgnored) {
|
|
127
|
+
if (fse__namespace.statSync(entryPath).isDirectory()) {
|
|
128
|
+
const subFiles = await getFiles(dirPath, ignorePatterns, entryPathFromRoot);
|
|
129
|
+
arrayOfFiles.push(...subFiles);
|
|
130
|
+
} else {
|
|
131
|
+
arrayOfFiles.push(entryPath);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return arrayOfFiles;
|
|
136
|
+
};
|
|
137
|
+
const readGitignore = async (folderPath) => {
|
|
140
138
|
const gitignorePath = path__namespace.resolve(folderPath, ".gitignore");
|
|
141
|
-
|
|
139
|
+
const pathExist = await fse__namespace.pathExists(gitignorePath);
|
|
140
|
+
if (!pathExist)
|
|
142
141
|
return [];
|
|
143
|
-
const gitignoreContent =
|
|
142
|
+
const gitignoreContent = await fse__namespace.readFile(gitignorePath, "utf8");
|
|
144
143
|
return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
|
|
145
144
|
};
|
|
146
145
|
const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
|
|
147
|
-
const ignorePatterns = readGitignore(folderToCompress);
|
|
148
|
-
const filesToCompress = getFiles(folderToCompress, ignorePatterns);
|
|
146
|
+
const ignorePatterns = await readGitignore(folderToCompress);
|
|
147
|
+
const filesToCompress = await getFiles(folderToCompress, ignorePatterns);
|
|
149
148
|
return tar__namespace.c(
|
|
150
149
|
{
|
|
151
150
|
gzip: true,
|
|
@@ -158,7 +157,7 @@ const APP_FOLDER_NAME = "com.strapi.cli";
|
|
|
158
157
|
const CONFIG_FILENAME = "config.json";
|
|
159
158
|
async function checkDirectoryExists(directoryPath) {
|
|
160
159
|
try {
|
|
161
|
-
const fsStat = await
|
|
160
|
+
const fsStat = await fse__namespace.default.lstat(directoryPath);
|
|
162
161
|
return fsStat.isDirectory();
|
|
163
162
|
} catch (e) {
|
|
164
163
|
return false;
|
|
@@ -166,14 +165,14 @@ async function checkDirectoryExists(directoryPath) {
|
|
|
166
165
|
}
|
|
167
166
|
async function getTmpStoragePath() {
|
|
168
167
|
const storagePath = path__namespace.default.join(os__default.default.tmpdir(), APP_FOLDER_NAME);
|
|
169
|
-
await
|
|
168
|
+
await fse__namespace.default.ensureDir(storagePath);
|
|
170
169
|
return storagePath;
|
|
171
170
|
}
|
|
172
171
|
async function getConfigPath() {
|
|
173
172
|
const configDirs = XDGAppPaths__default.default(APP_FOLDER_NAME).configDirs();
|
|
174
173
|
const configPath = configDirs.find(checkDirectoryExists);
|
|
175
174
|
if (!configPath) {
|
|
176
|
-
await
|
|
175
|
+
await fse__namespace.default.ensureDir(configDirs[0]);
|
|
177
176
|
return configDirs[0];
|
|
178
177
|
}
|
|
179
178
|
return configPath;
|
|
@@ -181,9 +180,9 @@ async function getConfigPath() {
|
|
|
181
180
|
async function getLocalConfig() {
|
|
182
181
|
const configPath = await getConfigPath();
|
|
183
182
|
const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
|
|
184
|
-
await
|
|
183
|
+
await fse__namespace.default.ensureFile(configFilePath);
|
|
185
184
|
try {
|
|
186
|
-
return await
|
|
185
|
+
return await fse__namespace.default.readJSON(configFilePath, { encoding: "utf8", throws: true });
|
|
187
186
|
} catch (e) {
|
|
188
187
|
return {};
|
|
189
188
|
}
|
|
@@ -191,10 +190,10 @@ async function getLocalConfig() {
|
|
|
191
190
|
async function saveLocalConfig(data) {
|
|
192
191
|
const configPath = await getConfigPath();
|
|
193
192
|
const configFilePath = path__namespace.default.join(configPath, CONFIG_FILENAME);
|
|
194
|
-
await
|
|
193
|
+
await fse__namespace.default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
|
|
195
194
|
}
|
|
196
195
|
const name = "@strapi/cloud-cli";
|
|
197
|
-
const version = "
|
|
196
|
+
const version = "5.0.2-beta.0";
|
|
198
197
|
const description = "Commands to interact with the Strapi Cloud";
|
|
199
198
|
const keywords = [
|
|
200
199
|
"strapi",
|
|
@@ -235,17 +234,18 @@ const scripts = {
|
|
|
235
234
|
build: "pack-up build",
|
|
236
235
|
clean: "run -T rimraf ./dist",
|
|
237
236
|
lint: "run -T eslint .",
|
|
237
|
+
"test:unit": "run -T jest",
|
|
238
238
|
watch: "pack-up watch"
|
|
239
239
|
};
|
|
240
240
|
const dependencies = {
|
|
241
|
-
"@strapi/utils": "
|
|
242
|
-
axios: "1.
|
|
241
|
+
"@strapi/utils": "workspace:*",
|
|
242
|
+
axios: "1.7.4",
|
|
243
243
|
chalk: "4.1.2",
|
|
244
244
|
"cli-progress": "3.12.0",
|
|
245
245
|
commander: "8.3.0",
|
|
246
246
|
eventsource: "2.0.2",
|
|
247
247
|
"fast-safe-stringify": "2.1.1",
|
|
248
|
-
"fs-extra": "
|
|
248
|
+
"fs-extra": "11.2.0",
|
|
249
249
|
inquirer: "8.2.5",
|
|
250
250
|
jsonwebtoken: "9.0.0",
|
|
251
251
|
"jwks-rsa": "3.1.0",
|
|
@@ -254,7 +254,7 @@ const dependencies = {
|
|
|
254
254
|
open: "8.4.0",
|
|
255
255
|
ora: "5.4.1",
|
|
256
256
|
"pkg-up": "3.1.0",
|
|
257
|
-
tar: "6.1
|
|
257
|
+
tar: "6.2.1",
|
|
258
258
|
"xdg-app-paths": "8.3.0",
|
|
259
259
|
yup: "0.32.9"
|
|
260
260
|
};
|
|
@@ -263,8 +263,8 @@ const devDependencies = {
|
|
|
263
263
|
"@types/cli-progress": "3.11.5",
|
|
264
264
|
"@types/eventsource": "1.1.15",
|
|
265
265
|
"@types/lodash": "^4.14.191",
|
|
266
|
-
"eslint-config-custom": "
|
|
267
|
-
tsconfig: "
|
|
266
|
+
"eslint-config-custom": "workspace:*",
|
|
267
|
+
tsconfig: "workspace:*"
|
|
268
268
|
};
|
|
269
269
|
const engines = {
|
|
270
270
|
node: ">=18.0.0 <=20.x.x",
|
|
@@ -317,7 +317,7 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
317
317
|
deploy({ filePath, project }, { onUploadProgress }) {
|
|
318
318
|
return axiosCloudAPI.post(
|
|
319
319
|
`/deploy/${project.name}`,
|
|
320
|
-
{ file:
|
|
320
|
+
{ file: fse__namespace.default.createReadStream(filePath) },
|
|
321
321
|
{
|
|
322
322
|
headers: {
|
|
323
323
|
"Content-Type": "multipart/form-data"
|
|
@@ -360,8 +360,47 @@ async function cloudApiFactory({ logger }, token) {
|
|
|
360
360
|
throw error;
|
|
361
361
|
}
|
|
362
362
|
},
|
|
363
|
-
listProjects() {
|
|
364
|
-
|
|
363
|
+
async listProjects() {
|
|
364
|
+
try {
|
|
365
|
+
const response = await axiosCloudAPI.get("/projects");
|
|
366
|
+
if (response.status !== 200) {
|
|
367
|
+
throw new Error("Error fetching cloud projects from the server.");
|
|
368
|
+
}
|
|
369
|
+
return response;
|
|
370
|
+
} catch (error) {
|
|
371
|
+
logger.debug(
|
|
372
|
+
"🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
|
|
373
|
+
);
|
|
374
|
+
throw error;
|
|
375
|
+
}
|
|
376
|
+
},
|
|
377
|
+
async listLinkProjects() {
|
|
378
|
+
try {
|
|
379
|
+
const response = await axiosCloudAPI.get("/projects-linkable");
|
|
380
|
+
if (response.status !== 200) {
|
|
381
|
+
throw new Error("Error fetching cloud projects from the server.");
|
|
382
|
+
}
|
|
383
|
+
return response;
|
|
384
|
+
} catch (error) {
|
|
385
|
+
logger.debug(
|
|
386
|
+
"🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
|
|
387
|
+
);
|
|
388
|
+
throw error;
|
|
389
|
+
}
|
|
390
|
+
},
|
|
391
|
+
async getProject({ name: name2 }) {
|
|
392
|
+
try {
|
|
393
|
+
const response = await axiosCloudAPI.get(`/projects/${name2}`);
|
|
394
|
+
if (response.status !== 200) {
|
|
395
|
+
throw new Error("Error fetching project's details.");
|
|
396
|
+
}
|
|
397
|
+
return response;
|
|
398
|
+
} catch (error) {
|
|
399
|
+
logger.debug(
|
|
400
|
+
"🥲 Oops! There was a problem retrieving your project's details. Please try again."
|
|
401
|
+
);
|
|
402
|
+
throw error;
|
|
403
|
+
}
|
|
365
404
|
},
|
|
366
405
|
track(event, payload = {}) {
|
|
367
406
|
return axiosCloudAPI.post("/track", {
|
|
@@ -376,18 +415,18 @@ async function save(data, { directoryPath } = {}) {
|
|
|
376
415
|
const alreadyInFileData = await retrieve({ directoryPath });
|
|
377
416
|
const storedData = { ...alreadyInFileData, ...data };
|
|
378
417
|
const pathToFile = path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
379
|
-
await
|
|
380
|
-
await
|
|
418
|
+
await fse__namespace.default.ensureDir(path__namespace.default.dirname(pathToFile));
|
|
419
|
+
await fse__namespace.default.writeJson(pathToFile, storedData, { encoding: "utf8" });
|
|
381
420
|
}
|
|
382
421
|
async function retrieve({
|
|
383
422
|
directoryPath
|
|
384
423
|
} = {}) {
|
|
385
424
|
const pathToFile = path__namespace.default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
|
|
386
|
-
const pathExists = await
|
|
425
|
+
const pathExists = await fse__namespace.default.pathExists(pathToFile);
|
|
387
426
|
if (!pathExists) {
|
|
388
427
|
return {};
|
|
389
428
|
}
|
|
390
|
-
return
|
|
429
|
+
return fse__namespace.default.readJSON(pathToFile, { encoding: "utf8" });
|
|
391
430
|
}
|
|
392
431
|
const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
393
432
|
__proto__: null,
|
|
@@ -632,6 +671,56 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
|
|
|
632
671
|
local: strapiInfoSave,
|
|
633
672
|
tokenServiceFactory
|
|
634
673
|
}, Symbol.toStringTag, { value: "Module" }));
|
|
674
|
+
yup__namespace.object({
|
|
675
|
+
name: yup__namespace.string().required(),
|
|
676
|
+
exports: yup__namespace.lazy(
|
|
677
|
+
(value) => yup__namespace.object(
|
|
678
|
+
typeof value === "object" ? Object.entries(value).reduce(
|
|
679
|
+
(acc, [key, value2]) => {
|
|
680
|
+
if (typeof value2 === "object") {
|
|
681
|
+
acc[key] = yup__namespace.object({
|
|
682
|
+
types: yup__namespace.string().optional(),
|
|
683
|
+
source: yup__namespace.string().required(),
|
|
684
|
+
module: yup__namespace.string().optional(),
|
|
685
|
+
import: yup__namespace.string().required(),
|
|
686
|
+
require: yup__namespace.string().required(),
|
|
687
|
+
default: yup__namespace.string().required()
|
|
688
|
+
}).noUnknown(true);
|
|
689
|
+
} else {
|
|
690
|
+
acc[key] = yup__namespace.string().matches(/^\.\/.*\.json$/).required();
|
|
691
|
+
}
|
|
692
|
+
return acc;
|
|
693
|
+
},
|
|
694
|
+
{}
|
|
695
|
+
) : void 0
|
|
696
|
+
).optional()
|
|
697
|
+
)
|
|
698
|
+
});
|
|
699
|
+
const loadPkg = async ({ cwd, logger }) => {
|
|
700
|
+
const pkgPath = await pkgUp__default.default({ cwd });
|
|
701
|
+
if (!pkgPath) {
|
|
702
|
+
throw new Error("Could not find a package.json in the current directory");
|
|
703
|
+
}
|
|
704
|
+
const buffer = await fse__namespace.readFile(pkgPath);
|
|
705
|
+
const pkg = JSON.parse(buffer.toString());
|
|
706
|
+
logger.debug("Loaded package.json:", os__default.default.EOL, pkg);
|
|
707
|
+
return pkg;
|
|
708
|
+
};
|
|
709
|
+
async function getProjectNameFromPackageJson(ctx) {
|
|
710
|
+
try {
|
|
711
|
+
const packageJson2 = await loadPkg(ctx);
|
|
712
|
+
return packageJson2.name || "my-strapi-project";
|
|
713
|
+
} catch (e) {
|
|
714
|
+
return "my-strapi-project";
|
|
715
|
+
}
|
|
716
|
+
}
|
|
717
|
+
const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
|
|
718
|
+
try {
|
|
719
|
+
await cloudApiService.track(eventName, eventData);
|
|
720
|
+
} catch (e) {
|
|
721
|
+
ctx.logger.debug(`Failed to track ${eventName}`, e);
|
|
722
|
+
}
|
|
723
|
+
};
|
|
635
724
|
const openModule$1 = import("open");
|
|
636
725
|
async function promptLogin(ctx) {
|
|
637
726
|
const response = await inquirer__default.default.prompt([
|
|
@@ -652,13 +741,6 @@ async function loginAction(ctx) {
|
|
|
652
741
|
const tokenService = await tokenServiceFactory(ctx);
|
|
653
742
|
const existingToken = await tokenService.retrieveToken();
|
|
654
743
|
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
744
|
if (existingToken) {
|
|
663
745
|
const isTokenValid = await tokenService.isTokenValid(existingToken);
|
|
664
746
|
if (isTokenValid) {
|
|
@@ -690,11 +772,7 @@ async function loginAction(ctx) {
|
|
|
690
772
|
logger.debug(e);
|
|
691
773
|
return false;
|
|
692
774
|
}
|
|
693
|
-
|
|
694
|
-
await cloudApiService.track("willLoginAttempt", {});
|
|
695
|
-
} catch (e) {
|
|
696
|
-
logger.debug("Failed to track login attempt", e);
|
|
697
|
-
}
|
|
775
|
+
await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
|
|
698
776
|
logger.debug("🔐 Creating device authentication request...", {
|
|
699
777
|
client_id: cliConfig2.clientId,
|
|
700
778
|
scope: cliConfig2.scope,
|
|
@@ -774,13 +852,13 @@ async function loginAction(ctx) {
|
|
|
774
852
|
"There seems to be a problem with your login information. Please try logging in again."
|
|
775
853
|
);
|
|
776
854
|
spinnerFail();
|
|
777
|
-
await
|
|
855
|
+
await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
|
|
778
856
|
return false;
|
|
779
857
|
}
|
|
780
858
|
if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
|
|
781
859
|
logger.debug(e);
|
|
782
860
|
spinnerFail();
|
|
783
|
-
await
|
|
861
|
+
await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
|
|
784
862
|
return false;
|
|
785
863
|
}
|
|
786
864
|
await new Promise((resolve) => {
|
|
@@ -794,15 +872,50 @@ async function loginAction(ctx) {
|
|
|
794
872
|
"To access your dashboard, please copy and paste the following URL into your web browser:"
|
|
795
873
|
);
|
|
796
874
|
logger.log(chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects`));
|
|
797
|
-
|
|
798
|
-
await cloudApiService.track("didLogin", { loginMethod: "cli" });
|
|
799
|
-
} catch (e) {
|
|
800
|
-
logger.debug("Failed to track login", e);
|
|
801
|
-
}
|
|
875
|
+
await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
|
|
802
876
|
};
|
|
803
877
|
await authenticate();
|
|
804
878
|
return isAuthenticated;
|
|
805
879
|
}
|
|
880
|
+
function questionDefaultValuesMapper(questionsMap) {
|
|
881
|
+
return (questions) => {
|
|
882
|
+
return questions.map((question) => {
|
|
883
|
+
const questionName = question.name;
|
|
884
|
+
if (questionName in questionsMap) {
|
|
885
|
+
const questionDefault = questionsMap[questionName];
|
|
886
|
+
if (typeof questionDefault === "function") {
|
|
887
|
+
return {
|
|
888
|
+
...question,
|
|
889
|
+
default: questionDefault(question)
|
|
890
|
+
};
|
|
891
|
+
}
|
|
892
|
+
return {
|
|
893
|
+
...question,
|
|
894
|
+
default: questionDefault
|
|
895
|
+
};
|
|
896
|
+
}
|
|
897
|
+
return question;
|
|
898
|
+
});
|
|
899
|
+
};
|
|
900
|
+
}
|
|
901
|
+
function getDefaultsFromQuestions(questions) {
|
|
902
|
+
return questions.reduce((acc, question) => {
|
|
903
|
+
if (question.default && question.name) {
|
|
904
|
+
return { ...acc, [question.name]: question.default };
|
|
905
|
+
}
|
|
906
|
+
return acc;
|
|
907
|
+
}, {});
|
|
908
|
+
}
|
|
909
|
+
function getProjectNodeVersionDefault(question) {
|
|
910
|
+
const currentNodeVersion = process.versions.node.split(".")[0];
|
|
911
|
+
if (question.type === "list" && Array.isArray(question.choices)) {
|
|
912
|
+
const choice = question.choices.find((choice2) => choice2.value === currentNodeVersion);
|
|
913
|
+
if (choice) {
|
|
914
|
+
return choice.value;
|
|
915
|
+
}
|
|
916
|
+
}
|
|
917
|
+
return question.default;
|
|
918
|
+
}
|
|
806
919
|
async function handleError(ctx, error) {
|
|
807
920
|
const { logger } = ctx;
|
|
808
921
|
logger.debug(error);
|
|
@@ -847,7 +960,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
|
|
|
847
960
|
throw e;
|
|
848
961
|
}
|
|
849
962
|
}
|
|
850
|
-
const action$
|
|
963
|
+
const action$4 = async (ctx) => {
|
|
851
964
|
const { logger } = ctx;
|
|
852
965
|
const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
853
966
|
const token = await getValidToken(ctx, promptLogin);
|
|
@@ -856,7 +969,16 @@ const action$2 = async (ctx) => {
|
|
|
856
969
|
}
|
|
857
970
|
const cloudApi = await cloudApiFactory(ctx, token);
|
|
858
971
|
const { data: config } = await cloudApi.config();
|
|
859
|
-
const
|
|
972
|
+
const projectName = await getProjectNameFromPackageJson(ctx);
|
|
973
|
+
const defaultAnswersMapper = questionDefaultValuesMapper({
|
|
974
|
+
name: projectName,
|
|
975
|
+
nodeVersion: getProjectNodeVersionDefault
|
|
976
|
+
});
|
|
977
|
+
const questions = defaultAnswersMapper(config.projectCreation.questions);
|
|
978
|
+
const defaultValues = {
|
|
979
|
+
...config.projectCreation.defaults,
|
|
980
|
+
...getDefaultsFromQuestions(questions)
|
|
981
|
+
};
|
|
860
982
|
const projectAnswersDefaulted = fp.defaults(defaultValues);
|
|
861
983
|
const projectAnswers = await inquirer__default.default.prompt(questions);
|
|
862
984
|
const projectInput = projectAnswersDefaulted(projectAnswers);
|
|
@@ -905,38 +1027,6 @@ function notificationServiceFactory({ logger }) {
|
|
|
905
1027
|
};
|
|
906
1028
|
};
|
|
907
1029
|
}
|
|
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
1030
|
const buildLogsServiceFactory = ({ logger }) => {
|
|
941
1031
|
return async (url, token, cliConfig2) => {
|
|
942
1032
|
const CONN_TIMEOUT = Number(cliConfig2.buildLogsConnectionTimeout);
|
|
@@ -990,6 +1080,7 @@ const buildLogsServiceFactory = ({ logger }) => {
|
|
|
990
1080
|
if (retries > MAX_RETRIES) {
|
|
991
1081
|
spinner.fail("We were unable to connect to the server to get build logs at this time.");
|
|
992
1082
|
es.close();
|
|
1083
|
+
clearExistingTimeout();
|
|
993
1084
|
reject(new Error("Max retries reached"));
|
|
994
1085
|
}
|
|
995
1086
|
};
|
|
@@ -1032,13 +1123,13 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
1032
1123
|
process.exit(1);
|
|
1033
1124
|
}
|
|
1034
1125
|
const tarFilePath = path__namespace.default.resolve(storagePath, compressedFilename);
|
|
1035
|
-
const fileStats = await
|
|
1126
|
+
const fileStats = await fse__namespace.default.stat(tarFilePath);
|
|
1036
1127
|
if (fileStats.size > maxProjectFileSize) {
|
|
1037
1128
|
ctx.logger.log(
|
|
1038
1129
|
"Unable to proceed: Your project is too big to be transferred, please use a git repo instead."
|
|
1039
1130
|
);
|
|
1040
1131
|
try {
|
|
1041
|
-
await
|
|
1132
|
+
await fse__namespace.default.remove(tarFilePath);
|
|
1042
1133
|
} catch (e) {
|
|
1043
1134
|
ctx.logger.log("Unable to remove file: ", tarFilePath);
|
|
1044
1135
|
ctx.logger.debug(e);
|
|
@@ -1064,20 +1155,10 @@ async function upload(ctx, project, token, maxProjectFileSize) {
|
|
|
1064
1155
|
return data.build_id;
|
|
1065
1156
|
} catch (e) {
|
|
1066
1157
|
progressBar.stop();
|
|
1067
|
-
|
|
1068
|
-
if (e.response.status === 404) {
|
|
1069
|
-
ctx.logger.error(
|
|
1070
|
-
`The project does not exist. Remove the ${LOCAL_SAVE_FILENAME} file and try again.`
|
|
1071
|
-
);
|
|
1072
|
-
} else {
|
|
1073
|
-
ctx.logger.error(e.response.data);
|
|
1074
|
-
}
|
|
1075
|
-
} else {
|
|
1076
|
-
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1077
|
-
}
|
|
1158
|
+
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1078
1159
|
ctx.logger.debug(e);
|
|
1079
1160
|
} finally {
|
|
1080
|
-
await
|
|
1161
|
+
await fse__namespace.default.remove(tarFilePath);
|
|
1081
1162
|
}
|
|
1082
1163
|
process.exit(0);
|
|
1083
1164
|
} catch (e) {
|
|
@@ -1090,7 +1171,7 @@ async function getProject(ctx) {
|
|
|
1090
1171
|
const { project } = await retrieve();
|
|
1091
1172
|
if (!project) {
|
|
1092
1173
|
try {
|
|
1093
|
-
return await action$
|
|
1174
|
+
return await action$4(ctx);
|
|
1094
1175
|
} catch (e) {
|
|
1095
1176
|
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1096
1177
|
ctx.logger.debug(e);
|
|
@@ -1099,7 +1180,19 @@ async function getProject(ctx) {
|
|
|
1099
1180
|
}
|
|
1100
1181
|
return project;
|
|
1101
1182
|
}
|
|
1102
|
-
|
|
1183
|
+
async function getConfig({
|
|
1184
|
+
ctx,
|
|
1185
|
+
cloudApiService
|
|
1186
|
+
}) {
|
|
1187
|
+
try {
|
|
1188
|
+
const { data: cliConfig2 } = await cloudApiService.config();
|
|
1189
|
+
return cliConfig2;
|
|
1190
|
+
} catch (e) {
|
|
1191
|
+
ctx.logger.debug("Failed to get cli config", e);
|
|
1192
|
+
return null;
|
|
1193
|
+
}
|
|
1194
|
+
}
|
|
1195
|
+
const action$3 = async (ctx) => {
|
|
1103
1196
|
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1104
1197
|
const token = await getValidToken(ctx, promptLogin);
|
|
1105
1198
|
if (!token) {
|
|
@@ -1109,15 +1202,51 @@ const action$1 = async (ctx) => {
|
|
|
1109
1202
|
if (!project) {
|
|
1110
1203
|
return;
|
|
1111
1204
|
}
|
|
1112
|
-
const cloudApiService = await cloudApiFactory(ctx);
|
|
1205
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1113
1206
|
try {
|
|
1114
|
-
|
|
1207
|
+
const {
|
|
1208
|
+
data: { data: projectData, metadata }
|
|
1209
|
+
} = await cloudApiService.getProject({ name: project.name });
|
|
1210
|
+
const isProjectSuspended = projectData.suspendedAt;
|
|
1211
|
+
if (isProjectSuspended) {
|
|
1212
|
+
ctx.logger.log(
|
|
1213
|
+
"\n Oops! This project has been suspended. \n\n Please reactivate it from the dashboard to continue deploying: "
|
|
1214
|
+
);
|
|
1215
|
+
ctx.logger.log(chalk__default.default.underline(`${metadata.dashboardUrls.project}`));
|
|
1216
|
+
return;
|
|
1217
|
+
}
|
|
1115
1218
|
} catch (e) {
|
|
1116
|
-
|
|
1219
|
+
if (e instanceof axios.AxiosError && e.response?.data) {
|
|
1220
|
+
if (e.response.status === 404) {
|
|
1221
|
+
ctx.logger.warn(
|
|
1222
|
+
`The project associated with this folder does not exist in Strapi Cloud.
|
|
1223
|
+
Please link your local project to an existing Strapi Cloud project using the ${chalk__default.default.cyan(
|
|
1224
|
+
"link"
|
|
1225
|
+
)} command before deploying.`
|
|
1226
|
+
);
|
|
1227
|
+
} else {
|
|
1228
|
+
ctx.logger.error(e.response.data);
|
|
1229
|
+
}
|
|
1230
|
+
} else {
|
|
1231
|
+
ctx.logger.error(
|
|
1232
|
+
"An error occurred while retrieving the project's information. Please try again later."
|
|
1233
|
+
);
|
|
1234
|
+
}
|
|
1235
|
+
ctx.logger.debug(e);
|
|
1236
|
+
return;
|
|
1117
1237
|
}
|
|
1238
|
+
await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
|
|
1239
|
+
projectInternalName: project.name
|
|
1240
|
+
});
|
|
1118
1241
|
const notificationService = notificationServiceFactory(ctx);
|
|
1119
1242
|
const buildLogsService = buildLogsServiceFactory(ctx);
|
|
1120
|
-
const
|
|
1243
|
+
const cliConfig2 = await getConfig({ ctx, cloudApiService });
|
|
1244
|
+
if (!cliConfig2) {
|
|
1245
|
+
ctx.logger.error(
|
|
1246
|
+
"An error occurred while retrieving data from Strapi Cloud. Please check your network or try again later."
|
|
1247
|
+
);
|
|
1248
|
+
return;
|
|
1249
|
+
}
|
|
1121
1250
|
let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
|
|
1122
1251
|
if (Number.isNaN(maxSize)) {
|
|
1123
1252
|
ctx.logger.debug(
|
|
@@ -1139,10 +1268,11 @@ const action$1 = async (ctx) => {
|
|
|
1139
1268
|
chalk__default.default.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
|
|
1140
1269
|
);
|
|
1141
1270
|
} catch (e) {
|
|
1271
|
+
ctx.logger.debug(e);
|
|
1142
1272
|
if (e instanceof Error) {
|
|
1143
1273
|
ctx.logger.error(e.message);
|
|
1144
1274
|
} else {
|
|
1145
|
-
|
|
1275
|
+
ctx.logger.error("An error occurred while deploying the project. Please try again later.");
|
|
1146
1276
|
}
|
|
1147
1277
|
}
|
|
1148
1278
|
};
|
|
@@ -1173,17 +1303,163 @@ const runAction = (name2, action2) => (...args) => {
|
|
|
1173
1303
|
process.exit(1);
|
|
1174
1304
|
});
|
|
1175
1305
|
};
|
|
1176
|
-
const command$
|
|
1177
|
-
|
|
1306
|
+
const command$5 = ({ ctx }) => {
|
|
1307
|
+
return commander.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));
|
|
1178
1308
|
};
|
|
1179
1309
|
const deployProject = {
|
|
1180
1310
|
name: "deploy-project",
|
|
1181
1311
|
description: "Deploy a Strapi Cloud project",
|
|
1182
|
-
action: action$
|
|
1183
|
-
command: command$
|
|
1312
|
+
action: action$3,
|
|
1313
|
+
command: command$5
|
|
1184
1314
|
};
|
|
1185
|
-
const
|
|
1186
|
-
|
|
1315
|
+
const QUIT_OPTION = "Quit";
|
|
1316
|
+
async function getExistingConfig(ctx) {
|
|
1317
|
+
try {
|
|
1318
|
+
return await retrieve();
|
|
1319
|
+
} catch (e) {
|
|
1320
|
+
ctx.logger.debug("Failed to get project config", e);
|
|
1321
|
+
ctx.logger.error("An error occurred while retrieving config data from your local project.");
|
|
1322
|
+
return null;
|
|
1323
|
+
}
|
|
1324
|
+
}
|
|
1325
|
+
async function promptForRelink(ctx, cloudApiService, existingConfig) {
|
|
1326
|
+
if (existingConfig && existingConfig.project) {
|
|
1327
|
+
const { shouldRelink } = await inquirer__default.default.prompt([
|
|
1328
|
+
{
|
|
1329
|
+
type: "confirm",
|
|
1330
|
+
name: "shouldRelink",
|
|
1331
|
+
message: `A project named ${chalk__default.default.cyan(
|
|
1332
|
+
existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
|
|
1333
|
+
)} is already linked to this local folder. Do you want to update the link?`,
|
|
1334
|
+
default: false
|
|
1335
|
+
}
|
|
1336
|
+
]);
|
|
1337
|
+
if (!shouldRelink) {
|
|
1338
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1339
|
+
currentProjectName: existingConfig.project?.name
|
|
1340
|
+
});
|
|
1341
|
+
return false;
|
|
1342
|
+
}
|
|
1343
|
+
}
|
|
1344
|
+
return true;
|
|
1345
|
+
}
|
|
1346
|
+
async function getProjectsList(ctx, cloudApiService, existingConfig) {
|
|
1347
|
+
const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
|
|
1348
|
+
try {
|
|
1349
|
+
const {
|
|
1350
|
+
data: { data: projectList }
|
|
1351
|
+
} = await cloudApiService.listLinkProjects();
|
|
1352
|
+
spinner.succeed();
|
|
1353
|
+
if (!Array.isArray(projectList)) {
|
|
1354
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1355
|
+
return null;
|
|
1356
|
+
}
|
|
1357
|
+
const projects = projectList.filter(
|
|
1358
|
+
(project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
|
|
1359
|
+
).map((project) => {
|
|
1360
|
+
return {
|
|
1361
|
+
name: project.displayName,
|
|
1362
|
+
value: { name: project.name, displayName: project.displayName }
|
|
1363
|
+
};
|
|
1364
|
+
});
|
|
1365
|
+
if (projects.length === 0) {
|
|
1366
|
+
ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
|
|
1367
|
+
return null;
|
|
1368
|
+
}
|
|
1369
|
+
return projects;
|
|
1370
|
+
} catch (e) {
|
|
1371
|
+
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1372
|
+
ctx.logger.debug("Failed to list projects", e);
|
|
1373
|
+
return null;
|
|
1374
|
+
}
|
|
1375
|
+
}
|
|
1376
|
+
async function getUserSelection(ctx, projects) {
|
|
1377
|
+
const { logger } = ctx;
|
|
1378
|
+
try {
|
|
1379
|
+
const answer = await inquirer__default.default.prompt([
|
|
1380
|
+
{
|
|
1381
|
+
type: "list",
|
|
1382
|
+
name: "linkProject",
|
|
1383
|
+
message: "Which project do you want to link?",
|
|
1384
|
+
choices: [...projects, { name: chalk__default.default.grey(`(${QUIT_OPTION})`), value: null }]
|
|
1385
|
+
}
|
|
1386
|
+
]);
|
|
1387
|
+
if (!answer.linkProject) {
|
|
1388
|
+
return null;
|
|
1389
|
+
}
|
|
1390
|
+
return answer;
|
|
1391
|
+
} catch (e) {
|
|
1392
|
+
logger.debug("Failed to get user input", e);
|
|
1393
|
+
logger.error("An error occurred while trying to get your input.");
|
|
1394
|
+
return null;
|
|
1395
|
+
}
|
|
1396
|
+
}
|
|
1397
|
+
const action$2 = async (ctx) => {
|
|
1398
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1399
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1400
|
+
const { logger } = ctx;
|
|
1401
|
+
if (!token) {
|
|
1402
|
+
return;
|
|
1403
|
+
}
|
|
1404
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1405
|
+
const existingConfig = await getExistingConfig(ctx);
|
|
1406
|
+
const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
|
|
1407
|
+
if (!shouldRelink) {
|
|
1408
|
+
return;
|
|
1409
|
+
}
|
|
1410
|
+
await trackEvent(ctx, cloudApiService, "willLinkProject", {});
|
|
1411
|
+
const projects = await getProjectsList(
|
|
1412
|
+
ctx,
|
|
1413
|
+
cloudApiService,
|
|
1414
|
+
existingConfig
|
|
1415
|
+
);
|
|
1416
|
+
if (!projects) {
|
|
1417
|
+
return;
|
|
1418
|
+
}
|
|
1419
|
+
const answer = await getUserSelection(ctx, projects);
|
|
1420
|
+
if (!answer) {
|
|
1421
|
+
return;
|
|
1422
|
+
}
|
|
1423
|
+
try {
|
|
1424
|
+
const { confirmAction } = await inquirer__default.default.prompt([
|
|
1425
|
+
{
|
|
1426
|
+
type: "confirm",
|
|
1427
|
+
name: "confirmAction",
|
|
1428
|
+
message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
|
|
1429
|
+
default: false
|
|
1430
|
+
}
|
|
1431
|
+
]);
|
|
1432
|
+
if (!confirmAction) {
|
|
1433
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1434
|
+
cancelledProjectName: answer.linkProject.name,
|
|
1435
|
+
currentProjectName: existingConfig ? existingConfig.project?.name : null
|
|
1436
|
+
});
|
|
1437
|
+
return;
|
|
1438
|
+
}
|
|
1439
|
+
await save({ project: answer.linkProject });
|
|
1440
|
+
logger.log(`Project ${chalk__default.default.cyan(answer.linkProject.displayName)} linked successfully.`);
|
|
1441
|
+
await trackEvent(ctx, cloudApiService, "didLinkProject", {
|
|
1442
|
+
projectInternalName: answer.linkProject
|
|
1443
|
+
});
|
|
1444
|
+
} catch (e) {
|
|
1445
|
+
logger.debug("Failed to link project", e);
|
|
1446
|
+
logger.error("An error occurred while linking the project.");
|
|
1447
|
+
await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
|
|
1448
|
+
projectInternalName: answer.linkProject
|
|
1449
|
+
});
|
|
1450
|
+
}
|
|
1451
|
+
};
|
|
1452
|
+
const command$4 = ({ command: command2, ctx }) => {
|
|
1453
|
+
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));
|
|
1454
|
+
};
|
|
1455
|
+
const link = {
|
|
1456
|
+
name: "link-project",
|
|
1457
|
+
description: "Link a local directory to a Strapi Cloud project",
|
|
1458
|
+
action: action$2,
|
|
1459
|
+
command: command$4
|
|
1460
|
+
};
|
|
1461
|
+
const command$3 = ({ ctx }) => {
|
|
1462
|
+
return commander.createCommand("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
|
|
1187
1463
|
"after",
|
|
1188
1464
|
"\nAfter running this command, you will be prompted to enter your authentication information."
|
|
1189
1465
|
).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", loginAction)(ctx));
|
|
@@ -1192,10 +1468,10 @@ const login = {
|
|
|
1192
1468
|
name: "login",
|
|
1193
1469
|
description: "Strapi Cloud Login",
|
|
1194
1470
|
action: loginAction,
|
|
1195
|
-
command: command$
|
|
1471
|
+
command: command$3
|
|
1196
1472
|
};
|
|
1197
1473
|
const openModule = import("open");
|
|
1198
|
-
const action = async (ctx) => {
|
|
1474
|
+
const action$1 = async (ctx) => {
|
|
1199
1475
|
const { logger } = ctx;
|
|
1200
1476
|
const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
|
|
1201
1477
|
const token = await retrieveToken();
|
|
@@ -1225,37 +1501,64 @@ const action = async (ctx) => {
|
|
|
1225
1501
|
logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
|
|
1226
1502
|
logger.debug(e);
|
|
1227
1503
|
}
|
|
1228
|
-
|
|
1229
|
-
await cloudApiService.track("didLogout", { loginMethod: "cli" });
|
|
1230
|
-
} catch (e) {
|
|
1231
|
-
logger.debug("Failed to track logout event", e);
|
|
1232
|
-
}
|
|
1504
|
+
await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
|
|
1233
1505
|
};
|
|
1234
|
-
const command$
|
|
1235
|
-
|
|
1506
|
+
const command$2 = ({ ctx }) => {
|
|
1507
|
+
return commander.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));
|
|
1236
1508
|
};
|
|
1237
1509
|
const logout = {
|
|
1238
1510
|
name: "logout",
|
|
1239
1511
|
description: "Strapi Cloud Logout",
|
|
1240
|
-
action,
|
|
1241
|
-
command: command$
|
|
1512
|
+
action: action$1,
|
|
1513
|
+
command: command$2
|
|
1242
1514
|
};
|
|
1243
|
-
const command = ({
|
|
1244
|
-
|
|
1515
|
+
const command$1 = ({ ctx }) => {
|
|
1516
|
+
return commander.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));
|
|
1245
1517
|
};
|
|
1246
1518
|
const createProject = {
|
|
1247
1519
|
name: "create-project",
|
|
1248
1520
|
description: "Create a new project",
|
|
1249
|
-
action: action$
|
|
1521
|
+
action: action$4,
|
|
1522
|
+
command: command$1
|
|
1523
|
+
};
|
|
1524
|
+
const action = async (ctx) => {
|
|
1525
|
+
const { getValidToken } = await tokenServiceFactory(ctx);
|
|
1526
|
+
const token = await getValidToken(ctx, promptLogin);
|
|
1527
|
+
const { logger } = ctx;
|
|
1528
|
+
if (!token) {
|
|
1529
|
+
return;
|
|
1530
|
+
}
|
|
1531
|
+
const cloudApiService = await cloudApiFactory(ctx, token);
|
|
1532
|
+
const spinner = logger.spinner("Fetching your projects...").start();
|
|
1533
|
+
try {
|
|
1534
|
+
const {
|
|
1535
|
+
data: { data: projectList }
|
|
1536
|
+
} = await cloudApiService.listProjects();
|
|
1537
|
+
spinner.succeed();
|
|
1538
|
+
logger.log(projectList);
|
|
1539
|
+
} catch (e) {
|
|
1540
|
+
ctx.logger.debug("Failed to list projects", e);
|
|
1541
|
+
spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
|
|
1542
|
+
}
|
|
1543
|
+
};
|
|
1544
|
+
const command = ({ command: command2, ctx }) => {
|
|
1545
|
+
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));
|
|
1546
|
+
};
|
|
1547
|
+
const listProjects = {
|
|
1548
|
+
name: "list-projects",
|
|
1549
|
+
description: "List Strapi Cloud projects",
|
|
1550
|
+
action,
|
|
1250
1551
|
command
|
|
1251
1552
|
};
|
|
1252
1553
|
const cli = {
|
|
1253
1554
|
deployProject,
|
|
1555
|
+
link,
|
|
1254
1556
|
login,
|
|
1255
1557
|
logout,
|
|
1256
|
-
createProject
|
|
1558
|
+
createProject,
|
|
1559
|
+
listProjects
|
|
1257
1560
|
};
|
|
1258
|
-
const cloudCommands = [deployProject, login, logout];
|
|
1561
|
+
const cloudCommands = [deployProject, link, login, logout, listProjects];
|
|
1259
1562
|
async function initCloudCLIConfig() {
|
|
1260
1563
|
const localConfig = await getLocalConfig();
|
|
1261
1564
|
if (!localConfig.deviceId) {
|
|
@@ -1271,7 +1574,10 @@ async function buildStrapiCloudCommands({
|
|
|
1271
1574
|
await initCloudCLIConfig();
|
|
1272
1575
|
for (const cloudCommand of cloudCommands) {
|
|
1273
1576
|
try {
|
|
1274
|
-
await cloudCommand.command({ command: command2, ctx, argv });
|
|
1577
|
+
const subCommand = await cloudCommand.command({ command: command2, ctx, argv });
|
|
1578
|
+
if (subCommand) {
|
|
1579
|
+
command2.addCommand(subCommand);
|
|
1580
|
+
}
|
|
1275
1581
|
} catch (e) {
|
|
1276
1582
|
console.error(`Failed to load command ${cloudCommand.name}`, e);
|
|
1277
1583
|
}
|