skuba 4.2.0-beta.6 → 4.2.1
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/README.md +1 -1
- 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/jest/index.d.ts +26 -11
- 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.d.ts +2 -1
- package/lib/cli/adapter/eslint.js +10 -15
- 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 +13 -21
- 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.d.ts +7 -1
- package/lib/cli/lint/autofix.js +26 -27
- package/lib/cli/lint/autofix.js.map +1 -1
- package/lib/cli/lint/external.js +37 -59
- 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.d.ts +2 -2
- package/lib/cli/test/reporters/github/index.js +37 -37
- 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/error.d.ts +14 -0
- package/lib/utils/error.js +16 -2
- package/lib/utils/error.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 +12 -22
- package/lib/utils/version.js.map +1 -1
- package/lib/utils/wait.d.ts +17 -0
- package/lib/utils/wait.js +32 -0
- package/lib/utils/wait.js.map +1 -0
- package/lib/utils/worker.js +4 -12
- 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 +19 -29
- package/template/base/tsconfig.json +2 -1
- package/template/express-rest-api/.buildkite/pipeline.yml +5 -4
- package/template/express-rest-api/Dockerfile +3 -3
- package/template/greeter/.buildkite/pipeline.yml +2 -1
- package/template/koa-rest-api/.buildkite/pipeline.yml +5 -4
- package/template/koa-rest-api/Dockerfile +3 -3
- package/template/koa-rest-api/package.json +5 -5
- package/template/koa-rest-api/src/api/jobs/getJobs.ts +2 -2
- package/template/koa-rest-api/src/api/jobs/postJob.ts +2 -2
- package/template/koa-rest-api/src/framework/logging.ts +8 -5
- package/template/koa-rest-api/src/framework/metrics.ts +2 -2
- package/template/koa-rest-api/src/framework/server.test.ts +21 -21
- package/template/koa-rest-api/src/framework/server.ts +4 -3
- package/template/koa-rest-api/src/listen.ts +2 -2
- package/template/koa-rest-api/src/testing/logging.ts +5 -20
- package/template/lambda-sqs-worker/.buildkite/pipeline.yml +2 -1
- package/template/lambda-sqs-worker/.nvmrc +1 -1
- package/template/lambda-sqs-worker/Dockerfile +1 -1
- package/template/lambda-sqs-worker/package.json +4 -4
- package/template/lambda-sqs-worker/serverless.yml +2 -2
- package/template/lambda-sqs-worker/src/app.test.ts +9 -9
- package/template/lambda-sqs-worker/src/app.ts +2 -1
- package/template/lambda-sqs-worker/src/framework/handler.test.ts +10 -10
- package/template/lambda-sqs-worker/src/framework/handler.ts +14 -17
- package/template/lambda-sqs-worker/src/framework/logging.ts +11 -6
- package/template/lambda-sqs-worker/src/testing/logging.ts +7 -5
- package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +2 -1
- package/template/lambda-sqs-worker-cdk/.nvmrc +1 -1
- package/template/lambda-sqs-worker-cdk/Dockerfile +1 -1
- package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +2 -2
- package/template/lambda-sqs-worker-cdk/infra/appStack.ts +1 -1
- package/template/lambda-sqs-worker-cdk/package.json +9 -11
- package/template/oss-npm-package/tsconfig.json +2 -1
- package/template/private-npm-package/.buildkite/pipeline.yml +1 -1
- package/template/private-npm-package/tsconfig.json +2 -1
- package/lib/cli/changesets/coreAdapter.d.ts +0 -9
- package/lib/cli/changesets/coreAdapter.js +0 -19
- 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 -94
- 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 -196
- 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
|
@@ -2,12 +2,20 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createEslintAnnotations = void 0;
|
|
4
4
|
const createEslintAnnotations = (eslint) => [...eslint.errors, ...eslint.warnings].flatMap((result) => result.messages.map((message) => {
|
|
5
|
-
var _a, _b, _c;
|
|
6
5
|
// Annotations only support start_column and end_column on the same line.
|
|
7
6
|
const isSameLine = message.line === message.endLine;
|
|
8
7
|
const startColumn = isSameLine && message.column;
|
|
9
8
|
const endColumn = (isSameLine && message.endColumn) || startColumn;
|
|
10
|
-
return
|
|
9
|
+
return {
|
|
10
|
+
annotation_level: message.severity === 2 ? 'failure' : 'warning',
|
|
11
|
+
start_line: message.line ?? 1,
|
|
12
|
+
end_line: message.endLine ?? message.line ?? 1,
|
|
13
|
+
...(startColumn && { start_column: startColumn }),
|
|
14
|
+
...(endColumn && { end_column: endColumn }),
|
|
15
|
+
message: message.message,
|
|
16
|
+
path: result.filePath,
|
|
17
|
+
title: `ESLint${message.ruleId ? ` (${message.ruleId})` : ''}`,
|
|
18
|
+
};
|
|
11
19
|
}));
|
|
12
20
|
exports.createEslintAnnotations = createEslintAnnotations;
|
|
13
21
|
//# sourceMappingURL=eslint.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../src/cli/lint/annotate/github/eslint.ts"],"names":[],"mappings":";;;AAGO,MAAM,uBAAuB,GAAG,CACrC,MAAoB,EACC,EAAE,CACvB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAoB,CAAC,MAAM,EAAE,EAAE,CAC3E,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAqB,EAAE
|
|
1
|
+
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../src/cli/lint/annotate/github/eslint.ts"],"names":[],"mappings":";;;AAGO,MAAM,uBAAuB,GAAG,CACrC,MAAoB,EACC,EAAE,CACvB,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAoB,CAAC,MAAM,EAAE,EAAE,CAC3E,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAqB,EAAE;IACjD,yEAAyE;IACzE,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,CAAC;IACpD,MAAM,WAAW,GAAG,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IACjD,MAAM,SAAS,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,SAAS,CAAC,IAAI,WAAW,CAAC;IAEnE,OAAO;QACL,gBAAgB,EAAE,OAAO,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QAChE,UAAU,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC;QAC7B,QAAQ,EAAE,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC;QAC9C,GAAG,CAAC,WAAW,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;QACjD,GAAG,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;QAC3C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,KAAK,EAAE,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;KAC/D,CAAC;AACJ,CAAC,CAAC,CACH,CAAC;AArBS,QAAA,uBAAuB,2BAqBhC"}
|
|
@@ -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.createGitHubAnnotations = void 0;
|
|
36
27
|
const GitHub = __importStar(require("../../../../api/github"));
|
|
@@ -38,7 +29,7 @@ const environment_1 = require("../../../../api/github/environment");
|
|
|
38
29
|
const eslint_1 = require("./eslint");
|
|
39
30
|
const prettier_1 = require("./prettier");
|
|
40
31
|
const tsc_1 = require("./tsc");
|
|
41
|
-
const createGitHubAnnotations = (eslint, prettier, tscOk, tscOutputStream) =>
|
|
32
|
+
const createGitHubAnnotations = async (eslint, prettier, tscOk, tscOutputStream) => {
|
|
42
33
|
if (!(0, environment_1.enabledFromEnvironment)()) {
|
|
43
34
|
return;
|
|
44
35
|
}
|
|
@@ -52,13 +43,13 @@ const createGitHubAnnotations = (eslint, prettier, tscOk, tscOutputStream) => __
|
|
|
52
43
|
? '`skuba lint` passed.'
|
|
53
44
|
: '`skuba lint` found issues that require triage.';
|
|
54
45
|
const build = (0, environment_1.buildNameFromEnvironment)();
|
|
55
|
-
|
|
46
|
+
await GitHub.createCheckRun({
|
|
56
47
|
name: 'skuba/lint',
|
|
57
48
|
summary,
|
|
58
49
|
annotations,
|
|
59
50
|
conclusion: isOk ? 'success' : 'failure',
|
|
60
51
|
title: `${build} ${isOk ? 'passed' : 'failed'}`,
|
|
61
52
|
});
|
|
62
|
-
}
|
|
53
|
+
};
|
|
63
54
|
exports.createGitHubAnnotations = createGitHubAnnotations;
|
|
64
55
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/lint/annotate/github/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/lint/annotate/github/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAiD;AACjD,oEAG4C;AAK5C,qCAAmD;AACnD,yCAAuD;AACvD,+BAA6C;AAEtC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,MAAoB,EACpB,QAAwB,EACxB,KAAc,EACd,eAAkC,EAClC,EAAE;IACF,IAAI,CAAC,IAAA,oCAAsB,GAAE,EAAE;QAC7B,OAAO;KACR;IAED,MAAM,WAAW,GAAwB;QACvC,GAAG,IAAA,gCAAuB,EAAC,MAAM,CAAC;QAClC,GAAG,IAAA,oCAAyB,EAAC,QAAQ,CAAC;QACtC,GAAG,IAAA,0BAAoB,EAAC,KAAK,EAAE,eAAe,CAAC;KAChD,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,IAAI,KAAK,CAAC;IAE/C,MAAM,OAAO,GAAG,IAAI;QAClB,CAAC,CAAC,sBAAsB;QACxB,CAAC,CAAC,gDAAgD,CAAC;IAErD,MAAM,KAAK,GAAG,IAAA,sCAAwB,GAAE,CAAC;IAEzC,MAAM,MAAM,CAAC,cAAc,CAAC;QAC1B,IAAI,EAAE,YAAY;QAClB,OAAO;QACP,WAAW;QACX,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QACxC,KAAK,EAAE,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE;KAChD,CAAC,CAAC;AACL,CAAC,CAAC;AA/BW,QAAA,uBAAuB,2BA+BlC"}
|
|
@@ -42,7 +42,7 @@ const createTscAnnotations = (tscOk, tscOutputStream) => {
|
|
|
42
42
|
return [];
|
|
43
43
|
}
|
|
44
44
|
const matches = (0, strip_ansi_1.default)(tscOutputStream.output()).matchAll(tscOutputRegex);
|
|
45
|
-
return Array.from(matches).flatMap((match) =>
|
|
45
|
+
return Array.from(matches).flatMap((match) => match?.length === 7
|
|
46
46
|
? {
|
|
47
47
|
annotation_level: annotationLevelMap[match[4]],
|
|
48
48
|
path: match[1],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsc.js","sourceRoot":"","sources":["../../../../../src/cli/lint/annotate/github/tsc.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;AAOnC;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,cAAc,GAClB,gHAAgH,CAAC;AAEnH,MAAM,kBAAkB,GAGpB;IACF,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,QAAQ;CACf,CAAC;AAEK,MAAM,oBAAoB,GAAG,CAClC,KAAc,EACd,eAAkC,EACb,EAAE;IACvB,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC7E,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAoB,CAAC,KAAK,EAAE,EAAE,CAC9D,
|
|
1
|
+
{"version":3,"file":"tsc.js","sourceRoot":"","sources":["../../../../../src/cli/lint/annotate/github/tsc.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAmC;AAOnC;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,cAAc,GAClB,gHAAgH,CAAC;AAEnH,MAAM,kBAAkB,GAGpB;IACF,KAAK,EAAE,SAAS;IAChB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,QAAQ;CACf,CAAC;AAEK,MAAM,oBAAoB,GAAG,CAClC,KAAc,EACd,eAAkC,EACb,EAAE;IACvB,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,IAAA,oBAAS,EAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAC7E,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAoB,CAAC,KAAK,EAAE,EAAE,CAC9D,KAAK,EAAE,MAAM,KAAK,CAAC;QACjB,CAAC,CAAC;YACE,gBAAgB,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAa,CAAC;YAC1D,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YACd,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC1B,YAAY,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9B,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5B,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE;YACxB,KAAK,EAAE,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG;SAC7B;QACH,CAAC,CAAC,EAAE,CACP,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,oBAAoB,wBAuB/B"}
|
|
@@ -1,22 +1,13 @@
|
|
|
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.createAnnotations = void 0;
|
|
13
4
|
const buildkite_1 = require("./buildkite");
|
|
14
5
|
const github_1 = require("./github");
|
|
15
|
-
const createAnnotations = (eslint, prettier, tscOk, tscOutputStream) =>
|
|
16
|
-
|
|
6
|
+
const createAnnotations = async (eslint, prettier, tscOk, tscOutputStream) => {
|
|
7
|
+
await Promise.all([
|
|
17
8
|
(0, github_1.createGitHubAnnotations)(eslint, prettier, tscOk, tscOutputStream),
|
|
18
9
|
(0, buildkite_1.createBuildkiteAnnotations)(eslint, prettier, tscOk, tscOutputStream),
|
|
19
10
|
]);
|
|
20
|
-
}
|
|
11
|
+
};
|
|
21
12
|
exports.createAnnotations = createAnnotations;
|
|
22
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/lint/annotate/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/lint/annotate/index.ts"],"names":[],"mappings":";;;AAKA,2CAAyD;AACzD,qCAAmD;AAE5C,MAAM,iBAAiB,GAAG,KAAK,EACpC,MAAoB,EACpB,QAAwB,EACxB,KAAc,EACd,eAAkC,EACnB,EAAE;IACjB,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,IAAA,gCAAuB,EAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC;QACjE,IAAA,sCAA0B,EAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC;KACrE,CAAC,CAAC;AACL,CAAC,CAAC;AAVW,QAAA,iBAAiB,qBAU5B"}
|
|
@@ -1,2 +1,8 @@
|
|
|
1
1
|
import type { Input } from './types';
|
|
2
|
-
|
|
2
|
+
interface AutofixParameters {
|
|
3
|
+
debug: Input['debug'];
|
|
4
|
+
eslint: boolean;
|
|
5
|
+
prettier: boolean;
|
|
6
|
+
}
|
|
7
|
+
export declare const autofix: (params: AutofixParameters) => Promise<void>;
|
|
8
|
+
export {};
|
package/lib/cli/lint/autofix.js
CHANGED
|
@@ -22,28 +22,21 @@ 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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
27
|
};
|
|
37
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
29
|
exports.autofix = void 0;
|
|
30
|
+
const util_1 = require("util");
|
|
39
31
|
const simple_git_1 = __importDefault(require("simple-git"));
|
|
40
32
|
const Git = __importStar(require("../../api/git"));
|
|
41
33
|
const eslint_1 = require("../../cli/adapter/eslint");
|
|
42
34
|
const prettier_1 = require("../../cli/adapter/prettier");
|
|
43
35
|
const env_1 = require("../../utils/env");
|
|
44
36
|
const logging_1 = require("../../utils/logging");
|
|
37
|
+
const wait_1 = require("../../utils/wait");
|
|
45
38
|
const AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';
|
|
46
|
-
const shouldPush = ({ currentBranch, dir, }) =>
|
|
39
|
+
const shouldPush = async ({ currentBranch, dir, }) => {
|
|
47
40
|
if (!(0, env_1.isCiEnv)()) {
|
|
48
41
|
// We're not running in a CI environment so we don't need to push autofixes.
|
|
49
42
|
// Ideally we'd drive this off of repository write permissions, but that is
|
|
@@ -60,9 +53,9 @@ const shouldPush = ({ currentBranch, dir, }) => __awaiter(void 0, void 0, void 0
|
|
|
60
53
|
}
|
|
61
54
|
let headCommitMessage;
|
|
62
55
|
try {
|
|
63
|
-
headCommitMessage =
|
|
56
|
+
headCommitMessage = await Git.getHeadCommitMessage({ dir });
|
|
64
57
|
}
|
|
65
|
-
catch
|
|
58
|
+
catch { }
|
|
66
59
|
if (headCommitMessage === AUTOFIX_COMMIT_MESSAGE) {
|
|
67
60
|
// Short circuit when the head commit appears to be one of our autofixes.
|
|
68
61
|
// Repeating the same operation is unlikely to correct outstanding issues.
|
|
@@ -70,32 +63,38 @@ const shouldPush = ({ currentBranch, dir, }) => __awaiter(void 0, void 0, void 0
|
|
|
70
63
|
}
|
|
71
64
|
// Allow the push attempt to go ahead if our guards have been cleared.
|
|
72
65
|
return true;
|
|
73
|
-
}
|
|
74
|
-
const autofix = (
|
|
66
|
+
};
|
|
67
|
+
const autofix = async (params) => {
|
|
68
|
+
if (!params.eslint && !params.prettier) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
75
71
|
const dir = process.cwd();
|
|
76
72
|
let currentBranch;
|
|
77
73
|
try {
|
|
78
|
-
currentBranch =
|
|
74
|
+
currentBranch = await Git.currentBranch({ dir });
|
|
79
75
|
}
|
|
80
|
-
catch
|
|
81
|
-
if (!(
|
|
76
|
+
catch { }
|
|
77
|
+
if (!(await shouldPush({ currentBranch, dir }))) {
|
|
82
78
|
return;
|
|
83
79
|
}
|
|
84
|
-
// Naively try to autofix issues as we can't tell from ESLint output.
|
|
85
80
|
try {
|
|
86
81
|
logging_1.log.newline();
|
|
87
|
-
logging_1.log.warn(`Trying to autofix with ESLint and Prettier...`);
|
|
88
|
-
const logger = (0, logging_1.createLogger)(
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
82
|
+
logging_1.log.warn(`Trying to autofix with ${params.eslint ? 'ESLint and ' : ''}Prettier...`);
|
|
83
|
+
const logger = (0, logging_1.createLogger)(params.debug);
|
|
84
|
+
if (params.eslint) {
|
|
85
|
+
await (0, eslint_1.runESLint)('format', logger);
|
|
86
|
+
}
|
|
87
|
+
// Unconditionally re-run Prettier; reaching here means we have pre-existing
|
|
88
|
+
// format violations or may have created new ones through ESLint fixes.
|
|
89
|
+
await (0, prettier_1.runPrettier)('format', logger);
|
|
90
|
+
const ref = await Git.commitAllChanges({
|
|
92
91
|
dir,
|
|
93
92
|
message: AUTOFIX_COMMIT_MESSAGE,
|
|
94
93
|
});
|
|
95
94
|
if (!ref) {
|
|
96
95
|
return logging_1.log.warn('No autofixes detected.');
|
|
97
96
|
}
|
|
98
|
-
|
|
97
|
+
await (0, wait_1.throwOnTimeout)(process.env.GITHUB_ACTIONS
|
|
99
98
|
? // GitHub's checkout action should preconfigure the Git CLI.
|
|
100
99
|
(0, simple_git_1.default)().push()
|
|
101
100
|
: // In other CI environments (Buildkite) we fall back to GitHub App auth.
|
|
@@ -104,14 +103,14 @@ const autofix = (input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
104
103
|
dir: process.cwd(),
|
|
105
104
|
ref,
|
|
106
105
|
remoteRef: currentBranch,
|
|
107
|
-
}));
|
|
106
|
+
}), { s: 30 });
|
|
108
107
|
logging_1.log.warn(`Pushed fix commit ${ref}.`);
|
|
109
108
|
}
|
|
110
109
|
catch (err) {
|
|
111
110
|
logging_1.log.warn(logging_1.log.bold('Failed to push fix commit.'));
|
|
112
111
|
logging_1.log.warn(logging_1.log.bold('Does your CI environment have write access to your Git repository?'));
|
|
113
|
-
logging_1.log.subtle(err);
|
|
112
|
+
logging_1.log.subtle((0, util_1.inspect)(err));
|
|
114
113
|
}
|
|
115
|
-
}
|
|
114
|
+
};
|
|
116
115
|
exports.autofix = autofix;
|
|
117
116
|
//# sourceMappingURL=autofix.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../../src/cli/lint/autofix.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../../src/cli/lint/autofix.ts"],"names":[],"mappings":"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"}
|
package/lib/cli/lint/external.js
CHANGED
|
@@ -1,31 +1,13 @@
|
|
|
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
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
12
|
-
var t = {};
|
|
13
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
14
|
-
t[p] = s[p];
|
|
15
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
16
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
17
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
18
|
-
t[p[i]] = s[p[i]];
|
|
19
|
-
}
|
|
20
|
-
return t;
|
|
21
|
-
};
|
|
22
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
23
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
24
4
|
};
|
|
25
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
6
|
exports.externalLint = exports.StreamInterceptor = void 0;
|
|
27
7
|
const stream_1 = __importDefault(require("stream"));
|
|
8
|
+
const util_1 = require("util");
|
|
28
9
|
const logging_1 = require("../../utils/logging");
|
|
10
|
+
const wait_1 = require("../../utils/wait");
|
|
29
11
|
const annotate_1 = require("./annotate");
|
|
30
12
|
const autofix_1 = require("./autofix");
|
|
31
13
|
const eslint_1 = require("./eslint");
|
|
@@ -46,15 +28,14 @@ class StreamInterceptor extends stream_1.default.Transform {
|
|
|
46
28
|
}
|
|
47
29
|
}
|
|
48
30
|
exports.StreamInterceptor = StreamInterceptor;
|
|
49
|
-
const lintConcurrently =
|
|
50
|
-
|
|
51
|
-
const [eslint, prettier, tscOk] = yield Promise.all([
|
|
31
|
+
const lintConcurrently = async ({ tscOutputStream, ...input }) => {
|
|
32
|
+
const [eslint, prettier, tscOk] = await Promise.all([
|
|
52
33
|
(0, eslint_1.runESLintInWorkerThread)(input),
|
|
53
34
|
(0, prettier_1.runPrettierInWorkerThread)(input),
|
|
54
|
-
(0, tsc_1.runTscInNewProcess)(
|
|
35
|
+
(0, tsc_1.runTscInNewProcess)({ ...input, tscOutputStream }),
|
|
55
36
|
]);
|
|
56
37
|
return { eslint, prettier, tscOk };
|
|
57
|
-
}
|
|
38
|
+
};
|
|
58
39
|
/**
|
|
59
40
|
* Run linting tools `--serial`ly for resource-constrained environments.
|
|
60
41
|
*
|
|
@@ -62,19 +43,18 @@ const lintConcurrently = (_a) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
62
43
|
* counterintuitive optimisation. Memory can be more readily freed on worker
|
|
63
44
|
* thread exit, which isn't as easy with a monolithic main thread.
|
|
64
45
|
*/
|
|
65
|
-
const lintSerially =
|
|
66
|
-
|
|
67
|
-
const
|
|
68
|
-
const
|
|
69
|
-
const tscOk = yield (0, tsc_1.runTscInNewProcess)(Object.assign(Object.assign({}, input), { tscOutputStream }));
|
|
46
|
+
const lintSerially = async ({ tscOutputStream, ...input }) => {
|
|
47
|
+
const eslint = await (0, eslint_1.runESLintInWorkerThread)(input);
|
|
48
|
+
const prettier = await (0, prettier_1.runPrettierInWorkerThread)(input);
|
|
49
|
+
const tscOk = await (0, tsc_1.runTscInNewProcess)({ ...input, tscOutputStream });
|
|
70
50
|
return { eslint, prettier, tscOk };
|
|
71
|
-
}
|
|
72
|
-
const lintSeriallyWithoutWorkerThreads = (input) =>
|
|
73
|
-
const eslint =
|
|
74
|
-
const prettier =
|
|
75
|
-
const tscOk =
|
|
51
|
+
};
|
|
52
|
+
const lintSeriallyWithoutWorkerThreads = async (input) => {
|
|
53
|
+
const eslint = await (0, eslint_1.runESLintInCurrentThread)(input);
|
|
54
|
+
const prettier = await (0, prettier_1.runPrettierInCurrentThread)(input);
|
|
55
|
+
const tscOk = await (0, tsc_1.runTscInNewProcess)(input);
|
|
76
56
|
return { eslint, prettier, tscOk };
|
|
77
|
-
}
|
|
57
|
+
};
|
|
78
58
|
const selectLintFunction = (input) => {
|
|
79
59
|
if (!input.workerThreads) {
|
|
80
60
|
return lintSeriallyWithoutWorkerThreads;
|
|
@@ -83,35 +63,33 @@ const selectLintFunction = (input) => {
|
|
|
83
63
|
const isSerial = input.debug || input.serial;
|
|
84
64
|
return isSerial ? lintSerially : lintConcurrently;
|
|
85
65
|
};
|
|
86
|
-
const externalLint = (input) =>
|
|
87
|
-
var _c;
|
|
66
|
+
const externalLint = async (input) => {
|
|
88
67
|
const lint = selectLintFunction(input);
|
|
89
68
|
const tscOutputStream = new StreamInterceptor();
|
|
90
|
-
tscOutputStream.pipe(
|
|
91
|
-
const { eslint, prettier, tscOk } =
|
|
69
|
+
tscOutputStream.pipe(input.tscOutputStream ?? process.stdout);
|
|
70
|
+
const { eslint, prettier, tscOk } = await lint({ ...input, tscOutputStream });
|
|
92
71
|
try {
|
|
93
|
-
|
|
72
|
+
await (0, wait_1.throwOnTimeout)((0, annotate_1.createAnnotations)(eslint, prettier, tscOk, tscOutputStream), { s: 30 });
|
|
94
73
|
}
|
|
95
74
|
catch (err) {
|
|
96
|
-
logging_1.log.warn('Failed to annotate results.');
|
|
97
|
-
logging_1.log.
|
|
98
|
-
}
|
|
99
|
-
if (eslint.ok && prettier.ok && tscOk) {
|
|
100
|
-
return;
|
|
75
|
+
logging_1.log.warn('Failed to annotate lint results.');
|
|
76
|
+
logging_1.log.subtle((0, util_1.inspect)(err));
|
|
101
77
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
// If these are fine then the issue lies with tsc, which we can't autofix.
|
|
112
|
-
return;
|
|
78
|
+
if (!eslint.ok || !prettier.ok || !tscOk) {
|
|
79
|
+
const tools = [
|
|
80
|
+
...(eslint.ok ? [] : ['ESLint']),
|
|
81
|
+
...(prettier.ok ? [] : ['Prettier']),
|
|
82
|
+
...(tscOk ? [] : ['tsc']),
|
|
83
|
+
];
|
|
84
|
+
logging_1.log.newline();
|
|
85
|
+
logging_1.log.err(`${tools.join(', ')} found issues that require triage.`);
|
|
86
|
+
process.exitCode = 1;
|
|
113
87
|
}
|
|
114
|
-
|
|
115
|
-
|
|
88
|
+
await (0, autofix_1.autofix)({
|
|
89
|
+
debug: input.debug,
|
|
90
|
+
eslint: eslint.fixable,
|
|
91
|
+
prettier: !prettier.ok,
|
|
92
|
+
});
|
|
93
|
+
};
|
|
116
94
|
exports.externalLint = externalLint;
|
|
117
95
|
//# sourceMappingURL=external.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"external.js","sourceRoot":"","sources":["../../../src/cli/lint/external.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"external.js","sourceRoot":"","sources":["../../../src/cli/lint/external.ts"],"names":[],"mappings":"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"}
|
package/lib/cli/lint/index.js
CHANGED
|
@@ -1,29 +1,20 @@
|
|
|
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.lint = void 0;
|
|
13
4
|
const args_1 = require("../../utils/args");
|
|
14
5
|
const refreshIgnoreFiles_1 = require("../configure/refreshIgnoreFiles");
|
|
15
6
|
const external_1 = require("./external");
|
|
16
7
|
const internal_1 = require("./internal");
|
|
17
|
-
const lint = (args = process.argv, tscOutputStream = undefined, workerThreads = true) =>
|
|
18
|
-
|
|
8
|
+
const lint = async (args = process.argv, tscOutputStream = undefined, workerThreads = true) => {
|
|
9
|
+
await (0, refreshIgnoreFiles_1.tryRefreshIgnoreFiles)();
|
|
19
10
|
const opts = {
|
|
20
11
|
debug: (0, args_1.hasDebugFlag)(args),
|
|
21
12
|
serial: (0, args_1.hasSerialFlag)(args),
|
|
22
13
|
tscOutputStream,
|
|
23
14
|
workerThreads,
|
|
24
15
|
};
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
}
|
|
16
|
+
await (0, external_1.externalLint)(opts);
|
|
17
|
+
await (0, internal_1.internalLint)();
|
|
18
|
+
};
|
|
28
19
|
exports.lint = lint;
|
|
29
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/lint/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/lint/index.ts"],"names":[],"mappings":";;;AAEA,2CAA+D;AAC/D,wEAAwE;AAExE,yCAA0C;AAC1C,yCAA0C;AAGnC,MAAM,IAAI,GAAG,KAAK,EACvB,IAAI,GAAG,OAAO,CAAC,IAAI,EACnB,kBAAwC,SAAS,EACjD,aAAa,GAAG,IAAI,EACpB,EAAE;IACF,MAAM,IAAA,0CAAqB,GAAE,CAAC;IAE9B,MAAM,IAAI,GAAU;QAClB,KAAK,EAAE,IAAA,mBAAY,EAAC,IAAI,CAAC;QACzB,MAAM,EAAE,IAAA,oBAAa,EAAC,IAAI,CAAC;QAC3B,eAAe;QACf,aAAa;KACd,CAAC;IAEF,MAAM,IAAA,uBAAY,EAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,IAAA,uBAAY,GAAE,CAAC;AACvB,CAAC,CAAC;AAjBW,QAAA,IAAI,QAiBf"}
|
package/lib/cli/lint/internal.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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -18,19 +9,19 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
18
9
|
const fs_extra_1 = require("fs-extra");
|
|
19
10
|
const logging_1 = require("../../utils/logging");
|
|
20
11
|
const manifest_1 = require("../../utils/manifest");
|
|
21
|
-
const noSkubaTemplateJs = () =>
|
|
22
|
-
const manifest =
|
|
12
|
+
const noSkubaTemplateJs = async () => {
|
|
13
|
+
const manifest = await (0, manifest_1.getConsumerManifest)();
|
|
23
14
|
if (!manifest) {
|
|
24
15
|
return;
|
|
25
16
|
}
|
|
26
17
|
const templateConfigPath = path_1.default.join(path_1.default.dirname(manifest.path), 'skuba.template.js');
|
|
27
|
-
if (
|
|
18
|
+
if (await (0, fs_extra_1.pathExists)(templateConfigPath)) {
|
|
28
19
|
logging_1.log.err(`Template is incomplete; run ${chalk_1.default.bold('yarn skuba configure')}. ${chalk_1.default.dim('no-skuba-template-js')}`);
|
|
29
20
|
process.exitCode = 1;
|
|
30
21
|
}
|
|
31
|
-
}
|
|
32
|
-
const internalLint = () =>
|
|
33
|
-
|
|
34
|
-
}
|
|
22
|
+
};
|
|
23
|
+
const internalLint = async () => {
|
|
24
|
+
await noSkubaTemplateJs();
|
|
25
|
+
};
|
|
35
26
|
exports.internalLint = internalLint;
|
|
36
27
|
//# sourceMappingURL=internal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/cli/lint/internal.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/cli/lint/internal.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAC1B,uCAAsC;AAEtC,iDAA0C;AAC1C,mDAA2D;AAE3D,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;IACnC,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAmB,GAAE,CAAC;IAE7C,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO;KACR;IAED,MAAM,kBAAkB,GAAG,cAAI,CAAC,IAAI,CAClC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC3B,mBAAmB,CACpB,CAAC;IAEF,IAAI,MAAM,IAAA,qBAAU,EAAC,kBAAkB,CAAC,EAAE;QACxC,aAAG,CAAC,GAAG,CACL,+BAA+B,eAAK,CAAC,IAAI,CACvC,sBAAsB,CACvB,KAAK,eAAK,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE,CAC1C,CAAC;QAEF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;KACtB;AACH,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,KAAK,IAAI,EAAE;IACrC,MAAM,iBAAiB,EAAE,CAAC;AAC5B,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB"}
|
package/lib/cli/lint/tsc.js
CHANGED
|
@@ -1,17 +1,8 @@
|
|
|
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.runTscInNewProcess = void 0;
|
|
13
4
|
const exec_1 = require("../../utils/exec");
|
|
14
|
-
const runTscInNewProcess = ({ debug, tscOutputStream, }) =>
|
|
5
|
+
const runTscInNewProcess = async ({ debug, tscOutputStream, }) => {
|
|
15
6
|
const command = [
|
|
16
7
|
'tsc',
|
|
17
8
|
...(debug ? ['--extendedDiagnostics'] : []),
|
|
@@ -22,7 +13,7 @@ const runTscInNewProcess = ({ debug, tscOutputStream, }) => __awaiter(void 0, vo
|
|
|
22
13
|
// We can use our regular console logger once we decide on an approach for
|
|
23
14
|
// compiling in-process, whether by interacting with the TypeScript Compiler
|
|
24
15
|
// API directly or using a higher-level tool like esbuild.
|
|
25
|
-
|
|
16
|
+
await (0, exec_1.execConcurrently)([
|
|
26
17
|
{
|
|
27
18
|
command,
|
|
28
19
|
name: 'tsc',
|
|
@@ -35,9 +26,9 @@ const runTscInNewProcess = ({ debug, tscOutputStream, }) => __awaiter(void 0, vo
|
|
|
35
26
|
});
|
|
36
27
|
return true;
|
|
37
28
|
}
|
|
38
|
-
catch
|
|
29
|
+
catch {
|
|
39
30
|
return false;
|
|
40
31
|
}
|
|
41
|
-
}
|
|
32
|
+
};
|
|
42
33
|
exports.runTscInNewProcess = runTscInNewProcess;
|
|
43
34
|
//# sourceMappingURL=tsc.js.map
|
package/lib/cli/lint/tsc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tsc.js","sourceRoot":"","sources":["../../../src/cli/lint/tsc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tsc.js","sourceRoot":"","sources":["../../../src/cli/lint/tsc.ts"],"names":[],"mappings":";;;AAAA,2CAAoD;AAI7C,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,KAAK,EACL,eAAe,GACT,EAAoB,EAAE;IAC5B,MAAM,OAAO,GAAG;QACd,KAAK;QACL,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,UAAU;KACX,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEZ,IAAI;QACF,qDAAqD;QACrD,0EAA0E;QAC1E,4EAA4E;QAC5E,0DAA0D;QAC1D,MAAM,IAAA,uBAAgB,EACpB;YACE;gBACE,OAAO;gBACP,IAAI,EAAE,KAAK;gBACX,WAAW,EAAE,MAAM;aACpB;SACF,EACD;YACE,YAAY,EAAE,CAAC;YACf,UAAU,EAAE,UAAU,CAAC,MAAM;YAC7B,YAAY,EAAE,eAAe;SAC9B,CACF,CAAC;QAEF,OAAO,IAAI,CAAC;KACb;IAAC,MAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAC;AAlCW,QAAA,kBAAkB,sBAkC7B"}
|
package/lib/cli/node.js
CHANGED
|
@@ -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
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
27
|
};
|
|
@@ -42,9 +33,9 @@ const tsNode = __importStar(require("ts-node"));
|
|
|
42
33
|
const args_1 = require("../utils/args");
|
|
43
34
|
const exec_1 = require("../utils/exec");
|
|
44
35
|
const validation_1 = require("../utils/validation");
|
|
45
|
-
const node = () =>
|
|
36
|
+
const node = async () => {
|
|
46
37
|
const args = (0, args_1.parseRunArgs)(process.argv.slice(2));
|
|
47
|
-
const availablePort =
|
|
38
|
+
const availablePort = await (0, get_port_1.default)();
|
|
48
39
|
if (args.entryPoint) {
|
|
49
40
|
const exec = (0, exec_1.createExec)({
|
|
50
41
|
env: {
|
|
@@ -68,6 +59,6 @@ const node = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
68
59
|
}),
|
|
69
60
|
})
|
|
70
61
|
.start();
|
|
71
|
-
}
|
|
62
|
+
};
|
|
72
63
|
exports.node = node;
|
|
73
64
|
//# sourceMappingURL=node.js.map
|
package/lib/cli/node.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAC/B,gDAAkC;AAElC,wCAA6C;AAC7C,wCAA2C;AAC3C,oDAA+C;AAExC,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;IAC7B,MAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEtC,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;YACtB,GAAG,EAAE;gBACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;gBACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;aACtE;SACF,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qDAAqD;QACrD,OAAO,IAAI,CACT,MAAM,EACN,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,iCAAiC;QACjC,mEAAmE;QACnE,qEAAqE;QACrE,8BAA8B,EAC9B,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;KACH;IAED,oDAAoD;IACpD,OAAO,MAAM;SACV,UAAU,CAAC;QACV,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,CAAC,eAAe,EAAE,yBAAyB,CAAC;YACrD,aAAa,EAAE,IAAI;SACpB,CAAC;KACH,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC,CAAC;AAzCW,QAAA,IAAI,QAyCf"}
|