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
@@ -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
  };
@@ -28,46 +19,46 @@ const package_1 = require("./analysis/package");
28
19
  const ensureTemplateCompletion_1 = require("./ensureTemplateCompletion");
29
20
  const getEntryPoint_1 = require("./getEntryPoint");
30
21
  const getProjectType_1 = require("./getProjectType");
31
- const shouldApply = (name) => __awaiter(void 0, void 0, void 0, function* () {
22
+ const shouldApply = async (name) => {
32
23
  const prompt = new enquirer_1.Select({
33
24
  choices: ['yes', 'no'],
34
25
  message: 'Apply changes?',
35
26
  name,
36
27
  });
37
- const result = yield prompt.run();
28
+ const result = await prompt.run();
38
29
  return result === 'yes';
39
- });
40
- const configure = () => __awaiter(void 0, void 0, void 0, function* () {
41
- yield (0, logo_1.showLogoAndVersionInfo)();
42
- const [manifest] = yield Promise.all([
30
+ };
31
+ const configure = async () => {
32
+ await (0, logo_1.showLogoAndVersionInfo)();
33
+ const [manifest] = await Promise.all([
43
34
  (0, package_1.getDestinationManifest)(),
44
35
  (0, exec_1.ensureCommands)('yarn'),
45
36
  ]);
46
37
  const destinationRoot = path_1.default.dirname(manifest.path);
47
38
  logging_1.log.plain('Detected project root:', logging_1.log.bold(destinationRoot));
48
- const [include] = yield Promise.all([
39
+ const [include] = await Promise.all([
49
40
  (0, dir_1.createInclusionFilter)([
50
41
  path_1.default.join(destinationRoot, '.gitignore'),
51
42
  path_1.default.join(template_1.BASE_TEMPLATE_DIR, '_.gitignore'),
52
43
  ]),
53
44
  (0, git_1.auditWorkingTree)(destinationRoot),
54
45
  ]);
55
- const templateConfig = yield (0, ensureTemplateCompletion_1.ensureTemplateCompletion)({
46
+ const templateConfig = await (0, ensureTemplateCompletion_1.ensureTemplateCompletion)({
56
47
  destinationRoot,
57
48
  include,
58
49
  manifest,
59
50
  });
60
- const type = yield (0, getProjectType_1.getProjectType)({
51
+ const type = await (0, getProjectType_1.getProjectType)({
61
52
  manifest,
62
53
  templateConfig,
63
54
  });
64
- const entryPoint = yield (0, getEntryPoint_1.getEntryPoint)({
55
+ const entryPoint = await (0, getEntryPoint_1.getEntryPoint)({
65
56
  destinationRoot,
66
57
  manifest,
67
58
  templateConfig,
68
59
  type,
69
60
  });
70
- const fixDependencies = yield (0, analyseDependencies_1.analyseDependencies)({
61
+ const fixDependencies = await (0, analyseDependencies_1.analyseDependencies)({
71
62
  destinationRoot,
72
63
  include,
73
64
  manifest,
@@ -75,12 +66,12 @@ const configure = () => __awaiter(void 0, void 0, void 0, function* () {
75
66
  });
76
67
  if (fixDependencies) {
77
68
  logging_1.log.newline();
78
- if (yield shouldApply('fixDependencies')) {
79
- yield fixDependencies();
69
+ if (await shouldApply('fixDependencies')) {
70
+ await fixDependencies();
80
71
  }
81
72
  }
82
73
  const firstRun = (0, validation_1.hasProp)(manifest.packageJson, 'skuba');
83
- const fixConfiguration = yield (0, analyseConfiguration_1.analyseConfiguration)({
74
+ const fixConfiguration = await (0, analyseConfiguration_1.analyseConfiguration)({
84
75
  destinationRoot,
85
76
  entryPoint,
86
77
  firstRun,
@@ -88,8 +79,8 @@ const configure = () => __awaiter(void 0, void 0, void 0, function* () {
88
79
  });
89
80
  if (fixConfiguration) {
90
81
  logging_1.log.newline();
91
- if (yield shouldApply('fixConfiguration')) {
92
- yield fixConfiguration();
82
+ if (await shouldApply('fixConfiguration')) {
83
+ await fixConfiguration();
93
84
  }
94
85
  }
95
86
  if (fixDependencies) {
@@ -99,9 +90,9 @@ const configure = () => __awaiter(void 0, void 0, void 0, function* () {
99
90
  });
100
91
  logging_1.log.newline();
101
92
  try {
102
- yield exec('yarn', 'install');
93
+ await exec('yarn', 'install');
103
94
  }
104
- catch (_a) {
95
+ catch {
105
96
  logging_1.log.newline();
106
97
  logging_1.log.warn(logging_1.log.bold('✗ Failed to install dependencies. Resume with:'));
107
98
  logging_1.log.newline();
@@ -112,9 +103,9 @@ const configure = () => __awaiter(void 0, void 0, void 0, function* () {
112
103
  return;
113
104
  }
114
105
  try {
115
- yield exec('npx', 'yarn-deduplicate', '--strategy=highest');
106
+ await exec('npx', 'yarn-deduplicate', '--strategy=highest');
116
107
  }
117
- catch (_b) { }
108
+ catch { }
118
109
  }
119
110
  if (fixConfiguration || fixDependencies) {
120
111
  logging_1.log.newline();
@@ -123,6 +114,6 @@ const configure = () => __awaiter(void 0, void 0, void 0, function* () {
123
114
  logging_1.log.plain(logging_1.log.bold('yarn format'));
124
115
  }
125
116
  logging_1.log.newline();
126
- });
117
+ };
127
118
  exports.configure = configure;
128
119
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/configure/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/configure/index.ts"],"names":[],"mappings":"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"}
@@ -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
  Object.defineProperty(exports, "__esModule", { value: true });
23
3
  exports.eslintModule = void 0;
24
4
  const template_1 = require("../../../utils/template");
@@ -26,23 +6,24 @@ const deleteFiles_1 = require("../processing/deleteFiles");
26
6
  const ignoreFile_1 = require("../processing/ignoreFile");
27
7
  const package_1 = require("../processing/package");
28
8
  const prettier_1 = require("../processing/prettier");
29
- const eslintModule = () => __awaiter(void 0, void 0, void 0, function* () {
30
- const [configFile, ignoreFile] = yield Promise.all([
9
+ const eslintModule = async () => {
10
+ const [configFile, ignoreFile] = await Promise.all([
31
11
  (0, template_1.readBaseTemplateFile)('_.eslintrc.js'),
32
12
  (0, template_1.readBaseTemplateFile)('_.eslintignore'),
33
13
  ]);
34
- return Object.assign(Object.assign({}, (0, deleteFiles_1.deleteFiles)('.eslintrc.cjs', '.eslintrc.yaml', '.eslintrc.yml', '.eslintrc.json', '.eslintrc')), {
14
+ return {
15
+ ...(0, deleteFiles_1.deleteFiles)('.eslintrc.cjs', '.eslintrc.yaml', '.eslintrc.yml', '.eslintrc.json', '.eslintrc'),
35
16
  // allow customised ESLint configs that extend skuba
36
17
  '.eslintrc.js': (inputFile) => {
37
- if (inputFile === null || inputFile === void 0 ? void 0 : inputFile.includes('skuba')) {
18
+ if (inputFile?.includes('skuba')) {
38
19
  const processedFile = inputFile.replace(/require.resolve\(['"](@seek\/)?skuba\/config\/eslint['"]\)/, "'skuba'");
39
20
  return (0, prettier_1.formatPrettier)(processedFile, { parser: 'typescript' });
40
21
  }
41
22
  return configFile;
42
- }, '.eslintignore': (0, ignoreFile_1.mergeWithIgnoreFile)(ignoreFile), 'package.json': (0, package_1.withPackage)((_a) => {
43
- var { eslintConfig } = _a, data = __rest(_a, ["eslintConfig"]);
44
- return data;
45
- }) });
46
- });
23
+ },
24
+ '.eslintignore': (0, ignoreFile_1.mergeWithIgnoreFile)(ignoreFile),
25
+ 'package.json': (0, package_1.withPackage)(({ eslintConfig, ...data }) => data),
26
+ };
27
+ };
47
28
  exports.eslintModule = eslintModule;
48
29
  //# sourceMappingURL=eslint.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/eslint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,yDAA+D;AAC/D,mDAAoD;AACpD,qDAAwD;AAGjD,MAAM,YAAY,GAAG,GAA0B,EAAE;IACtD,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjD,IAAA,+BAAoB,EAAC,eAAe,CAAC;QACrC,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;KACvC,CAAC,CAAC;IAEH,uCACK,IAAA,yBAAW,EACZ,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,WAAW,CACZ;QAED,oDAAoD;QACpD,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE;YAC5B,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAChC,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CACrC,4DAA4D,EAC5D,SAAS,CACV,CAAC;gBAEF,OAAO,IAAA,yBAAc,EAAC,aAAa,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;aAChE;YAED,OAAO,UAAU,CAAC;QACpB,CAAC,EAED,eAAe,EAAE,IAAA,gCAAmB,EAAC,UAAU,CAAC,EAEhD,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAyB,EAAE,EAAE;gBAA7B,EAAE,YAAY,OAAW,EAAN,IAAI,cAAvB,gBAAyB,CAAF;YAAO,OAAA,IAAI,CAAA;SAAA,CAAC,IAChE;AACJ,CAAC,CAAA,CAAC;AAjCW,QAAA,YAAY,gBAiCvB"}
1
+ {"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/eslint.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,yDAA+D;AAC/D,mDAAoD;AACpD,qDAAwD;AAGjD,MAAM,YAAY,GAAG,KAAK,IAAqB,EAAE;IACtD,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjD,IAAA,+BAAoB,EAAC,eAAe,CAAC;QACrC,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;KACvC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,IAAA,yBAAW,EACZ,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,WAAW,CACZ;QAED,oDAAoD;QACpD,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE;YAC5B,IAAI,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAChC,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CACrC,4DAA4D,EAC5D,SAAS,CACV,CAAC;gBAEF,OAAO,IAAA,yBAAc,EAAC,aAAa,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;aAChE;YAED,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,eAAe,EAAE,IAAA,gCAAmB,EAAC,UAAU,CAAC;QAEhD,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;KACjE,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,YAAY,gBAiCvB"}
@@ -1,19 +1,10 @@
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.ignoreModule = void 0;
13
4
  const template_1 = require("../../../utils/template");
14
5
  const ignoreFile_1 = require("../processing/ignoreFile");
15
- const ignoreModule = () => __awaiter(void 0, void 0, void 0, function* () {
16
- const [dockerFile, gitFile] = yield Promise.all([
6
+ const ignoreModule = async () => {
7
+ const [dockerFile, gitFile] = await Promise.all([
17
8
  (0, template_1.readBaseTemplateFile)('_.dockerignore'),
18
9
  (0, template_1.readBaseTemplateFile)('_.gitignore'),
19
10
  ]);
@@ -21,6 +12,6 @@ const ignoreModule = () => __awaiter(void 0, void 0, void 0, function* () {
21
12
  '.dockerignore': (0, ignoreFile_1.mergeWithIgnoreFile)(dockerFile),
22
13
  '.gitignore': (0, ignoreFile_1.mergeWithIgnoreFile)(gitFile),
23
14
  };
24
- });
15
+ };
25
16
  exports.ignoreModule = ignoreModule;
26
17
  //# sourceMappingURL=ignore.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ignore.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/ignore.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAA+D;AAC/D,yDAA+D;AAGxD,MAAM,YAAY,GAAG,GAA0B,EAAE;IACtD,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;QACtC,IAAA,+BAAoB,EAAC,aAAa,CAAC;KACpC,CAAC,CAAC;IAEH,OAAO;QACL,eAAe,EAAE,IAAA,gCAAmB,EAAC,UAAU,CAAC;QAEhD,YAAY,EAAE,IAAA,gCAAmB,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC,CAAA,CAAC;AAXW,QAAA,YAAY,gBAWvB"}
1
+ {"version":3,"file":"ignore.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/ignore.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,yDAA+D;AAGxD,MAAM,YAAY,GAAG,KAAK,IAAqB,EAAE;IACtD,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;QACtC,IAAA,+BAAoB,EAAC,aAAa,CAAC;KACpC,CAAC,CAAC;IAEH,OAAO;QACL,eAAe,EAAE,IAAA,gCAAmB,EAAC,UAAU,CAAC;QAEhD,YAAY,EAAE,IAAA,gCAAmB,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,YAAY,gBAWvB"}
@@ -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
  Object.defineProperty(exports, "__esModule", { value: true });
23
3
  exports.jestModule = void 0;
24
4
  const template_1 = require("../../../utils/template");
@@ -35,24 +15,26 @@ const filterProps = (0, typescript_1.createPropFilter)([
35
15
  'setupFiles',
36
16
  'setupFilesAfterEnv',
37
17
  ]);
38
- const jestModule = () => __awaiter(void 0, void 0, void 0, function* () {
39
- const [configFile, setupFile] = yield Promise.all([
18
+ const jestModule = async () => {
19
+ const [configFile, setupFile] = await Promise.all([
40
20
  (0, template_1.readBaseTemplateFile)('jest.config.ts'),
41
21
  (0, template_1.readBaseTemplateFile)('jest.setup.ts'),
42
22
  ]);
43
- return Object.assign(Object.assign(Object.assign({}, (0, deleteFiles_1.deleteFiles)('jest.config.js')), (0, loadFiles_1.loadFiles)('jest.setup.js')), { 'jest.config.ts': (tsFile, currentFiles, initialFiles) => {
44
- var _a;
23
+ return {
24
+ ...(0, deleteFiles_1.deleteFiles)('jest.config.js'),
25
+ ...(0, loadFiles_1.loadFiles)('jest.setup.js'),
26
+ 'jest.config.ts': (tsFile, currentFiles, initialFiles) => {
45
27
  // Allow customised TS Jest config that extends skuba
46
- if (tsFile === null || tsFile === void 0 ? void 0 : tsFile.includes('skuba')) {
28
+ if (tsFile?.includes('skuba')) {
47
29
  return tsFile;
48
30
  }
49
31
  const jsFile = initialFiles['jest.config.js'];
50
32
  // Migrate a JS config that extends skuba, retaining all existing props
51
- if (jsFile === null || jsFile === void 0 ? void 0 : jsFile.includes('skuba')) {
33
+ if (jsFile?.includes('skuba')) {
52
34
  return (0, typescript_1.transformModuleImportsAndExports)(jsFile, (_, p) => p);
53
35
  }
54
- (_a = currentFiles['jest.setup.ts']) !== null && _a !== void 0 ? _a : (currentFiles['jest.setup.ts'] = setupFile);
55
- const inputFile = tsFile !== null && tsFile !== void 0 ? tsFile : jsFile;
36
+ currentFiles['jest.setup.ts'] ?? (currentFiles['jest.setup.ts'] = setupFile);
37
+ const inputFile = tsFile ?? jsFile;
56
38
  const props = inputFile === undefined ? undefined : (0, typescript_1.readModuleExports)(inputFile);
57
39
  if (props === undefined) {
58
40
  return configFile;
@@ -61,10 +43,9 @@ const jestModule = () => __awaiter(void 0, void 0, void 0, function* () {
61
43
  const appendProps = (0, typescript_1.createPropAppender)(filteredProps);
62
44
  // Append a subset of custom props to our base `jest.config.ts`
63
45
  return (0, typescript_1.transformModuleImportsAndExports)(configFile, appendProps);
64
- }, 'package.json': (0, package_1.withPackage)((_a) => {
65
- var { jest } = _a, data = __rest(_a, ["jest"]);
66
- return data;
67
- }) });
68
- });
46
+ },
47
+ 'package.json': (0, package_1.withPackage)(({ jest, ...data }) => data),
48
+ };
49
+ };
69
50
  exports.jestModule = jestModule;
70
51
  //# sourceMappingURL=jest.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jest.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/jest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,uDAAoD;AACpD,mDAAoD;AACpD,yDAKkC;AAGlC,4CAA4C;AAC5C,MAAM,WAAW,GAAG,IAAA,6BAAgB,EAAC;IACnC,qBAAqB;IACrB,mBAAmB;IACnB,aAAa;IACb,gBAAgB;IAChB,YAAY;IACZ,oBAAoB;CACrB,CAAC,CAAC;AAEI,MAAM,UAAU,GAAG,GAA0B,EAAE;IACpD,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChD,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;QACtC,IAAA,+BAAoB,EAAC,eAAe,CAAC;KACtC,CAAC,CAAC;IAEH,qDACK,IAAA,yBAAW,EAAC,gBAAgB,CAAC,GAC7B,IAAA,qBAAS,EAAC,eAAe,CAAC,KAE7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE;;YACvD,qDAAqD;YACrD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC7B,OAAO,MAAM,CAAC;aACf;YAED,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;YAE9C,uEAAuE;YACvE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC7B,OAAO,IAAA,6CAAgC,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;aAC9D;YAED,MAAA,YAAY,CAAC,eAAe,qCAA5B,YAAY,CAAC,eAAe,IAAM,SAAS,EAAC;YAE5C,MAAM,SAAS,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,MAAM,CAAC;YAEnC,MAAM,KAAK,GACT,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,8BAAiB,EAAC,SAAS,CAAC,CAAC;YAErE,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,OAAO,UAAU,CAAC;aACnB;YAED,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAE/C,MAAM,WAAW,GAAG,IAAA,+BAAkB,EAAC,aAAa,CAAC,CAAC;YAEtD,+DAA+D;YAC/D,OAAO,IAAA,6CAAgC,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC,EAED,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAiB,EAAE,EAAE;gBAArB,EAAE,IAAI,OAAW,EAAN,IAAI,cAAf,QAAiB,CAAF;YAAO,OAAA,IAAI,CAAA;SAAA,CAAC,IACxD;AACJ,CAAC,CAAA,CAAC;AA5CW,QAAA,UAAU,cA4CrB"}
1
+ {"version":3,"file":"jest.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/jest.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,uDAAoD;AACpD,mDAAoD;AACpD,yDAKkC;AAGlC,4CAA4C;AAC5C,MAAM,WAAW,GAAG,IAAA,6BAAgB,EAAC;IACnC,qBAAqB;IACrB,mBAAmB;IACnB,aAAa;IACb,gBAAgB;IAChB,YAAY;IACZ,oBAAoB;CACrB,CAAC,CAAC;AAEI,MAAM,UAAU,GAAG,KAAK,IAAqB,EAAE;IACpD,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChD,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;QACtC,IAAA,+BAAoB,EAAC,eAAe,CAAC;KACtC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,IAAA,yBAAW,EAAC,gBAAgB,CAAC;QAChC,GAAG,IAAA,qBAAS,EAAC,eAAe,CAAC;QAE7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE;YACvD,qDAAqD;YACrD,IAAI,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC7B,OAAO,MAAM,CAAC;aACf;YAED,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;YAE9C,uEAAuE;YACvE,IAAI,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC7B,OAAO,IAAA,6CAAgC,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;aAC9D;YAED,YAAY,CAAC,eAAe,MAA5B,YAAY,CAAC,eAAe,IAAM,SAAS,EAAC;YAE5C,MAAM,SAAS,GAAG,MAAM,IAAI,MAAM,CAAC;YAEnC,MAAM,KAAK,GACT,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,8BAAiB,EAAC,SAAS,CAAC,CAAC;YAErE,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,OAAO,UAAU,CAAC;aACnB;YAED,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAE/C,MAAM,WAAW,GAAG,IAAA,+BAAkB,EAAC,aAAa,CAAC,CAAC;YAEtD,+DAA+D;YAC/D,OAAO,IAAA,6CAAgC,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QAED,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;KACzD,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,UAAU,cA4CrB"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.packageModule = void 0;
13
4
  const version_1 = require("../../../utils/version");
@@ -20,11 +11,18 @@ const DEFAULT_PACKAGE_FILES = [
20
11
  'lib*/**/*.js.map',
21
12
  'lib*/**/*.json',
22
13
  ];
23
- const packageModule = ({ entryPoint, type, }) => __awaiter(void 0, void 0, void 0, function* () {
24
- const version = yield (0, version_1.getSkubaVersion)();
14
+ const packageModule = async ({ entryPoint, type, }) => {
15
+ const version = await (0, version_1.getSkubaVersion)();
25
16
  const initialData = {
26
17
  private: type !== 'package',
27
- scripts: Object.assign(Object.assign({ build: type === 'package' ? 'skuba build-package' : 'skuba build', format: 'skuba format', lint: 'skuba lint' }, (type === 'package' ? {} : { start: 'skuba start' })), { test: 'skuba test --coverage', 'test:watch': 'skuba test --watch' }),
18
+ scripts: {
19
+ build: type === 'package' ? 'skuba build-package' : 'skuba build',
20
+ format: 'skuba format',
21
+ lint: 'skuba lint',
22
+ ...(type === 'package' ? {} : { start: 'skuba start' }),
23
+ test: 'skuba test --coverage',
24
+ 'test:watch': 'skuba test --watch',
25
+ },
28
26
  skuba: {
29
27
  entryPoint,
30
28
  template: null,
@@ -39,11 +37,12 @@ const packageModule = ({ entryPoint, type, }) => __awaiter(void 0, void 0, void
39
37
  version,
40
38
  },
41
39
  };
42
- return Object.assign(Object.assign({}, (0, deleteFiles_1.deleteFiles)('.npmignore', 'package-lock.json')), { 'package.json': (inputFile) => (0, package_1.withPackage)((inputData) => {
43
- var _a, _b, _c, _d, _e;
40
+ return {
41
+ ...(0, deleteFiles_1.deleteFiles)('.npmignore', 'package-lock.json'),
42
+ 'package.json': (inputFile) => (0, package_1.withPackage)((inputData) => {
44
43
  const outputData = (0, record_1.merge)(inputData, 'skuba' in inputData ? recurringData : initialData);
45
- (_a = outputData.license) !== null && _a !== void 0 ? _a : (outputData.license = 'UNLICENSED');
46
- (_b = outputData.scripts) !== null && _b !== void 0 ? _b : (outputData.scripts = {});
44
+ outputData.license ?? (outputData.license = 'UNLICENSED');
45
+ outputData.scripts ?? (outputData.scripts = {});
47
46
  // Workspaces can only be enabled in private projects
48
47
  if (outputData.workspaces && !outputData.private) {
49
48
  outputData.private = true;
@@ -59,14 +58,14 @@ const packageModule = ({ entryPoint, type, }) => __awaiter(void 0, void 0, void
59
58
  delete outputData.scripts['test:jest'];
60
59
  delete outputData.typings;
61
60
  if (type === 'package') {
62
- outputData.files = ((_c = outputData.files) !== null && _c !== void 0 ? _c : DEFAULT_PACKAGE_FILES).flatMap((filePattern) => filePattern === 'lib' ? DEFAULT_PACKAGE_FILES : [filePattern]);
63
- (_d = outputData.version) !== null && _d !== void 0 ? _d : (outputData.version = '0.0.0-semantically-released');
61
+ outputData.files = (outputData.files ?? DEFAULT_PACKAGE_FILES).flatMap((filePattern) => filePattern === 'lib' ? DEFAULT_PACKAGE_FILES : [filePattern]);
62
+ outputData.version ?? (outputData.version = '0.0.0-semantically-released');
64
63
  // User-defined pre- and post-scripts are confusing and dropped by e.g.
65
64
  // Yarn 2.
66
65
  outputData.scripts.release = [
67
66
  outputData.scripts.prepublish,
68
67
  outputData.scripts.prerelease,
69
- (_e = outputData.scripts.release) !== null && _e !== void 0 ? _e : 'skuba release',
68
+ outputData.scripts.release ?? 'skuba release',
70
69
  ]
71
70
  .filter((script) => typeof script === 'string')
72
71
  .map((script) => script
@@ -90,7 +89,8 @@ const packageModule = ({ entryPoint, type, }) => __awaiter(void 0, void 0, void
90
89
  delete outputData.scripts.prerelease;
91
90
  }
92
91
  return outputData;
93
- })(inputFile) });
94
- });
92
+ })(inputFile),
93
+ };
94
+ };
95
95
  exports.packageModule = packageModule;
96
96
  //# sourceMappingURL=package.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/package.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/package.ts"],"names":[],"mappings":"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"}
@@ -1,41 +1,22 @@
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
  Object.defineProperty(exports, "__esModule", { value: true });
23
3
  exports.prettierModule = void 0;
24
4
  const template_1 = require("../../../utils/template");
25
5
  const deleteFiles_1 = require("../processing/deleteFiles");
26
6
  const ignoreFile_1 = require("../processing/ignoreFile");
27
7
  const package_1 = require("../processing/package");
28
- const prettierModule = () => __awaiter(void 0, void 0, void 0, function* () {
29
- const [configFile, ignoreFile] = yield Promise.all([
8
+ const prettierModule = async () => {
9
+ const [configFile, ignoreFile] = await Promise.all([
30
10
  (0, template_1.readBaseTemplateFile)('_.prettierrc.js'),
31
11
  (0, template_1.readBaseTemplateFile)('_.prettierignore'),
32
12
  ]);
33
- return Object.assign(Object.assign({}, (0, deleteFiles_1.deleteFiles)('.prettierrc', '.prettierrc.json', '.prettierrc.toml', '.prettierrc.yaml', '.prettierrc.yml', 'prettier.config.js')), { '.prettierignore': (0, ignoreFile_1.mergeWithIgnoreFile)(ignoreFile),
13
+ return {
14
+ ...(0, deleteFiles_1.deleteFiles)('.prettierrc', '.prettierrc.json', '.prettierrc.toml', '.prettierrc.yaml', '.prettierrc.yml', 'prettier.config.js'),
15
+ '.prettierignore': (0, ignoreFile_1.mergeWithIgnoreFile)(ignoreFile),
34
16
  // enforce skuba opinions as there's no value in customising Prettier configs
35
- '.prettierrc.js': () => configFile, 'package.json': (0, package_1.withPackage)((_a) => {
36
- var { prettier } = _a, data = __rest(_a, ["prettier"]);
37
- return data;
38
- }) });
39
- });
17
+ '.prettierrc.js': () => configFile,
18
+ 'package.json': (0, package_1.withPackage)(({ prettier, ...data }) => data),
19
+ };
20
+ };
40
21
  exports.prettierModule = prettierModule;
41
22
  //# sourceMappingURL=prettier.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"prettier.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/prettier.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,yDAA+D;AAC/D,mDAAoD;AAG7C,MAAM,cAAc,GAAG,GAA0B,EAAE;IACxD,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjD,IAAA,+BAAoB,EAAC,iBAAiB,CAAC;QACvC,IAAA,+BAAoB,EAAC,kBAAkB,CAAC;KACzC,CAAC,CAAC;IAEH,uCACK,IAAA,yBAAW,EACZ,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,CACrB,KAED,iBAAiB,EAAE,IAAA,gCAAmB,EAAC,UAAU,CAAC;QAElD,6EAA6E;QAC7E,gBAAgB,EAAE,GAAG,EAAE,CAAC,UAAU,EAElC,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAqB,EAAE,EAAE;gBAAzB,EAAE,QAAQ,OAAW,EAAN,IAAI,cAAnB,YAAqB,CAAF;YAAO,OAAA,IAAI,CAAA;SAAA,CAAC,IAC5D;AACJ,CAAC,CAAA,CAAC;AAvBW,QAAA,cAAc,kBAuBzB"}
1
+ {"version":3,"file":"prettier.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/prettier.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,yDAA+D;AAC/D,mDAAoD;AAG7C,MAAM,cAAc,GAAG,KAAK,IAAqB,EAAE;IACxD,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjD,IAAA,+BAAoB,EAAC,iBAAiB,CAAC;QACvC,IAAA,+BAAoB,EAAC,kBAAkB,CAAC;KACzC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,IAAA,yBAAW,EACZ,aAAa,EACb,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,oBAAoB,CACrB;QAED,iBAAiB,EAAE,IAAA,gCAAmB,EAAC,UAAU,CAAC;QAElD,6EAA6E;QAC7E,gBAAgB,EAAE,GAAG,EAAE,CAAC,UAAU;QAElC,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;KAC7D,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,cAAc,kBAuBzB"}
@@ -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
  Object.defineProperty(exports, "__esModule", { value: true });
23
3
  exports.renovateModule = void 0;
24
4
  const template_1 = require("../../../utils/template");
@@ -33,29 +13,32 @@ const OTHER_CONFIG_FILENAMES = [
33
13
  'renovate.json',
34
14
  'renovate.json5',
35
15
  ];
36
- const renovateModule = ({ type }) => __awaiter(void 0, void 0, void 0, function* () {
37
- const configFile = yield (0, template_1.readBaseTemplateFile)('.github/renovate.json5');
38
- return Object.assign(Object.assign({}, (0, deleteFiles_1.deleteFiles)(...OTHER_CONFIG_FILENAMES)), { '.github/renovate.json5': (_inputFile, _files, initialFiles) => {
16
+ const renovateModule = async ({ type }) => {
17
+ const configFile = await (0, template_1.readBaseTemplateFile)('.github/renovate.json5');
18
+ return {
19
+ ...(0, deleteFiles_1.deleteFiles)(...OTHER_CONFIG_FILENAMES),
20
+ '.github/renovate.json5': (_inputFile, _files, initialFiles) => {
39
21
  // allow migration from other Renovate config files
40
22
  const inputFile = (0, record_1.getFirstDefined)(initialFiles, [
41
23
  '.github/renovate.json5',
42
24
  ...OTHER_CONFIG_FILENAMES,
43
25
  ]);
44
26
  // allow customised Renovate configs that extend a SEEK configuration
45
- return (inputFile === null || inputFile === void 0 ? void 0 : inputFile.includes('seek'))
27
+ return inputFile?.includes('seek')
46
28
  ? (0, prettier_1.formatPrettier)(inputFile, { parser: 'json5' })
47
29
  : configFile;
48
- },
30
+ },
49
31
  /**
50
32
  * Ensure Renovate correctly detects the project as an application/library.
51
33
  *
52
34
  * @see {@link https://docs.renovatebot.com/configuration-options/#rangestrategy }
53
35
  * @see {@link https://github.com/renovatebot/renovate/blob/8c361082842bb157d85ca39ecf4f6075730e74bb/lib/manager/npm/extract/type.ts#L3 }
54
36
  */
55
- 'package.json': (0, package_1.withPackage)((_a) => {
56
- var { private: _, renovate } = _a, data = __rest(_a, ["private", "renovate"]);
57
- return (Object.assign(Object.assign({}, data), { private: type !== 'package' }));
58
- }) });
59
- });
37
+ 'package.json': (0, package_1.withPackage)(({ private: _, renovate, ...data }) => ({
38
+ ...data,
39
+ private: type !== 'package',
40
+ })),
41
+ };
42
+ };
60
43
  exports.renovateModule = renovateModule;
61
44
  //# sourceMappingURL=renovate.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"renovate.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/renovate.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,mDAAoD;AACpD,qDAAwD;AACxD,iDAAuD;AAGvD,MAAM,sBAAsB,GAAG;IAC7B,uBAAuB;IACvB,aAAa;IACb,kBAAkB;IAClB,eAAe;IACf,gBAAgB;CACjB,CAAC;AAEK,MAAM,cAAc,GAAG,CAAO,EAAE,IAAI,EAAW,EAAmB,EAAE;IACzE,MAAM,UAAU,GAAG,MAAM,IAAA,+BAAoB,EAAC,wBAAwB,CAAC,CAAC;IAExE,uCACK,IAAA,yBAAW,EAAC,GAAG,sBAAsB,CAAC,KAEzC,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;YAC7D,mDAAmD;YACnD,MAAM,SAAS,GAAG,IAAA,wBAAe,EAAC,YAAY,EAAE;gBAC9C,wBAAwB;gBACxB,GAAG,sBAAsB;aAC1B,CAAC,CAAC;YAEH,qEAAqE;YACrE,OAAO,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,MAAM,CAAC;gBAChC,CAAC,CAAC,IAAA,yBAAc,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;gBAChD,CAAC,CAAC,UAAU,CAAC;QACjB,CAAC;QAED;;;;;WAKG;QACH,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAiC,EAAE,EAAE;gBAArC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,OAAW,EAAN,IAAI,cAA/B,uBAAiC,CAAF;YAAO,OAAA,iCAC9D,IAAI,KACP,OAAO,EAAE,IAAI,KAAK,SAAS,IAC3B,CAAA;SAAA,CAAC,IACH;AACJ,CAAC,CAAA,CAAC;AA9BW,QAAA,cAAc,kBA8BzB"}
1
+ {"version":3,"file":"renovate.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/renovate.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,mDAAoD;AACpD,qDAAwD;AACxD,iDAAuD;AAGvD,MAAM,sBAAsB,GAAG;IAC7B,uBAAuB;IACvB,aAAa;IACb,kBAAkB;IAClB,eAAe;IACf,gBAAgB;CACjB,CAAC;AAEK,MAAM,cAAc,GAAG,KAAK,EAAE,EAAE,IAAI,EAAW,EAAmB,EAAE;IACzE,MAAM,UAAU,GAAG,MAAM,IAAA,+BAAoB,EAAC,wBAAwB,CAAC,CAAC;IAExE,OAAO;QACL,GAAG,IAAA,yBAAW,EAAC,GAAG,sBAAsB,CAAC;QAEzC,wBAAwB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE;YAC7D,mDAAmD;YACnD,MAAM,SAAS,GAAG,IAAA,wBAAe,EAAC,YAAY,EAAE;gBAC9C,wBAAwB;gBACxB,GAAG,sBAAsB;aAC1B,CAAC,CAAC;YAEH,qEAAqE;YACrE,OAAO,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC;gBAChC,CAAC,CAAC,IAAA,yBAAc,EAAC,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;gBAChD,CAAC,CAAC,UAAU,CAAC;QACjB,CAAC;QAED;;;;;WAKG;QACH,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YAClE,GAAG,IAAI;YACP,OAAO,EAAE,IAAI,KAAK,SAAS;SAC5B,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,cAAc,kBA8BzB"}
@@ -15,14 +15,15 @@ const skubaDiveModule = ({ entryPoint, type }) => {
15
15
  if (type === 'package') {
16
16
  return {};
17
17
  }
18
- return Object.assign(Object.assign({}, (0, loadFiles_1.loadFiles)(DEFAULT_FILENAME, 'package.json')), { [entryPoint]: (inputFile, files) => {
19
- var _a;
18
+ return {
19
+ ...(0, loadFiles_1.loadFiles)(DEFAULT_FILENAME, 'package.json'),
20
+ [entryPoint]: (inputFile, files) => {
20
21
  const packageJson = (0, package_1.parsePackage)(files['package.json']);
21
22
  const registerFile = files[DEFAULT_FILENAME];
22
- if (!((_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['skuba-dive']) ||
23
+ if (!packageJson?.dependencies?.['skuba-dive'] ||
23
24
  inputFile === undefined ||
24
25
  inputFile.includes('skuba-dive/register') ||
25
- (registerFile === null || registerFile === void 0 ? void 0 : registerFile.includes('skuba-dive/register'))) {
26
+ registerFile?.includes('skuba-dive/register')) {
26
27
  return inputFile;
27
28
  }
28
29
  const outputFile = (0, javascript_1.stripImports)(skubaDive_1.SKUBA_DIVE_HOOKS, inputFile);
@@ -34,7 +35,8 @@ const skubaDiveModule = ({ entryPoint, type }) => {
34
35
  // import skuba-dive via src/register.ts
35
36
  files[DEFAULT_FILENAME] = (0, javascript_1.prependImport)('skuba-dive/register', registerFile);
36
37
  return (0, javascript_1.prependImport)(`${relativeToSrc}/register`, outputFile);
37
- } });
38
+ },
39
+ };
38
40
  };
39
41
  exports.skubaDiveModule = skubaDiveModule;
40
42
  //# sourceMappingURL=skubaDive.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"skubaDive.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/skubaDive.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,yDAA6D;AAC7D,yDAAuE;AACvE,uDAAoD;AACpD,mDAAqD;AAGrD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAEpC,MAAM,eAAe,GAAG,CAAC,EAAE,UAAU,EAAE,IAAI,EAAW,EAAU,EAAE;IACvE,uEAAuE;IACvE,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,uCACK,IAAA,qBAAS,EAAC,gBAAgB,EAAE,cAAc,CAAC,KAE9C,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;;YACjC,MAAM,WAAW,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;YAExD,MAAM,YAAY,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAE7C,IACE,CAAC,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,YAAY,0CAAG,YAAY,CAAC,CAAA;gBAC1C,SAAS,KAAK,SAAS;gBACvB,SAAS,CAAC,QAAQ,CAAC,qBAAqB,CAAC;iBACzC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAA,EAC7C;gBACA,OAAO,SAAS,CAAC;aAClB;YAED,MAAM,UAAU,GAAG,IAAA,yBAAY,EAAC,4BAAgB,EAAE,SAAS,CAAC,CAAC;YAE7D,MAAM,aAAa,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CACvC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAC3B,KAAK,CACN,CAAC;YAEF,kDAAkD;YAClD,IAAI,aAAa,KAAK,EAAE,EAAE;gBACxB,OAAO,IAAA,0BAAa,EAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;aACzD;YAED,wCAAwC;YACxC,KAAK,CAAC,gBAAgB,CAAC,GAAG,IAAA,0BAAa,EACrC,qBAAqB,EACrB,YAAY,CACb,CAAC;YAEF,OAAO,IAAA,0BAAa,EAAC,GAAG,aAAa,WAAW,EAAE,UAAU,CAAC,CAAC;QAChE,CAAC,IACD;AACJ,CAAC,CAAC;AA5CW,QAAA,eAAe,mBA4C1B"}
1
+ {"version":3,"file":"skubaDive.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/skubaDive.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,yDAA6D;AAC7D,yDAAuE;AACvE,uDAAoD;AACpD,mDAAqD;AAGrD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAEpC,MAAM,eAAe,GAAG,CAAC,EAAE,UAAU,EAAE,IAAI,EAAW,EAAU,EAAE;IACvE,uEAAuE;IACvE,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,OAAO;QACL,GAAG,IAAA,qBAAS,EAAC,gBAAgB,EAAE,cAAc,CAAC;QAE9C,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YACjC,MAAM,WAAW,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;YAExD,MAAM,YAAY,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAE7C,IACE,CAAC,WAAW,EAAE,YAAY,EAAE,CAAC,YAAY,CAAC;gBAC1C,SAAS,KAAK,SAAS;gBACvB,SAAS,CAAC,QAAQ,CAAC,qBAAqB,CAAC;gBACzC,YAAY,EAAE,QAAQ,CAAC,qBAAqB,CAAC,EAC7C;gBACA,OAAO,SAAS,CAAC;aAClB;YAED,MAAM,UAAU,GAAG,IAAA,yBAAY,EAAC,4BAAgB,EAAE,SAAS,CAAC,CAAC;YAE7D,MAAM,aAAa,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CACvC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAC3B,KAAK,CACN,CAAC;YAEF,kDAAkD;YAClD,IAAI,aAAa,KAAK,EAAE,EAAE;gBACxB,OAAO,IAAA,0BAAa,EAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;aACzD;YAED,wCAAwC;YACxC,KAAK,CAAC,gBAAgB,CAAC,GAAG,IAAA,0BAAa,EACrC,qBAAqB,EACrB,YAAY,CACb,CAAC;YAEF,OAAO,IAAA,0BAAa,EAAC,GAAG,aAAa,WAAW,EAAE,UAAU,CAAC,CAAC;QAChE,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,eAAe,mBA4C1B"}