skuba 4.2.0-beta.5 → 4.2.1-beta.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.
Files changed (195) hide show
  1. package/lib/api/buildkite/annotate.js +8 -19
  2. package/lib/api/buildkite/annotate.js.map +1 -1
  3. package/lib/api/git/commit.js +6 -17
  4. package/lib/api/git/commit.js.map +1 -1
  5. package/lib/api/git/commitAllChanges.js +4 -13
  6. package/lib/api/git/commitAllChanges.js.map +1 -1
  7. package/lib/api/git/currentBranch.js +5 -14
  8. package/lib/api/git/currentBranch.js.map +1 -1
  9. package/lib/api/git/getChangedFiles.js +3 -12
  10. package/lib/api/git/getChangedFiles.js.map +1 -1
  11. package/lib/api/git/log.js +7 -17
  12. package/lib/api/git/log.js.map +1 -1
  13. package/lib/api/git/push.js +7 -19
  14. package/lib/api/git/push.js.map +1 -1
  15. package/lib/api/git/remote.js +5 -14
  16. package/lib/api/git/remote.js.map +1 -1
  17. package/lib/api/git/reset.js +6 -15
  18. package/lib/api/git/reset.js.map +1 -1
  19. package/lib/api/github/checkRun.js +4 -13
  20. package/lib/api/github/checkRun.js.map +1 -1
  21. package/lib/api/github/environment.js +2 -3
  22. package/lib/api/github/environment.js.map +1 -1
  23. package/lib/api/github/issueComment.js +15 -28
  24. package/lib/api/github/issueComment.js.map +1 -1
  25. package/lib/api/github/pullRequest.js +8 -17
  26. package/lib/api/github/pullRequest.js.map +1 -1
  27. package/lib/api/net/compose.js +3 -12
  28. package/lib/api/net/compose.js.map +1 -1
  29. package/lib/api/net/socket.js +30 -43
  30. package/lib/api/net/socket.js.map +1 -1
  31. package/lib/api/net/waitFor.js +4 -13
  32. package/lib/api/net/waitFor.js.map +1 -1
  33. package/lib/cli/adapter/eslint.js +5 -14
  34. package/lib/cli/adapter/eslint.js.map +1 -1
  35. package/lib/cli/adapter/prettier.js +12 -24
  36. package/lib/cli/adapter/prettier.js.map +1 -1
  37. package/lib/cli/build/tsc.js +2 -11
  38. package/lib/cli/build/tsc.js.map +1 -1
  39. package/lib/cli/configure/analyseConfiguration.js +7 -16
  40. package/lib/cli/configure/analyseConfiguration.js.map +1 -1
  41. package/lib/cli/configure/analyseDependencies.js +22 -28
  42. package/lib/cli/configure/analyseDependencies.js.map +1 -1
  43. package/lib/cli/configure/analysis/files.js +3 -12
  44. package/lib/cli/configure/analysis/files.js.map +1 -1
  45. package/lib/cli/configure/analysis/git.js +4 -13
  46. package/lib/cli/configure/analysis/git.js.map +1 -1
  47. package/lib/cli/configure/analysis/package.js +7 -13
  48. package/lib/cli/configure/analysis/package.js.map +1 -1
  49. package/lib/cli/configure/analysis/project.js +13 -23
  50. package/lib/cli/configure/analysis/project.js.map +1 -1
  51. package/lib/cli/configure/ensureTemplateCompletion.js +6 -15
  52. package/lib/cli/configure/ensureTemplateCompletion.js.map +1 -1
  53. package/lib/cli/configure/getEntryPoint.js +3 -12
  54. package/lib/cli/configure/getEntryPoint.js.map +1 -1
  55. package/lib/cli/configure/getProjectType.js +3 -13
  56. package/lib/cli/configure/getProjectType.js.map +1 -1
  57. package/lib/cli/configure/index.js +21 -30
  58. package/lib/cli/configure/index.js.map +1 -1
  59. package/lib/cli/configure/modules/eslint.js +10 -29
  60. package/lib/cli/configure/modules/eslint.js.map +1 -1
  61. package/lib/cli/configure/modules/ignore.js +3 -12
  62. package/lib/cli/configure/modules/ignore.js.map +1 -1
  63. package/lib/cli/configure/modules/jest.js +14 -33
  64. package/lib/cli/configure/modules/jest.js.map +1 -1
  65. package/lib/cli/configure/modules/package.js +21 -21
  66. package/lib/cli/configure/modules/package.js.map +1 -1
  67. package/lib/cli/configure/modules/prettier.js +9 -28
  68. package/lib/cli/configure/modules/prettier.js.map +1 -1
  69. package/lib/cli/configure/modules/renovate.js +13 -30
  70. package/lib/cli/configure/modules/renovate.js.map +1 -1
  71. package/lib/cli/configure/modules/skubaDive.js +7 -5
  72. package/lib/cli/configure/modules/skubaDive.js.map +1 -1
  73. package/lib/cli/configure/modules/tsconfig.js +12 -18
  74. package/lib/cli/configure/modules/tsconfig.js.map +1 -1
  75. package/lib/cli/configure/processing/json.js +1 -1
  76. package/lib/cli/configure/processing/json.js.map +1 -1
  77. package/lib/cli/configure/processing/package.js +5 -5
  78. package/lib/cli/configure/processing/package.js.map +1 -1
  79. package/lib/cli/configure/processing/prettier.js +4 -1
  80. package/lib/cli/configure/processing/prettier.js.map +1 -1
  81. package/lib/cli/configure/processing/typescript.js +4 -7
  82. package/lib/cli/configure/processing/typescript.js.map +1 -1
  83. package/lib/cli/configure/refreshIgnoreFiles.js +13 -21
  84. package/lib/cli/configure/refreshIgnoreFiles.js.map +1 -1
  85. package/lib/cli/format.js +5 -14
  86. package/lib/cli/format.js.map +1 -1
  87. package/lib/cli/help.js +3 -12
  88. package/lib/cli/help.js.map +1 -1
  89. package/lib/cli/init/getConfig.js +63 -56
  90. package/lib/cli/init/getConfig.js.map +1 -1
  91. package/lib/cli/init/git.js +9 -18
  92. package/lib/cli/init/git.js.map +1 -1
  93. package/lib/cli/init/index.js +14 -23
  94. package/lib/cli/init/index.js.map +1 -1
  95. package/lib/cli/init/prompts.js +3 -12
  96. package/lib/cli/init/prompts.js.map +1 -1
  97. package/lib/cli/init/types.js +7 -2
  98. package/lib/cli/init/types.js.map +1 -1
  99. package/lib/cli/init/writePackageJson.js +5 -14
  100. package/lib/cli/init/writePackageJson.js.map +1 -1
  101. package/lib/cli/lint/annotate/buildkite/index.js +3 -12
  102. package/lib/cli/lint/annotate/buildkite/index.js.map +1 -1
  103. package/lib/cli/lint/annotate/github/eslint.js +10 -2
  104. package/lib/cli/lint/annotate/github/eslint.js.map +1 -1
  105. package/lib/cli/lint/annotate/github/index.js +3 -12
  106. package/lib/cli/lint/annotate/github/index.js.map +1 -1
  107. package/lib/cli/lint/annotate/github/tsc.js +1 -1
  108. package/lib/cli/lint/annotate/github/tsc.js.map +1 -1
  109. package/lib/cli/lint/annotate/index.js +3 -12
  110. package/lib/cli/lint/annotate/index.js.map +1 -1
  111. package/lib/cli/lint/autofix.js +15 -23
  112. package/lib/cli/lint/autofix.js.map +1 -1
  113. package/lib/cli/lint/external.js +23 -45
  114. package/lib/cli/lint/external.js.map +1 -1
  115. package/lib/cli/lint/index.js +5 -14
  116. package/lib/cli/lint/index.js.map +1 -1
  117. package/lib/cli/lint/internal.js +7 -16
  118. package/lib/cli/lint/internal.js.map +1 -1
  119. package/lib/cli/lint/tsc.js +4 -13
  120. package/lib/cli/lint/tsc.js.map +1 -1
  121. package/lib/cli/node.js +3 -12
  122. package/lib/cli/node.js.map +1 -1
  123. package/lib/cli/release.js +3 -12
  124. package/lib/cli/release.js.map +1 -1
  125. package/lib/cli/start.js +4 -14
  126. package/lib/cli/start.js.map +1 -1
  127. package/lib/cli/test/index.js +1 -2
  128. package/lib/cli/test/index.js.map +1 -1
  129. package/lib/cli/test/reporters/github/annotations.js +7 -7
  130. package/lib/cli/test/reporters/github/annotations.js.map +1 -1
  131. package/lib/cli/test/reporters/github/index.js +28 -38
  132. package/lib/cli/test/reporters/github/index.js.map +1 -1
  133. package/lib/cli/version.js +3 -12
  134. package/lib/cli/version.js.map +1 -1
  135. package/lib/skuba.js +3 -12
  136. package/lib/skuba.js.map +1 -1
  137. package/lib/utils/args.d.ts +1 -1
  138. package/lib/utils/args.js +7 -11
  139. package/lib/utils/args.js.map +1 -1
  140. package/lib/utils/command.d.ts +1 -1
  141. package/lib/utils/command.js +0 -1
  142. package/lib/utils/command.js.map +1 -1
  143. package/lib/utils/copy.js +11 -20
  144. package/lib/utils/copy.js.map +1 -1
  145. package/lib/utils/dir.js +9 -18
  146. package/lib/utils/dir.js.map +1 -1
  147. package/lib/utils/error.js +2 -1
  148. package/lib/utils/error.js.map +1 -1
  149. package/lib/utils/exec.js +25 -29
  150. package/lib/utils/exec.js.map +1 -1
  151. package/lib/utils/logo.js +4 -14
  152. package/lib/utils/logo.js.map +1 -1
  153. package/lib/utils/manifest.js +6 -15
  154. package/lib/utils/manifest.js.map +1 -1
  155. package/lib/utils/version.js +10 -19
  156. package/lib/utils/version.js.map +1 -1
  157. package/lib/utils/worker.js +4 -12
  158. package/lib/utils/worker.js.map +1 -1
  159. package/lib/wrapper/functionHandler.js +2 -11
  160. package/lib/wrapper/functionHandler.js.map +1 -1
  161. package/lib/wrapper/http.js +6 -15
  162. package/lib/wrapper/http.js.map +1 -1
  163. package/lib/wrapper/main.js +2 -11
  164. package/lib/wrapper/main.js.map +1 -1
  165. package/lib/wrapper/requestListener.js +3 -13
  166. package/lib/wrapper/requestListener.js.map +1 -1
  167. package/package.json +4 -13
  168. package/template/base/tsconfig.json +2 -1
  169. package/template/express-rest-api/.buildkite/pipeline.yml +3 -3
  170. package/template/express-rest-api/Dockerfile +3 -3
  171. package/template/koa-rest-api/.buildkite/pipeline.yml +3 -3
  172. package/template/koa-rest-api/Dockerfile +3 -3
  173. package/template/oss-npm-package/tsconfig.json +2 -1
  174. package/template/private-npm-package/tsconfig.json +2 -1
  175. package/lib/cli/changesets/coreAdapter.d.ts +0 -8
  176. package/lib/cli/changesets/coreAdapter.js +0 -18
  177. package/lib/cli/changesets/coreAdapter.js.map +0 -1
  178. package/lib/cli/changesets/gitUtils.d.ts +0 -17
  179. package/lib/cli/changesets/gitUtils.js +0 -128
  180. package/lib/cli/changesets/gitUtils.js.map +0 -1
  181. package/lib/cli/changesets/githubAdapter.d.ts +0 -3
  182. package/lib/cli/changesets/githubAdapter.js +0 -8
  183. package/lib/cli/changesets/githubAdapter.js.map +0 -1
  184. package/lib/cli/changesets/index.d.ts +0 -1
  185. package/lib/cli/changesets/index.js +0 -82
  186. package/lib/cli/changesets/index.js.map +0 -1
  187. package/lib/cli/changesets/readChangesetState.d.ts +0 -6
  188. package/lib/cli/changesets/readChangesetState.js +0 -34
  189. package/lib/cli/changesets/readChangesetState.js.map +0 -1
  190. package/lib/cli/changesets/run.d.ts +0 -22
  191. package/lib/cli/changesets/run.js +0 -195
  192. package/lib/cli/changesets/run.js.map +0 -1
  193. package/lib/cli/changesets/utils.d.ts +0 -30
  194. package/lib/cli/changesets/utils.js +0 -130
  195. 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 Object.assign(Object.assign(Object.assign({ annotation_level: message.severity === 2 ? 'failure' : 'warning', start_line: (_a = message.line) !== null && _a !== void 0 ? _a : 1, end_line: (_c = (_b = message.endLine) !== null && _b !== void 0 ? _b : message.line) !== null && _c !== void 0 ? _c : 1 }, (startColumn && { start_column: startColumn })), (endColumn && { end_column: endColumn })), { message: message.message, path: result.filePath, title: `ESLint${message.ruleId ? ` (${message.ruleId})` : ''}` });
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;;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,mDACE,gBAAgB,EAAE,OAAO,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,EAChE,UAAU,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,CAAC,EAC7B,QAAQ,EAAE,MAAA,MAAA,OAAO,CAAC,OAAO,mCAAI,OAAO,CAAC,IAAI,mCAAI,CAAC,IAC3C,CAAC,WAAW,IAAI,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC,GAC9C,CAAC,SAAS,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,KAC3C,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,IAAI,EAAE,MAAM,CAAC,QAAQ,EACrB,KAAK,EAAE,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,IAC9D;AACJ,CAAC,CAAC,CACH,CAAC;AArBS,QAAA,uBAAuB,2BAqBhC"}
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) => __awaiter(void 0, void 0, void 0, function* () {
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
- yield GitHub.createCheckRun({
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAiD;AACjD,oEAG4C;AAK5C,qCAAmD;AACnD,yCAAuD;AACvD,+BAA6C;AAEtC,MAAM,uBAAuB,GAAG,CACrC,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,CAAA,CAAC;AA/BW,QAAA,uBAAuB,2BA+BlC"}
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) => (match === null || match === void 0 ? void 0 : match.length) === 7
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,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,MAAK,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
+ {"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) => __awaiter(void 0, void 0, void 0, function* () {
16
- yield Promise.all([
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":";;;;;;;;;;;;AAKA,2CAAyD;AACzD,qCAAmD;AAE5C,MAAM,iBAAiB,GAAG,CAC/B,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,CAAA,CAAC;AAVW,QAAA,iBAAiB,qBAU5B"}
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"}
@@ -22,20 +22,12 @@ 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");
@@ -43,7 +35,7 @@ const prettier_1 = require("../../cli/adapter/prettier");
43
35
  const env_1 = require("../../utils/env");
44
36
  const logging_1 = require("../../utils/logging");
45
37
  const AUTOFIX_COMMIT_MESSAGE = 'Run `skuba format`';
46
- const shouldPush = ({ currentBranch, dir, }) => __awaiter(void 0, void 0, void 0, function* () {
38
+ const shouldPush = async ({ currentBranch, dir, }) => {
47
39
  if (!(0, env_1.isCiEnv)()) {
48
40
  // We're not running in a CI environment so we don't need to push autofixes.
49
41
  // Ideally we'd drive this off of repository write permissions, but that is
@@ -60,9 +52,9 @@ const shouldPush = ({ currentBranch, dir, }) => __awaiter(void 0, void 0, void 0
60
52
  }
61
53
  let headCommitMessage;
62
54
  try {
63
- headCommitMessage = yield Git.getHeadCommitMessage({ dir });
55
+ headCommitMessage = await Git.getHeadCommitMessage({ dir });
64
56
  }
65
- catch (_a) { }
57
+ catch { }
66
58
  if (headCommitMessage === AUTOFIX_COMMIT_MESSAGE) {
67
59
  // Short circuit when the head commit appears to be one of our autofixes.
68
60
  // Repeating the same operation is unlikely to correct outstanding issues.
@@ -70,15 +62,15 @@ const shouldPush = ({ currentBranch, dir, }) => __awaiter(void 0, void 0, void 0
70
62
  }
71
63
  // Allow the push attempt to go ahead if our guards have been cleared.
72
64
  return true;
73
- });
74
- const autofix = (input) => __awaiter(void 0, void 0, void 0, function* () {
65
+ };
66
+ const autofix = async (input) => {
75
67
  const dir = process.cwd();
76
68
  let currentBranch;
77
69
  try {
78
- currentBranch = yield Git.currentBranch({ dir });
70
+ currentBranch = await Git.currentBranch({ dir });
79
71
  }
80
- catch (_b) { }
81
- if (!(yield shouldPush({ currentBranch, dir }))) {
72
+ catch { }
73
+ if (!(await shouldPush({ currentBranch, dir }))) {
82
74
  return;
83
75
  }
84
76
  // Naively try to autofix issues as we can't tell from ESLint output.
@@ -86,16 +78,16 @@ const autofix = (input) => __awaiter(void 0, void 0, void 0, function* () {
86
78
  logging_1.log.newline();
87
79
  logging_1.log.warn(`Trying to autofix with ESLint and Prettier...`);
88
80
  const logger = (0, logging_1.createLogger)(input.debug);
89
- yield (0, eslint_1.runESLint)('format', logger);
90
- yield (0, prettier_1.runPrettier)('format', logger);
91
- const ref = yield Git.commitAllChanges({
81
+ await (0, eslint_1.runESLint)('format', logger);
82
+ await (0, prettier_1.runPrettier)('format', logger);
83
+ const ref = await Git.commitAllChanges({
92
84
  dir,
93
85
  message: AUTOFIX_COMMIT_MESSAGE,
94
86
  });
95
87
  if (!ref) {
96
88
  return logging_1.log.warn('No autofixes detected.');
97
89
  }
98
- yield (process.env.GITHUB_ACTIONS
90
+ await (process.env.GITHUB_ACTIONS
99
91
  ? // GitHub's checkout action should preconfigure the Git CLI.
100
92
  (0, simple_git_1.default)().push()
101
93
  : // In other CI environments (Buildkite) we fall back to GitHub App auth.
@@ -110,8 +102,8 @@ const autofix = (input) => __awaiter(void 0, void 0, void 0, function* () {
110
102
  catch (err) {
111
103
  logging_1.log.warn(logging_1.log.bold('Failed to push fix commit.'));
112
104
  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);
105
+ logging_1.log.subtle((0, util_1.inspect)(err));
114
106
  }
115
- });
107
+ };
116
108
  exports.autofix = autofix;
117
109
  //# sourceMappingURL=autofix.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../../src/cli/lint/autofix.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../../src/cli/lint/autofix.ts"],"names":[],"mappings":"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"}
@@ -1,30 +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
- 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");
29
10
  const annotate_1 = require("./annotate");
30
11
  const autofix_1 = require("./autofix");
@@ -46,15 +27,14 @@ class StreamInterceptor extends stream_1.default.Transform {
46
27
  }
47
28
  }
48
29
  exports.StreamInterceptor = StreamInterceptor;
49
- const lintConcurrently = (_a) => __awaiter(void 0, void 0, void 0, function* () {
50
- var { tscOutputStream } = _a, input = __rest(_a, ["tscOutputStream"]);
51
- const [eslint, prettier, tscOk] = yield Promise.all([
30
+ const lintConcurrently = async ({ tscOutputStream, ...input }) => {
31
+ const [eslint, prettier, tscOk] = await Promise.all([
52
32
  (0, eslint_1.runESLintInWorkerThread)(input),
53
33
  (0, prettier_1.runPrettierInWorkerThread)(input),
54
- (0, tsc_1.runTscInNewProcess)(Object.assign(Object.assign({}, input), { tscOutputStream })),
34
+ (0, tsc_1.runTscInNewProcess)({ ...input, tscOutputStream }),
55
35
  ]);
56
36
  return { eslint, prettier, tscOk };
57
- });
37
+ };
58
38
  /**
59
39
  * Run linting tools `--serial`ly for resource-constrained environments.
60
40
  *
@@ -62,19 +42,18 @@ const lintConcurrently = (_a) => __awaiter(void 0, void 0, void 0, function* ()
62
42
  * counterintuitive optimisation. Memory can be more readily freed on worker
63
43
  * thread exit, which isn't as easy with a monolithic main thread.
64
44
  */
65
- const lintSerially = (_b) => __awaiter(void 0, void 0, void 0, function* () {
66
- var { tscOutputStream } = _b, input = __rest(_b, ["tscOutputStream"]);
67
- const eslint = yield (0, eslint_1.runESLintInWorkerThread)(input);
68
- const prettier = yield (0, prettier_1.runPrettierInWorkerThread)(input);
69
- const tscOk = yield (0, tsc_1.runTscInNewProcess)(Object.assign(Object.assign({}, input), { tscOutputStream }));
45
+ const lintSerially = async ({ tscOutputStream, ...input }) => {
46
+ const eslint = await (0, eslint_1.runESLintInWorkerThread)(input);
47
+ const prettier = await (0, prettier_1.runPrettierInWorkerThread)(input);
48
+ const tscOk = await (0, tsc_1.runTscInNewProcess)({ ...input, tscOutputStream });
70
49
  return { eslint, prettier, tscOk };
71
- });
72
- const lintSeriallyWithoutWorkerThreads = (input) => __awaiter(void 0, void 0, void 0, function* () {
73
- const eslint = yield (0, eslint_1.runESLintInCurrentThread)(input);
74
- const prettier = yield (0, prettier_1.runPrettierInCurrentThread)(input);
75
- const tscOk = yield (0, tsc_1.runTscInNewProcess)(input);
50
+ };
51
+ const lintSeriallyWithoutWorkerThreads = async (input) => {
52
+ const eslint = await (0, eslint_1.runESLintInCurrentThread)(input);
53
+ const prettier = await (0, prettier_1.runPrettierInCurrentThread)(input);
54
+ const tscOk = await (0, tsc_1.runTscInNewProcess)(input);
76
55
  return { eslint, prettier, tscOk };
77
- });
56
+ };
78
57
  const selectLintFunction = (input) => {
79
58
  if (!input.workerThreads) {
80
59
  return lintSeriallyWithoutWorkerThreads;
@@ -83,18 +62,17 @@ const selectLintFunction = (input) => {
83
62
  const isSerial = input.debug || input.serial;
84
63
  return isSerial ? lintSerially : lintConcurrently;
85
64
  };
86
- const externalLint = (input) => __awaiter(void 0, void 0, void 0, function* () {
87
- var _c;
65
+ const externalLint = async (input) => {
88
66
  const lint = selectLintFunction(input);
89
67
  const tscOutputStream = new StreamInterceptor();
90
- tscOutputStream.pipe((_c = input.tscOutputStream) !== null && _c !== void 0 ? _c : process.stdout);
91
- const { eslint, prettier, tscOk } = yield lint(Object.assign(Object.assign({}, input), { tscOutputStream }));
68
+ tscOutputStream.pipe(input.tscOutputStream ?? process.stdout);
69
+ const { eslint, prettier, tscOk } = await lint({ ...input, tscOutputStream });
92
70
  try {
93
- yield (0, annotate_1.createAnnotations)(eslint, prettier, tscOk, tscOutputStream);
71
+ await (0, annotate_1.createAnnotations)(eslint, prettier, tscOk, tscOutputStream);
94
72
  }
95
73
  catch (err) {
96
- logging_1.log.warn('Failed to annotate results.');
97
- logging_1.log.warn(err);
74
+ logging_1.log.warn('Failed to annotate lint results.');
75
+ logging_1.log.subtle((0, util_1.inspect)(err));
98
76
  }
99
77
  if (eslint.ok && prettier.ok && tscOk) {
100
78
  return;
@@ -111,7 +89,7 @@ const externalLint = (input) => __awaiter(void 0, void 0, void 0, function* () {
111
89
  // If these are fine then the issue lies with tsc, which we can't autofix.
112
90
  return;
113
91
  }
114
- yield (0, autofix_1.autofix)(input);
115
- });
92
+ await (0, autofix_1.autofix)(input);
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":"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"}
1
+ {"version":3,"file":"external.js","sourceRoot":"","sources":["../../../src/cli/lint/external.ts"],"names":[],"mappings":"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"}
@@ -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) => __awaiter(void 0, void 0, void 0, function* () {
18
- yield (0, refreshIgnoreFiles_1.tryRefreshIgnoreFiles)();
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
- yield (0, external_1.externalLint)(opts);
26
- yield (0, internal_1.internalLint)();
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":";;;;;;;;;;;;AAEA,2CAA+D;AAC/D,wEAAwE;AAExE,yCAA0C;AAC1C,yCAA0C;AAGnC,MAAM,IAAI,GAAG,CAClB,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,CAAA,CAAC;AAjBW,QAAA,IAAI,QAiBf"}
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"}
@@ -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 = () => __awaiter(void 0, void 0, void 0, function* () {
22
- const manifest = yield (0, manifest_1.getConsumerManifest)();
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 (yield (0, fs_extra_1.pathExists)(templateConfigPath)) {
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 = () => __awaiter(void 0, void 0, void 0, function* () {
33
- yield noSkubaTemplateJs();
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":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAC1B,uCAAsC;AAEtC,iDAA0C;AAC1C,mDAA2D;AAE3D,MAAM,iBAAiB,GAAG,GAAS,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,CAAA,CAAC;AAEK,MAAM,YAAY,GAAG,GAAS,EAAE;IACrC,MAAM,iBAAiB,EAAE,CAAC;AAC5B,CAAC,CAAA,CAAC;AAFW,QAAA,YAAY,gBAEvB"}
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"}
@@ -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, }) => __awaiter(void 0, void 0, void 0, function* () {
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
- yield (0, exec_1.execConcurrently)([
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 (_a) {
29
+ catch {
39
30
  return false;
40
31
  }
41
- });
32
+ };
42
33
  exports.runTscInNewProcess = runTscInNewProcess;
43
34
  //# sourceMappingURL=tsc.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tsc.js","sourceRoot":"","sources":["../../../src/cli/lint/tsc.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoD;AAI7C,MAAM,kBAAkB,GAAG,CAAO,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,WAAM;QACN,OAAO,KAAK,CAAC;KACd;AACH,CAAC,CAAA,CAAC;AAlCW,QAAA,kBAAkB,sBAkC7B"}
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 = () => __awaiter(void 0, void 0, void 0, function* () {
36
+ const node = async () => {
46
37
  const args = (0, args_1.parseRunArgs)(process.argv.slice(2));
47
- const availablePort = yield (0, get_port_1.default)();
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
@@ -1 +1 @@
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,GAAS,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,CAAA,CAAC;AAzCW,QAAA,IAAI,QAyCf"}
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"}
@@ -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 = () => __awaiter(void 0, void 0, void 0, function* () {
15
- yield (0, exec_1.exec)('semantic-release', '--success', 'false');
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
@@ -1 +1 @@
1
- {"version":3,"file":"release.js","sourceRoot":"","sources":["../../src/cli/release.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAAqC;AAE9B,MAAM,OAAO,GAAG,GAAS,EAAE;IAChC,MAAM,IAAA,WAAI,EAAC,kBAAkB,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC,CAAA,CAAC;AAFW,QAAA,OAAO,WAElB"}
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"}