skuba 4.2.0-beta.6 → 4.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/lib/api/buildkite/annotate.js +8 -19
- package/lib/api/buildkite/annotate.js.map +1 -1
- package/lib/api/git/commit.js +6 -17
- package/lib/api/git/commit.js.map +1 -1
- package/lib/api/git/commitAllChanges.js +4 -13
- package/lib/api/git/commitAllChanges.js.map +1 -1
- package/lib/api/git/currentBranch.js +5 -14
- package/lib/api/git/currentBranch.js.map +1 -1
- package/lib/api/git/getChangedFiles.js +3 -12
- package/lib/api/git/getChangedFiles.js.map +1 -1
- package/lib/api/git/log.js +7 -17
- package/lib/api/git/log.js.map +1 -1
- package/lib/api/git/push.js +7 -19
- package/lib/api/git/push.js.map +1 -1
- package/lib/api/git/remote.js +5 -14
- package/lib/api/git/remote.js.map +1 -1
- package/lib/api/git/reset.js +6 -15
- package/lib/api/git/reset.js.map +1 -1
- package/lib/api/github/checkRun.js +4 -13
- package/lib/api/github/checkRun.js.map +1 -1
- package/lib/api/github/environment.js +2 -3
- package/lib/api/github/environment.js.map +1 -1
- package/lib/api/github/issueComment.js +15 -28
- package/lib/api/github/issueComment.js.map +1 -1
- package/lib/api/github/pullRequest.js +8 -17
- package/lib/api/github/pullRequest.js.map +1 -1
- package/lib/api/jest/index.d.ts +26 -11
- package/lib/api/net/compose.js +3 -12
- package/lib/api/net/compose.js.map +1 -1
- package/lib/api/net/socket.js +30 -43
- package/lib/api/net/socket.js.map +1 -1
- package/lib/api/net/waitFor.js +4 -13
- package/lib/api/net/waitFor.js.map +1 -1
- package/lib/cli/adapter/eslint.d.ts +2 -1
- package/lib/cli/adapter/eslint.js +10 -15
- package/lib/cli/adapter/eslint.js.map +1 -1
- package/lib/cli/adapter/prettier.js +12 -24
- package/lib/cli/adapter/prettier.js.map +1 -1
- package/lib/cli/build/tsc.js +2 -11
- package/lib/cli/build/tsc.js.map +1 -1
- package/lib/cli/configure/analyseConfiguration.js +7 -16
- package/lib/cli/configure/analyseConfiguration.js.map +1 -1
- package/lib/cli/configure/analyseDependencies.js +22 -28
- package/lib/cli/configure/analyseDependencies.js.map +1 -1
- package/lib/cli/configure/analysis/files.js +3 -12
- package/lib/cli/configure/analysis/files.js.map +1 -1
- package/lib/cli/configure/analysis/git.js +4 -13
- package/lib/cli/configure/analysis/git.js.map +1 -1
- package/lib/cli/configure/analysis/package.js +7 -13
- package/lib/cli/configure/analysis/package.js.map +1 -1
- package/lib/cli/configure/analysis/project.js +13 -23
- package/lib/cli/configure/analysis/project.js.map +1 -1
- package/lib/cli/configure/ensureTemplateCompletion.js +6 -15
- package/lib/cli/configure/ensureTemplateCompletion.js.map +1 -1
- package/lib/cli/configure/getEntryPoint.js +3 -12
- package/lib/cli/configure/getEntryPoint.js.map +1 -1
- package/lib/cli/configure/getProjectType.js +3 -13
- package/lib/cli/configure/getProjectType.js.map +1 -1
- package/lib/cli/configure/index.js +21 -30
- package/lib/cli/configure/index.js.map +1 -1
- package/lib/cli/configure/modules/eslint.js +10 -29
- package/lib/cli/configure/modules/eslint.js.map +1 -1
- package/lib/cli/configure/modules/ignore.js +3 -12
- package/lib/cli/configure/modules/ignore.js.map +1 -1
- package/lib/cli/configure/modules/jest.js +14 -33
- package/lib/cli/configure/modules/jest.js.map +1 -1
- package/lib/cli/configure/modules/package.js +21 -21
- package/lib/cli/configure/modules/package.js.map +1 -1
- package/lib/cli/configure/modules/prettier.js +9 -28
- package/lib/cli/configure/modules/prettier.js.map +1 -1
- package/lib/cli/configure/modules/renovate.js +13 -30
- package/lib/cli/configure/modules/renovate.js.map +1 -1
- package/lib/cli/configure/modules/skubaDive.js +7 -5
- package/lib/cli/configure/modules/skubaDive.js.map +1 -1
- package/lib/cli/configure/modules/tsconfig.js +12 -18
- package/lib/cli/configure/modules/tsconfig.js.map +1 -1
- package/lib/cli/configure/processing/json.js +1 -1
- package/lib/cli/configure/processing/json.js.map +1 -1
- package/lib/cli/configure/processing/package.js +5 -5
- package/lib/cli/configure/processing/package.js.map +1 -1
- package/lib/cli/configure/processing/prettier.js +4 -1
- package/lib/cli/configure/processing/prettier.js.map +1 -1
- package/lib/cli/configure/processing/typescript.js +4 -7
- package/lib/cli/configure/processing/typescript.js.map +1 -1
- package/lib/cli/configure/refreshIgnoreFiles.js +13 -21
- package/lib/cli/configure/refreshIgnoreFiles.js.map +1 -1
- package/lib/cli/format.js +5 -14
- package/lib/cli/format.js.map +1 -1
- package/lib/cli/help.js +3 -12
- package/lib/cli/help.js.map +1 -1
- package/lib/cli/init/getConfig.js +63 -56
- package/lib/cli/init/getConfig.js.map +1 -1
- package/lib/cli/init/git.js +9 -18
- package/lib/cli/init/git.js.map +1 -1
- package/lib/cli/init/index.js +14 -23
- package/lib/cli/init/index.js.map +1 -1
- package/lib/cli/init/prompts.js +3 -12
- package/lib/cli/init/prompts.js.map +1 -1
- package/lib/cli/init/types.js +7 -2
- package/lib/cli/init/types.js.map +1 -1
- package/lib/cli/init/writePackageJson.js +5 -14
- package/lib/cli/init/writePackageJson.js.map +1 -1
- package/lib/cli/lint/annotate/buildkite/index.js +3 -12
- package/lib/cli/lint/annotate/buildkite/index.js.map +1 -1
- package/lib/cli/lint/annotate/github/eslint.js +10 -2
- package/lib/cli/lint/annotate/github/eslint.js.map +1 -1
- package/lib/cli/lint/annotate/github/index.js +3 -12
- package/lib/cli/lint/annotate/github/index.js.map +1 -1
- package/lib/cli/lint/annotate/github/tsc.js +1 -1
- package/lib/cli/lint/annotate/github/tsc.js.map +1 -1
- package/lib/cli/lint/annotate/index.js +3 -12
- package/lib/cli/lint/annotate/index.js.map +1 -1
- package/lib/cli/lint/autofix.d.ts +7 -1
- package/lib/cli/lint/autofix.js +26 -27
- package/lib/cli/lint/autofix.js.map +1 -1
- package/lib/cli/lint/external.js +37 -59
- package/lib/cli/lint/external.js.map +1 -1
- package/lib/cli/lint/index.js +5 -14
- package/lib/cli/lint/index.js.map +1 -1
- package/lib/cli/lint/internal.js +7 -16
- package/lib/cli/lint/internal.js.map +1 -1
- package/lib/cli/lint/tsc.js +4 -13
- package/lib/cli/lint/tsc.js.map +1 -1
- package/lib/cli/node.js +3 -12
- package/lib/cli/node.js.map +1 -1
- package/lib/cli/release.js +3 -12
- package/lib/cli/release.js.map +1 -1
- package/lib/cli/start.js +4 -14
- package/lib/cli/start.js.map +1 -1
- package/lib/cli/test/index.js +1 -2
- package/lib/cli/test/index.js.map +1 -1
- package/lib/cli/test/reporters/github/annotations.js +7 -7
- package/lib/cli/test/reporters/github/annotations.js.map +1 -1
- package/lib/cli/test/reporters/github/index.d.ts +2 -2
- package/lib/cli/test/reporters/github/index.js +37 -37
- package/lib/cli/test/reporters/github/index.js.map +1 -1
- package/lib/cli/version.js +3 -12
- package/lib/cli/version.js.map +1 -1
- package/lib/skuba.js +3 -12
- package/lib/skuba.js.map +1 -1
- package/lib/utils/args.d.ts +1 -1
- package/lib/utils/args.js +7 -11
- package/lib/utils/args.js.map +1 -1
- package/lib/utils/command.d.ts +1 -1
- package/lib/utils/command.js +0 -1
- package/lib/utils/command.js.map +1 -1
- package/lib/utils/copy.js +11 -20
- package/lib/utils/copy.js.map +1 -1
- package/lib/utils/dir.js +9 -18
- package/lib/utils/dir.js.map +1 -1
- package/lib/utils/error.d.ts +14 -0
- package/lib/utils/error.js +16 -2
- package/lib/utils/error.js.map +1 -1
- package/lib/utils/exec.js +25 -29
- package/lib/utils/exec.js.map +1 -1
- package/lib/utils/logo.js +4 -14
- package/lib/utils/logo.js.map +1 -1
- package/lib/utils/manifest.js +6 -15
- package/lib/utils/manifest.js.map +1 -1
- package/lib/utils/version.js +12 -22
- package/lib/utils/version.js.map +1 -1
- package/lib/utils/wait.d.ts +17 -0
- package/lib/utils/wait.js +32 -0
- package/lib/utils/wait.js.map +1 -0
- package/lib/utils/worker.js +4 -12
- package/lib/utils/worker.js.map +1 -1
- package/lib/wrapper/functionHandler.js +2 -11
- package/lib/wrapper/functionHandler.js.map +1 -1
- package/lib/wrapper/http.js +6 -15
- package/lib/wrapper/http.js.map +1 -1
- package/lib/wrapper/main.js +2 -11
- package/lib/wrapper/main.js.map +1 -1
- package/lib/wrapper/requestListener.js +3 -13
- package/lib/wrapper/requestListener.js.map +1 -1
- package/package.json +19 -29
- package/template/base/tsconfig.json +2 -1
- package/template/express-rest-api/.buildkite/pipeline.yml +5 -4
- package/template/express-rest-api/Dockerfile +3 -3
- package/template/greeter/.buildkite/pipeline.yml +2 -1
- package/template/koa-rest-api/.buildkite/pipeline.yml +5 -4
- package/template/koa-rest-api/Dockerfile +3 -3
- package/template/koa-rest-api/package.json +5 -5
- package/template/koa-rest-api/src/api/jobs/getJobs.ts +2 -2
- package/template/koa-rest-api/src/api/jobs/postJob.ts +2 -2
- package/template/koa-rest-api/src/framework/logging.ts +8 -5
- package/template/koa-rest-api/src/framework/metrics.ts +2 -2
- package/template/koa-rest-api/src/framework/server.test.ts +21 -21
- package/template/koa-rest-api/src/framework/server.ts +4 -3
- package/template/koa-rest-api/src/listen.ts +2 -2
- package/template/koa-rest-api/src/testing/logging.ts +5 -20
- package/template/lambda-sqs-worker/.buildkite/pipeline.yml +2 -1
- package/template/lambda-sqs-worker/.nvmrc +1 -1
- package/template/lambda-sqs-worker/Dockerfile +1 -1
- package/template/lambda-sqs-worker/package.json +4 -4
- package/template/lambda-sqs-worker/serverless.yml +2 -2
- package/template/lambda-sqs-worker/src/app.test.ts +9 -9
- package/template/lambda-sqs-worker/src/app.ts +2 -1
- package/template/lambda-sqs-worker/src/framework/handler.test.ts +10 -10
- package/template/lambda-sqs-worker/src/framework/handler.ts +14 -17
- package/template/lambda-sqs-worker/src/framework/logging.ts +11 -6
- package/template/lambda-sqs-worker/src/testing/logging.ts +7 -5
- package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +2 -1
- package/template/lambda-sqs-worker-cdk/.nvmrc +1 -1
- package/template/lambda-sqs-worker-cdk/Dockerfile +1 -1
- package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +2 -2
- package/template/lambda-sqs-worker-cdk/infra/appStack.ts +1 -1
- package/template/lambda-sqs-worker-cdk/package.json +9 -11
- package/template/oss-npm-package/tsconfig.json +2 -1
- package/template/private-npm-package/.buildkite/pipeline.yml +1 -1
- package/template/private-npm-package/tsconfig.json +2 -1
- package/lib/cli/changesets/coreAdapter.d.ts +0 -9
- package/lib/cli/changesets/coreAdapter.js +0 -19
- package/lib/cli/changesets/coreAdapter.js.map +0 -1
- package/lib/cli/changesets/gitUtils.d.ts +0 -17
- package/lib/cli/changesets/gitUtils.js +0 -128
- package/lib/cli/changesets/gitUtils.js.map +0 -1
- package/lib/cli/changesets/githubAdapter.d.ts +0 -3
- package/lib/cli/changesets/githubAdapter.js +0 -8
- package/lib/cli/changesets/githubAdapter.js.map +0 -1
- package/lib/cli/changesets/index.d.ts +0 -1
- package/lib/cli/changesets/index.js +0 -94
- package/lib/cli/changesets/index.js.map +0 -1
- package/lib/cli/changesets/readChangesetState.d.ts +0 -6
- package/lib/cli/changesets/readChangesetState.js +0 -34
- package/lib/cli/changesets/readChangesetState.js.map +0 -1
- package/lib/cli/changesets/run.d.ts +0 -22
- package/lib/cli/changesets/run.js +0 -196
- package/lib/cli/changesets/run.js.map +0 -1
- package/lib/cli/changesets/utils.d.ts +0 -30
- package/lib/cli/changesets/utils.js +0 -130
- package/lib/cli/changesets/utils.js.map +0 -1
|
@@ -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
|
};
|
|
@@ -27,39 +18,41 @@ const prompts_1 = require("./prompts");
|
|
|
27
18
|
const types_1 = require("./types");
|
|
28
19
|
const runForm = (props) => {
|
|
29
20
|
const { message, name } = props;
|
|
30
|
-
const choices = props.choices.map((choice) => (
|
|
31
|
-
|
|
21
|
+
const choices = props.choices.map((choice) => ({
|
|
22
|
+
...choice,
|
|
23
|
+
validate: (value) => {
|
|
32
24
|
if (value === '' || value === choice.initial) {
|
|
33
25
|
return 'Form is not complete';
|
|
34
26
|
}
|
|
35
|
-
return
|
|
36
|
-
}
|
|
27
|
+
return choice.validate?.(value) ?? true;
|
|
28
|
+
},
|
|
29
|
+
}));
|
|
37
30
|
const form = new enquirer_1.Form({
|
|
38
31
|
choices,
|
|
39
32
|
message,
|
|
40
33
|
name,
|
|
41
|
-
validate: (values) =>
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
}
|
|
34
|
+
validate: async (values) => {
|
|
35
|
+
const results = await Promise.all(choices.map((choice) => choice.validate(values[choice.name])));
|
|
36
|
+
return (results.find((result) => typeof result === 'string') ??
|
|
37
|
+
results.every((result) => result === true));
|
|
38
|
+
},
|
|
46
39
|
});
|
|
47
40
|
return form.run();
|
|
48
41
|
};
|
|
49
42
|
exports.runForm = runForm;
|
|
50
|
-
const confirmShouldContinue = (choices) =>
|
|
43
|
+
const confirmShouldContinue = async (choices) => {
|
|
51
44
|
const fieldsList = choices.map((choice) => choice.message);
|
|
52
45
|
logging_1.log.newline();
|
|
53
46
|
logging_1.log.plain('This template uses the following information:');
|
|
54
47
|
logging_1.log.newline();
|
|
55
48
|
fieldsList.forEach((message) => logging_1.log.subtle(`- ${message}`));
|
|
56
49
|
logging_1.log.newline();
|
|
57
|
-
const result =
|
|
50
|
+
const result = await prompts_1.SHOULD_CONTINUE_PROMPT.run();
|
|
58
51
|
return result === 'yes';
|
|
59
|
-
}
|
|
60
|
-
const createDirectory = (dir) =>
|
|
52
|
+
};
|
|
53
|
+
const createDirectory = async (dir) => {
|
|
61
54
|
try {
|
|
62
|
-
|
|
55
|
+
await fs_extra_1.default.promises.mkdir(dir);
|
|
63
56
|
}
|
|
64
57
|
catch (err) {
|
|
65
58
|
if ((0, error_1.isErrorWithCode)(err, 'EEXIST')) {
|
|
@@ -68,14 +61,14 @@ const createDirectory = (dir) => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
68
61
|
}
|
|
69
62
|
throw err;
|
|
70
63
|
}
|
|
71
|
-
}
|
|
72
|
-
const cloneTemplate = (templateName, destinationDir) =>
|
|
64
|
+
};
|
|
65
|
+
const cloneTemplate = async (templateName, destinationDir) => {
|
|
73
66
|
if (templateName.startsWith('github:')) {
|
|
74
67
|
const gitHubPath = templateName.slice('github:'.length);
|
|
75
68
|
return (0, git_1.downloadGitHubTemplate)(gitHubPath, destinationDir);
|
|
76
69
|
}
|
|
77
70
|
const templateDir = path_1.default.join(template_1.TEMPLATE_DIR, templateName);
|
|
78
|
-
|
|
71
|
+
await (0, copy_1.copyFiles)({
|
|
79
72
|
// assume built-in templates have no extraneous files
|
|
80
73
|
include: () => true,
|
|
81
74
|
sourceRoot: templateDir,
|
|
@@ -84,15 +77,15 @@ const cloneTemplate = (templateName, destinationDir) => __awaiter(void 0, void 0
|
|
|
84
77
|
// built-in templates have files like _package.json
|
|
85
78
|
stripUnderscorePrefix: true,
|
|
86
79
|
});
|
|
87
|
-
}
|
|
88
|
-
const getTemplateName = () =>
|
|
89
|
-
const templateSelection =
|
|
80
|
+
};
|
|
81
|
+
const getTemplateName = async () => {
|
|
82
|
+
const templateSelection = await prompts_1.TEMPLATE_PROMPT.run();
|
|
90
83
|
if (templateSelection === 'github →') {
|
|
91
|
-
const gitHubPath =
|
|
84
|
+
const gitHubPath = await prompts_1.GIT_PATH_PROMPT.run();
|
|
92
85
|
return `github:${gitHubPath}`;
|
|
93
86
|
}
|
|
94
87
|
return templateSelection;
|
|
95
|
-
}
|
|
88
|
+
};
|
|
96
89
|
const generatePlaceholders = (choices) => Object.fromEntries(choices.map(({ name }) => [name, `<%- ${name} %>`]));
|
|
97
90
|
const getTemplateConfig = (dir) => {
|
|
98
91
|
const templateConfigPath = path_1.default.join(dir, template_1.TEMPLATE_CONFIG_FILENAME);
|
|
@@ -113,27 +106,27 @@ const getTemplateConfig = (dir) => {
|
|
|
113
106
|
}
|
|
114
107
|
};
|
|
115
108
|
exports.getTemplateConfig = getTemplateConfig;
|
|
116
|
-
const baseToTemplateData = ({ ownerName, repoName }) =>
|
|
109
|
+
const baseToTemplateData = async ({ ownerName, repoName }) => {
|
|
117
110
|
const [orgName, teamName] = ownerName.split('/');
|
|
118
|
-
const port = String(
|
|
111
|
+
const port = String(await (0, port_1.getRandomPort)());
|
|
119
112
|
return {
|
|
120
113
|
orgName,
|
|
121
114
|
ownerName,
|
|
122
115
|
port,
|
|
123
116
|
repoName,
|
|
124
117
|
// Use standalone username in `teamName` contexts
|
|
125
|
-
teamName: teamName
|
|
118
|
+
teamName: teamName ?? orgName,
|
|
126
119
|
};
|
|
127
|
-
}
|
|
128
|
-
const configureFromPrompt = () =>
|
|
129
|
-
const { ownerName, repoName } =
|
|
120
|
+
};
|
|
121
|
+
const configureFromPrompt = async () => {
|
|
122
|
+
const { ownerName, repoName } = await (0, exports.runForm)(prompts_1.BASE_PROMPT_PROPS);
|
|
130
123
|
logging_1.log.plain(chalk_1.default.cyan(repoName), 'by', chalk_1.default.cyan(ownerName));
|
|
131
|
-
const templateData =
|
|
124
|
+
const templateData = await baseToTemplateData({ ownerName, repoName });
|
|
132
125
|
const destinationDir = repoName;
|
|
133
|
-
|
|
126
|
+
await createDirectory(destinationDir);
|
|
134
127
|
logging_1.log.newline();
|
|
135
|
-
const templateName =
|
|
136
|
-
|
|
128
|
+
const templateName = await getTemplateName();
|
|
129
|
+
await cloneTemplate(templateName, destinationDir);
|
|
137
130
|
const { entryPoint, fields, noSkip, type } = (0, exports.getTemplateConfig)(path_1.default.join(process.cwd(), destinationDir));
|
|
138
131
|
if (fields.length === 0) {
|
|
139
132
|
return {
|
|
@@ -145,10 +138,10 @@ const configureFromPrompt = () => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
145
138
|
type,
|
|
146
139
|
};
|
|
147
140
|
}
|
|
148
|
-
const shouldContinue = noSkip ? true :
|
|
141
|
+
const shouldContinue = noSkip ? true : await confirmShouldContinue(fields);
|
|
149
142
|
if (shouldContinue) {
|
|
150
143
|
logging_1.log.newline();
|
|
151
|
-
const customAnswers =
|
|
144
|
+
const customAnswers = await (0, exports.runForm)({
|
|
152
145
|
choices: fields,
|
|
153
146
|
message: chalk_1.default.bold(`Complete ${chalk_1.default.cyan(templateName)}:`),
|
|
154
147
|
name: 'customAnswers',
|
|
@@ -157,7 +150,7 @@ const configureFromPrompt = () => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
157
150
|
destinationDir,
|
|
158
151
|
entryPoint,
|
|
159
152
|
templateComplete: true,
|
|
160
|
-
templateData:
|
|
153
|
+
templateData: { ...templateData, ...customAnswers },
|
|
161
154
|
templateName,
|
|
162
155
|
type,
|
|
163
156
|
};
|
|
@@ -169,15 +162,15 @@ const configureFromPrompt = () => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
169
162
|
destinationDir,
|
|
170
163
|
entryPoint,
|
|
171
164
|
templateComplete: false,
|
|
172
|
-
templateData:
|
|
165
|
+
templateData: { ...templateData, ...customAnswers },
|
|
173
166
|
templateName,
|
|
174
167
|
type,
|
|
175
168
|
};
|
|
176
|
-
}
|
|
169
|
+
};
|
|
177
170
|
exports.configureFromPrompt = configureFromPrompt;
|
|
178
|
-
const configureFromPipe = () =>
|
|
171
|
+
const configureFromPipe = async () => {
|
|
179
172
|
let text = '';
|
|
180
|
-
|
|
173
|
+
await new Promise((resolve) => process.stdin.on('data', (chunk) => (text += chunk)).once('end', resolve));
|
|
181
174
|
text = text.trim();
|
|
182
175
|
if (text === '') {
|
|
183
176
|
logging_1.log.err('No data from stdin.');
|
|
@@ -187,7 +180,7 @@ const configureFromPipe = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
187
180
|
try {
|
|
188
181
|
value = JSON.parse(text);
|
|
189
182
|
}
|
|
190
|
-
catch
|
|
183
|
+
catch {
|
|
191
184
|
logging_1.log.err('Invalid JSON from stdin.');
|
|
192
185
|
process.exit(1);
|
|
193
186
|
}
|
|
@@ -198,16 +191,27 @@ const configureFromPipe = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
198
191
|
process.exit(1);
|
|
199
192
|
}
|
|
200
193
|
const { destinationDir, templateComplete, templateName } = result.value;
|
|
201
|
-
const templateData =
|
|
202
|
-
|
|
203
|
-
|
|
194
|
+
const templateData = {
|
|
195
|
+
...(await baseToTemplateData(result.value.templateData)),
|
|
196
|
+
...result.value.templateData,
|
|
197
|
+
};
|
|
198
|
+
await createDirectory(destinationDir);
|
|
199
|
+
await cloneTemplate(templateName, destinationDir);
|
|
204
200
|
const { entryPoint, fields, noSkip, type } = (0, exports.getTemplateConfig)(path_1.default.join(process.cwd(), destinationDir));
|
|
205
201
|
if (!templateComplete) {
|
|
206
202
|
if (noSkip) {
|
|
207
203
|
logging_1.log.err('Templating for', logging_1.log.bold(templateName), 'cannot be skipped.');
|
|
208
204
|
process.exit(1);
|
|
209
205
|
}
|
|
210
|
-
return
|
|
206
|
+
return {
|
|
207
|
+
...result.value,
|
|
208
|
+
entryPoint,
|
|
209
|
+
templateData: {
|
|
210
|
+
...templateData,
|
|
211
|
+
...generatePlaceholders(fields),
|
|
212
|
+
},
|
|
213
|
+
type,
|
|
214
|
+
};
|
|
211
215
|
}
|
|
212
216
|
const required = fields.map(({ name }) => name);
|
|
213
217
|
const provided = new Set(Object.keys(templateData));
|
|
@@ -218,10 +222,13 @@ const configureFromPipe = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
218
222
|
missing.forEach((name) => logging_1.log.err(`- ${name}`));
|
|
219
223
|
process.exit(1);
|
|
220
224
|
}
|
|
221
|
-
return
|
|
225
|
+
return {
|
|
226
|
+
...result.value,
|
|
227
|
+
entryPoint,
|
|
222
228
|
templateData,
|
|
223
|
-
type
|
|
224
|
-
}
|
|
229
|
+
type,
|
|
230
|
+
};
|
|
231
|
+
};
|
|
225
232
|
const getConfig = () => process.stdin.isTTY ? (0, exports.configureFromPrompt)() : configureFromPipe();
|
|
226
233
|
exports.getConfig = getConfig;
|
|
227
234
|
//# sourceMappingURL=getConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../../src/cli/init/getConfig.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getConfig.js","sourceRoot":"","sources":["../../../src/cli/init/getConfig.ts"],"names":[],"mappings":"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"}
|
package/lib/cli/init/git.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,38 +33,38 @@ const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
|
|
|
42
33
|
const simple_git_1 = __importDefault(require("simple-git"));
|
|
43
34
|
const Git = __importStar(require("../../api/git"));
|
|
44
35
|
const logging_1 = require("../../utils/logging");
|
|
45
|
-
const initialiseRepo = (dir, { orgName, repoName }) =>
|
|
46
|
-
|
|
36
|
+
const initialiseRepo = async (dir, { orgName, repoName }) => {
|
|
37
|
+
await isomorphic_git_1.default.init({
|
|
47
38
|
// TODO: support main as an alternative.
|
|
48
39
|
defaultBranch: 'master',
|
|
49
40
|
dir,
|
|
50
41
|
fs: fs_extra_1.default,
|
|
51
42
|
});
|
|
52
|
-
|
|
43
|
+
await Git.commit({
|
|
53
44
|
dir,
|
|
54
45
|
message: 'Initial commit',
|
|
55
46
|
});
|
|
56
|
-
|
|
47
|
+
await isomorphic_git_1.default.addRemote({
|
|
57
48
|
dir,
|
|
58
49
|
fs: fs_extra_1.default,
|
|
59
50
|
remote: 'origin',
|
|
60
51
|
url: `git@github.com:${orgName}/${repoName}.git`,
|
|
61
52
|
});
|
|
62
|
-
}
|
|
53
|
+
};
|
|
63
54
|
exports.initialiseRepo = initialiseRepo;
|
|
64
|
-
const downloadGitHubTemplate = (gitHubPath, destinationDir) =>
|
|
55
|
+
const downloadGitHubTemplate = async (gitHubPath, destinationDir) => {
|
|
65
56
|
logging_1.log.newline();
|
|
66
57
|
logging_1.log.plain('Downloading', logging_1.log.bold(gitHubPath), 'from GitHub...');
|
|
67
|
-
|
|
58
|
+
await (0, simple_git_1.default)().clone(`git@github.com:${gitHubPath}.git`, destinationDir, [
|
|
68
59
|
'--depth=1',
|
|
69
60
|
'--quiet',
|
|
70
61
|
]);
|
|
71
|
-
|
|
62
|
+
await fs_extra_1.default.promises.rm(path_1.default.join(destinationDir, '.git'), {
|
|
72
63
|
force: true,
|
|
73
64
|
recursive: true,
|
|
74
65
|
});
|
|
75
66
|
logging_1.log.newline();
|
|
76
67
|
logging_1.log.warn('You may need to run', logging_1.log.bold('yarn skuba configure'), 'once this is done.');
|
|
77
|
-
}
|
|
68
|
+
};
|
|
78
69
|
exports.downloadGitHubTemplate = downloadGitHubTemplate;
|
|
79
70
|
//# sourceMappingURL=git.js.map
|
package/lib/cli/init/git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/cli/init/git.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../src/cli/init/git.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA0B;AAC1B,oEAAiC;AACjC,4DAAmC;AAEnC,mDAAqC;AACrC,iDAA0C;AAOnC,MAAM,cAAc,GAAG,KAAK,EACjC,GAAW,EACX,EAAE,OAAO,EAAE,QAAQ,EAAiB,EACpC,EAAE;IACF,MAAM,wBAAG,CAAC,IAAI,CAAC;QACb,wCAAwC;QACxC,aAAa,EAAE,QAAQ;QACvB,GAAG;QACH,EAAE,EAAF,kBAAE;KACH,CAAC,CAAC;IAEH,MAAM,GAAG,CAAC,MAAM,CAAC;QACf,GAAG;QACH,OAAO,EAAE,gBAAgB;KAC1B,CAAC,CAAC;IAEH,MAAM,wBAAG,CAAC,SAAS,CAAC;QAClB,GAAG;QACH,EAAE,EAAF,kBAAE;QACF,MAAM,EAAE,QAAQ;QAChB,GAAG,EAAE,kBAAkB,OAAO,IAAI,QAAQ,MAAM;KACjD,CAAC,CAAC;AACL,CAAC,CAAC;AAtBW,QAAA,cAAc,kBAsBzB;AAEK,MAAM,sBAAsB,GAAG,KAAK,EACzC,UAAkB,EAClB,cAAsB,EACtB,EAAE;IACF,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,KAAK,CAAC,aAAa,EAAE,aAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAEjE,MAAM,IAAA,oBAAS,GAAE,CAAC,KAAK,CAAC,kBAAkB,UAAU,MAAM,EAAE,cAAc,EAAE;QAC1E,WAAW;QACX,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,kBAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,EAAE;QACtD,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,IAAI;KAChB,CAAC,CAAC;IAEH,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,IAAI,CACN,qBAAqB,EACrB,aAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAChC,oBAAoB,CACrB,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,sBAAsB,0BAuBjC"}
|
package/lib/cli/init/index.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -24,16 +15,16 @@ const template_1 = require("../../utils/template");
|
|
|
24
15
|
const getConfig_1 = require("./getConfig");
|
|
25
16
|
const git_2 = require("./git");
|
|
26
17
|
const writePackageJson_1 = require("./writePackageJson");
|
|
27
|
-
const init = () =>
|
|
28
|
-
const skubaVersionInfo =
|
|
29
|
-
|
|
30
|
-
const { destinationDir, entryPoint, templateComplete, templateData, templateName, type, } =
|
|
31
|
-
const include =
|
|
18
|
+
const init = async () => {
|
|
19
|
+
const skubaVersionInfo = await (0, logo_1.showLogoAndVersionInfo)();
|
|
20
|
+
await (0, exec_1.ensureCommands)('yarn');
|
|
21
|
+
const { destinationDir, entryPoint, templateComplete, templateData, templateName, type, } = await (0, getConfig_1.getConfig)();
|
|
22
|
+
const include = await (0, dir_1.createInclusionFilter)([
|
|
32
23
|
path_1.default.join(destinationDir, '.gitignore'),
|
|
33
24
|
path_1.default.join(template_1.BASE_TEMPLATE_DIR, '_.gitignore'),
|
|
34
25
|
]);
|
|
35
26
|
const processors = [(0, copy_1.createEjsRenderer)(templateData)];
|
|
36
|
-
|
|
27
|
+
await (0, copy_1.copyFiles)({
|
|
37
28
|
sourceRoot: template_1.BASE_TEMPLATE_DIR,
|
|
38
29
|
destinationRoot: destinationDir,
|
|
39
30
|
include,
|
|
@@ -43,13 +34,13 @@ const init = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
43
34
|
// base template has files like _.eslintrc.js
|
|
44
35
|
stripUnderscorePrefix: true,
|
|
45
36
|
});
|
|
46
|
-
|
|
37
|
+
await (0, copy_1.copyFiles)({
|
|
47
38
|
sourceRoot: destinationDir,
|
|
48
39
|
destinationRoot: destinationDir,
|
|
49
40
|
include,
|
|
50
41
|
processors,
|
|
51
42
|
});
|
|
52
|
-
|
|
43
|
+
await Promise.all([
|
|
53
44
|
templateComplete
|
|
54
45
|
? (0, template_1.ensureTemplateConfigDeletion)(destinationDir)
|
|
55
46
|
: Promise.resolve(),
|
|
@@ -67,16 +58,16 @@ const init = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
67
58
|
streamStdio: 'yarn',
|
|
68
59
|
});
|
|
69
60
|
logging_1.log.newline();
|
|
70
|
-
|
|
61
|
+
await (0, git_2.initialiseRepo)(destinationDir, templateData);
|
|
71
62
|
const skubaSlug = `skuba@${skubaVersionInfo.local}`;
|
|
72
63
|
let depsInstalled = false;
|
|
73
64
|
try {
|
|
74
|
-
|
|
65
|
+
await exec('yarn', 'add', '--dev', skubaSlug);
|
|
75
66
|
depsInstalled = true;
|
|
76
|
-
|
|
67
|
+
await exec('npx', 'yarn-deduplicate', '--strategy=highest');
|
|
77
68
|
}
|
|
78
|
-
catch
|
|
79
|
-
|
|
69
|
+
catch { }
|
|
70
|
+
await (0, git_1.commitAllChanges)({
|
|
80
71
|
dir: destinationDir,
|
|
81
72
|
message: `Clone ${templateName}`,
|
|
82
73
|
});
|
|
@@ -109,6 +100,6 @@ const init = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
109
100
|
logging_1.log.ok('cd', destinationDir);
|
|
110
101
|
logging_1.log.ok('git push --set-upstream origin master');
|
|
111
102
|
logging_1.log.newline();
|
|
112
|
-
}
|
|
103
|
+
};
|
|
113
104
|
exports.init = init;
|
|
114
105
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/init/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/init/index.ts"],"names":[],"mappings":"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"}
|
package/lib/cli/init/prompts.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.TEMPLATE_PROMPT = exports.GIT_PATH_PROMPT = exports.SHOULD_CONTINUE_PROMPT = exports.BASE_PROMPT_PROPS = void 0;
|
|
13
4
|
const enquirer_1 = require("enquirer");
|
|
@@ -34,16 +25,16 @@ const BASE_CHOICES = [
|
|
|
34
25
|
name: 'repoName',
|
|
35
26
|
message: 'Repo',
|
|
36
27
|
initial: 'my-repo',
|
|
37
|
-
validate: (value) =>
|
|
28
|
+
validate: async (value) => {
|
|
38
29
|
if (typeof value !== 'string') {
|
|
39
30
|
return 'required';
|
|
40
31
|
}
|
|
41
32
|
if (!(0, validation_1.isGitHubRepo)(value)) {
|
|
42
33
|
return 'fails GitHub validation';
|
|
43
34
|
}
|
|
44
|
-
const exists =
|
|
35
|
+
const exists = await (0, fs_extra_1.pathExists)(value);
|
|
45
36
|
return !exists || `'${value}' is an existing directory`;
|
|
46
|
-
}
|
|
37
|
+
},
|
|
47
38
|
},
|
|
48
39
|
];
|
|
49
40
|
exports.BASE_PROMPT_PROPS = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/cli/init/prompts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/cli/init/prompts.ts"],"names":[],"mappings":";;;AAAA,uCAAyC;AACzC,uCAAsC;AAEtC,mDAA+D;AAE/D,6CAAuE;AAIvE,MAAM,YAAY,GAAG;IACnB;QACE,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,mBAAmB;QAC5B,QAAQ,EAAE,CAAC,KAAc,EAAE,EAAE;YAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,OAAO,UAAU,CAAC;aACnB;YAED,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAErC,IAAI,CAAC,IAAA,wBAAW,EAAC,GAAG,CAAC,EAAE;gBACrB,OAAO,yBAAyB,CAAC;aAClC;YAED,OAAO,CACL,IAAI,KAAK,SAAS,IAAI,IAAA,yBAAY,EAAC,IAAI,CAAC,IAAI,yBAAyB,CACtE,CAAC;QACJ,CAAC;KACF;IACD;QACE,IAAI,EAAE,UAAU;QAChB,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,SAAS;QAClB,QAAQ,EAAE,KAAK,EAAE,KAAc,EAAE,EAAE;YACjC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,OAAO,UAAU,CAAC;aACnB;YAED,IAAI,CAAC,IAAA,yBAAY,EAAC,KAAK,CAAC,EAAE;gBACxB,OAAO,yBAAyB,CAAC;aAClC;YAED,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAU,EAAC,KAAK,CAAC,CAAC;YAEvC,OAAO,CAAC,MAAM,IAAI,IAAI,KAAK,4BAA4B,CAAC;QAC1D,CAAC;KACF;CACO,CAAC;AAEE,QAAA,iBAAiB,GAAG;IAC/B,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,oCAAoC;IAC7C,IAAI,EAAE,aAAa;CACpB,CAAC;AAEW,QAAA,sBAAsB,GAAG,IAAI,iBAAM,CAAC;IAC/C,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,CAAU;IAC/B,OAAO,EAAE,mBAAmB;IAC5B,IAAI,EAAE,gBAAgB;CACvB,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,IAAI,gBAAK,CAAC;IACvC,OAAO,EAAE,UAAU;IACnB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,gBAAgB;IACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,mBAAmB;CACvE,CAAC,CAAC;AAEU,QAAA,eAAe,GAAG,IAAI,iBAAM,CAAC;IACxC,OAAO,EAAE,kCAAuB;IAChC,OAAO,EAAE,oBAAoB;IAC7B,IAAI,EAAE,cAAc;CACrB,CAAC,CAAC"}
|
package/lib/cli/init/types.js
CHANGED
|
@@ -39,7 +39,9 @@ const INIT_CONFIG_INPUT_FIELDS = {
|
|
|
39
39
|
templateName: t.String,
|
|
40
40
|
};
|
|
41
41
|
exports.InitConfigInput = t.Record(INIT_CONFIG_INPUT_FIELDS);
|
|
42
|
-
const InitConfig = t.Record(
|
|
42
|
+
const InitConfig = t.Record({
|
|
43
|
+
...INIT_CONFIG_INPUT_FIELDS,
|
|
44
|
+
templateData: t
|
|
43
45
|
.Record({
|
|
44
46
|
ownerName: t.String,
|
|
45
47
|
repoName: t.String,
|
|
@@ -49,5 +51,8 @@ const InitConfig = t.Record(Object.assign(Object.assign({}, INIT_CONFIG_INPUT_FI
|
|
|
49
51
|
// Generated by init command
|
|
50
52
|
port: t.String,
|
|
51
53
|
})
|
|
52
|
-
.And(t.Dictionary(t.String, t.String)),
|
|
54
|
+
.And(t.Dictionary(t.String, t.String)),
|
|
55
|
+
entryPoint: t.String.optional(),
|
|
56
|
+
type: manifest_1.ProjectType.optional(),
|
|
57
|
+
});
|
|
53
58
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/cli/init/types.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;AAE5B,4CAA8B;AAE9B,mDAAmD;AAEnD,MAAM,wBAAwB,GAAG;IAC/B,cAAc,EAAE,CAAC,CAAC,MAAM;IACxB,gBAAgB,EAAE,CAAC,CAAC,OAAO;IAC3B,YAAY,EAAE,CAAC;SACZ,MAAM,CAAC;QACN,SAAS,EAAE,CAAC,CAAC,MAAM;QACnB,QAAQ,EAAE,CAAC,CAAC,MAAM;KACnB,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACxC,YAAY,EAAE,CAAC,CAAC,MAAM;CACvB,CAAC;AAIW,QAAA,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAIlE,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/cli/init/types.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;AAE5B,4CAA8B;AAE9B,mDAAmD;AAEnD,MAAM,wBAAwB,GAAG;IAC/B,cAAc,EAAE,CAAC,CAAC,MAAM;IACxB,gBAAgB,EAAE,CAAC,CAAC,OAAO;IAC3B,YAAY,EAAE,CAAC;SACZ,MAAM,CAAC;QACN,SAAS,EAAE,CAAC,CAAC,MAAM;QACnB,QAAQ,EAAE,CAAC,CAAC,MAAM;KACnB,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACxC,YAAY,EAAE,CAAC,CAAC,MAAM;CACvB,CAAC;AAIW,QAAA,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAIlE,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,GAAG,wBAAwB;IAE3B,YAAY,EAAE,CAAC;SACZ,MAAM,CAAC;QACN,SAAS,EAAE,CAAC,CAAC,MAAM;QACnB,QAAQ,EAAE,CAAC,CAAC,MAAM;QAElB,yBAAyB;QACzB,OAAO,EAAE,CAAC,CAAC,MAAM;QACjB,QAAQ,EAAE,CAAC,CAAC,MAAM;QAElB,4BAA4B;QAC5B,IAAI,EAAE,CAAC,CAAC,MAAM;KACf,CAAC;SACD,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IAExC,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE;IAC/B,IAAI,EAAE,sBAAW,CAAC,QAAQ,EAAE;CAC7B,CAAC,CAAC"}
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -19,16 +10,16 @@ const package_2 = require("../configure/processing/package");
|
|
|
19
10
|
/**
|
|
20
11
|
* Write a `skuba` section into the destination `package.json`.
|
|
21
12
|
*/
|
|
22
|
-
const writePackageJson = ({ cwd, entryPoint, template, type, version, }) =>
|
|
23
|
-
const manifest =
|
|
13
|
+
const writePackageJson = async ({ cwd, entryPoint, template, type, version, }) => {
|
|
14
|
+
const manifest = await (0, package_1.getDestinationManifest)({ cwd });
|
|
24
15
|
manifest.packageJson.skuba = {
|
|
25
|
-
entryPoint: entryPoint
|
|
16
|
+
entryPoint: entryPoint ?? null,
|
|
26
17
|
template,
|
|
27
18
|
type,
|
|
28
19
|
version,
|
|
29
20
|
};
|
|
30
21
|
const updatedPackageJson = (0, package_2.formatPackage)(manifest.packageJson);
|
|
31
|
-
|
|
32
|
-
}
|
|
22
|
+
await fs_extra_1.default.promises.writeFile(manifest.path, updatedPackageJson);
|
|
23
|
+
};
|
|
33
24
|
exports.writePackageJson = writePackageJson;
|
|
34
25
|
//# sourceMappingURL=writePackageJson.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writePackageJson.js","sourceRoot":"","sources":["../../../src/cli/init/writePackageJson.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"writePackageJson.js","sourceRoot":"","sources":["../../../src/cli/init/writePackageJson.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAG1B,2DAAuE;AACvE,6DAAgE;AAUhE;;GAEG;AACI,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACrC,GAAG,EACH,UAAU,EACV,QAAQ,EACR,IAAI,EACJ,OAAO,GACe,EAAE,EAAE;IAC1B,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAsB,EAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAEvD,QAAQ,CAAC,WAAW,CAAC,KAAK,GAAG;QAC3B,UAAU,EAAE,UAAU,IAAI,IAAI;QAC9B,QAAQ;QACR,IAAI;QACJ,OAAO;KACR,CAAC;IAEF,MAAM,kBAAkB,GAAG,IAAA,uBAAa,EAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE/D,MAAM,kBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;AACjE,CAAC,CAAC;AAnBW,QAAA,gBAAgB,oBAmB3B"}
|
|
@@ -22,22 +22,13 @@ 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.createBuildkiteAnnotations = void 0;
|
|
36
27
|
const Buildkite = __importStar(require("../../../../api/buildkite"));
|
|
37
28
|
const eslint_1 = require("./eslint");
|
|
38
29
|
const prettier_1 = require("./prettier");
|
|
39
30
|
const tsc_1 = require("./tsc");
|
|
40
|
-
const createBuildkiteAnnotations = (eslint, prettier, tscOk, tscOutputStream) =>
|
|
31
|
+
const createBuildkiteAnnotations = async (eslint, prettier, tscOk, tscOutputStream) => {
|
|
41
32
|
if (eslint.ok && prettier.ok && tscOk) {
|
|
42
33
|
return;
|
|
43
34
|
}
|
|
@@ -47,11 +38,11 @@ const createBuildkiteAnnotations = (eslint, prettier, tscOk, tscOutputStream) =>
|
|
|
47
38
|
...(0, prettier_1.createPrettierAnnotations)(prettier),
|
|
48
39
|
...(0, tsc_1.createTscAnnotations)(tscOk, tscOutputStream),
|
|
49
40
|
].join('\n\n');
|
|
50
|
-
|
|
41
|
+
await Buildkite.annotate(buildkiteOutput, {
|
|
51
42
|
context: 'skuba-lint-external',
|
|
52
43
|
scopeContextToStep: true,
|
|
53
44
|
style: 'error',
|
|
54
45
|
});
|
|
55
|
-
}
|
|
46
|
+
};
|
|
56
47
|
exports.createBuildkiteAnnotations = createBuildkiteAnnotations;
|
|
57
48
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/lint/annotate/buildkite/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cli/lint/annotate/buildkite/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qEAAuD;AAKvD,qCAAmD;AACnD,yCAAuD;AACvD,+BAA6C;AAEtC,MAAM,0BAA0B,GAAG,KAAK,EAC7C,MAAoB,EACpB,QAAwB,EACxB,KAAc,EACd,eAAkC,EACnB,EAAE;IACjB,IAAI,MAAM,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,IAAI,KAAK,EAAE;QACrC,OAAO;KACR;IAED,MAAM,eAAe,GAAG;QACtB,gDAAgD;QAChD,GAAG,IAAA,gCAAuB,EAAC,MAAM,CAAC;QAClC,GAAG,IAAA,oCAAyB,EAAC,QAAQ,CAAC;QACtC,GAAG,IAAA,0BAAoB,EAAC,KAAK,EAAE,eAAe,CAAC;KAChD,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEf,MAAM,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE;QACxC,OAAO,EAAE,qBAAqB;QAC9B,kBAAkB,EAAE,IAAI;QACxB,KAAK,EAAE,OAAO;KACf,CAAC,CAAC;AACL,CAAC,CAAC;AAtBW,QAAA,0BAA0B,8BAsBrC"}
|