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
package/lib/cli/lint/external.js
CHANGED
|
@@ -1,24 +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
|
-
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
|
};
|
|
@@ -46,15 +26,14 @@ class StreamInterceptor extends stream_1.default.Transform {
|
|
|
46
26
|
}
|
|
47
27
|
}
|
|
48
28
|
exports.StreamInterceptor = StreamInterceptor;
|
|
49
|
-
const lintConcurrently =
|
|
50
|
-
|
|
51
|
-
const [eslint, prettier, tscOk] = yield Promise.all([
|
|
29
|
+
const lintConcurrently = async ({ tscOutputStream, ...input }) => {
|
|
30
|
+
const [eslint, prettier, tscOk] = await Promise.all([
|
|
52
31
|
(0, eslint_1.runESLintInWorkerThread)(input),
|
|
53
32
|
(0, prettier_1.runPrettierInWorkerThread)(input),
|
|
54
|
-
(0, tsc_1.runTscInNewProcess)(
|
|
33
|
+
(0, tsc_1.runTscInNewProcess)({ ...input, tscOutputStream }),
|
|
55
34
|
]);
|
|
56
35
|
return { eslint, prettier, tscOk };
|
|
57
|
-
}
|
|
36
|
+
};
|
|
58
37
|
/**
|
|
59
38
|
* Run linting tools `--serial`ly for resource-constrained environments.
|
|
60
39
|
*
|
|
@@ -62,19 +41,18 @@ const lintConcurrently = (_a) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
62
41
|
* counterintuitive optimisation. Memory can be more readily freed on worker
|
|
63
42
|
* thread exit, which isn't as easy with a monolithic main thread.
|
|
64
43
|
*/
|
|
65
|
-
const lintSerially =
|
|
66
|
-
|
|
67
|
-
const
|
|
68
|
-
const
|
|
69
|
-
const tscOk = yield (0, tsc_1.runTscInNewProcess)(Object.assign(Object.assign({}, input), { tscOutputStream }));
|
|
44
|
+
const lintSerially = async ({ tscOutputStream, ...input }) => {
|
|
45
|
+
const eslint = await (0, eslint_1.runESLintInWorkerThread)(input);
|
|
46
|
+
const prettier = await (0, prettier_1.runPrettierInWorkerThread)(input);
|
|
47
|
+
const tscOk = await (0, tsc_1.runTscInNewProcess)({ ...input, tscOutputStream });
|
|
70
48
|
return { eslint, prettier, tscOk };
|
|
71
|
-
}
|
|
72
|
-
const lintSeriallyWithoutWorkerThreads = (input) =>
|
|
73
|
-
const eslint =
|
|
74
|
-
const prettier =
|
|
75
|
-
const tscOk =
|
|
49
|
+
};
|
|
50
|
+
const lintSeriallyWithoutWorkerThreads = async (input) => {
|
|
51
|
+
const eslint = await (0, eslint_1.runESLintInCurrentThread)(input);
|
|
52
|
+
const prettier = await (0, prettier_1.runPrettierInCurrentThread)(input);
|
|
53
|
+
const tscOk = await (0, tsc_1.runTscInNewProcess)(input);
|
|
76
54
|
return { eslint, prettier, tscOk };
|
|
77
|
-
}
|
|
55
|
+
};
|
|
78
56
|
const selectLintFunction = (input) => {
|
|
79
57
|
if (!input.workerThreads) {
|
|
80
58
|
return lintSeriallyWithoutWorkerThreads;
|
|
@@ -83,14 +61,13 @@ const selectLintFunction = (input) => {
|
|
|
83
61
|
const isSerial = input.debug || input.serial;
|
|
84
62
|
return isSerial ? lintSerially : lintConcurrently;
|
|
85
63
|
};
|
|
86
|
-
const externalLint = (input) =>
|
|
87
|
-
var _c;
|
|
64
|
+
const externalLint = async (input) => {
|
|
88
65
|
const lint = selectLintFunction(input);
|
|
89
66
|
const tscOutputStream = new StreamInterceptor();
|
|
90
|
-
tscOutputStream.pipe(
|
|
91
|
-
const { eslint, prettier, tscOk } =
|
|
67
|
+
tscOutputStream.pipe(input.tscOutputStream ?? process.stdout);
|
|
68
|
+
const { eslint, prettier, tscOk } = await lint({ ...input, tscOutputStream });
|
|
92
69
|
try {
|
|
93
|
-
|
|
70
|
+
await (0, annotate_1.createAnnotations)(eslint, prettier, tscOk, tscOutputStream);
|
|
94
71
|
}
|
|
95
72
|
catch (err) {
|
|
96
73
|
logging_1.log.warn('Failed to annotate results.');
|
|
@@ -111,7 +88,7 @@ const externalLint = (input) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
111
88
|
// If these are fine then the issue lies with tsc, which we can't autofix.
|
|
112
89
|
return;
|
|
113
90
|
}
|
|
114
|
-
|
|
115
|
-
}
|
|
91
|
+
await (0, autofix_1.autofix)(input);
|
|
92
|
+
};
|
|
116
93
|
exports.externalLint = externalLint;
|
|
117
94
|
//# 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":";;;;;;AAAA,oDAA4B;AAE5B,iDAA0C;AAE1C,yCAA+C;AAC/C,uCAAoC;AACpC,qCAA6E;AAC7E,yCAGoB;AACpB,+BAA2C;AAG3C,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAE9C,MAAa,iBAAkB,SAAQ,gBAAM,CAAC,SAAS;IAAvD;;QACU,WAAM,GAAiB,EAAE,CAAC;IAepC,CAAC;IAbQ,MAAM;QACX,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,UAAU,CACR,KAAiB,EACjB,SAAyB,EACzB,QAAkC;QAElC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAExB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxB,CAAC;CACF;AAhBD,8CAgBC;AAED,MAAM,gBAAgB,GAAG,KAAK,EAAE,EAAE,eAAe,EAAE,GAAG,KAAK,EAAS,EAAE,EAAE;IACtE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAClD,IAAA,gCAAuB,EAAC,KAAK,CAAC;QAC9B,IAAA,oCAAyB,EAAC,KAAK,CAAC;QAChC,IAAA,wBAAkB,EAAC,EAAE,GAAG,KAAK,EAAE,eAAe,EAAE,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,YAAY,GAAG,KAAK,EAAE,EAAE,eAAe,EAAE,GAAG,KAAK,EAAS,EAAE,EAAE;IAClE,MAAM,MAAM,GAAG,MAAM,IAAA,gCAAuB,EAAC,KAAK,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,MAAM,IAAA,oCAAyB,EAAC,KAAK,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,MAAM,IAAA,wBAAkB,EAAC,EAAE,GAAG,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;IAEtE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,gCAAgC,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE;IAC9D,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAwB,EAAC,KAAK,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,MAAM,IAAA,qCAA0B,EAAC,KAAK,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,MAAM,IAAA,wBAAkB,EAAC,KAAK,CAAC,CAAC;IAE9C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,KAAY,EAAE,EAAE;IAC1C,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;QACxB,OAAO,gCAAgC,CAAC;KACzC;IAED,gCAAgC;IAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;IAE7C,OAAO,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAgB,CAAC;AACpD,CAAC,CAAC;AAEK,MAAM,YAAY,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE;IACjD,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAEvC,MAAM,eAAe,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAChD,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;IAE9E,IAAI;QACF,MAAM,IAAA,4BAAiB,EAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;KACnE;IAAC,OAAO,GAAG,EAAE;QACZ,aAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACxC,aAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACf;IAED,IAAI,MAAM,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,IAAI,KAAK,EAAE;QACrC,OAAO;KACR;IAED,MAAM,KAAK,GAAG;QACZ,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACpC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;KAC1B,CAAC;IAEF,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;IAEjE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IAErB,IAAI,MAAM,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,EAAE;QAC5B,0EAA0E;QAC1E,OAAO;KACR;IAED,MAAM,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC;AApCW,QAAA,YAAY,gBAoCvB"}
|
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"}
|
package/lib/cli/release.js
CHANGED
|
@@ -1,18 +1,9 @@
|
|
|
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.release = void 0;
|
|
13
4
|
const exec_1 = require("../utils/exec");
|
|
14
|
-
const release = () =>
|
|
15
|
-
|
|
16
|
-
}
|
|
5
|
+
const release = async () => {
|
|
6
|
+
await (0, exec_1.exec)('semantic-release', '--success', 'false');
|
|
7
|
+
};
|
|
17
8
|
exports.release = release;
|
|
18
9
|
//# sourceMappingURL=release.js.map
|
package/lib/cli/release.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release.js","sourceRoot":"","sources":["../../src/cli/release.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"release.js","sourceRoot":"","sources":["../../src/cli/release.ts"],"names":[],"mappings":";;;AAAA,wCAAqC;AAE9B,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,IAAA,WAAI,EAAC,kBAAkB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC,CAAC;AAFW,QAAA,OAAO,WAElB"}
|
package/lib/cli/start.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
|
};
|
|
@@ -19,13 +10,12 @@ const args_1 = require("../utils/args");
|
|
|
19
10
|
const exec_1 = require("../utils/exec");
|
|
20
11
|
const manifest_1 = require("../utils/manifest");
|
|
21
12
|
const validation_1 = require("../utils/validation");
|
|
22
|
-
const start = () =>
|
|
23
|
-
|
|
24
|
-
const [args, availablePort] = yield Promise.all([
|
|
13
|
+
const start = async () => {
|
|
14
|
+
const [args, availablePort] = await Promise.all([
|
|
25
15
|
(0, args_1.parseRunArgs)(process.argv.slice(2)),
|
|
26
16
|
(0, get_port_1.default)(),
|
|
27
17
|
]);
|
|
28
|
-
|
|
18
|
+
args.entryPoint ?? (args.entryPoint = await (0, manifest_1.getEntryPointFromManifest)());
|
|
29
19
|
const execProcess = (0, exec_1.createExec)({
|
|
30
20
|
env: {
|
|
31
21
|
__SKUBA_ENTRY_POINT: args.entryPoint,
|
|
@@ -33,6 +23,6 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
33
23
|
},
|
|
34
24
|
});
|
|
35
25
|
return execProcess('ts-node-dev', ...args.node, '--require', 'dotenv/config', '--require', 'tsconfig-paths/register', '--respawn', '--transpile-only', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
|
|
36
|
-
}
|
|
26
|
+
};
|
|
37
27
|
exports.start = start;
|
|
38
28
|
//# sourceMappingURL=start.js.map
|
package/lib/cli/start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/cli/start.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/cli/start.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAE/B,wCAA6C;AAC7C,wCAA2C;AAC3C,gDAA8D;AAC9D,oDAA+C;AAExC,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;IAC9B,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAA,kBAAO,GAAE;KACV,CAAC,CAAC;IAEH,IAAI,CAAC,UAAU,KAAf,IAAI,CAAC,UAAU,GAAK,MAAM,IAAA,oCAAyB,GAAE,EAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,iBAAU,EAAC;QAC7B,GAAG,EAAE;YACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;YACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;SACtE;KACF,CAAC,CAAC;IAEH,OAAO,WAAW,CAChB,aAAa,EACb,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,kBAAkB,EAClB,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,KAAK,SA2BhB"}
|
package/lib/cli/test/index.js
CHANGED
|
@@ -4,9 +4,8 @@ exports.test = void 0;
|
|
|
4
4
|
const jest_1 = require("jest");
|
|
5
5
|
const test = () => {
|
|
6
6
|
var _a;
|
|
7
|
-
var _b;
|
|
8
7
|
// This is usually set in `jest-cli`'s binary wrapper
|
|
9
|
-
(_a =
|
|
8
|
+
(_a = process.env).NODE_ENV ?? (_a.NODE_ENV = 'test');
|
|
10
9
|
const argv = process.argv.slice(2);
|
|
11
10
|
return (0, jest_1.run)(argv);
|
|
12
11
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/test/index.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAEpB,MAAM,IAAI,GAAG,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/test/index.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAEpB,MAAM,IAAI,GAAG,GAAG,EAAE;;IACvB,qDAAqD;IACrD,MAAA,OAAO,CAAC,GAAG,EAAC,QAAQ,QAAR,QAAQ,GAAK,MAAM,EAAC;IAEhC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEnC,OAAO,IAAA,UAAG,EAAC,IAAI,CAAC,CAAC;AACnB,CAAC,CAAC;AAPW,QAAA,IAAI,QAOf"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.generateAnnotationEntries = exports.createAnnotations = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const strip_ansi_1 = __importDefault(require("strip-ansi"));
|
|
8
9
|
/**
|
|
9
10
|
* Matches the first stack trace location in a Jest failure message.
|
|
10
11
|
*
|
|
@@ -36,14 +37,14 @@ const createAnnotations = (testResults) => {
|
|
|
36
37
|
path: path_1.default.relative(cwd, testResult.testFilePath),
|
|
37
38
|
start_line: 1,
|
|
38
39
|
end_line: 1,
|
|
39
|
-
message: testResult.testExecError.message,
|
|
40
|
+
message: (0, strip_ansi_1.default)(testResult.testExecError.message),
|
|
40
41
|
title: 'Jest',
|
|
41
42
|
};
|
|
42
43
|
}
|
|
43
44
|
if (testResult.numFailingTests > 0) {
|
|
44
45
|
return testResult.testResults.flatMap((assertionResult) => assertionResult.failureMessages.flatMap((failureMessage) => {
|
|
45
46
|
const match = JEST_LOCATION_REGEX.exec(failureMessage);
|
|
46
|
-
if (
|
|
47
|
+
if (match?.length === 4) {
|
|
47
48
|
return {
|
|
48
49
|
annotation_level: 'failure',
|
|
49
50
|
path: path_1.default.relative(cwd, match[1]),
|
|
@@ -51,7 +52,7 @@ const createAnnotations = (testResults) => {
|
|
|
51
52
|
end_line: Number(match[2]),
|
|
52
53
|
start_column: Number(match[3]),
|
|
53
54
|
end_column: Number(match[3]),
|
|
54
|
-
message: failureMessage,
|
|
55
|
+
message: (0, strip_ansi_1.default)(failureMessage),
|
|
55
56
|
title: 'Jest',
|
|
56
57
|
};
|
|
57
58
|
}
|
|
@@ -66,14 +67,13 @@ const DEFAULT_DISPLAY_NAME = Symbol('DEFAULT_DISPLAY_NAME');
|
|
|
66
67
|
const generateAnnotationEntries = (testResults) => {
|
|
67
68
|
// Group test results by display name.
|
|
68
69
|
const resultsByDisplayName = testResults.reduce((acc, result) => {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
((_c = acc[displayName]) !== null && _c !== void 0 ? _c : (acc[displayName] = [])).push(result);
|
|
70
|
+
const displayName = result.displayName?.name ?? DEFAULT_DISPLAY_NAME;
|
|
71
|
+
(acc[displayName] ?? (acc[displayName] = [])).push(result);
|
|
72
72
|
return acc;
|
|
73
73
|
}, {});
|
|
74
74
|
const defaultResults = resultsByDisplayName[DEFAULT_DISPLAY_NAME];
|
|
75
75
|
const entries = [
|
|
76
|
-
...(
|
|
76
|
+
...(defaultResults?.length ? [[undefined, defaultResults]] : []),
|
|
77
77
|
...Object.entries(resultsByDisplayName),
|
|
78
78
|
];
|
|
79
79
|
// Create annotations for each display name.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../../../src/cli/test/reporters/github/annotations.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;
|
|
1
|
+
{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../../../src/cli/test/reporters/github/annotations.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,51 +22,40 @@ 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
|
const GitHub = __importStar(require("../../../../api/github"));
|
|
36
27
|
const environment_1 = require("../../../../api/github/environment");
|
|
37
28
|
const logging_1 = require("../../../../utils/logging");
|
|
38
29
|
const annotations_1 = require("./annotations");
|
|
39
30
|
class GitHubReporter {
|
|
40
|
-
onRunComplete(_contexts, { testResults }) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
});
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
catch (err) {
|
|
66
|
-
logging_1.log.warn('Failed to annotate results.');
|
|
67
|
-
logging_1.log.warn(err);
|
|
31
|
+
async onRunComplete(_contexts, { testResults }) {
|
|
32
|
+
if (!(0, environment_1.enabledFromEnvironment)()) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
try {
|
|
36
|
+
const entries = (0, annotations_1.generateAnnotationEntries)(testResults);
|
|
37
|
+
const build = (0, environment_1.buildNameFromEnvironment)();
|
|
38
|
+
// Create a check run per display name.
|
|
39
|
+
// Run in series to reduce the likelihood of exceeding GitHub rate limits.
|
|
40
|
+
for (const { displayName, annotations } of entries) {
|
|
41
|
+
const name = `skuba/test${displayName ? ` (${displayName})` : ''}`;
|
|
42
|
+
const isOk = !annotations.length;
|
|
43
|
+
const summary = isOk
|
|
44
|
+
? '`skuba test` passed.'
|
|
45
|
+
: '`skuba test` found issues that require triage.';
|
|
46
|
+
await GitHub.createCheckRun({
|
|
47
|
+
name,
|
|
48
|
+
annotations,
|
|
49
|
+
conclusion: isOk ? 'success' : 'failure',
|
|
50
|
+
summary,
|
|
51
|
+
title: `${build} ${isOk ? 'passed' : 'failed'}`,
|
|
52
|
+
});
|
|
68
53
|
}
|
|
69
|
-
}
|
|
54
|
+
}
|
|
55
|
+
catch (err) {
|
|
56
|
+
logging_1.log.warn('Failed to annotate results.');
|
|
57
|
+
logging_1.log.warn(err);
|
|
58
|
+
}
|
|
70
59
|
}
|
|
71
60
|
}
|
|
72
61
|
exports.default = GitHubReporter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/test/reporters/github/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/test/reporters/github/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAGA,+DAAiD;AACjD,oEAG4C;AAC5C,uDAAgD;AAEhD,+CAA0D;AAE1D,MAAqB,cAAc;IACjC,KAAK,CAAC,aAAa,CACjB,SAAuB,EACvB,EAAE,WAAW,EAAoB;QAEjC,IAAI,CAAC,IAAA,oCAAsB,GAAE,EAAE;YAC7B,OAAO;SACR;QAED,IAAI;YACF,MAAM,OAAO,GAAG,IAAA,uCAAyB,EAAC,WAAW,CAAC,CAAC;YAEvD,MAAM,KAAK,GAAG,IAAA,sCAAwB,GAAE,CAAC;YAEzC,uCAAuC;YACvC,0EAA0E;YAC1E,KAAK,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,OAAO,EAAE;gBAClD,MAAM,IAAI,GAAG,aAAa,WAAW,CAAC,CAAC,CAAC,KAAK,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;gBAEnE,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAEjC,MAAM,OAAO,GAAG,IAAI;oBAClB,CAAC,CAAC,sBAAsB;oBACxB,CAAC,CAAC,gDAAgD,CAAC;gBAErD,MAAM,MAAM,CAAC,cAAc,CAAC;oBAC1B,IAAI;oBACJ,WAAW;oBACX,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;oBACxC,OAAO;oBACP,KAAK,EAAE,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE;iBAChD,CAAC,CAAC;aACJ;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,aAAG,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;YACxC,aAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACf;IACH,CAAC;CACF;AAtCD,iCAsCC"}
|
package/lib/cli/version.js
CHANGED
|
@@ -1,20 +1,11 @@
|
|
|
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.version = void 0;
|
|
13
4
|
const logging_1 = require("../utils/logging");
|
|
14
5
|
const version_1 = require("../utils/version");
|
|
15
|
-
const version = () =>
|
|
16
|
-
const skubaVersion =
|
|
6
|
+
const version = async () => {
|
|
7
|
+
const skubaVersion = await (0, version_1.getSkubaVersion)();
|
|
17
8
|
logging_1.log.plain(skubaVersion);
|
|
18
|
-
}
|
|
9
|
+
};
|
|
19
10
|
exports.version = version;
|
|
20
11
|
//# sourceMappingURL=version.js.map
|
package/lib/cli/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/cli/version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/cli/version.ts"],"names":[],"mappings":";;;AAAA,8CAAuC;AACvC,8CAAmD;AAE5C,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAe,GAAE,CAAC;IAE7C,aAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;AAC1B,CAAC,CAAC;AAJW,QAAA,OAAO,WAIlB"}
|