@takeshape/cli 9.84.0 → 9.86.2
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/validate.d.ts.map +1 -1
- package/dist/commands/validate.js +28 -2
- package/dist/index.js +2 -2
- package/dist/util/data.d.ts +1 -0
- package/dist/util/data.d.ts.map +1 -1
- package/dist/util/data.js +9 -1
- package/package.json +7 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/validate.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../src/commands/validate.ts"],"names":[],"mappings":"AAMA,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AAIjC,QAAA,MAAM,QAAQ,EAAE,OAwDf,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -10,8 +10,10 @@ var _fatalError = require("../util/fatal-error");
|
|
|
10
10
|
var _path = _interopRequireDefault(require("path"));
|
|
11
11
|
var _formatValidationResult = require("../util/format-validation-result");
|
|
12
12
|
var _schema = require("@takeshape/schema");
|
|
13
|
+
var _graphql = require("../graphql");
|
|
14
|
+
var _data = require("../util/data");
|
|
13
15
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
|
-
const validate = async cli => {
|
|
16
|
+
const validate = async (cli, params) => {
|
|
15
17
|
const {
|
|
16
18
|
flags
|
|
17
19
|
} = cli;
|
|
@@ -30,7 +32,31 @@ const validate = async cli => {
|
|
|
30
32
|
}
|
|
31
33
|
try {
|
|
32
34
|
const schema = JSON.parse(_fsExtra.default.readFileSync(schemaPath).toString());
|
|
33
|
-
|
|
35
|
+
let project;
|
|
36
|
+
if (params.authToken) {
|
|
37
|
+
try {
|
|
38
|
+
var _response$data;
|
|
39
|
+
const client = (0, _graphql.createAdminConnector)(params, params.authToken, {
|
|
40
|
+
environment: 'PRODUCTION',
|
|
41
|
+
projectId: schema.projectId
|
|
42
|
+
});
|
|
43
|
+
const response = await client({
|
|
44
|
+
query: _data.getProjectQuery,
|
|
45
|
+
variables: {
|
|
46
|
+
id: schema.projectId
|
|
47
|
+
}
|
|
48
|
+
});
|
|
49
|
+
project = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.project;
|
|
50
|
+
} catch {
|
|
51
|
+
// Eat the error and use default entitlements
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
if (!project) {
|
|
55
|
+
(0, _log.default)('Using default entitlements.');
|
|
56
|
+
}
|
|
57
|
+
const validationString = (0, _formatValidationResult.formatValidationResult)(await (0, _schema.validateSchema)({
|
|
58
|
+
entitlements: project ? project.status.billing.entitlements : {}
|
|
59
|
+
}, schema));
|
|
34
60
|
if (validationString) {
|
|
35
61
|
return (0, _fatalError.fatalError)(validationString);
|
|
36
62
|
}
|
package/dist/index.js
CHANGED
|
@@ -9,7 +9,7 @@ var _options = require("./options");
|
|
|
9
9
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
10
10
|
const help = `
|
|
11
11
|
Usage
|
|
12
|
-
$ takeshape <
|
|
12
|
+
$ takeshape <command>
|
|
13
13
|
|
|
14
14
|
Commands
|
|
15
15
|
login
|
|
@@ -53,7 +53,7 @@ const help = `
|
|
|
53
53
|
$ takeshape branch promote --name my-feature
|
|
54
54
|
$ takeshape branch url --production
|
|
55
55
|
$ takeshape branch tagVersion --name my-feature --tag my-tag
|
|
56
|
-
$ takeshape
|
|
56
|
+
$ takeshape branch merge --head my-feature
|
|
57
57
|
|
|
58
58
|
Options
|
|
59
59
|
--token, -t TakeShape API auth token
|
package/dist/util/data.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { LoggedInCliConfig, CliConfig } from '../types';
|
|
|
3
3
|
import { Choice } from '../prompt';
|
|
4
4
|
export declare const projectListQuery = "\n {\n projects: tsGetProjectList {\n value: id\n name\n invite\n }\n }\n";
|
|
5
5
|
export declare const siteListQuery = "\n {\n sites: getTSStaticSiteList {\n items {\n value: _id\n name: title\n }\n }\n }\n";
|
|
6
|
+
export declare const getProjectQuery = "\n query($id: ID!) {\n project: tsGetProject(id: $id) {\n status\n }\n }\n";
|
|
6
7
|
export interface ProjectChoice extends Choice {
|
|
7
8
|
invite: unknown;
|
|
8
9
|
}
|
package/dist/util/data.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/util/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElG,OAAO,EAAC,iBAAiB,EAAE,SAAS,EAAC,MAAM,UAAU,CAAC;AACtD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAGjC,eAAO,MAAM,gBAAgB,4HAQ5B,CAAC;AAEF,eAAO,MAAM,aAAa,sJASzB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,MAAM;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhF;AAED,eAAO,MAAM,SAAS;;;CAA6C,CAAC;AAEpE,wBAAsB,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAS5G;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,iCAAiC;UAAuB,MAAM;kCAOzE,CAAC;AAEH,eAAO,MAAM,4BAA4B;UAAuB,MAAM;qBAOpE,CAAC;AAEH,eAAO,MAAM,iCAAiC;QAAqB,MAAM;sBAIvE,CAAC;AAEH,eAAO,MAAM,oBAAoB;QAAqB,MAAM;sBAI1D,CAAC;AAMH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAOhH;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,oBAWxE;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAOpH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,oBAO5G"}
|
|
1
|
+
{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/util/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElG,OAAO,EAAC,iBAAiB,EAAE,SAAS,EAAC,MAAM,UAAU,CAAC;AACtD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAGjC,eAAO,MAAM,gBAAgB,4HAQ5B,CAAC;AAEF,eAAO,MAAM,aAAa,sJASzB,CAAC;AAEF,eAAO,MAAM,eAAe,4FAM3B,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,MAAM;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhF;AAED,eAAO,MAAM,SAAS;;;CAA6C,CAAC;AAEpE,wBAAsB,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAS5G;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,iCAAiC;UAAuB,MAAM;kCAOzE,CAAC;AAEH,eAAO,MAAM,4BAA4B;UAAuB,MAAM;qBAOpE,CAAC;AAEH,eAAO,MAAM,iCAAiC;QAAqB,MAAM;sBAIvE,CAAC;AAEH,eAAO,MAAM,oBAAoB;QAAqB,MAAM;sBAI1D,CAAC;AAMH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAOhH;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,oBAWxE;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAOpH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,oBAO5G"}
|
package/dist/util/data.js
CHANGED
|
@@ -13,7 +13,7 @@ exports.deletePersonalAccessToken = deletePersonalAccessToken;
|
|
|
13
13
|
exports.deletePersonalAccessTokenMutation = void 0;
|
|
14
14
|
exports.fetchProjects = fetchProjects;
|
|
15
15
|
exports.fetchSites = fetchSites;
|
|
16
|
-
exports.siteListQuery = exports.projectListQuery = exports.laterSite = void 0;
|
|
16
|
+
exports.siteListQuery = exports.projectListQuery = exports.laterSite = exports.getProjectQuery = void 0;
|
|
17
17
|
var _graphql = require("../graphql");
|
|
18
18
|
var _errors = require("../errors");
|
|
19
19
|
var _os = _interopRequireDefault(require("os"));
|
|
@@ -39,6 +39,14 @@ const siteListQuery = `
|
|
|
39
39
|
}
|
|
40
40
|
`;
|
|
41
41
|
exports.siteListQuery = siteListQuery;
|
|
42
|
+
const getProjectQuery = `
|
|
43
|
+
query($id: ID!) {
|
|
44
|
+
project: tsGetProject(id: $id) {
|
|
45
|
+
status
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
`;
|
|
49
|
+
exports.getProjectQuery = getProjectQuery;
|
|
42
50
|
async function fetchProjects(params) {
|
|
43
51
|
try {
|
|
44
52
|
const client = (0, _graphql.createAdminConnector)(params, params.authToken);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@takeshape/cli",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.86.2",
|
|
4
4
|
"description": "TakeShape CLI",
|
|
5
5
|
"homepage": "https://www.takeshape.io",
|
|
6
6
|
"repository": {
|
|
@@ -54,11 +54,11 @@
|
|
|
54
54
|
"semver": "^6.3.0",
|
|
55
55
|
"stream-to-promise": "^2.2.0",
|
|
56
56
|
"tmp": "^0.0.33",
|
|
57
|
-
"@takeshape/
|
|
58
|
-
"@takeshape/ssg": "9.
|
|
59
|
-
"@takeshape/
|
|
60
|
-
"@takeshape/
|
|
61
|
-
"@takeshape/
|
|
57
|
+
"@takeshape/schema": "9.86.2",
|
|
58
|
+
"@takeshape/ssg": "9.86.2",
|
|
59
|
+
"@takeshape/util": "9.86.2",
|
|
60
|
+
"@takeshape/streams": "9.86.2",
|
|
61
|
+
"@takeshape/branches": "9.86.2"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
64
|
"@types/archiver": "^3.1.0",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"graphql": "16.6.0",
|
|
81
81
|
"nock": "^13.2.9",
|
|
82
82
|
"unzipper": "^0.10.11",
|
|
83
|
-
"@takeshape/typescript-jest-junit-reporter": "9.
|
|
83
|
+
"@takeshape/typescript-jest-junit-reporter": "9.86.2"
|
|
84
84
|
},
|
|
85
85
|
"engines": {
|
|
86
86
|
"node": ">=16"
|