skuba 4.0.0 → 4.2.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/git/commitAllChanges.d.ts +1 -1
- package/lib/api/git/commitAllChanges.js +4 -1
- package/lib/api/git/commitAllChanges.js.map +1 -1
- package/lib/api/git/currentBranch.d.ts +10 -0
- package/lib/api/git/currentBranch.js +41 -0
- package/lib/api/git/currentBranch.js.map +1 -0
- package/lib/api/git/index.d.ts +2 -1
- package/lib/api/git/index.js +4 -1
- package/lib/api/git/index.js.map +1 -1
- package/lib/api/git/log.d.ts +9 -2
- package/lib/api/git/log.js +24 -5
- package/lib/api/git/log.js.map +1 -1
- package/lib/api/git/remote.d.ts +4 -2
- package/lib/api/git/remote.js +22 -5
- package/lib/api/git/remote.js.map +1 -1
- package/lib/api/github/environment.d.ts +0 -4
- package/lib/api/github/environment.js +3 -7
- package/lib/api/github/environment.js.map +1 -1
- package/lib/cli/adapter/eslint.js +16 -1
- package/lib/cli/adapter/eslint.js.map +1 -1
- package/lib/cli/configure/analysis/package.js +1 -1
- package/lib/cli/configure/analysis/package.js.map +1 -1
- package/lib/cli/configure/modules/package.js +1 -1
- package/lib/cli/configure/modules/package.js.map +1 -1
- package/lib/cli/configure/processing/package.d.ts +1 -0
- package/lib/cli/format.js +3 -2
- package/lib/cli/format.js.map +1 -1
- package/lib/cli/init/git.d.ts +0 -1
- package/lib/cli/init/git.js +1 -11
- package/lib/cli/init/git.js.map +1 -1
- package/lib/cli/init/index.js +7 -3
- package/lib/cli/init/index.js.map +1 -1
- package/lib/cli/lint/autofix.d.ts +2 -0
- package/lib/cli/lint/autofix.js +114 -0
- package/lib/cli/lint/autofix.js.map +1 -0
- package/lib/cli/lint/external.js +6 -0
- package/lib/cli/lint/external.js.map +1 -1
- package/lib/cli/node.js +5 -2
- package/lib/cli/node.js.map +1 -1
- package/lib/cli/start.js +3 -4
- package/lib/cli/start.js.map +1 -1
- package/lib/utils/env.d.ts +5 -0
- package/lib/utils/env.js +9 -0
- package/lib/utils/env.js.map +1 -0
- package/package.json +78 -64
- package/template/base/jest.config.ts +6 -0
- package/template/express-rest-api/.buildkite/pipeline.yml +13 -22
- package/template/express-rest-api/.env +1 -0
- package/template/express-rest-api/docker-compose.yml +3 -1
- package/template/express-rest-api/gantry.apply.yml +2 -0
- package/template/express-rest-api/gantry.build.yml +2 -1
- package/template/express-rest-api/package.json +2 -2
- package/template/greeter/.buildkite/pipeline.yml +4 -9
- package/template/greeter/docker-compose.yml +3 -1
- package/template/greeter/package.json +2 -2
- package/template/koa-rest-api/.buildkite/pipeline.yml +13 -22
- package/template/koa-rest-api/.env +1 -0
- package/template/koa-rest-api/docker-compose.yml +3 -1
- package/template/koa-rest-api/gantry.apply.yml +2 -0
- package/template/koa-rest-api/gantry.build.yml +2 -1
- package/template/koa-rest-api/package.json +3 -3
- package/template/lambda-sqs-worker/.buildkite/pipeline.yml +16 -22
- package/template/lambda-sqs-worker/.env +1 -0
- package/template/lambda-sqs-worker/docker-compose.yml +3 -1
- package/template/lambda-sqs-worker/package.json +2 -2
- package/template/lambda-sqs-worker/serverless.yml +6 -11
- package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +14 -20
- package/template/lambda-sqs-worker-cdk/cdk.json +3 -3
- package/template/lambda-sqs-worker-cdk/docker-compose.yml +3 -1
- package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +2 -0
- package/template/lambda-sqs-worker-cdk/infra/appStack.ts +1 -0
- package/template/lambda-sqs-worker-cdk/package.json +1 -1
- package/template/private-npm-package/.buildkite/pipeline.yml +3 -2
|
@@ -8,5 +8,5 @@ interface CommitAllParameters {
|
|
|
8
8
|
/**
|
|
9
9
|
* Stages all changes and writes a commit to the local Git repository.
|
|
10
10
|
*/
|
|
11
|
-
export declare const commitAllChanges: ({ dir, message, author, committer, }: CommitAllParameters) => Promise<
|
|
11
|
+
export declare const commitAllChanges: ({ dir, message, author, committer, }: CommitAllParameters) => Promise<string | undefined>;
|
|
12
12
|
export {};
|
|
@@ -22,10 +22,13 @@ const getChangedFiles_1 = require("./getChangedFiles");
|
|
|
22
22
|
*/
|
|
23
23
|
const commitAllChanges = ({ dir, message, author, committer, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
24
|
const changedFiles = yield (0, getChangedFiles_1.getChangedFiles)({ dir });
|
|
25
|
+
if (!changedFiles.length) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
25
28
|
yield Promise.all(changedFiles.map((file) => file.state === 'deleted'
|
|
26
29
|
? isomorphic_git_1.default.remove({ fs: fs_extra_1.default, dir, filepath: file.path })
|
|
27
30
|
: isomorphic_git_1.default.add({ fs: fs_extra_1.default, dir, filepath: file.path })));
|
|
28
|
-
|
|
31
|
+
return (0, commit_1.commit)({
|
|
29
32
|
dir,
|
|
30
33
|
message,
|
|
31
34
|
author,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commitAllChanges.js","sourceRoot":"","sources":["../../../src/api/git/commitAllChanges.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AAEjC,qCAAkC;AAElC,uDAAoD;AASpD;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAO,EACrC,GAAG,EACH,OAAO,EACP,MAAM,EACN,SAAS,GACW,
|
|
1
|
+
{"version":3,"file":"commitAllChanges.js","sourceRoot":"","sources":["../../../src/api/git/commitAllChanges.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AAEjC,qCAAkC;AAElC,uDAAoD;AASpD;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAO,EACrC,GAAG,EACH,OAAO,EACP,MAAM,EACN,SAAS,GACW,EAA+B,EAAE;IACrD,MAAM,YAAY,GAAG,MAAM,IAAA,iCAAe,EAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAEpD,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,OAAO;KACR;IAED,MAAM,OAAO,CAAC,GAAG,CACf,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACxB,IAAI,CAAC,KAAK,KAAK,SAAS;QACtB,CAAC,CAAC,wBAAG,CAAC,MAAM,CAAC,EAAE,EAAE,EAAF,kBAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QAC9C,CAAC,CAAC,wBAAG,CAAC,GAAG,CAAC,EAAE,EAAE,EAAF,kBAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAC9C,CACF,CAAC;IAEF,OAAO,IAAA,eAAM,EAAC;QACZ,GAAG;QACH,OAAO;QACP,MAAM;QACN,SAAS;KACV,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AA1BW,QAAA,gBAAgB,oBA0B3B"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
interface CurrentBranchParameters {
|
|
2
|
+
dir?: string;
|
|
3
|
+
env?: Record<string, string | undefined>;
|
|
4
|
+
}
|
|
5
|
+
/**
|
|
6
|
+
* Tries to return a Git branch name from CI environment variables, falling back
|
|
7
|
+
* to the local Git repository when the current working `dir` is supplied.
|
|
8
|
+
*/
|
|
9
|
+
export declare const currentBranch: ({ dir, env, }?: CurrentBranchParameters) => Promise<string | undefined>;
|
|
10
|
+
export {};
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.currentBranch = void 0;
|
|
16
|
+
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
17
|
+
const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
|
|
18
|
+
/**
|
|
19
|
+
* Tries to return a Git branch name from CI environment variables.
|
|
20
|
+
*/
|
|
21
|
+
const currentBranchFromEnvironment = (env = process.env) => { var _a, _b; return (_b = (_a = env.BUILDKITE_BRANCH) !== null && _a !== void 0 ? _a : env.GITHUB_HEAD_REF) !== null && _b !== void 0 ? _b : env.GITHUB_REF_NAME; };
|
|
22
|
+
/**
|
|
23
|
+
* Tries to return a Git branch name from CI environment variables, falling back
|
|
24
|
+
* to the local Git repository when the current working `dir` is supplied.
|
|
25
|
+
*/
|
|
26
|
+
const currentBranch = ({ dir, env = process.env, } = {}) => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
|
+
const fromEnv = currentBranchFromEnvironment(env);
|
|
28
|
+
if (fromEnv) {
|
|
29
|
+
return fromEnv;
|
|
30
|
+
}
|
|
31
|
+
if (!dir) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const fromRepo = yield isomorphic_git_1.default.currentBranch({
|
|
35
|
+
dir,
|
|
36
|
+
fs: fs_extra_1.default,
|
|
37
|
+
});
|
|
38
|
+
return fromRepo !== null && fromRepo !== void 0 ? fromRepo : undefined;
|
|
39
|
+
});
|
|
40
|
+
exports.currentBranch = currentBranch;
|
|
41
|
+
//# sourceMappingURL=currentBranch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"currentBranch.js","sourceRoot":"","sources":["../../../src/api/git/currentBranch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AAEjC;;GAEG;AACH,MAAM,4BAA4B,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAsB,EAAE,eAC7E,OAAA,MAAA,MAAA,GAAG,CAAC,gBAAgB,mCAAI,GAAG,CAAC,eAAe,mCAAI,GAAG,CAAC,eAAe,CAAA,EAAA,CAAC;AAOrE;;;GAGG;AACI,MAAM,aAAa,GAAG,CAAO,EAClC,GAAG,EACH,GAAG,GAAG,OAAO,CAAC,GAAG,MACU,EAAE,EAA+B,EAAE;IAC9D,MAAM,OAAO,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC;IAElD,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC;KAChB;IAED,IAAI,CAAC,GAAG,EAAE;QACR,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,MAAM,wBAAG,CAAC,aAAa,CAAC;QACvC,GAAG;QACH,EAAE,EAAF,kBAAE;KACH,CAAC,CAAC;IAEH,OAAO,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,SAAS,CAAC;AAC/B,CAAC,CAAA,CAAC;AApBW,QAAA,aAAa,iBAoBxB"}
|
package/lib/api/git/index.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export { commit } from './commit';
|
|
2
2
|
export { commitAllChanges } from './commitAllChanges';
|
|
3
|
+
export { currentBranch } from './currentBranch';
|
|
3
4
|
export { getChangedFiles } from './getChangedFiles';
|
|
4
|
-
export { getHeadCommitId } from './log';
|
|
5
|
+
export { getHeadCommitId, getHeadCommitMessage } from './log';
|
|
5
6
|
export { getOwnerAndRepo } from './remote';
|
|
6
7
|
export { push } from './push';
|
|
7
8
|
export { reset } from './reset';
|
package/lib/api/git/index.js
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.reset = exports.push = exports.getOwnerAndRepo = exports.getHeadCommitId = exports.getChangedFiles = exports.commitAllChanges = exports.commit = void 0;
|
|
3
|
+
exports.reset = exports.push = exports.getOwnerAndRepo = exports.getHeadCommitMessage = exports.getHeadCommitId = exports.getChangedFiles = exports.currentBranch = exports.commitAllChanges = exports.commit = void 0;
|
|
4
4
|
var commit_1 = require("./commit");
|
|
5
5
|
Object.defineProperty(exports, "commit", { enumerable: true, get: function () { return commit_1.commit; } });
|
|
6
6
|
var commitAllChanges_1 = require("./commitAllChanges");
|
|
7
7
|
Object.defineProperty(exports, "commitAllChanges", { enumerable: true, get: function () { return commitAllChanges_1.commitAllChanges; } });
|
|
8
|
+
var currentBranch_1 = require("./currentBranch");
|
|
9
|
+
Object.defineProperty(exports, "currentBranch", { enumerable: true, get: function () { return currentBranch_1.currentBranch; } });
|
|
8
10
|
var getChangedFiles_1 = require("./getChangedFiles");
|
|
9
11
|
Object.defineProperty(exports, "getChangedFiles", { enumerable: true, get: function () { return getChangedFiles_1.getChangedFiles; } });
|
|
10
12
|
var log_1 = require("./log");
|
|
11
13
|
Object.defineProperty(exports, "getHeadCommitId", { enumerable: true, get: function () { return log_1.getHeadCommitId; } });
|
|
14
|
+
Object.defineProperty(exports, "getHeadCommitMessage", { enumerable: true, get: function () { return log_1.getHeadCommitMessage; } });
|
|
12
15
|
var remote_1 = require("./remote");
|
|
13
16
|
Object.defineProperty(exports, "getOwnerAndRepo", { enumerable: true, get: function () { return remote_1.getOwnerAndRepo; } });
|
|
14
17
|
var push_1 = require("./push");
|
package/lib/api/git/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/git/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA;AACf,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/git/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA;AACf,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,6BAA8D;AAArD,sGAAA,eAAe,OAAA;AAAE,2GAAA,oBAAoB,OAAA;AAC9C,mCAA2C;AAAlC,yGAAA,eAAe,OAAA;AACxB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,iCAAgC;AAAvB,8FAAA,KAAK,OAAA"}
|
package/lib/api/git/log.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
interface
|
|
1
|
+
interface GetHeadCommitParameters {
|
|
2
2
|
dir: string;
|
|
3
3
|
env?: Record<string, string | undefined>;
|
|
4
4
|
}
|
|
@@ -8,5 +8,12 @@ interface GetHeadCommitIdParameters {
|
|
|
8
8
|
* This tries to extract the commit ID from common CI environment variables,
|
|
9
9
|
* and falls back to the local Git repository log.
|
|
10
10
|
*/
|
|
11
|
-
export declare const getHeadCommitId: ({ dir, env, }:
|
|
11
|
+
export declare const getHeadCommitId: ({ dir, env, }: GetHeadCommitParameters) => Promise<string>;
|
|
12
|
+
/**
|
|
13
|
+
* Gets the message of the head commit.
|
|
14
|
+
*
|
|
15
|
+
* This tries to extract the message from common CI environment variables,
|
|
16
|
+
* and falls back to the local Git repository log.
|
|
17
|
+
*/
|
|
18
|
+
export declare const getHeadCommitMessage: ({ dir, env, }: GetHeadCommitParameters) => Promise<string>;
|
|
12
19
|
export {};
|
package/lib/api/git/log.js
CHANGED
|
@@ -12,9 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getHeadCommitId = void 0;
|
|
15
|
+
exports.getHeadCommitMessage = exports.getHeadCommitId = void 0;
|
|
16
16
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
17
17
|
const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
|
|
18
|
+
const EMPTY_GIT_LOG_ERROR = new Error('Git log does not contain any commits');
|
|
18
19
|
/**
|
|
19
20
|
* Gets the object ID of the head commit.
|
|
20
21
|
*
|
|
@@ -27,11 +28,29 @@ const getHeadCommitId = ({ dir, env = process.env, }) => __awaiter(void 0, void
|
|
|
27
28
|
if (oidFromEnv) {
|
|
28
29
|
return oidFromEnv;
|
|
29
30
|
}
|
|
30
|
-
const [
|
|
31
|
-
if (!
|
|
32
|
-
throw
|
|
31
|
+
const [headResult] = yield isomorphic_git_1.default.log({ depth: 1, dir, fs: fs_extra_1.default });
|
|
32
|
+
if (!headResult) {
|
|
33
|
+
throw EMPTY_GIT_LOG_ERROR;
|
|
33
34
|
}
|
|
34
|
-
return
|
|
35
|
+
return headResult.oid;
|
|
35
36
|
});
|
|
36
37
|
exports.getHeadCommitId = getHeadCommitId;
|
|
38
|
+
/**
|
|
39
|
+
* Gets the message of the head commit.
|
|
40
|
+
*
|
|
41
|
+
* This tries to extract the message from common CI environment variables,
|
|
42
|
+
* and falls back to the local Git repository log.
|
|
43
|
+
*/
|
|
44
|
+
const getHeadCommitMessage = ({ dir, env = process.env, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
|
+
const messageFromEnv = env.BUILDKITE_MESSAGE;
|
|
46
|
+
if (messageFromEnv) {
|
|
47
|
+
return messageFromEnv;
|
|
48
|
+
}
|
|
49
|
+
const [headResult] = yield isomorphic_git_1.default.log({ depth: 1, dir, fs: fs_extra_1.default });
|
|
50
|
+
if (!headResult) {
|
|
51
|
+
throw EMPTY_GIT_LOG_ERROR;
|
|
52
|
+
}
|
|
53
|
+
return headResult.commit.message;
|
|
54
|
+
});
|
|
55
|
+
exports.getHeadCommitMessage = getHeadCommitMessage;
|
|
37
56
|
//# sourceMappingURL=log.js.map
|
package/lib/api/git/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/api/git/log.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AAOjC;;;;;GAKG;AACI,MAAM,eAAe,GAAG,CAAO,EACpC,GAAG,EACH,GAAG,GAAG,OAAO,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/api/git/log.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AAOjC,MAAM,mBAAmB,GAAG,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;AAE9E;;;;;GAKG;AACI,MAAM,eAAe,GAAG,CAAO,EACpC,GAAG,EACH,GAAG,GAAG,OAAO,CAAC,GAAG,GACO,EAAE,EAAE;;IAC5B,MAAM,UAAU,GAAG,MAAA,GAAG,CAAC,gBAAgB,mCAAI,GAAG,CAAC,UAAU,CAAC;IAE1D,IAAI,UAAU,EAAE;QACd,OAAO,UAAU,CAAC;KACnB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,wBAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAF,kBAAE,EAAE,CAAC,CAAC;IAE1D,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,mBAAmB,CAAC;KAC3B;IAED,OAAO,UAAU,CAAC,GAAG,CAAC;AACxB,CAAC,CAAA,CAAC;AAjBW,QAAA,eAAe,mBAiB1B;AAEF;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,CAAO,EACzC,GAAG,EACH,GAAG,GAAG,OAAO,CAAC,GAAG,GACO,EAAE,EAAE;IAC5B,MAAM,cAAc,GAAG,GAAG,CAAC,iBAAiB,CAAC;IAE7C,IAAI,cAAc,EAAE;QAClB,OAAO,cAAc,CAAC;KACvB;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,wBAAG,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAF,kBAAE,EAAE,CAAC,CAAC;IAE1D,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,mBAAmB,CAAC;KAC3B;IAED,OAAO,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC;AACnC,CAAC,CAAA,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B"}
|
package/lib/api/git/remote.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
interface GetOwnerAndRepoParameters {
|
|
2
2
|
dir: string;
|
|
3
|
+
env?: Record<string, string | undefined>;
|
|
3
4
|
}
|
|
4
5
|
/**
|
|
5
|
-
* Extracts the owner and repository names from
|
|
6
|
+
* Extracts the owner and repository names from CI environment variables,
|
|
7
|
+
* falling back to local Git remotes.
|
|
6
8
|
*
|
|
7
9
|
* Currently, only GitHub repository URLs are supported:
|
|
8
10
|
*
|
|
@@ -11,7 +13,7 @@ interface GetOwnerAndRepoParameters {
|
|
|
11
13
|
* https://github.com/seek-oss/skuba.git
|
|
12
14
|
* ```
|
|
13
15
|
*/
|
|
14
|
-
export declare const getOwnerAndRepo: ({ dir, }: GetOwnerAndRepoParameters) => Promise<{
|
|
16
|
+
export declare const getOwnerAndRepo: ({ dir, env, }: GetOwnerAndRepoParameters) => Promise<{
|
|
15
17
|
owner: string;
|
|
16
18
|
repo: string;
|
|
17
19
|
}>;
|
package/lib/api/git/remote.js
CHANGED
|
@@ -31,8 +31,15 @@ const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
|
|
|
31
31
|
* 2. skuba
|
|
32
32
|
*/
|
|
33
33
|
const ownerRepoRegex = /github.com(?::|\/)(.+)\/(.+).git$/;
|
|
34
|
+
const ownerAndRepoFromUrl = (url) => {
|
|
35
|
+
const match = ownerRepoRegex.exec(url);
|
|
36
|
+
const owner = match === null || match === void 0 ? void 0 : match[1];
|
|
37
|
+
const repo = match === null || match === void 0 ? void 0 : match[2];
|
|
38
|
+
return { owner, repo };
|
|
39
|
+
};
|
|
34
40
|
/**
|
|
35
|
-
* Extracts the owner and repository names from
|
|
41
|
+
* Extracts the owner and repository names from CI environment variables,
|
|
42
|
+
* falling back to local Git remotes.
|
|
36
43
|
*
|
|
37
44
|
* Currently, only GitHub repository URLs are supported:
|
|
38
45
|
*
|
|
@@ -41,12 +48,22 @@ const ownerRepoRegex = /github.com(?::|\/)(.+)\/(.+).git$/;
|
|
|
41
48
|
* https://github.com/seek-oss/skuba.git
|
|
42
49
|
* ```
|
|
43
50
|
*/
|
|
44
|
-
const getOwnerAndRepo = ({ dir, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
51
|
+
const getOwnerAndRepo = ({ dir, env = process.env, }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
+
if (env.GITHUB_REPOSITORY) {
|
|
53
|
+
const [owner, repo] = env.GITHUB_REPOSITORY.split('/');
|
|
54
|
+
if (owner && repo) {
|
|
55
|
+
return { owner, repo };
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
if (env.BUILDKITE_REPO) {
|
|
59
|
+
const { owner, repo } = ownerAndRepoFromUrl(env.BUILDKITE_REPO);
|
|
60
|
+
if (owner && repo) {
|
|
61
|
+
return { owner, repo };
|
|
62
|
+
}
|
|
63
|
+
}
|
|
45
64
|
const remotes = yield isomorphic_git_1.default.listRemotes({ dir, fs: fs_extra_1.default });
|
|
46
65
|
for (const { url } of remotes) {
|
|
47
|
-
const
|
|
48
|
-
const owner = match === null || match === void 0 ? void 0 : match[1];
|
|
49
|
-
const repo = match === null || match === void 0 ? void 0 : match[2];
|
|
66
|
+
const { owner, repo } = ownerAndRepoFromUrl(url);
|
|
50
67
|
if (owner && repo) {
|
|
51
68
|
return { owner, repo };
|
|
52
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../src/api/git/remote.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AAEjC;;;;;;;;;;;;;;GAcG;AACH,MAAM,cAAc,GAAG,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../src/api/git/remote.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AAEjC;;;;;;;;;;;;;;GAcG;AACH,MAAM,cAAc,GAAG,mCAAmC,CAAC;AAE3D,MAAM,mBAAmB,GAAG,CAAC,GAAW,EAAE,EAAE;IAC1C,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,CAAC,CAAC,CAAC;IACzB,MAAM,IAAI,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,CAAC,CAAC,CAAC;IAExB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC,CAAC;AAOF;;;;;;;;;;GAUG;AACI,MAAM,eAAe,GAAG,CAAO,EACpC,GAAG,EACH,GAAG,GAAG,OAAO,CAAC,GAAG,GACS,EAA4C,EAAE;IACxE,IAAI,GAAG,CAAC,iBAAiB,EAAE;QACzB,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAEvD,IAAI,KAAK,IAAI,IAAI,EAAE;YACjB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACxB;KACF;IAED,IAAI,GAAG,CAAC,cAAc,EAAE;QACtB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAEhE,IAAI,KAAK,IAAI,IAAI,EAAE;YACjB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACxB;KACF;IAED,MAAM,OAAO,GAAG,MAAM,wBAAG,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,EAAE,EAAF,kBAAE,EAAE,CAAC,CAAC;IAEnD,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,OAAO,EAAE;QAC7B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAEjD,IAAI,KAAK,IAAI,IAAI,EAAE;YACjB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;SACxB;KACF;IAED,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;AACpD,CAAC,CAAA,CAAC;AA/BW,QAAA,eAAe,mBA+B1B"}
|
|
@@ -16,7 +16,3 @@ export declare const enabledFromEnvironment: (env?: NodeJS.ProcessEnv) => boolea
|
|
|
16
16
|
* Tries to return a GitHub API token from the environment.
|
|
17
17
|
*/
|
|
18
18
|
export declare const apiTokenFromEnvironment: (env?: NodeJS.ProcessEnv) => string | undefined;
|
|
19
|
-
/**
|
|
20
|
-
* Tries to return a branch name from CI environment variables.
|
|
21
|
-
*/
|
|
22
|
-
export declare const currentBranchFromEnvironment: (env?: NodeJS.ProcessEnv) => string | undefined;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.apiTokenFromEnvironment = exports.enabledFromEnvironment = exports.buildNameFromEnvironment = void 0;
|
|
4
|
+
const env_1 = require("../../utils/env");
|
|
4
5
|
/**
|
|
5
6
|
* Returns the name of the build as seen in GitHub status checks.
|
|
6
7
|
*
|
|
@@ -25,7 +26,7 @@ exports.buildNameFromEnvironment = buildNameFromEnvironment;
|
|
|
25
26
|
*/
|
|
26
27
|
const enabledFromEnvironment = (env = process.env) =>
|
|
27
28
|
// Running in a CI environment.
|
|
28
|
-
|
|
29
|
+
(0, env_1.isCiEnv)(env) &&
|
|
29
30
|
// Has an API token at the ready.
|
|
30
31
|
Boolean((0, exports.apiTokenFromEnvironment)(env));
|
|
31
32
|
exports.enabledFromEnvironment = enabledFromEnvironment;
|
|
@@ -34,9 +35,4 @@ exports.enabledFromEnvironment = enabledFromEnvironment;
|
|
|
34
35
|
*/
|
|
35
36
|
const apiTokenFromEnvironment = (env = process.env) => { var _a; return (_a = env.GITHUB_API_TOKEN) !== null && _a !== void 0 ? _a : env.GITHUB_TOKEN; };
|
|
36
37
|
exports.apiTokenFromEnvironment = apiTokenFromEnvironment;
|
|
37
|
-
/**
|
|
38
|
-
* Tries to return a branch name from CI environment variables.
|
|
39
|
-
*/
|
|
40
|
-
const currentBranchFromEnvironment = (env = process.env) => { var _a; return (_a = env.BUILDKITE_BRANCH) !== null && _a !== void 0 ? _a : env.GITHUB_REF_NAME; };
|
|
41
|
-
exports.currentBranchFromEnvironment = currentBranchFromEnvironment;
|
|
42
38
|
//# sourceMappingURL=environment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/api/github/environment.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACI,MAAM,wBAAwB,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAU,EAAE;;IACpE,IAAI,GAAG,CAAC,sBAAsB,EAAE;QAC9B,OAAO,UAAU,GAAG,CAAC,sBAAsB,EAAE,CAAC;KAC/C;IAED,IAAI,GAAG,CAAC,iBAAiB,EAAE;QACzB,OAAO,GAAG,MAAA,GAAG,CAAC,eAAe,mCAAI,OAAO,KAAK,GAAG,CAAC,iBAAiB,EAAE,CAAC;KACtE;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAVW,QAAA,wBAAwB,4BAUnC;AAEF;;;;;GAKG;AACI,MAAM,sBAAsB,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAW,EAAE;AACnE,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../src/api/github/environment.ts"],"names":[],"mappings":";;;AAAA,yCAA0C;AAE1C;;;;GAIG;AACI,MAAM,wBAAwB,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAU,EAAE;;IACpE,IAAI,GAAG,CAAC,sBAAsB,EAAE;QAC9B,OAAO,UAAU,GAAG,CAAC,sBAAsB,EAAE,CAAC;KAC/C;IAED,IAAI,GAAG,CAAC,iBAAiB,EAAE;QACzB,OAAO,GAAG,MAAA,GAAG,CAAC,eAAe,mCAAI,OAAO,KAAK,GAAG,CAAC,iBAAiB,EAAE,CAAC;KACtE;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAVW,QAAA,wBAAwB,4BAUnC;AAEF;;;;;GAKG;AACI,MAAM,sBAAsB,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,EAAW,EAAE;AACnE,+BAA+B;AAC/B,IAAA,aAAO,EAAC,GAAG,CAAC;IACZ,iCAAiC;IACjC,OAAO,CAAC,IAAA,+BAAuB,EAAC,GAAG,CAAC,CAAC,CAAC;AAJ3B,QAAA,sBAAsB,0BAIK;AAExC;;GAEG;AACI,MAAM,uBAAuB,GAAG,CACrC,GAAG,GAAG,OAAO,CAAC,GAAG,EACG,EAAE,WAAC,OAAA,MAAA,GAAG,CAAC,gBAAgB,mCAAI,GAAG,CAAC,YAAY,CAAA,EAAA,CAAC;AAFrD,QAAA,uBAAuB,2BAE8B"}
|
|
@@ -34,10 +34,25 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
|
|
|
34
34
|
const cwd = process.cwd();
|
|
35
35
|
logger.debug('Processing files...');
|
|
36
36
|
const start = process.hrtime.bigint();
|
|
37
|
+
/* eslint-disable no-console */
|
|
38
|
+
const ogConsoleError = console.error;
|
|
39
|
+
console.error = (...args) => {
|
|
40
|
+
if (args[0] !==
|
|
41
|
+
// `eslint-plugin-react` prints this annoying error on non-React repos.
|
|
42
|
+
// We still want to support React linting for repos that have React code,
|
|
43
|
+
// so we have to manually suppress it.
|
|
44
|
+
//
|
|
45
|
+
// https://github.com/yannickcr/eslint-plugin-react/blob/7484acaca8351a8568fa99344bc811c5cd8396bd/lib/util/version.js#L61-L65
|
|
46
|
+
'Warning: React version was set to "detect" in eslint-plugin-react settings, but the "react" package is not installed. Assuming latest React version for linting.') {
|
|
47
|
+
ogConsoleError(...args);
|
|
48
|
+
}
|
|
49
|
+
};
|
|
37
50
|
const [formatter, results] = yield Promise.all([
|
|
38
51
|
engine.loadFormatter(),
|
|
39
52
|
engine.lintFiles('.'),
|
|
40
53
|
]);
|
|
54
|
+
console.error = ogConsoleError;
|
|
55
|
+
/* eslint-enable no-console */
|
|
41
56
|
const end = process.hrtime.bigint();
|
|
42
57
|
logger.plain(`Processed ${(0, logging_1.pluralise)(results.length, 'file')} in ${logger.timing(start, end)}.`);
|
|
43
58
|
const errors = [];
|
|
@@ -60,7 +75,7 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
|
|
|
60
75
|
}
|
|
61
76
|
const ok = errors.length === 0;
|
|
62
77
|
yield eslint_1.ESLint.outputFixes(results);
|
|
63
|
-
const output = formatter.format(results);
|
|
78
|
+
const output = yield formatter.format(results);
|
|
64
79
|
if (output) {
|
|
65
80
|
logger.plain(output);
|
|
66
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAE1B,mCAAgC;AAGhC,iDAAgD;AAEhD,MAAM,eAAe,GAAG,CAAC,MAAyB,EAAE,EAAE;IACpD,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACvB;IAED,OAAO,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACpE,CAAC,CAAC;AAcK,MAAM,SAAS,GAAG,CACvB,IAAuB,EACvB,MAAc,EACS,EAAE;IACzB,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;QACxB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;QAC/B,GAAG,EAAE,IAAI,KAAK,QAAQ;QACtB,6BAA6B,EAAE,OAAO;KACvC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAEpC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAEtC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC7C,MAAM,CAAC,aAAa,EAAE;QACtB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;KACtB,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAEpC,MAAM,CAAC,KAAK,CACV,aAAa,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC,MAAM,CAChE,KAAK,EACL,GAAG,CACJ,GAAG,CACL,CAAC;IAEF,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAmB,EAAE,CAAC;IAEpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC;gBACV,QAAQ,EAAE,YAAY;gBACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;SACJ;QAED,IAAI,MAAM,CAAC,YAAY,EAAE;YACvB,QAAQ,CAAC,IAAI,CAAC;gBACZ,QAAQ,EAAE,YAAY;gBACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;SACJ;QAED,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;KACrD;IAED,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAE/B,MAAM,eAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,kDAA0B;AAE1B,mCAAgC;AAGhC,iDAAgD;AAEhD,MAAM,eAAe,GAAG,CAAC,MAAyB,EAAE,EAAE;IACpD,IAAI,MAAM,CAAC,UAAU,EAAE;QACrB,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KACvB;IAED,OAAO,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACpE,CAAC,CAAC;AAcK,MAAM,SAAS,GAAG,CACvB,IAAuB,EACvB,MAAc,EACS,EAAE;IACzB,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAEvC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC;QACxB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;QAC/B,GAAG,EAAE,IAAI,KAAK,QAAQ;QACtB,6BAA6B,EAAE,OAAO;KACvC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAEpC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAEtC,+BAA+B;IAC/B,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC;IACrC,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,IAAe,EAAE,EAAE;QACrC,IACE,IAAI,CAAC,CAAC,CAAC;YACP,uEAAuE;YACvE,yEAAyE;YACzE,sCAAsC;YACtC,EAAE;YACF,6HAA6H;YAC7H,kKAAkK,EAClK;YACA,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;SACzB;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC7C,MAAM,CAAC,aAAa,EAAE;QACtB,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC;KACtB,CAAC,CAAC;IAEH,OAAO,CAAC,KAAK,GAAG,cAAc,CAAC;IAC/B,8BAA8B;IAE9B,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAEpC,MAAM,CAAC,KAAK,CACV,aAAa,IAAA,mBAAS,EAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,MAAM,CAAC,MAAM,CAChE,KAAK,EACL,GAAG,CACJ,GAAG,CACL,CAAC;IAEF,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAmB,EAAE,CAAC;IAEpC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,UAAU,EAAE;YACrB,MAAM,CAAC,IAAI,CAAC;gBACV,QAAQ,EAAE,YAAY;gBACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;SACJ;QAED,IAAI,MAAM,CAAC,YAAY,EAAE;YACvB,QAAQ,CAAC,IAAI,CAAC;gBACZ,QAAQ,EAAE,YAAY;gBACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;aAC1B,CAAC,CAAC;SACJ;QAED,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;KACrD;IAED,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;IAE/B,MAAM,eAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAElC,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;KACtB;IAED,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;AAC1C,CAAC,CAAA,CAAC;AArFW,QAAA,SAAS,aAqFpB"}
|
|
@@ -56,7 +56,7 @@ const generateNotices = ({ dependencies, devDependencies, }) => {
|
|
|
56
56
|
logging_1.log.newline();
|
|
57
57
|
logging_1.log.warn("We're going to tweak your output directories,", 'so double check your bundle once this is done.');
|
|
58
58
|
logging_1.log.newline();
|
|
59
|
-
logging_1.log.warn('Read more:', logging_1.log.bold('https://
|
|
59
|
+
logging_1.log.warn('Read more:', logging_1.log.bold('https://seek-oss.github.io/skuba/docs/migration-guides/seek-module-toolkit.html#building'));
|
|
60
60
|
};
|
|
61
61
|
}
|
|
62
62
|
return () => { };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/package.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ const packageModule = ({ entryPoint, type, }) => __awaiter(void 0, void 0, void
|
|
|
24
24
|
const version = yield (0, version_1.getSkubaVersion)();
|
|
25
25
|
const initialData = {
|
|
26
26
|
private: type !== 'package',
|
|
27
|
-
scripts: Object.assign(Object.assign({ build: type === 'package' ? 'skuba build-package' : 'skuba build', format: 'skuba format', lint: 'skuba lint' }, (type === 'package' ? {} : { start: '
|
|
27
|
+
scripts: Object.assign(Object.assign({ build: type === 'package' ? 'skuba build-package' : 'skuba build', format: 'skuba format', lint: 'skuba lint' }, (type === 'package' ? {} : { start: 'skuba start' })), { test: 'skuba test --coverage', 'test:watch': 'skuba test --watch' }),
|
|
28
28
|
skuba: {
|
|
29
29
|
entryPoint,
|
|
30
30
|
template: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/package.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAyD;AACzD,2DAAwD;AACxD,mDAAoD;AACpD,iDAA6C;AAG7C,MAAM,qBAAqB,GAAG;IAC5B,gBAAgB;IAChB,cAAc;IACd,kBAAkB;IAClB,gBAAgB;CACjB,CAAC;AAEK,MAAM,aAAa,GAAG,CAAO,EAClC,UAAU,EACV,IAAI,GACI,EAAmB,EAAE;IAC7B,MAAM,OAAO,GAAG,MAAM,IAAA,yBAAe,GAAE,CAAC;IAExC,MAAM,WAAW,GAAG;QAClB,OAAO,EAAE,IAAI,KAAK,SAAS;QAE3B,OAAO,gCACL,KAAK,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,EACjE,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,YAAY,IACf,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE
|
|
1
|
+
{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/package.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ export declare const createDependencyFilter: (names: readonly string[], type: 'd
|
|
|
21
21
|
type?: "module" | "commonjs" | undefined;
|
|
22
22
|
main?: string | undefined;
|
|
23
23
|
exports?: import("type-fest").PackageJson.Exports | undefined;
|
|
24
|
+
imports?: import("type-fest").PackageJson.Imports | undefined;
|
|
24
25
|
bin?: string | Record<string, string> | undefined;
|
|
25
26
|
man?: string | string[] | undefined;
|
|
26
27
|
directories?: import("type-fest").PackageJson.DirectoryLocations | undefined;
|
package/lib/cli/format.js
CHANGED
|
@@ -22,11 +22,12 @@ const refreshIgnoreFiles_1 = require("./configure/refreshIgnoreFiles");
|
|
|
22
22
|
const format = (args = process.argv) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
23
|
yield (0, refreshIgnoreFiles_1.tryRefreshIgnoreFiles)();
|
|
24
24
|
const debug = (0, args_1.hasDebugFlag)(args);
|
|
25
|
+
const logger = (0, logging_1.createLogger)(debug);
|
|
25
26
|
logging_1.log.plain(chalk_1.default.magenta('ESLint'));
|
|
26
|
-
const eslint = yield (0, eslint_1.runESLint)('format',
|
|
27
|
+
const eslint = yield (0, eslint_1.runESLint)('format', logger);
|
|
27
28
|
logging_1.log.newline();
|
|
28
29
|
logging_1.log.plain(chalk_1.default.cyan('Prettier'));
|
|
29
|
-
const prettier = yield (0, prettier_1.runPrettier)('format',
|
|
30
|
+
const prettier = yield (0, prettier_1.runPrettier)('format', logger);
|
|
30
31
|
if (eslint.ok && prettier.ok) {
|
|
31
32
|
return;
|
|
32
33
|
}
|
package/lib/cli/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/cli/format.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAE1B,wCAA6C;AAC7C,8CAAqD;AAErD,6CAA6C;AAC7C,iDAAiD;AACjD,uEAAuE;AAEhE,MAAM,MAAM,GAAG,CAAO,IAAI,GAAG,OAAO,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/cli/format.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAA0B;AAE1B,wCAA6C;AAC7C,8CAAqD;AAErD,6CAA6C;AAC7C,iDAAiD;AACjD,uEAAuE;AAEhE,MAAM,MAAM,GAAG,CAAO,IAAI,GAAG,OAAO,CAAC,IAAI,EAAiB,EAAE;IACjE,MAAM,IAAA,0CAAqB,GAAE,CAAC;IAE9B,MAAM,KAAK,GAAG,IAAA,mBAAY,EAAC,IAAI,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;IAEnC,aAAG,CAAC,KAAK,CAAC,eAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEnC,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEjD,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,KAAK,CAAC,eAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAElC,MAAM,QAAQ,GAAG,MAAM,IAAA,sBAAW,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAErD,IAAI,MAAM,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,EAAE;QAC5B,OAAO;KACR;IAED,MAAM,KAAK,GAAG;QACZ,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;KACrC,CAAC;IAEF,aAAG,CAAC,OAAO,EAAE,CAAC;IACd,aAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,mCAAmC,CAAC,CAAC;IAE/D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAA,CAAC;AA5BW,QAAA,MAAM,UA4BjB"}
|
package/lib/cli/init/git.d.ts
CHANGED
|
@@ -3,6 +3,5 @@ interface GitHubProject {
|
|
|
3
3
|
repoName: string;
|
|
4
4
|
}
|
|
5
5
|
export declare const initialiseRepo: (dir: string, { orgName, repoName }: GitHubProject) => Promise<void>;
|
|
6
|
-
export declare const commitChanges: (dir: string, message: string) => Promise<void>;
|
|
7
6
|
export declare const downloadGitHubTemplate: (gitHubPath: string, destinationDir: string) => Promise<void>;
|
|
8
7
|
export {};
|
package/lib/cli/init/git.js
CHANGED
|
@@ -31,13 +31,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
31
31
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
32
32
|
};
|
|
33
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
34
|
-
exports.downloadGitHubTemplate = exports.
|
|
34
|
+
exports.downloadGitHubTemplate = exports.initialiseRepo = void 0;
|
|
35
35
|
const path_1 = __importDefault(require("path"));
|
|
36
36
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
37
37
|
const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
|
|
38
38
|
const simple_git_1 = __importDefault(require("simple-git"));
|
|
39
39
|
const Git = __importStar(require("../../api/git"));
|
|
40
|
-
const dir_1 = require("../../utils/dir");
|
|
41
40
|
const logging_1 = require("../../utils/logging");
|
|
42
41
|
const initialiseRepo = (dir, { orgName, repoName }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
43
42
|
yield isomorphic_git_1.default.init({
|
|
@@ -58,15 +57,6 @@ const initialiseRepo = (dir, { orgName, repoName }) => __awaiter(void 0, void 0,
|
|
|
58
57
|
});
|
|
59
58
|
});
|
|
60
59
|
exports.initialiseRepo = initialiseRepo;
|
|
61
|
-
const commitChanges = (dir, message) => __awaiter(void 0, void 0, void 0, function* () {
|
|
62
|
-
const filepaths = yield (0, dir_1.crawlDirectory)(dir);
|
|
63
|
-
yield Promise.all(filepaths.map((filepath) => isomorphic_git_1.default.add({ dir, filepath, fs: fs_extra_1.default })));
|
|
64
|
-
yield Git.commit({
|
|
65
|
-
dir,
|
|
66
|
-
message,
|
|
67
|
-
});
|
|
68
|
-
});
|
|
69
|
-
exports.commitChanges = commitChanges;
|
|
70
60
|
const downloadGitHubTemplate = (gitHubPath, destinationDir) => __awaiter(void 0, void 0, void 0, function* () {
|
|
71
61
|
logging_1.log.newline();
|
|
72
62
|
logging_1.log.plain('Downloading', logging_1.log.bold(gitHubPath), 'from GitHub...');
|
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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA0B;AAC1B,oEAAiC;AACjC,4DAAmC;AAEnC,mDAAqC;AACrC,
|
|
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,CAC5B,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,CAAA,CAAC;AAtBW,QAAA,cAAc,kBAsBzB;AAEK,MAAM,sBAAsB,GAAG,CACpC,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,CAAA,CAAC;AAvBW,QAAA,sBAAsB,0BAuBjC"}
|
package/lib/cli/init/index.js
CHANGED
|
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.init = void 0;
|
|
16
16
|
const path_1 = __importDefault(require("path"));
|
|
17
|
+
const git_1 = require("../../api/git");
|
|
17
18
|
const copy_1 = require("../../utils/copy");
|
|
18
19
|
const dir_1 = require("../../utils/dir");
|
|
19
20
|
const exec_1 = require("../../utils/exec");
|
|
@@ -21,7 +22,7 @@ const logging_1 = require("../../utils/logging");
|
|
|
21
22
|
const logo_1 = require("../../utils/logo");
|
|
22
23
|
const template_1 = require("../../utils/template");
|
|
23
24
|
const getConfig_1 = require("./getConfig");
|
|
24
|
-
const
|
|
25
|
+
const git_2 = require("./git");
|
|
25
26
|
const writePackageJson_1 = require("./writePackageJson");
|
|
26
27
|
const init = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
27
28
|
const skubaVersionInfo = yield (0, logo_1.showLogoAndVersionInfo)();
|
|
@@ -66,7 +67,7 @@ const init = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
66
67
|
streamStdio: 'yarn',
|
|
67
68
|
});
|
|
68
69
|
logging_1.log.newline();
|
|
69
|
-
yield (0,
|
|
70
|
+
yield (0, git_2.initialiseRepo)(destinationDir, templateData);
|
|
70
71
|
const skubaSlug = `skuba@${skubaVersionInfo.local}`;
|
|
71
72
|
let depsInstalled = false;
|
|
72
73
|
try {
|
|
@@ -75,7 +76,10 @@ const init = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
75
76
|
yield exec('npx', 'yarn-deduplicate', '--strategy=highest');
|
|
76
77
|
}
|
|
77
78
|
catch (_a) { }
|
|
78
|
-
yield (0, git_1.
|
|
79
|
+
yield (0, git_1.commitAllChanges)({
|
|
80
|
+
dir: destinationDir,
|
|
81
|
+
message: `Clone ${templateName}`,
|
|
82
|
+
});
|
|
79
83
|
const logGitHubRepoCreation = () => {
|
|
80
84
|
logging_1.log.plain('Next, create an empty', logging_1.log.bold(`${templateData.orgName}/${templateData.repoName}`), 'repository:');
|
|
81
85
|
logging_1.log.ok('https://github.com/new');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/init/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,2CAAgE;AAChE,yCAAwD;AACxD,2CAA8D;AAC9D,iDAA0C;AAC1C,2CAA0D;AAC1D,mDAG8B;AAE9B,2CAAwC;AACxC,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/init/index.ts"],"names":[],"mappings":"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"}
|