@takeshape/cli 10.12.0 → 10.14.9
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/commands/login.js +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +0 -2
- package/dist/index.js +0 -1
- package/dist/options.d.ts +0 -4
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +0 -4
- package/dist/types.d.ts +0 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/util/login.d.ts +0 -14
- package/dist/util/login.d.ts.map +1 -1
- package/dist/util/login.js +1 -50
- package/package.json +7 -9
package/dist/commands/login.js
CHANGED
|
@@ -10,7 +10,7 @@ var _config = require("../config");
|
|
|
10
10
|
var _data = require("../util/data");
|
|
11
11
|
const login = async (_, params) => {
|
|
12
12
|
try {
|
|
13
|
-
const userJwt = await (
|
|
13
|
+
const userJwt = await (0, _login.loginBrowser)(params);
|
|
14
14
|
if (userJwt) {
|
|
15
15
|
const personalAccessToken = await (0, _data.createPersonalAccessToken)(params, userJwt);
|
|
16
16
|
await (0, _config.writeHomeConfig)(personalAccessToken);
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,KAAK,QAAQ,EAAC,MAAM,MAAM,CAAC;AACnC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,SAAS,CAAC;AAMvC,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,UAAU,CAAC;AACrC,OAAO,EAAC,KAAK,MAAM,EAAE,KAAK,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAElE,eAAO,MAAM,yBAAyB,iBAAiB,CAAC;AACxD,eAAO,MAAM,uBAAuB,mBAAmB,CAAC;AAExD,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CA6B7E;AAWD,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,SAAS,EACjB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,GAAG,SAAS,GACvB,OAAO,CAAC,IAAI,CAAC,CA6Cf;AAED,wBAAgB,kBAAkB,SAQjC;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrF;AAED,wBAAgB,gBAAgB,SAK/B"}
|
package/dist/config.js
CHANGED
|
@@ -13,7 +13,6 @@ exports.writeLinkedProjectConfig = writeLinkedProjectConfig;
|
|
|
13
13
|
var _path = _interopRequireDefault(require("path"));
|
|
14
14
|
var _os = _interopRequireDefault(require("os"));
|
|
15
15
|
var _fsExtra = _interopRequireDefault(require("fs-extra"));
|
|
16
|
-
var _isDocker = _interopRequireDefault(require("is-docker"));
|
|
17
16
|
var _ignore = _interopRequireDefault(require("ignore"));
|
|
18
17
|
var _messages = require("./util/messages");
|
|
19
18
|
var _graphql = require("./graphql");
|
|
@@ -49,7 +48,6 @@ function loadConfig(cwd, cli) {
|
|
|
49
48
|
id: 'TS_API_KEY',
|
|
50
49
|
apiKey: process.env.TS_API_KEY
|
|
51
50
|
} : config.linkedApiKey,
|
|
52
|
-
cliLogin: Boolean(cli.flags.cliLogin) || (0, _isDocker.default)() || Boolean(process.env.GITHUB_ACTIONS),
|
|
53
51
|
siteId: cli.flags.site ?? process.env.TS_SITE_ID ?? config.siteId,
|
|
54
52
|
projectName: process.env.TS_PROJECT_NAME ?? config.projectName,
|
|
55
53
|
projectId: process.env.TS_PROJECT_ID ?? config.projectId,
|
package/dist/index.js
CHANGED
package/dist/options.d.ts
CHANGED
package/dist/options.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,MAAM,CAAC;AAEjC,eAAO,MAAM,OAAO
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,MAAM,EAAC,MAAM,MAAM,CAAC;AAEjC,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2FV,CAAC;AAEX,MAAM,MAAM,KAAK,GAAG,OAAO,OAAO,CAAC,KAAK,CAAC;AACzC,MAAM,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,GAAG;IAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAAC"}
|
package/dist/options.js
CHANGED
package/dist/types.d.ts
CHANGED
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AAEnC,MAAM,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AAEnC,MAAM,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACnF,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACjF,MAAM,MAAM,wBAAwB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpG,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE1E,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,eAAe,CAEpF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,iBAAiB,CAExF;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,uBAAuB,CAEpG;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC"}
|
package/dist/util/login.d.ts
CHANGED
|
@@ -5,18 +5,4 @@ export declare const waitingQuestions: {
|
|
|
5
5
|
message: string;
|
|
6
6
|
}[];
|
|
7
7
|
export declare function loginBrowser(params: CliConfig): Promise<string>;
|
|
8
|
-
export declare const loginQuestions: ({
|
|
9
|
-
type: string;
|
|
10
|
-
name: string;
|
|
11
|
-
message: string;
|
|
12
|
-
validate(input: string): true | "Please enter a valid email";
|
|
13
|
-
} | {
|
|
14
|
-
type: string;
|
|
15
|
-
name: string;
|
|
16
|
-
message: string;
|
|
17
|
-
validate?: undefined;
|
|
18
|
-
})[];
|
|
19
|
-
export declare function attemptLogin(params: CliConfig): Promise<string>;
|
|
20
|
-
export declare function attemptOpenForgotPassword(params: CliConfig): Promise<void>;
|
|
21
|
-
export declare function loginCli(params: CliConfig, maxAttempts: number): Promise<string | undefined>;
|
|
22
8
|
//# sourceMappingURL=login.d.ts.map
|
package/dist/util/login.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/util/login.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/util/login.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,KAAK,SAAS,EAAC,MAAM,UAAU,CAAC;AAGxC,eAAO,MAAM,gBAAgB;;;;GAM5B,CAAC;AAEF,wBAAsB,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAkDrE"}
|
package/dist/util/login.js
CHANGED
|
@@ -3,17 +3,12 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.attemptLogin = attemptLogin;
|
|
7
|
-
exports.attemptOpenForgotPassword = attemptOpenForgotPassword;
|
|
8
6
|
exports.loginBrowser = loginBrowser;
|
|
9
|
-
exports.
|
|
10
|
-
exports.waitingQuestions = exports.loginQuestions = void 0;
|
|
7
|
+
exports.waitingQuestions = void 0;
|
|
11
8
|
var _http = _interopRequireDefault(require("http"));
|
|
12
9
|
var _open = _interopRequireDefault(require("open"));
|
|
13
|
-
var _emailValidator = require("email-validator");
|
|
14
10
|
var _getPort = _interopRequireDefault(require("get-port"));
|
|
15
11
|
var _prompt = require("../prompt");
|
|
16
|
-
var _auth = require("../auth");
|
|
17
12
|
var _messages = require("./messages");
|
|
18
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
19
14
|
const waitingQuestions = exports.waitingQuestions = [{
|
|
@@ -69,48 +64,4 @@ async function loginBrowser(params) {
|
|
|
69
64
|
server.close();
|
|
70
65
|
});
|
|
71
66
|
});
|
|
72
|
-
}
|
|
73
|
-
const loginQuestions = exports.loginQuestions = [{
|
|
74
|
-
type: 'input',
|
|
75
|
-
name: 'email',
|
|
76
|
-
message: 'Enter your TakeShape email:',
|
|
77
|
-
validate(input) {
|
|
78
|
-
return (0, _emailValidator.validate)(input) || 'Please enter a valid email';
|
|
79
|
-
}
|
|
80
|
-
}, {
|
|
81
|
-
type: 'password',
|
|
82
|
-
name: 'password',
|
|
83
|
-
message: 'Enter your TakeShape password:'
|
|
84
|
-
}];
|
|
85
|
-
async function attemptLogin(params) {
|
|
86
|
-
const answers = await (0, _prompt.prompt)(loginQuestions);
|
|
87
|
-
return (0, _auth.login)(params.endpoint, answers.email, answers.password);
|
|
88
|
-
}
|
|
89
|
-
async function attemptOpenForgotPassword(params) {
|
|
90
|
-
const isConfirmed = await (0, _prompt.confirm)('Would you like to open TakeShape to set a password?');
|
|
91
|
-
if (isConfirmed) {
|
|
92
|
-
await (0, _open.default)(params.appUrl + '/forgot-password', {
|
|
93
|
-
wait: false
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
async function loginCli(params, maxAttempts) {
|
|
98
|
-
let attempts = 0;
|
|
99
|
-
do {
|
|
100
|
-
attempts++;
|
|
101
|
-
try {
|
|
102
|
-
// eslint-disable-next-line no-await-in-loop
|
|
103
|
-
return await attemptLogin(params);
|
|
104
|
-
} catch (e) {
|
|
105
|
-
if (e.statusCode === 403) {
|
|
106
|
-
attempts--;
|
|
107
|
-
(0, _messages.missingPasswordMsg)();
|
|
108
|
-
// eslint-disable-next-line no-await-in-loop
|
|
109
|
-
await attemptOpenForgotPassword(params);
|
|
110
|
-
} else {
|
|
111
|
-
(0, _messages.invalidLoginMsg)();
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
} while (attempts < maxAttempts);
|
|
115
|
-
(0, _messages.forgotPasswordWarning)(params);
|
|
116
67
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@takeshape/cli",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.14.9",
|
|
4
4
|
"description": "TakeShape CLI",
|
|
5
5
|
"homepage": "https://www.takeshape.io",
|
|
6
6
|
"repository": {
|
|
@@ -31,13 +31,11 @@
|
|
|
31
31
|
"date-fns": "^2.28.0",
|
|
32
32
|
"dotenv": "^6.0.0",
|
|
33
33
|
"dotenv-stringify": "^1.0.0",
|
|
34
|
-
"email-validator": "^2.0.4",
|
|
35
34
|
"fs-extra": "^7.0.1",
|
|
36
35
|
"get-port": "^5.1.1",
|
|
37
36
|
"glob": "^7.1.2",
|
|
38
37
|
"ignore": "^5.1.8",
|
|
39
38
|
"inquirer": "^7.3.3",
|
|
40
|
-
"is-docker": "^2.1.1",
|
|
41
39
|
"jsonwebtoken": "^8.1.1",
|
|
42
40
|
"lodash": "^4.17.21",
|
|
43
41
|
"lokka": "^1.7.0",
|
|
@@ -54,11 +52,11 @@
|
|
|
54
52
|
"semver": "^6.3.0",
|
|
55
53
|
"stream-to-promise": "^2.2.0",
|
|
56
54
|
"tmp": "^0.0.33",
|
|
57
|
-
"@takeshape/branches": "10.
|
|
58
|
-
"@takeshape/
|
|
59
|
-
"@takeshape/
|
|
60
|
-
"@takeshape/
|
|
61
|
-
"@takeshape/
|
|
55
|
+
"@takeshape/branches": "10.14.9",
|
|
56
|
+
"@takeshape/ssg": "10.14.9",
|
|
57
|
+
"@takeshape/streams": "10.14.9",
|
|
58
|
+
"@takeshape/util": "10.14.9",
|
|
59
|
+
"@takeshape/schema": "10.14.9"
|
|
62
60
|
},
|
|
63
61
|
"devDependencies": {
|
|
64
62
|
"@types/archiver": "^3.1.0",
|
|
@@ -80,7 +78,7 @@
|
|
|
80
78
|
"graphql": "16.6.0",
|
|
81
79
|
"nock": "^13.2.9",
|
|
82
80
|
"unzipper": "^0.10.11",
|
|
83
|
-
"@takeshape/typescript-jest-junit-reporter": "10.
|
|
81
|
+
"@takeshape/typescript-jest-junit-reporter": "10.14.9"
|
|
84
82
|
},
|
|
85
83
|
"engines": {
|
|
86
84
|
"node": ">=18"
|