skuba 4.2.0-beta.6 → 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 +3 -12
- 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 -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
package/lib/skuba.js
CHANGED
|
@@ -9,15 +9,6 @@
|
|
|
9
9
|
* [yarn] skuba help
|
|
10
10
|
* ```
|
|
11
11
|
*/
|
|
12
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
13
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
14
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
15
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
16
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
17
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
18
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
19
|
-
});
|
|
20
|
-
};
|
|
21
12
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
22
13
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
23
14
|
};
|
|
@@ -30,7 +21,7 @@ const help_1 = require("./utils/help");
|
|
|
30
21
|
const logging_1 = require("./utils/logging");
|
|
31
22
|
const logo_1 = require("./utils/logo");
|
|
32
23
|
const validation_1 = require("./utils/validation");
|
|
33
|
-
const skuba = () =>
|
|
24
|
+
const skuba = async () => {
|
|
34
25
|
const { commandName } = (0, args_1.parseProcessArgs)(process.argv);
|
|
35
26
|
if (command_1.COMMAND_SET.has(commandName)) {
|
|
36
27
|
const moduleName = (0, command_1.commandToModule)(commandName);
|
|
@@ -45,9 +36,9 @@ const skuba = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
45
36
|
return run();
|
|
46
37
|
}
|
|
47
38
|
logging_1.log.err(logging_1.log.bold(commandName), 'is not recognised as a command.');
|
|
48
|
-
|
|
39
|
+
await (0, logo_1.showLogoAndVersionInfo)();
|
|
49
40
|
(0, help_1.showHelp)();
|
|
50
41
|
process.exitCode = 1;
|
|
51
|
-
}
|
|
42
|
+
};
|
|
52
43
|
skuba().catch(error_1.handleCliError);
|
|
53
44
|
//# sourceMappingURL=skuba.js.map
|
package/lib/skuba.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skuba.js","sourceRoot":"","sources":["../src/skuba.ts"],"names":[],"mappings":";;AAEA;;;;;;;;GAQG
|
|
1
|
+
{"version":3,"file":"skuba.js","sourceRoot":"","sources":["../src/skuba.ts"],"names":[],"mappings":";;AAEA;;;;;;;;GAQG;;;;;AAEH,gDAAwB;AAExB,uCAAgD;AAChD,6CAA4E;AAC5E,yCAA+C;AAC/C,uCAAwC;AACxC,6CAAsC;AACtC,uCAAsD;AACtD,mDAA6C;AAE7C,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;IACvB,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,uBAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvD,IAAI,qBAAW,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;QAChC,MAAM,UAAU,GAAG,IAAA,yBAAe,EAAC,WAAW,CAAC,CAAC;QAEhD,uDAAuD;QACvD,MAAM,aAAa,GAAG,OAAO,CAAC,cAAI,CAAC,IAAI,CACrC,qBAAW,EACX,UAAU,CACX,CAAY,CAAC;QAEd,IAAI,CAAC,IAAA,oBAAO,EAAC,aAAa,EAAE,UAAU,CAAC,EAAE;YACvC,aAAG,CAAC,GAAG,CAAC,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,uCAAuC,CAAC,CAAC;YACxE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;SACR;QAED,MAAM,GAAG,GAAG,aAAa,CAAC,UAAU,CAA2B,CAAC;QAEhE,OAAO,GAAG,EAAE,CAAC;KACd;IAED,aAAG,CAAC,GAAG,CAAC,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,iCAAiC,CAAC,CAAC;IAClE,MAAM,IAAA,6BAAsB,GAAE,CAAC;IAC/B,IAAA,eAAQ,GAAE,CAAC;IAEX,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,KAAK,EAAE,CAAC,KAAK,CAAC,sBAAc,CAAC,CAAC"}
|
package/lib/utils/args.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export declare const hasSerialFlag: (args?: string[], env?: NodeJS.ProcessEnv) =
|
|
|
15
15
|
* ```
|
|
16
16
|
*/
|
|
17
17
|
export declare const parseProcessArgs: (args?: string[]) => {
|
|
18
|
-
commandName: "format" | "node" | "test" | "release" | "build" | "build-package" | "
|
|
18
|
+
commandName: "format" | "node" | "test" | "release" | "build" | "build-package" | "configure" | "help" | "init" | "lint" | "start" | "version";
|
|
19
19
|
args: string[];
|
|
20
20
|
};
|
|
21
21
|
interface RunArgs {
|
package/lib/utils/args.js
CHANGED
|
@@ -8,14 +8,11 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
8
8
|
const command_1 = require("./command");
|
|
9
9
|
const hasDebugFlag = (args = process.argv) => args.some((arg) => arg.toLocaleLowerCase() === '--debug');
|
|
10
10
|
exports.hasDebugFlag = hasDebugFlag;
|
|
11
|
-
const hasSerialFlag = (args = process.argv, env = process.env) =>
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
// Exhausting agents here can cause grief.
|
|
17
|
-
(_a = env.BUILDKITE_AGENT_META_DATA_QUEUE) === null || _a === void 0 ? void 0 : _a.split(',').includes('artefacts:npm'));
|
|
18
|
-
};
|
|
11
|
+
const hasSerialFlag = (args = process.argv, env = process.env) => args.some((arg) => arg.toLocaleLowerCase() === '--serial') ||
|
|
12
|
+
Boolean(
|
|
13
|
+
// Run serially on SEEK's central npm publishing pipeline.
|
|
14
|
+
// Exhausting agents here can cause grief.
|
|
15
|
+
env.BUILDKITE_AGENT_META_DATA_QUEUE?.split(',').includes('artefacts:npm'));
|
|
19
16
|
exports.hasSerialFlag = hasSerialFlag;
|
|
20
17
|
/**
|
|
21
18
|
* Parse process arguments.
|
|
@@ -31,11 +28,10 @@ exports.hasSerialFlag = hasSerialFlag;
|
|
|
31
28
|
* ```
|
|
32
29
|
*/
|
|
33
30
|
const parseProcessArgs = (args = process.argv) => {
|
|
34
|
-
var _a, _b;
|
|
35
31
|
const skubaIdx = args.findIndex((chunk) => /skuba(\.[jt]s)?$/.test(chunk));
|
|
36
32
|
(0, assert_1.default)(skubaIdx >= 0, 'Cannot parse args for `skuba`');
|
|
37
|
-
const rawCommand = (
|
|
38
|
-
const commandName =
|
|
33
|
+
const rawCommand = (args[skubaIdx + 1] ?? 'help').toLocaleLowerCase();
|
|
34
|
+
const commandName = command_1.COMMAND_ALIASES[rawCommand] ?? rawCommand;
|
|
39
35
|
const payload = {
|
|
40
36
|
commandName,
|
|
41
37
|
args: args.slice(skubaIdx + 2),
|
package/lib/utils/args.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/utils/args.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAE5B,uCAA4C;AAErC,MAAM,YAAY,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,EAAE,CAClD,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,SAAS,CAAC,CAAC;AAD/C,QAAA,YAAY,gBACmC;AAErD,MAAM,aAAa,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"args.js","sourceRoot":"","sources":["../../src/utils/args.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/command.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
export declare type Command = typeof COMMAND_LIST[number];
|
|
2
2
|
export declare const COMMAND_ALIASES: Record<string, Command>;
|
|
3
3
|
export declare const COMMAND_DIR: string;
|
|
4
|
-
export declare const COMMAND_LIST: readonly ["build", "build-package", "
|
|
4
|
+
export declare const COMMAND_LIST: readonly ["build", "build-package", "configure", "format", "help", "init", "lint", "node", "release", "start", "test", "version"];
|
|
5
5
|
export declare const COMMAND_SET: Set<string>;
|
|
6
6
|
export declare const commandToModule: (command: Command) => string;
|
package/lib/utils/command.js
CHANGED
package/lib/utils/command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/utils/command.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAIX,QAAA,eAAe,GAA4B;IACtD,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,MAAM;IAChB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;CACvB,CAAC;AAEW,QAAA,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAEhD,QAAA,YAAY,GAAG;IAC1B,OAAO;IACP,eAAe;IACf,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/utils/command.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAIX,QAAA,eAAe,GAA4B;IACtD,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,MAAM;IAChB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;CACvB,CAAC;AAEW,QAAA,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;AAEhD,QAAA,YAAY,GAAG;IAC1B,OAAO;IACP,eAAe;IACf,WAAW;IACX,QAAQ;IACR,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,SAAS;IACT,OAAO;IACP,MAAM;IACN,SAAS;CACD,CAAC;AAEE,QAAA,WAAW,GAAG,IAAI,GAAG,CAAS,oBAAY,CAAC,CAAC;AAElD,MAAM,eAAe,GAAG,CAAC,OAAgB,EAAU,EAAE,CAC1D,OAAO;KACJ,KAAK,CAAC,GAAG,CAAC;KACV,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CACtB,KAAK,KAAK,CAAC;IACT,CAAC,CAAC,OAAO;IACT,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAC3D;KACA,IAAI,CAAC,EAAE,CAAC,CAAC;AARD,QAAA,eAAe,mBAQd"}
|
package/lib/utils/copy.js
CHANGED
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
4
|
};
|
|
@@ -18,14 +9,14 @@ const ejs_1 = __importDefault(require("ejs"));
|
|
|
18
9
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
19
10
|
const error_1 = require("./error");
|
|
20
11
|
const logging_1 = require("./logging");
|
|
21
|
-
const copyFile = (sourcePath, destinationPath, { overwrite = true, processors }) =>
|
|
22
|
-
const oldContents =
|
|
12
|
+
const copyFile = async (sourcePath, destinationPath, { overwrite = true, processors }) => {
|
|
13
|
+
const oldContents = await fs_extra_1.default.promises.readFile(sourcePath, 'utf8');
|
|
23
14
|
const newContents = processors.reduce((contents, process) => process(contents), oldContents);
|
|
24
15
|
if (oldContents === newContents && sourcePath === destinationPath) {
|
|
25
16
|
return;
|
|
26
17
|
}
|
|
27
18
|
try {
|
|
28
|
-
|
|
19
|
+
await fs_extra_1.default.promises.writeFile(destinationPath, newContents, {
|
|
29
20
|
flag: overwrite ? 'w' : 'wx',
|
|
30
21
|
});
|
|
31
22
|
}
|
|
@@ -35,34 +26,34 @@ const copyFile = (sourcePath, destinationPath, { overwrite = true, processors })
|
|
|
35
26
|
}
|
|
36
27
|
throw err;
|
|
37
28
|
}
|
|
38
|
-
}
|
|
29
|
+
};
|
|
39
30
|
const createEjsRenderer = (templateData) => (contents) => ejs_1.default.render(contents, templateData);
|
|
40
31
|
exports.createEjsRenderer = createEjsRenderer;
|
|
41
32
|
const createStringReplacer = (replacements) => (contents) => replacements.reduce((newContents, { input, output }) => newContents.replace(input, output), contents);
|
|
42
33
|
exports.createStringReplacer = createStringReplacer;
|
|
43
|
-
const copyFiles = (opts, currentSourceDir = opts.sourceRoot, currentDestinationDir = opts.destinationRoot) =>
|
|
44
|
-
const filenames =
|
|
34
|
+
const copyFiles = async (opts, currentSourceDir = opts.sourceRoot, currentDestinationDir = opts.destinationRoot) => {
|
|
35
|
+
const filenames = await fs_extra_1.default.promises.readdir(currentSourceDir);
|
|
45
36
|
const toDestinationPath = (filename) => path_1.default.join(currentDestinationDir, opts.stripUnderscorePrefix
|
|
46
37
|
? filename
|
|
47
38
|
.replace(/^_\./, '.')
|
|
48
39
|
.replace(/^_package\.json/, 'package.json')
|
|
49
40
|
: filename);
|
|
50
41
|
const filteredFilenames = filenames.filter((filename) => opts.include(path_1.default.relative(opts.destinationRoot, toDestinationPath(filename))));
|
|
51
|
-
|
|
42
|
+
await Promise.all(filteredFilenames.map(async (filename) => {
|
|
52
43
|
const sourcePath = path_1.default.join(currentSourceDir, filename);
|
|
53
44
|
const destinationPath = toDestinationPath(filename);
|
|
54
45
|
try {
|
|
55
|
-
|
|
46
|
+
await copyFile(sourcePath, destinationPath, opts);
|
|
56
47
|
}
|
|
57
48
|
catch (err) {
|
|
58
49
|
if ((0, error_1.isErrorWithCode)(err, 'EISDIR')) {
|
|
59
|
-
|
|
50
|
+
await fs_extra_1.default.promises.mkdir(destinationPath, { recursive: true });
|
|
60
51
|
return (0, exports.copyFiles)(opts, sourcePath, destinationPath);
|
|
61
52
|
}
|
|
62
53
|
logging_1.log.err('Failed to render', logging_1.log.bold(sourcePath));
|
|
63
54
|
throw err;
|
|
64
55
|
}
|
|
65
|
-
}))
|
|
66
|
-
}
|
|
56
|
+
}));
|
|
57
|
+
};
|
|
67
58
|
exports.copyFiles = copyFiles;
|
|
68
59
|
//# sourceMappingURL=copy.js.map
|
package/lib/utils/copy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../src/utils/copy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"copy.js","sourceRoot":"","sources":["../../src/utils/copy.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/dir.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
|
};
|
|
@@ -37,11 +28,11 @@ exports.buildPatternToFilepathMap = buildPatternToFilepathMap;
|
|
|
37
28
|
* - `.git` subdirectories
|
|
38
29
|
* - `node_modules` subdirectories
|
|
39
30
|
*/
|
|
40
|
-
const crawlDirectory = (root, ignoreFilename = '.gitignore') =>
|
|
41
|
-
const ignoreFileFilter =
|
|
31
|
+
const crawlDirectory = async (root, ignoreFilename = '.gitignore') => {
|
|
32
|
+
const ignoreFileFilter = await (0, exports.createInclusionFilter)([
|
|
42
33
|
path_1.default.join(root, ignoreFilename),
|
|
43
34
|
]);
|
|
44
|
-
const output =
|
|
35
|
+
const output = await new fdir_1.fdir()
|
|
45
36
|
.crawlWithOptions(root, {
|
|
46
37
|
exclude: (dirname) => ['.git', 'node_modules'].includes(dirname),
|
|
47
38
|
filters: [
|
|
@@ -57,16 +48,16 @@ const crawlDirectory = (root, ignoreFilename = '.gitignore') => __awaiter(void 0
|
|
|
57
48
|
const absoluteFilenames = output;
|
|
58
49
|
const relativeFilepaths = absoluteFilenames.map((filepath) => path_1.default.relative(root, filepath));
|
|
59
50
|
return relativeFilepaths;
|
|
60
|
-
}
|
|
51
|
+
};
|
|
61
52
|
exports.crawlDirectory = crawlDirectory;
|
|
62
53
|
/**
|
|
63
54
|
* Create a filter function that excludes filepaths based on ignore files like
|
|
64
55
|
* `.gitignore` and `.prettierignore`.
|
|
65
56
|
*/
|
|
66
|
-
const createInclusionFilter = (ignoreFilepaths) =>
|
|
67
|
-
const ignoreFiles =
|
|
57
|
+
const createInclusionFilter = async (ignoreFilepaths) => {
|
|
58
|
+
const ignoreFiles = await Promise.all(ignoreFilepaths.map(async (ignoreFilepath) => {
|
|
68
59
|
try {
|
|
69
|
-
return
|
|
60
|
+
return await fs_extra_1.default.promises.readFile(ignoreFilepath, 'utf8');
|
|
70
61
|
}
|
|
71
62
|
catch (err) {
|
|
72
63
|
if ((0, error_1.isErrorWithCode)(err, 'ENOENT')) {
|
|
@@ -74,11 +65,11 @@ const createInclusionFilter = (ignoreFilepaths) => __awaiter(void 0, void 0, voi
|
|
|
74
65
|
}
|
|
75
66
|
throw err;
|
|
76
67
|
}
|
|
77
|
-
}))
|
|
68
|
+
}));
|
|
78
69
|
const managers = ignoreFiles
|
|
79
70
|
.filter((value) => typeof value === 'string')
|
|
80
71
|
.map((value) => (0, ignore_1.default)().add(value));
|
|
81
72
|
return (0, ignore_1.default)().add('.git').add(managers).createFilter();
|
|
82
|
-
}
|
|
73
|
+
};
|
|
83
74
|
exports.createInclusionFilter = createInclusionFilter;
|
|
84
75
|
//# sourceMappingURL=dir.js.map
|
package/lib/utils/dir.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dir.js","sourceRoot":"","sources":["../../src/utils/dir.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dir.js","sourceRoot":"","sources":["../../src/utils/dir.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,+BAAoC;AACpC,wDAA0B;AAC1B,oDAA4B;AAC5B,0DAAkC;AAElC,mCAA0C;AAE1C;;GAEG;AACI,MAAM,yBAAyB,GAAG,CACvC,QAAkB,EAClB,YAAsB,EACtB,EAAE,CACF,MAAM,CAAC,WAAW,CAChB,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;IACvB,MAAM,OAAO,GAAG,IAAA,mBAAS,EAAC,OAAO,CAAC,CAAC;IAEnC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEvE,OAAO,CAAC,OAAO,EAAE,SAAS,CAAU,CAAC;AACvC,CAAC,CAAC,CACH,CAAC;AAZS,QAAA,yBAAyB,6BAYlC;AAEJ;;;;;;;;GAQG;AACI,MAAM,cAAc,GAAG,KAAK,EACjC,IAAY,EACZ,cAAc,GAAG,YAAY,EAC7B,EAAE;IACF,MAAM,gBAAgB,GAAG,MAAM,IAAA,6BAAqB,EAAC;QACnD,cAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;KAChC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,IAAI,WAAI,EAAE;SAC5B,gBAAgB,CAAC,IAAI,EAAE;QACtB,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;QAChE,OAAO,EAAE;YACP,CAAC,QAAQ,EAAE,EAAE;gBACX,MAAM,gBAAgB,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAEvD,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;YAC5C,CAAC;SACF;QACD,eAAe,EAAE,IAAI;KACtB,CAAC;SACD,WAAW,EAAE,CAAC;IAEjB,0CAA0C;IAC1C,MAAM,iBAAiB,GAAG,MAAkB,CAAC;IAE7C,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC3D,cAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAC9B,CAAC;IAEF,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AA9BW,QAAA,cAAc,kBA8BzB;AAEF;;;GAGG;AACI,MAAM,qBAAqB,GAAG,KAAK,EAAE,eAAyB,EAAE,EAAE;IACvE,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,GAAG,CACnC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,EAAE,EAAE;QAC3C,IAAI;YACF,OAAO,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;SAC3D;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,IAAA,uBAAe,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE;gBAClC,OAAO;aACR;YAED,MAAM,GAAG,CAAC;SACX;IACH,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,QAAQ,GAAG,WAAW;SACzB,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC;SAC7D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,gBAAM,GAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;IAEvC,OAAO,IAAA,gBAAM,GAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,YAAY,EAAE,CAAC;AAC3D,CAAC,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC"}
|
package/lib/utils/exec.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
|
};
|
|
@@ -55,18 +46,22 @@ const envWithPath = {
|
|
|
55
46
|
PATH: (0, npm_run_path_1.default)({ cwd: __dirname }),
|
|
56
47
|
};
|
|
57
48
|
const runCommand = (command, args, opts) => {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
49
|
+
const subprocess = (0, execa_1.default)(command, args, {
|
|
50
|
+
localDir: __dirname,
|
|
51
|
+
preferLocal: true,
|
|
52
|
+
stdio: 'inherit',
|
|
53
|
+
...opts,
|
|
54
|
+
});
|
|
55
|
+
switch (opts?.streamStdio) {
|
|
61
56
|
case 'yarn':
|
|
62
57
|
const stderrFilter = new YarnWarningFilter();
|
|
63
58
|
const stdoutFilter = new YarnSpamFilter();
|
|
64
|
-
|
|
65
|
-
|
|
59
|
+
subprocess.stderr?.pipe(stderrFilter).pipe(process.stderr);
|
|
60
|
+
subprocess.stdout?.pipe(stdoutFilter).pipe(process.stdout);
|
|
66
61
|
break;
|
|
67
62
|
case true:
|
|
68
|
-
|
|
69
|
-
|
|
63
|
+
subprocess.stderr?.pipe(process.stderr);
|
|
64
|
+
subprocess.stdout?.pipe(process.stdout);
|
|
70
65
|
break;
|
|
71
66
|
}
|
|
72
67
|
return subprocess;
|
|
@@ -77,16 +72,17 @@ const createExec = (opts) => (command, ...args) => runCommand(command, args, opt
|
|
|
77
72
|
exports.createExec = createExec;
|
|
78
73
|
const exec = (command, ...args) => runCommand(command, args);
|
|
79
74
|
exports.exec = exec;
|
|
80
|
-
const execConcurrently = (commands, { maxProcesses, nameLength, outputStream } = {}) =>
|
|
81
|
-
const maxNameLength = nameLength
|
|
75
|
+
const execConcurrently = async (commands, { maxProcesses, nameLength, outputStream } = {}) => {
|
|
76
|
+
const maxNameLength = nameLength ??
|
|
77
|
+
commands.reduce((length, command) => Math.max(length, command.name.length), 0);
|
|
82
78
|
try {
|
|
83
|
-
|
|
79
|
+
await (0, concurrently_1.default)(commands.map(({ command, name, prefixColor }) => ({
|
|
84
80
|
command,
|
|
85
81
|
env: envWithPath,
|
|
86
82
|
name: name.padEnd(maxNameLength),
|
|
87
83
|
prefixColor,
|
|
88
84
|
})), {
|
|
89
|
-
maxProcesses: maxProcesses
|
|
85
|
+
maxProcesses: maxProcesses ?? (0, os_1.cpus)().length,
|
|
90
86
|
outputStream,
|
|
91
87
|
// Use a minimalist logging prefix.
|
|
92
88
|
prefix: '{name} │',
|
|
@@ -103,25 +99,25 @@ const execConcurrently = (commands, { maxProcesses, nameLength, outputStream } =
|
|
|
103
99
|
.map((subprocess) => subprocess.command.name);
|
|
104
100
|
throw Error(`${failed.join(', ')} subprocess${failed.length === 1 ? '' : 'es'} failed.`);
|
|
105
101
|
}
|
|
106
|
-
}
|
|
102
|
+
};
|
|
107
103
|
exports.execConcurrently = execConcurrently;
|
|
108
|
-
const ensureCommands = (...names) =>
|
|
104
|
+
const ensureCommands = async (...names) => {
|
|
109
105
|
let success = true;
|
|
110
|
-
|
|
111
|
-
const result =
|
|
106
|
+
await Promise.all(names.map(async (name) => {
|
|
107
|
+
const result = await (0, exports.hasCommand)(name);
|
|
112
108
|
if (!result) {
|
|
113
109
|
success = false;
|
|
114
110
|
logging_1.log.err(logging_1.log.bold(name), 'needs to be installed.');
|
|
115
111
|
}
|
|
116
|
-
}))
|
|
112
|
+
}));
|
|
117
113
|
if (!success) {
|
|
118
114
|
process.exit(1);
|
|
119
115
|
}
|
|
120
|
-
}
|
|
116
|
+
};
|
|
121
117
|
exports.ensureCommands = ensureCommands;
|
|
122
|
-
const hasCommand = (name) =>
|
|
118
|
+
const hasCommand = async (name) => {
|
|
123
119
|
try {
|
|
124
|
-
|
|
120
|
+
await which(name);
|
|
125
121
|
return true;
|
|
126
122
|
}
|
|
127
123
|
catch (err) {
|
|
@@ -130,6 +126,6 @@ const hasCommand = (name) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
130
126
|
}
|
|
131
127
|
throw err;
|
|
132
128
|
}
|
|
133
|
-
}
|
|
129
|
+
};
|
|
134
130
|
exports.hasCommand = hasCommand;
|
|
135
131
|
//# sourceMappingURL=exec.js.map
|
package/lib/utils/exec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"exec.js","sourceRoot":"","sources":["../../src/utils/exec.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/logo.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
|
};
|
|
@@ -23,11 +14,10 @@ const LOGO = chalk_1.default.blueBright(`
|
|
|
23
14
|
│_ ─┤ <${chalk_1.default.magentaBright('│ ╵ │')} • │ • │
|
|
24
15
|
╰───╰─┴─${chalk_1.default.magentaBright('╰───╯')}───╯── ╰
|
|
25
16
|
`);
|
|
26
|
-
const showLogoAndVersionInfo = () =>
|
|
27
|
-
|
|
28
|
-
const versionInfo = yield (0, version_1.getSkubaVersionInfo)();
|
|
17
|
+
const showLogoAndVersionInfo = async () => {
|
|
18
|
+
const versionInfo = await (0, version_1.getSkubaVersionInfo)();
|
|
29
19
|
logging_1.log.plain(LOGO);
|
|
30
|
-
logging_1.log.subtle(logging_1.log.bold(versionInfo.local), '|', 'latest', logging_1.log.bold(
|
|
20
|
+
logging_1.log.subtle(logging_1.log.bold(versionInfo.local), '|', 'latest', logging_1.log.bold(versionInfo.latest ?? 'offline ✈'));
|
|
31
21
|
logging_1.log.newline();
|
|
32
22
|
if (versionInfo.isStale) {
|
|
33
23
|
logging_1.log.warn('Your skuba installation is out of date.');
|
|
@@ -37,6 +27,6 @@ const showLogoAndVersionInfo = () => __awaiter(void 0, void 0, void 0, function*
|
|
|
37
27
|
logging_1.log.newline();
|
|
38
28
|
}
|
|
39
29
|
return versionInfo;
|
|
40
|
-
}
|
|
30
|
+
};
|
|
41
31
|
exports.showLogoAndVersionInfo = showLogoAndVersionInfo;
|
|
42
32
|
//# sourceMappingURL=logo.js.map
|
package/lib/utils/logo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logo.js","sourceRoot":"","sources":["../../src/utils/logo.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logo.js","sourceRoot":"","sources":["../../src/utils/logo.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,kFAAwD;AAExD,uCAAgC;AAChC,uCAAgD;AAEhD,MAAM,IAAI,GAAG,eAAK,CAAC,UAAU,CAAC;UACpB,eAAK,CAAC,aAAa,CAAC,MAAM,CAAC;UAC3B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;UAC5B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;UAC5B,eAAK,CAAC,aAAa,CAAC,OAAO,CAAC;CACrC,CAAC,CAAC;AAEI,MAAM,sBAAsB,GAAG,KAAK,IAAI,EAAE;IAC/C,MAAM,WAAW,GAAG,MAAM,IAAA,6BAAmB,GAAE,CAAC;IAEhD,aAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChB,aAAG,CAAC,MAAM,CACR,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAC3B,GAAG,EACH,QAAQ,EACR,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,WAAW,CAAC,CAC5C,CAAC;IACF,aAAG,CAAC,OAAO,EAAE,CAAC;IAEd,IAAI,WAAW,CAAC,OAAO,EAAE;QACvB,aAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;QACpD,aAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAChC,aAAG,CAAC,OAAO,EAAE,CAAC;QACd,aAAG,CAAC,IAAI,CACN,aAAG,CAAC,IAAI,CACN,MAAM,EACN,GAAG,CAAC,+BAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAC1C,SAAS,EACT,SAAS,WAAW,CAAC,MAAM,EAAE,CAC9B,CACF,CAAC;QACF,aAAG,CAAC,OAAO,EAAE,CAAC;KACf;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AA5BW,QAAA,sBAAsB,0BA4BjC"}
|
package/lib/utils/manifest.js
CHANGED
|
@@ -23,15 +23,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
23
23
|
__setModuleDefault(result, mod);
|
|
24
24
|
return result;
|
|
25
25
|
};
|
|
26
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
27
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
28
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
29
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
30
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
31
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
32
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
33
|
-
});
|
|
34
|
-
};
|
|
35
26
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
27
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
28
|
};
|
|
@@ -44,25 +35,25 @@ exports.ProjectType = t.Union(t.Literal('application'), t.Literal('package'));
|
|
|
44
35
|
exports.PROJECT_TYPES = ['application', 'package'];
|
|
45
36
|
const DEFAULT_ENTRY_POINT = 'src/app.ts';
|
|
46
37
|
let skubaManifest;
|
|
47
|
-
const getSkubaManifest = () =>
|
|
38
|
+
const getSkubaManifest = async () => {
|
|
48
39
|
if (skubaManifest !== undefined) {
|
|
49
40
|
return skubaManifest;
|
|
50
41
|
}
|
|
51
|
-
const result =
|
|
42
|
+
const result = await (0, read_pkg_up_1.default)({ cwd: __dirname });
|
|
52
43
|
if (result === undefined) {
|
|
53
44
|
throw Error('skuba could not find its own manifest');
|
|
54
45
|
}
|
|
55
46
|
return (skubaManifest = result.packageJson);
|
|
56
|
-
}
|
|
47
|
+
};
|
|
57
48
|
exports.getSkubaManifest = getSkubaManifest;
|
|
58
49
|
const getConsumerManifest = () => (0, read_pkg_up_1.default)();
|
|
59
50
|
exports.getConsumerManifest = getConsumerManifest;
|
|
60
|
-
const getEntryPointFromManifest = () =>
|
|
61
|
-
const result =
|
|
51
|
+
const getEntryPointFromManifest = async () => {
|
|
52
|
+
const result = await (0, exports.getConsumerManifest)();
|
|
62
53
|
return result !== undefined &&
|
|
63
54
|
(0, validation_1.hasStringProp)(result.packageJson.skuba, 'entryPoint')
|
|
64
55
|
? result.packageJson.skuba.entryPoint
|
|
65
56
|
: DEFAULT_ENTRY_POINT;
|
|
66
|
-
}
|
|
57
|
+
};
|
|
67
58
|
exports.getEntryPointFromManifest = getEntryPointFromManifest;
|
|
68
59
|
//# sourceMappingURL=manifest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/utils/manifest.ts"],"names":[],"mappings":";AAAA,4BAA4B
|
|
1
|
+
{"version":3,"file":"manifest.js","sourceRoot":"","sources":["../../src/utils/manifest.ts"],"names":[],"mappings":";AAAA,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAG5B,8DAAoC;AACpC,4CAA8B;AAE9B,6CAA6C;AAIhC,QAAA,WAAW,GAAG,CAAC,CAAC,KAAK,CAChC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EACxB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CACrB,CAAC;AAEW,QAAA,aAAa,GAAG,CAAC,aAAa,EAAE,SAAS,CAAU,CAAC;AAEjE,MAAM,mBAAmB,GAAG,YAAY,CAAC;AAEzC,IAAI,aAAgD,CAAC;AAE9C,MAAM,gBAAgB,GAAG,KAAK,IAAoC,EAAE;IACzE,IAAI,aAAa,KAAK,SAAS,EAAE;QAC/B,OAAO,aAAa,CAAC;KACtB;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAS,EAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;IAEnD,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,MAAM,KAAK,CAAC,uCAAuC,CAAC,CAAC;KACtD;IAED,OAAO,CAAC,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC,CAAC;AAZW,QAAA,gBAAgB,oBAY3B;AAEK,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,IAAA,qBAAS,GAAE,CAAC;AAAxC,QAAA,mBAAmB,uBAAqB;AAE9C,MAAM,yBAAyB,GAAG,KAAK,IAAI,EAAE;IAClD,MAAM,MAAM,GAAG,MAAM,IAAA,2BAAmB,GAAE,CAAC;IAE3C,OAAO,MAAM,KAAK,SAAS;QACzB,IAAA,0BAAa,EAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC;QACrD,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,UAAU;QACrC,CAAC,CAAC,mBAAmB,CAAC;AAC1B,CAAC,CAAC;AAPW,QAAA,yBAAyB,6BAOpC"}
|
package/lib/utils/version.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
|
};
|
|
@@ -16,23 +7,23 @@ exports.getSkubaVersionInfo = exports.getSkubaVersion = void 0;
|
|
|
16
7
|
const latest_version_1 = __importDefault(require("latest-version"));
|
|
17
8
|
const manifest_1 = require("./manifest");
|
|
18
9
|
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
19
|
-
const latestSkubaVersion = () =>
|
|
10
|
+
const latestSkubaVersion = async () => {
|
|
20
11
|
try {
|
|
21
12
|
// Don't pull an Apple; bail out before holding up the command for too long
|
|
22
|
-
const result =
|
|
13
|
+
const result = await Promise.race([(0, latest_version_1.default)('skuba'), sleep(2000)]);
|
|
23
14
|
return typeof result === 'string' ? result : null;
|
|
24
15
|
}
|
|
25
|
-
catch
|
|
16
|
+
catch {
|
|
26
17
|
return null;
|
|
27
18
|
}
|
|
28
|
-
}
|
|
29
|
-
const getSkubaVersion = () =>
|
|
30
|
-
const { version } =
|
|
19
|
+
};
|
|
20
|
+
const getSkubaVersion = async () => {
|
|
21
|
+
const { version } = await (0, manifest_1.getSkubaManifest)();
|
|
31
22
|
return version;
|
|
32
|
-
}
|
|
23
|
+
};
|
|
33
24
|
exports.getSkubaVersion = getSkubaVersion;
|
|
34
|
-
const getSkubaVersionInfo = () =>
|
|
35
|
-
const [local, latest] =
|
|
25
|
+
const getSkubaVersionInfo = async () => {
|
|
26
|
+
const [local, latest] = await Promise.all([
|
|
36
27
|
(0, exports.getSkubaVersion)(),
|
|
37
28
|
latestSkubaVersion(),
|
|
38
29
|
]);
|
|
@@ -49,6 +40,6 @@ const getSkubaVersionInfo = () => __awaiter(void 0, void 0, void 0, function* ()
|
|
|
49
40
|
local,
|
|
50
41
|
latest,
|
|
51
42
|
};
|
|
52
|
-
}
|
|
43
|
+
};
|
|
53
44
|
exports.getSkubaVersionInfo = getSkubaVersionInfo;
|
|
54
45
|
//# sourceMappingURL=version.js.map
|
package/lib/utils/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;AAAA,oEAA2C;AAE3C,yCAA8C;AAE9C,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAC3B,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAE1D,MAAM,kBAAkB,GAAG,KAAK,IAA4B,EAAE;IAC5D,IAAI;QACF,2EAA2E;QAC3E,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,IAAA,wBAAa,EAAC,OAAO,CAAC,EAAE,KAAK,CAAC,IAAK,CAAC,CAAC,CAAC,CAAC;QAE1E,OAAO,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;KACnD;IAAC,MAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,KAAK,IAAqB,EAAE;IACzD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAgB,GAAE,CAAC;IAE7C,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B;AAgBK,MAAM,mBAAmB,GAAG,KAAK,IAA+B,EAAE;IACvE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACxC,IAAA,uBAAe,GAAE;QACjB,kBAAkB,EAAE;KACrB,CAAC,CAAC;IAEH,IAAI,MAAM,KAAK,IAAI,EAAE;QACnB,6DAA6D;QAC7D,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK;YACL,MAAM;SACP,CAAC;KACH;IAED,OAAO;QACL,OAAO,EAAE,MAAM,KAAK,KAAK;QACzB,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}
|