skuba 4.2.0-beta.4 → 4.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/buildkite/annotate.js +8 -19
- package/lib/api/buildkite/annotate.js.map +1 -1
- package/lib/api/git/commit.js +6 -17
- package/lib/api/git/commit.js.map +1 -1
- package/lib/api/git/commitAllChanges.js +4 -13
- package/lib/api/git/commitAllChanges.js.map +1 -1
- package/lib/api/git/currentBranch.js +5 -14
- package/lib/api/git/currentBranch.js.map +1 -1
- package/lib/api/git/getChangedFiles.js +3 -12
- package/lib/api/git/getChangedFiles.js.map +1 -1
- package/lib/api/git/log.js +7 -17
- package/lib/api/git/log.js.map +1 -1
- package/lib/api/git/push.js +7 -19
- package/lib/api/git/push.js.map +1 -1
- package/lib/api/git/remote.js +5 -14
- package/lib/api/git/remote.js.map +1 -1
- package/lib/api/git/reset.js +6 -15
- package/lib/api/git/reset.js.map +1 -1
- package/lib/api/github/checkRun.js +4 -13
- package/lib/api/github/checkRun.js.map +1 -1
- package/lib/api/github/environment.js +2 -3
- package/lib/api/github/environment.js.map +1 -1
- package/lib/api/github/issueComment.js +15 -28
- package/lib/api/github/issueComment.js.map +1 -1
- package/lib/api/github/pullRequest.js +8 -17
- package/lib/api/github/pullRequest.js.map +1 -1
- package/lib/api/net/compose.js +3 -12
- package/lib/api/net/compose.js.map +1 -1
- package/lib/api/net/socket.js +30 -43
- package/lib/api/net/socket.js.map +1 -1
- package/lib/api/net/waitFor.js +4 -13
- package/lib/api/net/waitFor.js.map +1 -1
- package/lib/cli/adapter/eslint.js +5 -14
- package/lib/cli/adapter/eslint.js.map +1 -1
- package/lib/cli/adapter/prettier.js +12 -24
- package/lib/cli/adapter/prettier.js.map +1 -1
- package/lib/cli/build/tsc.js +2 -11
- package/lib/cli/build/tsc.js.map +1 -1
- package/lib/cli/configure/analyseConfiguration.js +7 -16
- package/lib/cli/configure/analyseConfiguration.js.map +1 -1
- package/lib/cli/configure/analyseDependencies.js +22 -28
- package/lib/cli/configure/analyseDependencies.js.map +1 -1
- package/lib/cli/configure/analysis/files.js +3 -12
- package/lib/cli/configure/analysis/files.js.map +1 -1
- package/lib/cli/configure/analysis/git.js +4 -13
- package/lib/cli/configure/analysis/git.js.map +1 -1
- package/lib/cli/configure/analysis/package.js +7 -13
- package/lib/cli/configure/analysis/package.js.map +1 -1
- package/lib/cli/configure/analysis/project.js +13 -23
- package/lib/cli/configure/analysis/project.js.map +1 -1
- package/lib/cli/configure/ensureTemplateCompletion.js +6 -15
- package/lib/cli/configure/ensureTemplateCompletion.js.map +1 -1
- package/lib/cli/configure/getEntryPoint.js +3 -12
- package/lib/cli/configure/getEntryPoint.js.map +1 -1
- package/lib/cli/configure/getProjectType.js +3 -13
- package/lib/cli/configure/getProjectType.js.map +1 -1
- package/lib/cli/configure/index.js +21 -30
- package/lib/cli/configure/index.js.map +1 -1
- package/lib/cli/configure/modules/eslint.js +10 -29
- package/lib/cli/configure/modules/eslint.js.map +1 -1
- package/lib/cli/configure/modules/ignore.js +3 -12
- package/lib/cli/configure/modules/ignore.js.map +1 -1
- package/lib/cli/configure/modules/jest.js +14 -33
- package/lib/cli/configure/modules/jest.js.map +1 -1
- package/lib/cli/configure/modules/package.js +21 -21
- package/lib/cli/configure/modules/package.js.map +1 -1
- package/lib/cli/configure/modules/prettier.js +9 -28
- package/lib/cli/configure/modules/prettier.js.map +1 -1
- package/lib/cli/configure/modules/renovate.js +13 -30
- package/lib/cli/configure/modules/renovate.js.map +1 -1
- package/lib/cli/configure/modules/skubaDive.js +7 -5
- package/lib/cli/configure/modules/skubaDive.js.map +1 -1
- package/lib/cli/configure/modules/tsconfig.js +12 -18
- package/lib/cli/configure/modules/tsconfig.js.map +1 -1
- package/lib/cli/configure/processing/json.js +1 -1
- package/lib/cli/configure/processing/json.js.map +1 -1
- package/lib/cli/configure/processing/package.js +5 -5
- package/lib/cli/configure/processing/package.js.map +1 -1
- package/lib/cli/configure/processing/prettier.js +4 -1
- package/lib/cli/configure/processing/prettier.js.map +1 -1
- package/lib/cli/configure/processing/typescript.js +4 -7
- package/lib/cli/configure/processing/typescript.js.map +1 -1
- package/lib/cli/configure/refreshIgnoreFiles.js +11 -20
- package/lib/cli/configure/refreshIgnoreFiles.js.map +1 -1
- package/lib/cli/format.js +5 -14
- package/lib/cli/format.js.map +1 -1
- package/lib/cli/help.js +3 -12
- package/lib/cli/help.js.map +1 -1
- package/lib/cli/init/getConfig.js +63 -56
- package/lib/cli/init/getConfig.js.map +1 -1
- package/lib/cli/init/git.js +9 -18
- package/lib/cli/init/git.js.map +1 -1
- package/lib/cli/init/index.js +14 -23
- package/lib/cli/init/index.js.map +1 -1
- package/lib/cli/init/prompts.js +3 -12
- package/lib/cli/init/prompts.js.map +1 -1
- package/lib/cli/init/types.js +7 -2
- package/lib/cli/init/types.js.map +1 -1
- package/lib/cli/init/writePackageJson.js +5 -14
- package/lib/cli/init/writePackageJson.js.map +1 -1
- package/lib/cli/lint/annotate/buildkite/index.js +3 -12
- package/lib/cli/lint/annotate/buildkite/index.js.map +1 -1
- package/lib/cli/lint/annotate/github/eslint.js +10 -2
- package/lib/cli/lint/annotate/github/eslint.js.map +1 -1
- package/lib/cli/lint/annotate/github/index.js +3 -12
- package/lib/cli/lint/annotate/github/index.js.map +1 -1
- package/lib/cli/lint/annotate/github/tsc.js +1 -1
- package/lib/cli/lint/annotate/github/tsc.js.map +1 -1
- package/lib/cli/lint/annotate/index.js +3 -12
- package/lib/cli/lint/annotate/index.js.map +1 -1
- package/lib/cli/lint/autofix.js +13 -22
- package/lib/cli/lint/autofix.js.map +1 -1
- package/lib/cli/lint/external.js +20 -43
- package/lib/cli/lint/external.js.map +1 -1
- package/lib/cli/lint/index.js +5 -14
- package/lib/cli/lint/index.js.map +1 -1
- package/lib/cli/lint/internal.js +7 -16
- package/lib/cli/lint/internal.js.map +1 -1
- package/lib/cli/lint/tsc.js +4 -13
- package/lib/cli/lint/tsc.js.map +1 -1
- package/lib/cli/node.js +3 -12
- package/lib/cli/node.js.map +1 -1
- package/lib/cli/release.js +3 -12
- package/lib/cli/release.js.map +1 -1
- package/lib/cli/start.js +4 -14
- package/lib/cli/start.js.map +1 -1
- package/lib/cli/test/index.js +1 -2
- package/lib/cli/test/index.js.map +1 -1
- package/lib/cli/test/reporters/github/annotations.js +7 -7
- package/lib/cli/test/reporters/github/annotations.js.map +1 -1
- package/lib/cli/test/reporters/github/index.js +27 -38
- package/lib/cli/test/reporters/github/index.js.map +1 -1
- package/lib/cli/version.js +3 -12
- package/lib/cli/version.js.map +1 -1
- package/lib/skuba.js +3 -12
- package/lib/skuba.js.map +1 -1
- package/lib/utils/args.d.ts +1 -1
- package/lib/utils/args.js +7 -11
- package/lib/utils/args.js.map +1 -1
- package/lib/utils/command.d.ts +1 -1
- package/lib/utils/command.js +0 -1
- package/lib/utils/command.js.map +1 -1
- package/lib/utils/copy.js +11 -20
- package/lib/utils/copy.js.map +1 -1
- package/lib/utils/dir.js +9 -18
- package/lib/utils/dir.js.map +1 -1
- package/lib/utils/exec.js +25 -29
- package/lib/utils/exec.js.map +1 -1
- package/lib/utils/logo.js +4 -14
- package/lib/utils/logo.js.map +1 -1
- package/lib/utils/manifest.js +6 -15
- package/lib/utils/manifest.js.map +1 -1
- package/lib/utils/version.js +10 -19
- package/lib/utils/version.js.map +1 -1
- package/lib/utils/worker.js +2 -11
- package/lib/utils/worker.js.map +1 -1
- package/lib/wrapper/functionHandler.js +2 -11
- package/lib/wrapper/functionHandler.js.map +1 -1
- package/lib/wrapper/http.js +6 -15
- package/lib/wrapper/http.js.map +1 -1
- package/lib/wrapper/main.js +2 -11
- package/lib/wrapper/main.js.map +1 -1
- package/lib/wrapper/requestListener.js +3 -13
- package/lib/wrapper/requestListener.js.map +1 -1
- package/package.json +4 -13
- package/template/base/tsconfig.json +2 -1
- package/template/express-rest-api/.buildkite/pipeline.yml +3 -3
- package/template/express-rest-api/Dockerfile +3 -3
- package/template/koa-rest-api/.buildkite/pipeline.yml +3 -3
- package/template/koa-rest-api/Dockerfile +3 -3
- package/template/oss-npm-package/tsconfig.json +2 -1
- package/template/private-npm-package/tsconfig.json +2 -1
- package/lib/cli/changesets/coreAdapter.d.ts +0 -8
- package/lib/cli/changesets/coreAdapter.js +0 -18
- package/lib/cli/changesets/coreAdapter.js.map +0 -1
- package/lib/cli/changesets/gitUtils.d.ts +0 -17
- package/lib/cli/changesets/gitUtils.js +0 -128
- package/lib/cli/changesets/gitUtils.js.map +0 -1
- package/lib/cli/changesets/githubAdapter.d.ts +0 -3
- package/lib/cli/changesets/githubAdapter.js +0 -8
- package/lib/cli/changesets/githubAdapter.js.map +0 -1
- package/lib/cli/changesets/index.d.ts +0 -1
- package/lib/cli/changesets/index.js +0 -82
- package/lib/cli/changesets/index.js.map +0 -1
- package/lib/cli/changesets/readChangesetState.d.ts +0 -6
- package/lib/cli/changesets/readChangesetState.js +0 -34
- package/lib/cli/changesets/readChangesetState.js.map +0 -1
- package/lib/cli/changesets/run.d.ts +0 -22
- package/lib/cli/changesets/run.js +0 -195
- package/lib/cli/changesets/run.js.map +0 -1
- package/lib/cli/changesets/utils.d.ts +0 -30
- package/lib/cli/changesets/utils.js +0 -130
- package/lib/cli/changesets/utils.js.map +0 -1
|
@@ -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
|
};
|
|
@@ -56,29 +47,28 @@ const logDiff = (diff) => {
|
|
|
56
47
|
.forEach(([name, { operation, version }]) => logging_1.log.plain(operation, name, logging_1.log.formatSubtle(version)));
|
|
57
48
|
return true;
|
|
58
49
|
};
|
|
59
|
-
const pinUnspecifiedVersions = (dependencies) =>
|
|
60
|
-
const updates =
|
|
50
|
+
const pinUnspecifiedVersions = async (dependencies) => {
|
|
51
|
+
const updates = await Promise.all(Object.entries(dependencies)
|
|
61
52
|
.filter(([, version]) => version === '*')
|
|
62
|
-
.map(([name]) =>
|
|
63
|
-
const version =
|
|
53
|
+
.map(async ([name]) => {
|
|
54
|
+
const version = await (name === 'skuba'
|
|
64
55
|
? (0, version_1.getSkubaVersion)()
|
|
65
56
|
: (0, latest_version_1.default)(name));
|
|
66
57
|
return [name, version];
|
|
67
|
-
}))
|
|
58
|
+
}));
|
|
68
59
|
updates.forEach(([name, version]) => {
|
|
69
60
|
dependencies[name] = version;
|
|
70
61
|
});
|
|
71
|
-
}
|
|
72
|
-
const analyseDependencies = ({ destinationRoot, include, manifest: { packageJson }, type, }) =>
|
|
73
|
-
var _a, _b;
|
|
62
|
+
};
|
|
63
|
+
const analyseDependencies = async ({ destinationRoot, include, manifest: { packageJson }, type, }) => {
|
|
74
64
|
const input = {
|
|
75
|
-
dependencies:
|
|
76
|
-
devDependencies:
|
|
65
|
+
dependencies: packageJson.dependencies ?? {},
|
|
66
|
+
devDependencies: packageJson.devDependencies ?? {},
|
|
77
67
|
type,
|
|
78
68
|
};
|
|
79
69
|
const output = {
|
|
80
|
-
dependencies:
|
|
81
|
-
devDependencies:
|
|
70
|
+
dependencies: { ...input.dependencies },
|
|
71
|
+
devDependencies: { ...input.devDependencies },
|
|
82
72
|
type,
|
|
83
73
|
};
|
|
84
74
|
const printNotices = (0, package_1.generateNotices)(input);
|
|
@@ -87,7 +77,7 @@ const analyseDependencies = ({ destinationRoot, include, manifest: { packageJson
|
|
|
87
77
|
acc.push(...newProcessors);
|
|
88
78
|
return acc;
|
|
89
79
|
}, []);
|
|
90
|
-
|
|
80
|
+
await Promise.all([
|
|
91
81
|
pinUnspecifiedVersions(output.dependencies),
|
|
92
82
|
pinUnspecifiedVersions(output.devDependencies),
|
|
93
83
|
]);
|
|
@@ -112,19 +102,23 @@ const analyseDependencies = ({ destinationRoot, include, manifest: { packageJson
|
|
|
112
102
|
if (!hasDependencyDiff && !hasDevDependencyDiff) {
|
|
113
103
|
return;
|
|
114
104
|
}
|
|
115
|
-
return () =>
|
|
116
|
-
const updatedPackageJson = (0, package_2.formatPackage)(
|
|
117
|
-
|
|
105
|
+
return async () => {
|
|
106
|
+
const updatedPackageJson = (0, package_2.formatPackage)({
|
|
107
|
+
...packageJson,
|
|
108
|
+
dependencies: output.dependencies,
|
|
109
|
+
devDependencies: output.devDependencies,
|
|
110
|
+
});
|
|
111
|
+
await fs_extra_1.default.promises.writeFile(packageJsonFilepath, updatedPackageJson);
|
|
118
112
|
if (processors.length === 0) {
|
|
119
113
|
return;
|
|
120
114
|
}
|
|
121
|
-
|
|
115
|
+
await (0, copy_1.copyFiles)({
|
|
122
116
|
sourceRoot: destinationRoot,
|
|
123
117
|
destinationRoot,
|
|
124
118
|
include,
|
|
125
119
|
processors,
|
|
126
120
|
});
|
|
127
|
-
}
|
|
128
|
-
}
|
|
121
|
+
};
|
|
122
|
+
};
|
|
129
123
|
exports.analyseDependencies = analyseDependencies;
|
|
130
124
|
//# sourceMappingURL=analyseDependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyseDependencies.js","sourceRoot":"","sources":["../../../src/cli/configure/analyseDependencies.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"analyseDependencies.js","sourceRoot":"","sources":["../../../src/cli/configure/analyseDependencies.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA0B;AAC1B,oEAA2C;AAI3C,2CAA6C;AAC7C,iDAA0C;AAE1C,iDAAsD;AAEtD,gDAAuE;AACvE,mEAAqD;AACrD,kDAAqD;AAGrD,MAAM,OAAO,GAAG,CAAC,IAAoB,EAAW,EAAE;IAChD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAErC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,aAAG,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;QAEvB,OAAO,KAAK,CAAC;KACd;IAED,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACjB,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SACtD,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAC1C,aAAG,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE,aAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CACtD,CAAC;IAEJ,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,KAAK,EAClC,YAAoC,EACrB,EAAE;IACjB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;SACzB,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,GAAG,CAAC;SACxC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE;QACpB,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,KAAK,OAAO;YACrC,CAAC,CAAC,IAAA,yBAAe,GAAE;YACnB,CAAC,CAAC,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC,CAAC;QAEzB,OAAO,CAAC,IAAI,EAAE,OAAO,CAAU,CAAC;IAClC,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;QAClC,YAAY,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AASK,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,eAAe,EACf,OAAO,EACP,QAAQ,EAAE,EAAE,WAAW,EAAE,EACzB,IAAI,GACE,EAA8C,EAAE;IACtD,MAAM,KAAK,GAAG;QACZ,YAAY,EAAE,WAAW,CAAC,YAAY,IAAI,EAAE;QAC5C,eAAe,EAAE,WAAW,CAAC,eAAe,IAAI,EAAE;QAClD,IAAI;KACL,CAAC;IAEF,MAAM,MAAM,GAAG;QACb,YAAY,EAAE,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE;QACvC,eAAe,EAAE,EAAE,GAAG,KAAK,CAAC,eAAe,EAAE;QAC7C,IAAI;KACL,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,yBAAe,EAAC,KAAK,CAAC,CAAC;IAE5C,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CACzD,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACd,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QACrC,GAAG,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;QAC3B,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;IAEF,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,sBAAsB,CAAC,MAAM,CAAC,YAAY,CAAC;QAC3C,sBAAsB,CAAC,MAAM,CAAC,eAAe,CAAC;KAC/C,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAA,0BAAgB,EAAC;QACtC,GAAG,EAAE,KAAK,CAAC,YAAY;QACvB,GAAG,EAAE,MAAM,CAAC,YAAY;KACzB,CAAC,CAAC;IAEH,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,KAAK,CAAC,aAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAErC,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,MAAM,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAElD,MAAM,iBAAiB,GAAG,IAAA,0BAAgB,EAAC;QACzC,GAAG,EAAE,KAAK,CAAC,eAAe;QAC1B,GAAG,EAAE,MAAM,CAAC,eAAe;KAC5B,CAAC,CAAC;IAEH,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,KAAK,CAAC,aAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;IAEzC,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,MAAM,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAExD,YAAY,EAAE,CAAC;IAEf,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IAEvE,IAAI,CAAC,iBAAiB,IAAI,CAAC,oBAAoB,EAAE;QAC/C,OAAO;KACR;IAED,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,kBAAkB,GAAG,IAAA,uBAAa,EAAC;YACvC,GAAG,WAAW;YACd,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;QAEH,MAAM,kBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;QAErE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO;SACR;QAED,MAAM,IAAA,gBAAS,EAAC;YACd,UAAU,EAAE,eAAe;YAC3B,eAAe;YACf,OAAO;YACP,UAAU;SACX,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AApFW,QAAA,mBAAmB,uBAoF9B"}
|
|
@@ -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
|
};
|
|
@@ -16,13 +7,13 @@ exports.tsFileExists = void 0;
|
|
|
16
7
|
const path_1 = __importDefault(require("path"));
|
|
17
8
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
18
9
|
const error_1 = require("../../../utils/error");
|
|
19
|
-
const tsFileExists = (filePath) =>
|
|
10
|
+
const tsFileExists = async (filePath) => {
|
|
20
11
|
const ext = path_1.default.extname(filePath);
|
|
21
12
|
if (ext !== '' && ext !== '.ts') {
|
|
22
13
|
return false;
|
|
23
14
|
}
|
|
24
15
|
try {
|
|
25
|
-
const stats =
|
|
16
|
+
const stats = await fs_extra_1.default.promises.lstat(ext === '' ? `${filePath}.ts` : filePath);
|
|
26
17
|
return stats.isFile();
|
|
27
18
|
}
|
|
28
19
|
catch (err) {
|
|
@@ -31,6 +22,6 @@ const tsFileExists = (filePath) => __awaiter(void 0, void 0, void 0, function* (
|
|
|
31
22
|
}
|
|
32
23
|
throw err;
|
|
33
24
|
}
|
|
34
|
-
}
|
|
25
|
+
};
|
|
35
26
|
exports.tsFileExists = tsFileExists;
|
|
36
27
|
//# sourceMappingURL=files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/files.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/files.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,wDAA0B;AAE1B,gDAAuD;AAEhD,MAAM,YAAY,GAAG,KAAK,EAAE,QAAgB,EAAE,EAAE;IACrD,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEnC,IAAI,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,KAAK,EAAE;QAC/B,OAAO,KAAK,CAAC;KACd;IAED,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,KAAK,CACnC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,KAAK,CAAC,CAAC,CAAC,QAAQ,CACzC,CAAC;QAEF,OAAO,KAAK,CAAC,MAAM,EAAE,CAAC;KACvB;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,IAAA,uBAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE;YAClC,OAAO,KAAK,CAAC;SACd;QAED,MAAM,GAAG,CAAC;KACX;AACH,CAAC,CAAC;AApBW,QAAA,YAAY,gBAoBvB"}
|
|
@@ -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
|
};
|
|
@@ -17,13 +8,13 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
|
17
8
|
const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
|
|
18
9
|
const dir_1 = require("../../../utils/dir");
|
|
19
10
|
const logging_1 = require("../../../utils/logging");
|
|
20
|
-
const auditWorkingTree = (dir) =>
|
|
21
|
-
const filepaths =
|
|
22
|
-
const statuses =
|
|
11
|
+
const auditWorkingTree = async (dir) => {
|
|
12
|
+
const filepaths = await (0, dir_1.crawlDirectory)(dir);
|
|
13
|
+
const statuses = await Promise.all(filepaths.map((filepath) => isomorphic_git_1.default.status({ dir, fs: fs_extra_1.default, filepath })));
|
|
23
14
|
if (statuses.some((status) => status !== 'absent' && status !== 'ignored' && status !== 'unmodified')) {
|
|
24
15
|
logging_1.log.newline();
|
|
25
16
|
logging_1.log.warn('You have dirty/untracked files that may be overwritten.');
|
|
26
17
|
}
|
|
27
|
-
}
|
|
18
|
+
};
|
|
28
19
|
exports.auditWorkingTree = auditWorkingTree;
|
|
29
20
|
//# sourceMappingURL=git.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/git.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/git.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AAEjC,4CAAoD;AACpD,oDAA6C;AAEtC,MAAM,gBAAgB,GAAG,KAAK,EAAE,GAAW,EAAE,EAAE;IACpD,MAAM,SAAS,GAAG,MAAM,IAAA,oBAAc,EAAC,GAAG,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,wBAAG,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,EAAF,kBAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAC/D,CAAC;IAEF,IACE,QAAQ,CAAC,IAAI,CACX,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,YAAY,CACzE,EACD;QACA,aAAG,CAAC,OAAO,EAAE,CAAC;QACd,aAAG,CAAC,IAAI,CAAC,yDAAyD,CAAC,CAAC;KACrE;AACH,CAAC,CAAC;AAhBW,QAAA,gBAAgB,oBAgB3B"}
|
|
@@ -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
|
};
|
|
@@ -16,14 +7,14 @@ exports.generateNotices = exports.diffDependencies = exports.getDestinationManif
|
|
|
16
7
|
const read_pkg_up_1 = __importDefault(require("read-pkg-up"));
|
|
17
8
|
const logging_1 = require("../../../utils/logging");
|
|
18
9
|
const diff_1 = require("./diff");
|
|
19
|
-
const getDestinationManifest = (props) =>
|
|
20
|
-
const result =
|
|
10
|
+
const getDestinationManifest = async (props) => {
|
|
11
|
+
const result = await (0, read_pkg_up_1.default)(props);
|
|
21
12
|
if (result === undefined) {
|
|
22
13
|
logging_1.log.err('Could not find a', logging_1.log.bold('package.json'), 'in your working directory.');
|
|
23
14
|
process.exit(1);
|
|
24
15
|
}
|
|
25
16
|
return result;
|
|
26
|
-
}
|
|
17
|
+
};
|
|
27
18
|
exports.getDestinationManifest = getDestinationManifest;
|
|
28
19
|
const joinVersions = (a, b) => [a, b].filter((v) => v !== undefined).join(' -> ');
|
|
29
20
|
const diffDependencies = (props) => {
|
|
@@ -44,7 +35,10 @@ const diffDependencies = (props) => {
|
|
|
44
35
|
const operation = (0, diff_1.determineOperation)(oldVersion, version);
|
|
45
36
|
return [[name, { operation, version }]];
|
|
46
37
|
}));
|
|
47
|
-
return
|
|
38
|
+
return {
|
|
39
|
+
...deletionsAndModifications,
|
|
40
|
+
...additions,
|
|
41
|
+
};
|
|
48
42
|
};
|
|
49
43
|
exports.diffDependencies = diffDependencies;
|
|
50
44
|
const generateNotices = ({ dependencies, devDependencies, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/package.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,9 +10,9 @@ const dir_1 = require("../../../utils/dir");
|
|
|
19
10
|
const error_1 = require("../../../utils/error");
|
|
20
11
|
const modules_1 = require("../modules");
|
|
21
12
|
const diff_1 = require("./diff");
|
|
22
|
-
const createDestinationFileReader = (root) => (filename) =>
|
|
13
|
+
const createDestinationFileReader = (root) => async (filename) => {
|
|
23
14
|
try {
|
|
24
|
-
return
|
|
15
|
+
return await fs_extra_1.default.promises.readFile(path_1.default.join(root, filename), 'utf8');
|
|
25
16
|
}
|
|
26
17
|
catch (err) {
|
|
27
18
|
if ((0, error_1.isErrorWithCode)(err, 'ENOENT')) {
|
|
@@ -29,29 +20,28 @@ const createDestinationFileReader = (root) => (filename) => __awaiter(void 0, vo
|
|
|
29
20
|
}
|
|
30
21
|
throw err;
|
|
31
22
|
}
|
|
32
|
-
}
|
|
23
|
+
};
|
|
33
24
|
exports.createDestinationFileReader = createDestinationFileReader;
|
|
34
|
-
const loadModuleFiles = (modules, destinationRoot) =>
|
|
25
|
+
const loadModuleFiles = async (modules, destinationRoot) => {
|
|
35
26
|
const readDestinationFile = (0, exports.createDestinationFileReader)(destinationRoot);
|
|
36
|
-
const allFilepaths =
|
|
27
|
+
const allFilepaths = await (0, dir_1.crawlDirectory)(destinationRoot);
|
|
37
28
|
const patterns = [...new Set(modules.flatMap((m) => Object.keys(m)))];
|
|
38
29
|
const patternToFilepaths = (0, dir_1.buildPatternToFilepathMap)(patterns, allFilepaths);
|
|
39
30
|
const matchedFilepaths = [
|
|
40
31
|
...new Set(Object.values(patternToFilepaths).flat()),
|
|
41
32
|
];
|
|
42
|
-
const fileEntries =
|
|
33
|
+
const fileEntries = await Promise.all(matchedFilepaths.map(async (filepath) => [filepath, await readDestinationFile(filepath)]));
|
|
43
34
|
return {
|
|
44
35
|
inputFiles: Object.fromEntries(fileEntries),
|
|
45
36
|
patternToFilepaths,
|
|
46
37
|
};
|
|
47
|
-
}
|
|
38
|
+
};
|
|
48
39
|
const processTextFiles = (modules, inputFiles, patternToFilepaths) => {
|
|
49
|
-
const outputFiles =
|
|
40
|
+
const outputFiles = { ...inputFiles };
|
|
50
41
|
const textProcessorEntries = modules.flatMap((module) => Object.entries(module).flatMap(([pattern, processText]) => {
|
|
51
|
-
var _a;
|
|
52
42
|
// Include the raw pattern along with any matched filepaths.
|
|
53
43
|
// Some modules create a new file at the specified pattern.
|
|
54
|
-
const filepaths = [pattern, ...(
|
|
44
|
+
const filepaths = [pattern, ...(patternToFilepaths[pattern] ?? [])];
|
|
55
45
|
return [...new Set(filepaths)].map((filepath) => [filepath, processText]);
|
|
56
46
|
}));
|
|
57
47
|
for (const [filepath, processText] of textProcessorEntries) {
|
|
@@ -59,9 +49,9 @@ const processTextFiles = (modules, inputFiles, patternToFilepaths) => {
|
|
|
59
49
|
}
|
|
60
50
|
return outputFiles;
|
|
61
51
|
};
|
|
62
|
-
const diffFiles = (opts) =>
|
|
63
|
-
const modules =
|
|
64
|
-
const { inputFiles, patternToFilepaths } = Object.freeze(
|
|
52
|
+
const diffFiles = async (opts) => {
|
|
53
|
+
const modules = await (0, modules_1.loadModules)(opts);
|
|
54
|
+
const { inputFiles, patternToFilepaths } = Object.freeze(await loadModuleFiles(modules, opts.destinationRoot));
|
|
65
55
|
const outputFiles = processTextFiles(modules, inputFiles, patternToFilepaths);
|
|
66
56
|
const diffEntries = Object.entries(outputFiles)
|
|
67
57
|
.filter(([filepath, data]) => inputFiles[filepath] !== data)
|
|
@@ -70,6 +60,6 @@ const diffFiles = (opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
70
60
|
return [filepath, { data, operation }];
|
|
71
61
|
});
|
|
72
62
|
return Object.fromEntries(diffEntries);
|
|
73
|
-
}
|
|
63
|
+
};
|
|
74
64
|
exports.diffFiles = diffFiles;
|
|
75
65
|
//# sourceMappingURL=project.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/project.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/project.ts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
};
|
|
@@ -22,7 +13,7 @@ const template_1 = require("../../utils/template");
|
|
|
22
13
|
const validation_1 = require("../../utils/validation");
|
|
23
14
|
const getConfig_1 = require("../init/getConfig");
|
|
24
15
|
const json_1 = require("./processing/json");
|
|
25
|
-
const ensureTemplateCompletion = ({ destinationRoot, include, manifest, }) =>
|
|
16
|
+
const ensureTemplateCompletion = async ({ destinationRoot, include, manifest, }) => {
|
|
26
17
|
const templateConfig = (0, getConfig_1.getTemplateConfig)(destinationRoot);
|
|
27
18
|
if (templateConfig.fields.length === 0) {
|
|
28
19
|
return templateConfig;
|
|
@@ -31,24 +22,24 @@ const ensureTemplateCompletion = ({ destinationRoot, include, manifest, }) => __
|
|
|
31
22
|
? manifest.packageJson.skuba.template
|
|
32
23
|
: 'template';
|
|
33
24
|
logging_1.log.newline();
|
|
34
|
-
const templateData =
|
|
25
|
+
const templateData = await (0, getConfig_1.runForm)({
|
|
35
26
|
choices: templateConfig.fields,
|
|
36
27
|
message: chalk_1.default.bold(`Complete ${chalk_1.default.cyan(templateName)}:`),
|
|
37
28
|
name: 'customAnswers',
|
|
38
29
|
});
|
|
39
30
|
const updatedPackageJson = (0, json_1.formatObject)(manifest.packageJson);
|
|
40
31
|
const packageJsonFilepath = path_1.default.join(destinationRoot, 'package.json');
|
|
41
|
-
|
|
42
|
-
|
|
32
|
+
await fs_extra_1.default.promises.writeFile(packageJsonFilepath, updatedPackageJson);
|
|
33
|
+
await (0, copy_1.copyFiles)({
|
|
43
34
|
sourceRoot: destinationRoot,
|
|
44
35
|
destinationRoot,
|
|
45
36
|
include,
|
|
46
37
|
processors: [(0, copy_1.createEjsRenderer)(templateData)],
|
|
47
38
|
});
|
|
48
|
-
|
|
39
|
+
await (0, template_1.ensureTemplateConfigDeletion)(destinationRoot);
|
|
49
40
|
logging_1.log.newline();
|
|
50
41
|
logging_1.log.ok('Templating complete!');
|
|
51
42
|
return templateConfig;
|
|
52
|
-
}
|
|
43
|
+
};
|
|
53
44
|
exports.ensureTemplateCompletion = ensureTemplateCompletion;
|
|
54
45
|
//# sourceMappingURL=ensureTemplateCompletion.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureTemplateCompletion.js","sourceRoot":"","sources":["../../../src/cli/configure/ensureTemplateCompletion.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ensureTemplateCompletion.js","sourceRoot":"","sources":["../../../src/cli/configure/ensureTemplateCompletion.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAC1B,wDAA0B;AAG1B,2CAAgE;AAChE,iDAA0C;AAE1C,mDAAoE;AACpE,uDAAuD;AACvD,iDAA+D;AAE/D,4CAAiD;AAQ1C,MAAM,wBAAwB,GAAG,KAAK,EAAE,EAC7C,eAAe,EACf,OAAO,EACP,QAAQ,GACF,EAA2B,EAAE;IACnC,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,YAAY,GAAG,IAAA,0BAAa,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC;QACxE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ;QACrC,CAAC,CAAC,UAAU,CAAC;IAEf,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,MAAM,YAAY,GAAG,MAAM,IAAA,mBAAO,EAAC;QACjC,OAAO,EAAE,cAAc,CAAC,MAAM;QAC9B,OAAO,EAAE,eAAK,CAAC,IAAI,CAAC,YAAY,eAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;QAC5D,IAAI,EAAE,eAAe;KACtB,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAA,mBAAY,EAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,mBAAmB,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IACvE,MAAM,kBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;IAErE,MAAM,IAAA,gBAAS,EAAC;QACd,UAAU,EAAE,eAAe;QAC3B,eAAe;QACf,OAAO;QACP,UAAU,EAAE,CAAC,IAAA,wBAAiB,EAAC,YAAY,CAAC,CAAC;KAC9C,CAAC,CAAC;IAEH,MAAM,IAAA,uCAA4B,EAAC,eAAe,CAAC,CAAC;IAEpD,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC;IAE/B,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAvCW,QAAA,wBAAwB,4BAuCnC"}
|
|
@@ -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
|
};
|
|
@@ -32,12 +23,12 @@ const getEntryPoint = ({ destinationRoot, manifest, templateConfig, type, }) =>
|
|
|
32
23
|
message: 'Entry point:',
|
|
33
24
|
name: 'entryPoint',
|
|
34
25
|
result: (value) => (value.endsWith('.ts') ? value : `${value}.ts`),
|
|
35
|
-
validate: (value) =>
|
|
26
|
+
validate: async (value) => {
|
|
36
27
|
// Support exported function targeting, e.g. `src/module.ts#callMeMaybe`
|
|
37
28
|
const [modulePath] = value.split('#', 2);
|
|
38
|
-
const exists =
|
|
29
|
+
const exists = await (0, files_1.tsFileExists)(path_1.default.join(destinationRoot, modulePath));
|
|
39
30
|
return exists || `${chalk_1.default.bold(value)} is not a TypeScript file.`;
|
|
40
|
-
}
|
|
31
|
+
},
|
|
41
32
|
});
|
|
42
33
|
return entryPointPrompt.run();
|
|
43
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEntryPoint.js","sourceRoot":"","sources":["../../../src/cli/configure/getEntryPoint.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getEntryPoint.js","sourceRoot":"","sources":["../../../src/cli/configure/getEntryPoint.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAC1B,uCAAiC;AAGjC,iDAA0C;AAG1C,uDAAuD;AAEvD,4CAAgD;AAQzC,MAAM,aAAa,GAAG,CAAC,EAC5B,eAAe,EACf,QAAQ,EACR,cAAc,EACd,IAAI,GACE,EAAE,EAAE;IACV,IAAI,IAAA,0BAAa,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE;QAC3D,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC;KAC9C;IAED,IAAI,cAAc,CAAC,UAAU,KAAK,SAAS,EAAE;QAC3C,OAAO,cAAc,CAAC,UAAU,CAAC;KAClC;IAED,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,MAAM,gBAAgB,GAAG,IAAI,gBAAK,CAAC;QACjC,OAAO,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY;QAC3D,OAAO,EAAE,cAAc;QACvB,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC;QAClE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACxB,wEAAwE;YACxE,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAEzC,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAC,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC;YAE1E,OAAO,MAAM,IAAI,GAAG,eAAK,CAAC,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC;QACpE,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,gBAAgB,CAAC,GAAG,EAAE,CAAC;AAChC,CAAC,CAAC;AA/BW,QAAA,aAAa,iBA+BxB"}
|
|
@@ -1,21 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.getProjectType = void 0;
|
|
13
4
|
const enquirer_1 = require("enquirer");
|
|
14
5
|
const logging_1 = require("../../utils/logging");
|
|
15
6
|
const manifest_1 = require("../../utils/manifest");
|
|
16
7
|
const validation_1 = require("../../utils/validation");
|
|
17
|
-
const getProjectType = ({ manifest, templateConfig, }) =>
|
|
18
|
-
var _a;
|
|
8
|
+
const getProjectType = async ({ manifest, templateConfig, }) => {
|
|
19
9
|
if ((0, validation_1.hasProp)(manifest.packageJson.skuba, 'type') &&
|
|
20
10
|
manifest_1.ProjectType.guard(manifest.packageJson.skuba.type)) {
|
|
21
11
|
return manifest.packageJson.skuba.type;
|
|
@@ -23,7 +13,7 @@ const getProjectType = ({ manifest, templateConfig, }) => __awaiter(void 0, void
|
|
|
23
13
|
if (templateConfig.type !== undefined) {
|
|
24
14
|
return templateConfig.type;
|
|
25
15
|
}
|
|
26
|
-
const initial =
|
|
16
|
+
const initial = manifest.packageJson.devDependencies?.['@seek/seek-module-toolkit'] ||
|
|
27
17
|
manifest.packageJson.files
|
|
28
18
|
? 'package'
|
|
29
19
|
: 'application';
|
|
@@ -35,6 +25,6 @@ const getProjectType = ({ manifest, templateConfig, }) => __awaiter(void 0, void
|
|
|
35
25
|
initial,
|
|
36
26
|
});
|
|
37
27
|
return projectTypePrompt.run();
|
|
38
|
-
}
|
|
28
|
+
};
|
|
39
29
|
exports.getProjectType = getProjectType;
|
|
40
30
|
//# sourceMappingURL=getProjectType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getProjectType.js","sourceRoot":"","sources":["../../../src/cli/configure/getProjectType.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getProjectType.js","sourceRoot":"","sources":["../../../src/cli/configure/getProjectType.ts"],"names":[],"mappings":";;;AAAA,uCAAkC;AAGlC,iDAA0C;AAC1C,mDAAkE;AAElE,uDAAiD;AAO1C,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,QAAQ,EACR,cAAc,GACR,EAAwB,EAAE;IAChC,IACE,IAAA,oBAAO,EAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC;QAC3C,sBAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAClD;QACA,OAAO,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;KACxC;IAED,IAAI,cAAc,CAAC,IAAI,KAAK,SAAS,EAAE;QACrC,OAAO,cAAc,CAAC,IAAI,CAAC;KAC5B;IAED,MAAM,OAAO,GACX,QAAQ,CAAC,WAAW,CAAC,eAAe,EAAE,CAAC,2BAA2B,CAAC;QACnE,QAAQ,CAAC,WAAW,CAAC,KAAK;QACxB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,aAAa,CAAC;IAEpB,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,MAAM,iBAAiB,GAAG,IAAI,iBAAM,CAAC;QACnC,OAAO,EAAE,wBAAa;QACtB,OAAO,EAAE,eAAe;QACxB,IAAI,EAAE,aAAa;QACnB,OAAO;KACR,CAAC,CAAC;IAEH,OAAO,iBAAiB,CAAC,GAAG,EAAE,CAAC;AACjC,CAAC,CAAC;AA9BW,QAAA,cAAc,kBA8BzB"}
|