skuba 4.2.0-beta.4 → 4.2.0
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/lib/api/buildkite/annotate.js +8 -19
- package/lib/api/buildkite/annotate.js.map +1 -1
- package/lib/api/git/commit.js +6 -17
- package/lib/api/git/commit.js.map +1 -1
- package/lib/api/git/commitAllChanges.js +4 -13
- package/lib/api/git/commitAllChanges.js.map +1 -1
- package/lib/api/git/currentBranch.js +5 -14
- package/lib/api/git/currentBranch.js.map +1 -1
- package/lib/api/git/getChangedFiles.js +3 -12
- package/lib/api/git/getChangedFiles.js.map +1 -1
- package/lib/api/git/log.js +7 -17
- package/lib/api/git/log.js.map +1 -1
- package/lib/api/git/push.js +7 -19
- package/lib/api/git/push.js.map +1 -1
- package/lib/api/git/remote.js +5 -14
- package/lib/api/git/remote.js.map +1 -1
- package/lib/api/git/reset.js +6 -15
- package/lib/api/git/reset.js.map +1 -1
- package/lib/api/github/checkRun.js +4 -13
- package/lib/api/github/checkRun.js.map +1 -1
- package/lib/api/github/environment.js +2 -3
- package/lib/api/github/environment.js.map +1 -1
- package/lib/api/github/issueComment.js +15 -28
- package/lib/api/github/issueComment.js.map +1 -1
- package/lib/api/github/pullRequest.js +8 -17
- package/lib/api/github/pullRequest.js.map +1 -1
- package/lib/api/net/compose.js +3 -12
- package/lib/api/net/compose.js.map +1 -1
- package/lib/api/net/socket.js +30 -43
- package/lib/api/net/socket.js.map +1 -1
- package/lib/api/net/waitFor.js +4 -13
- package/lib/api/net/waitFor.js.map +1 -1
- package/lib/cli/adapter/eslint.js +5 -14
- package/lib/cli/adapter/eslint.js.map +1 -1
- package/lib/cli/adapter/prettier.js +12 -24
- package/lib/cli/adapter/prettier.js.map +1 -1
- package/lib/cli/build/tsc.js +2 -11
- package/lib/cli/build/tsc.js.map +1 -1
- package/lib/cli/configure/analyseConfiguration.js +7 -16
- package/lib/cli/configure/analyseConfiguration.js.map +1 -1
- package/lib/cli/configure/analyseDependencies.js +22 -28
- package/lib/cli/configure/analyseDependencies.js.map +1 -1
- package/lib/cli/configure/analysis/files.js +3 -12
- package/lib/cli/configure/analysis/files.js.map +1 -1
- package/lib/cli/configure/analysis/git.js +4 -13
- package/lib/cli/configure/analysis/git.js.map +1 -1
- package/lib/cli/configure/analysis/package.js +7 -13
- package/lib/cli/configure/analysis/package.js.map +1 -1
- package/lib/cli/configure/analysis/project.js +13 -23
- package/lib/cli/configure/analysis/project.js.map +1 -1
- package/lib/cli/configure/ensureTemplateCompletion.js +6 -15
- package/lib/cli/configure/ensureTemplateCompletion.js.map +1 -1
- package/lib/cli/configure/getEntryPoint.js +3 -12
- package/lib/cli/configure/getEntryPoint.js.map +1 -1
- package/lib/cli/configure/getProjectType.js +3 -13
- package/lib/cli/configure/getProjectType.js.map +1 -1
- package/lib/cli/configure/index.js +21 -30
- package/lib/cli/configure/index.js.map +1 -1
- package/lib/cli/configure/modules/eslint.js +10 -29
- package/lib/cli/configure/modules/eslint.js.map +1 -1
- package/lib/cli/configure/modules/ignore.js +3 -12
- package/lib/cli/configure/modules/ignore.js.map +1 -1
- package/lib/cli/configure/modules/jest.js +14 -33
- package/lib/cli/configure/modules/jest.js.map +1 -1
- package/lib/cli/configure/modules/package.js +21 -21
- package/lib/cli/configure/modules/package.js.map +1 -1
- package/lib/cli/configure/modules/prettier.js +9 -28
- package/lib/cli/configure/modules/prettier.js.map +1 -1
- package/lib/cli/configure/modules/renovate.js +13 -30
- package/lib/cli/configure/modules/renovate.js.map +1 -1
- package/lib/cli/configure/modules/skubaDive.js +7 -5
- package/lib/cli/configure/modules/skubaDive.js.map +1 -1
- package/lib/cli/configure/modules/tsconfig.js +12 -18
- package/lib/cli/configure/modules/tsconfig.js.map +1 -1
- package/lib/cli/configure/processing/json.js +1 -1
- package/lib/cli/configure/processing/json.js.map +1 -1
- package/lib/cli/configure/processing/package.js +5 -5
- package/lib/cli/configure/processing/package.js.map +1 -1
- package/lib/cli/configure/processing/prettier.js +4 -1
- package/lib/cli/configure/processing/prettier.js.map +1 -1
- package/lib/cli/configure/processing/typescript.js +4 -7
- package/lib/cli/configure/processing/typescript.js.map +1 -1
- package/lib/cli/configure/refreshIgnoreFiles.js +11 -20
- package/lib/cli/configure/refreshIgnoreFiles.js.map +1 -1
- package/lib/cli/format.js +5 -14
- package/lib/cli/format.js.map +1 -1
- package/lib/cli/help.js +3 -12
- package/lib/cli/help.js.map +1 -1
- package/lib/cli/init/getConfig.js +63 -56
- package/lib/cli/init/getConfig.js.map +1 -1
- package/lib/cli/init/git.js +9 -18
- package/lib/cli/init/git.js.map +1 -1
- package/lib/cli/init/index.js +14 -23
- package/lib/cli/init/index.js.map +1 -1
- package/lib/cli/init/prompts.js +3 -12
- package/lib/cli/init/prompts.js.map +1 -1
- package/lib/cli/init/types.js +7 -2
- package/lib/cli/init/types.js.map +1 -1
- package/lib/cli/init/writePackageJson.js +5 -14
- package/lib/cli/init/writePackageJson.js.map +1 -1
- package/lib/cli/lint/annotate/buildkite/index.js +3 -12
- package/lib/cli/lint/annotate/buildkite/index.js.map +1 -1
- package/lib/cli/lint/annotate/github/eslint.js +10 -2
- package/lib/cli/lint/annotate/github/eslint.js.map +1 -1
- package/lib/cli/lint/annotate/github/index.js +3 -12
- package/lib/cli/lint/annotate/github/index.js.map +1 -1
- package/lib/cli/lint/annotate/github/tsc.js +1 -1
- package/lib/cli/lint/annotate/github/tsc.js.map +1 -1
- package/lib/cli/lint/annotate/index.js +3 -12
- package/lib/cli/lint/annotate/index.js.map +1 -1
- package/lib/cli/lint/autofix.js +13 -22
- package/lib/cli/lint/autofix.js.map +1 -1
- package/lib/cli/lint/external.js +20 -43
- package/lib/cli/lint/external.js.map +1 -1
- package/lib/cli/lint/index.js +5 -14
- package/lib/cli/lint/index.js.map +1 -1
- package/lib/cli/lint/internal.js +7 -16
- package/lib/cli/lint/internal.js.map +1 -1
- package/lib/cli/lint/tsc.js +4 -13
- package/lib/cli/lint/tsc.js.map +1 -1
- package/lib/cli/node.js +3 -12
- package/lib/cli/node.js.map +1 -1
- package/lib/cli/release.js +3 -12
- package/lib/cli/release.js.map +1 -1
- package/lib/cli/start.js +4 -14
- package/lib/cli/start.js.map +1 -1
- package/lib/cli/test/index.js +1 -2
- package/lib/cli/test/index.js.map +1 -1
- package/lib/cli/test/reporters/github/annotations.js +7 -7
- package/lib/cli/test/reporters/github/annotations.js.map +1 -1
- package/lib/cli/test/reporters/github/index.js +27 -38
- package/lib/cli/test/reporters/github/index.js.map +1 -1
- package/lib/cli/version.js +3 -12
- package/lib/cli/version.js.map +1 -1
- package/lib/skuba.js +3 -12
- package/lib/skuba.js.map +1 -1
- package/lib/utils/args.d.ts +1 -1
- package/lib/utils/args.js +7 -11
- package/lib/utils/args.js.map +1 -1
- package/lib/utils/command.d.ts +1 -1
- package/lib/utils/command.js +0 -1
- package/lib/utils/command.js.map +1 -1
- package/lib/utils/copy.js +11 -20
- package/lib/utils/copy.js.map +1 -1
- package/lib/utils/dir.js +9 -18
- package/lib/utils/dir.js.map +1 -1
- package/lib/utils/exec.js +25 -29
- package/lib/utils/exec.js.map +1 -1
- package/lib/utils/logo.js +4 -14
- package/lib/utils/logo.js.map +1 -1
- package/lib/utils/manifest.js +6 -15
- package/lib/utils/manifest.js.map +1 -1
- package/lib/utils/version.js +10 -19
- package/lib/utils/version.js.map +1 -1
- package/lib/utils/worker.js +2 -11
- package/lib/utils/worker.js.map +1 -1
- package/lib/wrapper/functionHandler.js +2 -11
- package/lib/wrapper/functionHandler.js.map +1 -1
- package/lib/wrapper/http.js +6 -15
- package/lib/wrapper/http.js.map +1 -1
- package/lib/wrapper/main.js +2 -11
- package/lib/wrapper/main.js.map +1 -1
- package/lib/wrapper/requestListener.js +3 -13
- package/lib/wrapper/requestListener.js.map +1 -1
- package/package.json +4 -13
- package/template/base/tsconfig.json +2 -1
- package/template/express-rest-api/.buildkite/pipeline.yml +3 -3
- package/template/express-rest-api/Dockerfile +3 -3
- package/template/koa-rest-api/.buildkite/pipeline.yml +3 -3
- package/template/koa-rest-api/Dockerfile +3 -3
- package/template/oss-npm-package/tsconfig.json +2 -1
- package/template/private-npm-package/tsconfig.json +2 -1
- package/lib/cli/changesets/coreAdapter.d.ts +0 -8
- package/lib/cli/changesets/coreAdapter.js +0 -18
- package/lib/cli/changesets/coreAdapter.js.map +0 -1
- package/lib/cli/changesets/gitUtils.d.ts +0 -17
- package/lib/cli/changesets/gitUtils.js +0 -128
- package/lib/cli/changesets/gitUtils.js.map +0 -1
- package/lib/cli/changesets/githubAdapter.d.ts +0 -3
- package/lib/cli/changesets/githubAdapter.js +0 -8
- package/lib/cli/changesets/githubAdapter.js.map +0 -1
- package/lib/cli/changesets/index.d.ts +0 -1
- package/lib/cli/changesets/index.js +0 -82
- package/lib/cli/changesets/index.js.map +0 -1
- package/lib/cli/changesets/readChangesetState.d.ts +0 -6
- package/lib/cli/changesets/readChangesetState.js +0 -34
- package/lib/cli/changesets/readChangesetState.js.map +0 -1
- package/lib/cli/changesets/run.d.ts +0 -22
- package/lib/cli/changesets/run.js +0 -195
- package/lib/cli/changesets/run.js.map +0 -1
- package/lib/cli/changesets/utils.d.ts +0 -30
- package/lib/cli/changesets/utils.js +0 -130
- package/lib/cli/changesets/utils.js.map +0 -1
|
@@ -22,25 +22,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
-
});
|
|
33
|
-
};
|
|
34
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
26
|
exports.putIssueComment = void 0;
|
|
36
27
|
const rest_1 = require("@octokit/rest");
|
|
37
28
|
const Git = __importStar(require("../git"));
|
|
38
29
|
const environment_1 = require("./environment");
|
|
39
30
|
const pullRequest_1 = require("./pullRequest");
|
|
40
|
-
const getUserId = (client) =>
|
|
41
|
-
const { data } =
|
|
31
|
+
const getUserId = async (client) => {
|
|
32
|
+
const { data } = await client.users.getAuthenticated();
|
|
42
33
|
return data.id;
|
|
43
|
-
}
|
|
34
|
+
};
|
|
44
35
|
/**
|
|
45
36
|
* Asynchronously creates or updates a GitHub issue comment.
|
|
46
37
|
*
|
|
@@ -52,33 +43,29 @@ const getUserId = (client) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
52
43
|
* A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with write permissions must be present
|
|
53
44
|
* on the environment.
|
|
54
45
|
*/
|
|
55
|
-
const putIssueComment = (params) =>
|
|
56
|
-
|
|
57
|
-
const env = (_a = params.env) !== null && _a !== void 0 ? _a : process.env;
|
|
46
|
+
const putIssueComment = async (params) => {
|
|
47
|
+
const env = params.env ?? process.env;
|
|
58
48
|
const dir = process.cwd();
|
|
59
|
-
const { owner, repo } =
|
|
49
|
+
const { owner, repo } = await Git.getOwnerAndRepo({ dir });
|
|
60
50
|
const client = new rest_1.Octokit({ auth: (0, environment_1.apiTokenFromEnvironment)() });
|
|
61
|
-
const issueNumber =
|
|
51
|
+
const issueNumber = params.issueNumber ?? (await (0, pullRequest_1.getPullRequestNumber)({ client, env }));
|
|
62
52
|
if (!issueNumber) {
|
|
63
53
|
throw new Error('Failed to infer an issue number');
|
|
64
54
|
}
|
|
65
|
-
const comments =
|
|
55
|
+
const comments = await client.issues.listComments({
|
|
66
56
|
issue_number: issueNumber,
|
|
67
57
|
owner,
|
|
68
58
|
repo,
|
|
69
59
|
});
|
|
70
|
-
const userId =
|
|
71
|
-
const commentId =
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
? (_b = comment.body) === null || _b === void 0 ? void 0 : _b.endsWith(`\n\n<!-- ${params.internalId} -->`)
|
|
76
|
-
: true);
|
|
77
|
-
})) === null || _d === void 0 ? void 0 : _d.id;
|
|
60
|
+
const userId = params.userId ?? (await getUserId(client));
|
|
61
|
+
const commentId = comments.data.find((comment) => comment.user?.id === userId &&
|
|
62
|
+
(params.internalId
|
|
63
|
+
? comment.body?.endsWith(`\n\n<!-- ${params.internalId} -->`)
|
|
64
|
+
: true))?.id;
|
|
78
65
|
const body = params.internalId
|
|
79
66
|
? [params.body.trim(), `<!-- ${params.internalId} -->`].join('\n\n')
|
|
80
67
|
: params.body.trim();
|
|
81
|
-
const response =
|
|
68
|
+
const response = await (commentId
|
|
82
69
|
? client.issues.updateComment({
|
|
83
70
|
body,
|
|
84
71
|
comment_id: commentId,
|
|
@@ -95,6 +82,6 @@ const putIssueComment = (params) => __awaiter(void 0, void 0, void 0, function*
|
|
|
95
82
|
return {
|
|
96
83
|
id: response.data.id,
|
|
97
84
|
};
|
|
98
|
-
}
|
|
85
|
+
};
|
|
99
86
|
exports.putIssueComment = putIssueComment;
|
|
100
87
|
//# sourceMappingURL=issueComment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issueComment.js","sourceRoot":"","sources":["../../../src/api/github/issueComment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"issueComment.js","sourceRoot":"","sources":["../../../src/api/github/issueComment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAwC;AAExC,4CAA8B;AAE9B,+CAAwD;AACxD,+CAAqD;AAErD,MAAM,SAAS,GAAG,KAAK,EAAE,MAAe,EAAmB,EAAE;IAC3D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAEvD,OAAO,IAAI,CAAC,EAAE,CAAC;AACjB,CAAC,CAAC;AAsDF;;;;;;;;;;GAUG;AACI,MAAM,eAAe,GAAG,KAAK,EAClC,MAAiC,EACV,EAAE;IACzB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAEtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAG,IAAI,cAAO,CAAC,EAAE,IAAI,EAAE,IAAA,qCAAuB,GAAE,EAAE,CAAC,CAAC;IAEhE,MAAM,WAAW,GACf,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,IAAA,kCAAoB,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAEtE,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IAED,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QAChD,YAAY,EAAE,WAAW;QACzB,KAAK;QACL,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAClC,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,MAAM;QAC3B,CAAC,MAAM,CAAC,UAAU;YAChB,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,MAAM,CAAC,UAAU,MAAM,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,CACZ,EAAE,EAAE,CAAC;IAEN,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU;QAC5B,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,MAAM,CAAC,UAAU,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QACpE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAEvB,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS;QAC/B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;YAC1B,IAAI;YACJ,UAAU,EAAE,SAAS;YACrB,YAAY,EAAE,WAAW;YACzB,KAAK;YACL,IAAI;SACL,CAAC;QACJ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;YAC1B,IAAI;YACJ,YAAY,EAAE,WAAW;YACzB,KAAK;YACL,IAAI;SACL,CAAC,CAAC,CAAC;IAER,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;KACrB,CAAC;AACJ,CAAC,CAAC;AAxDW,QAAA,eAAe,mBAwD1B"}
|
|
@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
-
});
|
|
33
|
-
};
|
|
34
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
26
|
exports.getPullRequestNumber = void 0;
|
|
36
27
|
const rest_1 = require("@octokit/rest");
|
|
@@ -44,20 +35,20 @@ const environment_1 = require("./environment");
|
|
|
44
35
|
* associated with the head commit. An error is thrown if there are no
|
|
45
36
|
* associated pull requests, or if they are all closed or locked.
|
|
46
37
|
*/
|
|
47
|
-
const getPullRequestNumber = (params = {}) =>
|
|
48
|
-
|
|
49
|
-
const env = (_a = params.env) !== null && _a !== void 0 ? _a : process.env;
|
|
38
|
+
const getPullRequestNumber = async (params = {}) => {
|
|
39
|
+
const env = params.env ?? process.env;
|
|
50
40
|
const dir = process.cwd();
|
|
51
|
-
const number = Number(
|
|
41
|
+
const number = Number(env.BUILDKITE_PULL_REQUEST ??
|
|
42
|
+
env.GITHUB_REF?.replace(/^refs\/pull\/(\d+).*$/, '$1'));
|
|
52
43
|
if (Number.isSafeInteger(number)) {
|
|
53
44
|
return number;
|
|
54
45
|
}
|
|
55
|
-
const client =
|
|
56
|
-
const [commitId, { owner, repo }] =
|
|
46
|
+
const client = params.client ?? new rest_1.Octokit({ auth: (0, environment_1.apiTokenFromEnvironment)() });
|
|
47
|
+
const [commitId, { owner, repo }] = await Promise.all([
|
|
57
48
|
Git.getHeadCommitId({ dir, env }),
|
|
58
49
|
Git.getOwnerAndRepo({ dir }),
|
|
59
50
|
]);
|
|
60
|
-
const response =
|
|
51
|
+
const response = await client.repos.listPullRequestsAssociatedWithCommit({
|
|
61
52
|
commit_sha: commitId,
|
|
62
53
|
owner,
|
|
63
54
|
repo,
|
|
@@ -69,6 +60,6 @@ const getPullRequestNumber = (params = {}) => __awaiter(void 0, void 0, void 0,
|
|
|
69
60
|
throw new Error(`Commit ${commitId} is not associated with an open GitHub pull request`);
|
|
70
61
|
}
|
|
71
62
|
return data[0].number;
|
|
72
|
-
}
|
|
63
|
+
};
|
|
73
64
|
exports.getPullRequestNumber = getPullRequestNumber;
|
|
74
65
|
//# sourceMappingURL=pullRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pullRequest.js","sourceRoot":"","sources":["../../../src/api/github/pullRequest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pullRequest.js","sourceRoot":"","sources":["../../../src/api/github/pullRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAwC;AAExC,4CAA8B;AAE9B,+CAAwD;AAcxD;;;;;;;GAOG;AACI,MAAM,oBAAoB,GAAG,KAAK,EACvC,SAAmC,EAAE,EACpB,EAAE;IACnB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAEtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,CACnB,GAAG,CAAC,sBAAsB;QACxB,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,uBAAuB,EAAE,IAAI,CAAC,CACzD,CAAC;IAEF,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;QAChC,OAAO,MAAM,CAAC;KACf;IAED,MAAM,MAAM,GACV,MAAM,CAAC,MAAM,IAAI,IAAI,cAAO,CAAC,EAAE,IAAI,EAAE,IAAA,qCAAuB,GAAE,EAAE,CAAC,CAAC;IAEpE,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpD,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACjC,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;KAC7B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC;QACvE,UAAU,EAAE,QAAQ;QACpB,KAAK;QACL,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI;SACvB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;SACjD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAE5D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,UAAU,QAAQ,qDAAqD,CACxE,CAAC;KACH;IAED,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACxB,CAAC,CAAC;AAzCW,QAAA,oBAAoB,wBAyC/B"}
|
package/lib/api/net/compose.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.resolveComposeAddress = void 0;
|
|
13
4
|
const exec_1 = require("../../utils/exec");
|
|
@@ -18,14 +9,14 @@ const portStringToNumber = (portString) => {
|
|
|
18
9
|
}
|
|
19
10
|
return port;
|
|
20
11
|
};
|
|
21
|
-
const resolveComposeAddress = (privateHost, privatePort) =>
|
|
12
|
+
const resolveComposeAddress = async (privateHost, privatePort) => {
|
|
22
13
|
const exec = (0, exec_1.createExec)({ stdio: 'pipe' });
|
|
23
|
-
const { stdout } =
|
|
14
|
+
const { stdout } = await exec('docker-compose', 'port', privateHost, String(privatePort));
|
|
24
15
|
const [host, portString] = stdout.trim().split(':');
|
|
25
16
|
if (!host || !portString) {
|
|
26
17
|
throw Error(`Docker Compose returned unrecognised address: '${stdout}'`);
|
|
27
18
|
}
|
|
28
19
|
return { host, port: portStringToNumber(portString) };
|
|
29
|
-
}
|
|
20
|
+
};
|
|
30
21
|
exports.resolveComposeAddress = resolveComposeAddress;
|
|
31
22
|
//# sourceMappingURL=compose.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/api/net/compose.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/api/net/compose.ts"],"names":[],"mappings":";;;AAAA,2CAA8C;AAE9C,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,EAAE;IAChD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;QAC/B,MAAM,KAAK,CAAC,+BAA+B,UAAU,GAAG,CAAC,CAAC;KAC3D;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,KAAK,EACxC,WAAmB,EACnB,WAAmB,EACnB,EAAE;IACF,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAC3B,gBAAgB,EAChB,MAAM,EACN,WAAW,EACX,MAAM,CAAC,WAAW,CAAC,CACpB,CAAC;IAEF,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEpD,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;QACxB,MAAM,KAAK,CAAC,kDAAkD,MAAM,GAAG,CAAC,CAAC;KAC1E;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;AACxD,CAAC,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC"}
|
package/lib/api/net/socket.js
CHANGED
|
@@ -1,55 +1,42 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
14
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
6
|
exports.pollSocket = void 0;
|
|
16
7
|
const net_1 = __importDefault(require("net"));
|
|
17
|
-
const trySocket = (host, port) =>
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.setTimeout(1000);
|
|
30
|
-
});
|
|
8
|
+
const trySocket = async (host, port) => new Promise((resolve) => {
|
|
9
|
+
const socket = new net_1.default.Socket();
|
|
10
|
+
const onFailure = () => {
|
|
11
|
+
socket.destroy();
|
|
12
|
+
resolve(false);
|
|
13
|
+
};
|
|
14
|
+
const onSuccess = () => socket.end(() => resolve(true));
|
|
15
|
+
socket
|
|
16
|
+
.connect(port, host, onSuccess)
|
|
17
|
+
.once('error', onFailure)
|
|
18
|
+
.once('timeout', onFailure)
|
|
19
|
+
.setTimeout(1000);
|
|
31
20
|
});
|
|
32
|
-
const pollSocket = (host, port, timeout) =>
|
|
33
|
-
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
const intervalId = setInterval(() => {
|
|
44
|
-
callPort().catch(() => undefined);
|
|
45
|
-
}, 250);
|
|
46
|
-
const timeoutId = setTimeout(() => {
|
|
47
|
-
clearTimeout(intervalId);
|
|
48
|
-
clearTimeout(timeoutId);
|
|
49
|
-
reject(Error(`could not reach ${host}:${port} within ${timeout}ms`));
|
|
50
|
-
}, timeout);
|
|
21
|
+
const pollSocket = async (host, port, timeout) => new Promise((resolve, reject) => {
|
|
22
|
+
const callPort = async () => {
|
|
23
|
+
const success = await trySocket(host, port);
|
|
24
|
+
if (!success) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
clearTimeout(intervalId);
|
|
28
|
+
clearTimeout(timeoutId);
|
|
29
|
+
resolve();
|
|
30
|
+
};
|
|
31
|
+
const intervalId = setInterval(() => {
|
|
51
32
|
callPort().catch(() => undefined);
|
|
52
|
-
});
|
|
33
|
+
}, 250);
|
|
34
|
+
const timeoutId = setTimeout(() => {
|
|
35
|
+
clearTimeout(intervalId);
|
|
36
|
+
clearTimeout(timeoutId);
|
|
37
|
+
reject(Error(`could not reach ${host}:${port} within ${timeout}ms`));
|
|
38
|
+
}, timeout);
|
|
39
|
+
callPort().catch(() => undefined);
|
|
53
40
|
});
|
|
54
41
|
exports.pollSocket = pollSocket;
|
|
55
42
|
//# sourceMappingURL=socket.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../src/api/net/socket.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../src/api/net/socket.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AAOtB,MAAM,SAAS,GAAG,KAAK,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE,CACrD,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;IACtB,MAAM,MAAM,GAAG,IAAI,aAAG,CAAC,MAAM,EAAE,CAAC;IAEhC,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAExD,MAAM;SACH,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC;SAC9B,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC;SACxB,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;SAC1B,UAAU,CAAC,IAAK,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEE,MAAM,UAAU,GAAG,KAAK,EAAE,IAAY,EAAE,IAAY,EAAE,OAAe,EAAE,EAAE,CAC9E,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IACpC,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE5C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,YAAY,CAAC,UAAU,CAAC,CAAC;QACzB,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;QAClC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;QAChC,YAAY,CAAC,UAAU,CAAC,CAAC;QACzB,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,MAAM,CAAC,KAAK,CAAC,mBAAmB,IAAI,IAAI,IAAI,WAAW,OAAO,IAAI,CAAC,CAAC,CAAC;IACvE,CAAC,EAAE,OAAO,CAAC,CAAC;IAEZ,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AA3BQ,QAAA,UAAU,cA2BlB"}
|
package/lib/api/net/waitFor.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.waitFor = void 0;
|
|
13
4
|
const compose_1 = require("./compose");
|
|
@@ -18,12 +9,12 @@ const socket_1 = require("./socket");
|
|
|
18
9
|
* The socket is polled on an interval until it accepts a connection or the
|
|
19
10
|
* `timeout` is reached.
|
|
20
11
|
*/
|
|
21
|
-
const waitFor = ({ host = 'localhost', port, resolveCompose = false, timeout = 15000, }) =>
|
|
12
|
+
const waitFor = async ({ host = 'localhost', port, resolveCompose = false, timeout = 15000, }) => {
|
|
22
13
|
const resolvedAddress = resolveCompose
|
|
23
|
-
?
|
|
14
|
+
? await (0, compose_1.resolveComposeAddress)(host, port)
|
|
24
15
|
: { host, port };
|
|
25
|
-
|
|
16
|
+
await (0, socket_1.pollSocket)(resolvedAddress.host, resolvedAddress.port, timeout);
|
|
26
17
|
return resolvedAddress;
|
|
27
|
-
}
|
|
18
|
+
};
|
|
28
19
|
exports.waitFor = waitFor;
|
|
29
20
|
//# sourceMappingURL=waitFor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitFor.js","sourceRoot":"","sources":["../../../src/api/net/waitFor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"waitFor.js","sourceRoot":"","sources":["../../../src/api/net/waitFor.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAElD,qCAAsC;AAEtC;;;;;GAKG;AACI,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,IAAI,GAAG,WAAW,EAClB,IAAI,EACJ,cAAc,GAAG,KAAK,EACtB,OAAO,GAAG,KAAM,GAkBjB,EAA0B,EAAE;IAC3B,MAAM,eAAe,GAAG,cAAc;QACpC,CAAC,CAAC,MAAM,IAAA,+BAAqB,EAAC,IAAI,EAAE,IAAI,CAAC;QACzC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEnB,MAAM,IAAA,mBAAU,EAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEtE,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AA9BW,QAAA,OAAO,WA8BlB"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -23,7 +14,7 @@ const symbolForResult = (result) => {
|
|
|
23
14
|
}
|
|
24
15
|
return result.warningCount ? chalk_1.default.yellow('◍') : chalk_1.default.green('○');
|
|
25
16
|
};
|
|
26
|
-
const runESLint = (mode, logger) =>
|
|
17
|
+
const runESLint = async (mode, logger) => {
|
|
27
18
|
logger.debug('Initialising ESLint...');
|
|
28
19
|
const engine = new eslint_1.ESLint({
|
|
29
20
|
cache: true,
|
|
@@ -47,7 +38,7 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
|
|
|
47
38
|
ogConsoleError(...args);
|
|
48
39
|
}
|
|
49
40
|
};
|
|
50
|
-
const [formatter, results] =
|
|
41
|
+
const [formatter, results] = await Promise.all([
|
|
51
42
|
engine.loadFormatter(),
|
|
52
43
|
engine.lintFiles('.'),
|
|
53
44
|
]);
|
|
@@ -74,12 +65,12 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
|
|
|
74
65
|
logger.debug(symbolForResult(result), relativePath);
|
|
75
66
|
}
|
|
76
67
|
const ok = errors.length === 0;
|
|
77
|
-
|
|
78
|
-
const output =
|
|
68
|
+
await eslint_1.ESLint.outputFixes(results);
|
|
69
|
+
const output = await formatter.format(results);
|
|
79
70
|
if (output) {
|
|
80
71
|
logger.plain(output);
|
|
81
72
|
}
|
|
82
73
|
return { ok, output, errors, warnings };
|
|
83
|
-
}
|
|
74
|
+
};
|
|
84
75
|
exports.runESLint = runESLint;
|
|
85
76
|
//# sourceMappingURL=eslint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -42,13 +33,10 @@ let languages;
|
|
|
42
33
|
*/
|
|
43
34
|
const inferParser = (filepath) => {
|
|
44
35
|
const filename = path_1.default.basename(filepath).toLowerCase();
|
|
45
|
-
languages
|
|
46
|
-
const firstLanguage = languages.find((language) =>
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
((_b = language.filenames) === null || _b === void 0 ? void 0 : _b.some((name) => name.toLowerCase() === filename));
|
|
50
|
-
});
|
|
51
|
-
return firstLanguage === null || firstLanguage === void 0 ? void 0 : firstLanguage.parsers[0];
|
|
36
|
+
languages ?? (languages = (0, prettier_1.getSupportInfo)().languages.filter((language) => language.since));
|
|
37
|
+
const firstLanguage = languages.find((language) => language.extensions?.some((extension) => filename.endsWith(extension)) ||
|
|
38
|
+
language.filenames?.some((name) => name.toLowerCase() === filename));
|
|
39
|
+
return firstLanguage?.parsers[0];
|
|
52
40
|
};
|
|
53
41
|
exports.inferParser = inferParser;
|
|
54
42
|
const formatOrLintFile = ({ data, filepath, options }, mode, result) => {
|
|
@@ -88,11 +76,11 @@ const formatOrLintFile = ({ data, filepath, options }, mode, result) => {
|
|
|
88
76
|
* On the other hand, this affords more flexibility in how we track and report
|
|
89
77
|
* on progress and results.
|
|
90
78
|
*/
|
|
91
|
-
const runPrettier = (mode, logger) =>
|
|
79
|
+
const runPrettier = async (mode, logger) => {
|
|
92
80
|
logger.debug('Initialising Prettier...');
|
|
93
81
|
const start = process.hrtime.bigint();
|
|
94
82
|
let directory = process.cwd();
|
|
95
|
-
const manifest =
|
|
83
|
+
const manifest = await (0, manifest_1.getConsumerManifest)();
|
|
96
84
|
if (manifest) {
|
|
97
85
|
directory = path_1.default.dirname(manifest.path);
|
|
98
86
|
}
|
|
@@ -101,7 +89,7 @@ const runPrettier = (mode, logger) => __awaiter(void 0, void 0, void 0, function
|
|
|
101
89
|
// Match Prettier's opinion of not respecting `.gitignore`.
|
|
102
90
|
// This avoids exhibiting different behaviour than a Prettier IDE integration,
|
|
103
91
|
// and the headache of conflicting `.gitignore` and `.prettierignore` rules.
|
|
104
|
-
const filepaths =
|
|
92
|
+
const filepaths = await (0, dir_1.crawlDirectory)(directory, '.prettierignore');
|
|
105
93
|
logger.debug(`Discovered ${(0, logging_1.pluralise)(filepaths.length, 'file')}.`);
|
|
106
94
|
const result = {
|
|
107
95
|
count: filepaths.length,
|
|
@@ -114,23 +102,23 @@ const runPrettier = (mode, logger) => __awaiter(void 0, void 0, void 0, function
|
|
|
114
102
|
// Infer parser upfront so we can skip unsupported files.
|
|
115
103
|
const parser = (0, exports.inferParser)(filepath);
|
|
116
104
|
logger.debug(filepath);
|
|
117
|
-
logger.debug(' parser:', parser
|
|
105
|
+
logger.debug(' parser:', parser ?? '-');
|
|
118
106
|
if (!parser) {
|
|
119
107
|
result.unparsed.push(filepath);
|
|
120
108
|
continue;
|
|
121
109
|
}
|
|
122
|
-
const [config, data] =
|
|
110
|
+
const [config, data] = await Promise.all([
|
|
123
111
|
(0, prettier_1.resolveConfig)(filepath),
|
|
124
112
|
fs_extra_1.default.promises.readFile(filepath, 'utf-8'),
|
|
125
113
|
]);
|
|
126
114
|
const file = {
|
|
127
115
|
data,
|
|
128
116
|
filepath,
|
|
129
|
-
options:
|
|
117
|
+
options: { ...config, filepath },
|
|
130
118
|
};
|
|
131
119
|
const formatted = formatOrLintFile(file, mode, result);
|
|
132
120
|
if (typeof formatted === 'string') {
|
|
133
|
-
|
|
121
|
+
await fs_extra_1.default.promises.writeFile(filepath, formatted);
|
|
134
122
|
}
|
|
135
123
|
}
|
|
136
124
|
const end = process.hrtime.bigint();
|
|
@@ -148,6 +136,6 @@ const runPrettier = (mode, logger) => __awaiter(void 0, void 0, void 0, function
|
|
|
148
136
|
}
|
|
149
137
|
}
|
|
150
138
|
return { ok: result.errored.length === 0, result };
|
|
151
|
-
}
|
|
139
|
+
};
|
|
152
140
|
exports.runPrettier = runPrettier;
|
|
153
141
|
//# sourceMappingURL=prettier.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prettier.js","sourceRoot":"","sources":["../../../src/cli/adapter/prettier.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prettier.js","sourceRoot":"","sources":["../../../src/cli/adapter/prettier.ts"],"names":[],"mappings":"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"}
|
package/lib/cli/build/tsc.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.tsc = void 0;
|
|
13
4
|
const exec_1 = require("../../utils/exec");
|
|
@@ -21,7 +12,7 @@ const PROJECT_OPTS = new Set([
|
|
|
21
12
|
'-project',
|
|
22
13
|
'--project',
|
|
23
14
|
]);
|
|
24
|
-
const tsc = () =>
|
|
15
|
+
const tsc = async () => {
|
|
25
16
|
const args = process.argv.slice(2);
|
|
26
17
|
const defaultArgs = args
|
|
27
18
|
.map((arg) => arg.toLocaleLowerCase())
|
|
@@ -29,6 +20,6 @@ const tsc = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
29
20
|
? []
|
|
30
21
|
: DEFAULT_ARGS;
|
|
31
22
|
return (0, exec_1.exec)('tsc', ...defaultArgs, ...args);
|
|
32
|
-
}
|
|
23
|
+
};
|
|
33
24
|
exports.tsc = tsc;
|
|
34
25
|
//# sourceMappingURL=tsc.js.map
|
package/lib/cli/build/tsc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsc.js","sourceRoot":"","sources":["../../../src/cli/build/tsc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tsc.js","sourceRoot":"","sources":["../../../src/cli/build/tsc.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,MAAM,YAAY,GAAG,CAAC,WAAW,EAAE,qBAAqB,CAAU,CAAC;AAEnE,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC;IAC3B,+CAA+C;IAC/C,IAAI;IACJ,QAAQ;IACR,SAAS;IAET,IAAI;IACJ,UAAU;IACV,WAAW;CACZ,CAAC,CAAC;AAEI,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;IAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEnC,MAAM,WAAW,GAAG,IAAI;SACrB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;SACrC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,YAAY,CAAC;IAEjB,OAAO,IAAA,WAAI,EAAC,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC,CAAC;AAC9C,CAAC,CAAC;AAVW,QAAA,GAAG,OAUd"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -17,10 +8,10 @@ const path_1 = __importDefault(require("path"));
|
|
|
17
8
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
18
9
|
const logging_1 = require("../../utils/logging");
|
|
19
10
|
const project_1 = require("./analysis/project");
|
|
20
|
-
const analyseConfiguration = (props) =>
|
|
11
|
+
const analyseConfiguration = async (props) => {
|
|
21
12
|
logging_1.log.newline();
|
|
22
13
|
logging_1.log.plain(logging_1.log.bold('Config:'));
|
|
23
|
-
const files =
|
|
14
|
+
const files = await (0, project_1.diffFiles)(props);
|
|
24
15
|
if (Object.keys(files).length === 0) {
|
|
25
16
|
logging_1.log.newline();
|
|
26
17
|
logging_1.log.ok('✔ No changes');
|
|
@@ -30,15 +21,15 @@ const analyseConfiguration = (props) => __awaiter(void 0, void 0, void 0, functi
|
|
|
30
21
|
Object.entries(files)
|
|
31
22
|
.sort(([filenameA], [filenameB]) => filenameA.localeCompare(filenameB))
|
|
32
23
|
.forEach(([filename, { operation }]) => logging_1.log.plain(operation, filename));
|
|
33
|
-
return () =>
|
|
24
|
+
return async () => {
|
|
34
25
|
const dirnames = [
|
|
35
26
|
...new Set(Object.keys(files).map((filename) => path_1.default.dirname(filename))),
|
|
36
27
|
];
|
|
37
|
-
|
|
38
|
-
|
|
28
|
+
await Promise.all(dirnames.map((dirname) => fs_extra_1.default.promises.mkdir(dirname, { recursive: true })));
|
|
29
|
+
await Promise.all(Object.entries(files).map(([filename, { data }]) => data === undefined
|
|
39
30
|
? fs_extra_1.default.promises.rm(filename)
|
|
40
31
|
: fs_extra_1.default.promises.writeFile(filename, data)));
|
|
41
|
-
}
|
|
42
|
-
}
|
|
32
|
+
};
|
|
33
|
+
};
|
|
43
34
|
exports.analyseConfiguration = analyseConfiguration;
|
|
44
35
|
//# sourceMappingURL=analyseConfiguration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyseConfiguration.js","sourceRoot":"","sources":["../../../src/cli/configure/analyseConfiguration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"analyseConfiguration.js","sourceRoot":"","sources":["../../../src/cli/configure/analyseConfiguration.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,wDAA0B;AAE1B,iDAA0C;AAG1C,gDAA+C;AASxC,MAAM,oBAAoB,GAAG,KAAK,EACvC,KAAY,EACgC,EAAE;IAC9C,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,KAAK,CAAC,aAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAE/B,MAAM,KAAK,GAAG,MAAM,IAAA,mBAAS,EAAC,KAAK,CAAC,CAAC;IAErC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,aAAG,CAAC,OAAO,EAAE,CAAC;QACd,aAAG,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;QACvB,OAAO;KACR;IAED,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;SAClB,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;SACtE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,aAAG,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE1E,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,QAAQ,GAAG;YACf,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;SACzE,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACvB,kBAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAChD,CACF,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,CACjD,IAAI,KAAK,SAAS;YAChB,CAAC,CAAC,kBAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC;YAC1B,CAAC,CAAC,kBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,CAC1C,CACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAtCW,QAAA,oBAAoB,wBAsC/B"}
|