skuba 4.3.0-beta.0 → 4.4.0

package/README.md

@@ -17,7 +17,7 @@
 - Deploy with [Gantry], [Serverless] or the [AWS CDK]
 
 [aws cdk]: https://docs.aws.amazon.com/cdk/latest/guide/work-with-cdk-typescript.html
-[gantry]: https://gantry.ssod.skinfra.xyz
+[gantry]: https://backstage.myseek.xyz/docs/default/component/gantry/
 [serverless]: https://serverless.com/
 
 It provides you with:

package/jest/moduleNameMapper.test.ts

@@ -12,7 +12,7 @@ describe('moduleNameMapper', () => {
   it('expands wildcard paths', () =>
     expect(act({ 'src/*': ['src/*'], 'lib/wip/*': ['lib/wip/*'] }))
       .toMatchInlineSnapshot(`
-      Object {
+      {
         "^lib/wip$": "<rootDir>/lib/wip",
         "^lib/wip/(.*)$": "<rootDir>/lib/wip/$1",
         "^src$": "<rootDir>/src",
@@ -22,7 +22,7 @@ describe('moduleNameMapper', () => {
 
   it('expands non-wildcard paths', () =>
     expect(act({ cli: ['cli'], 'src/': ['src/'] })).toMatchInlineSnapshot(`
-      Object {
+      {
         "^cli$": "<rootDir>/cli",
         "^cli/(.*)$": "<rootDir>/cli/$1",
         "^src$": "<rootDir>/src",
@@ -37,7 +37,7 @@ describe('moduleNameMapper', () => {
         'jquery/*': ['node_modules/jquery/dist/jquery/*'],
       }),
     ).toMatchInlineSnapshot(`
-      Object {
+      {
         "^jquery$": "<rootDir>/node_modules/jquery/dist/jquery",
         "^jquery/(.*)$": "<rootDir>/node_modules/jquery/dist/jquery/$1",
       }
@@ -46,7 +46,7 @@ describe('moduleNameMapper', () => {
   it('respects a base URL', () =>
     expect(act({ cli: ['../cli'], 'app/*': ['app/*'] }, 'src'))
       .toMatchInlineSnapshot(`
-      Object {
+      {
         "^app$": "<rootDir>/src/app",
         "^app/(.*)$": "<rootDir>/src/app/$1",
         "^cli$": "<rootDir>/cli",
@@ -54,12 +54,11 @@ describe('moduleNameMapper', () => {
       }
     `));
 
-  it('respects no paths', () =>
-    expect(act({})).toMatchInlineSnapshot(`Object {}`));
+  it('respects no paths', () => expect(act({})).toMatchInlineSnapshot(`{}`));
 
   it('falls back on undefined paths', () =>
     expect(act(undefined)).toMatchInlineSnapshot(`
-      Object {
+      {
         "^src$": "<rootDir>/src",
         "^src/(.*)$": "<rootDir>/src/$1",
       }
@@ -67,7 +66,7 @@ describe('moduleNameMapper', () => {
 
   it('falls back on invalid config', () =>
     expect(act('INVALID')).toMatchInlineSnapshot(`
-      Object {
+      {
         "^src$": "<rootDir>/src",
         "^src/(.*)$": "<rootDir>/src/$1",
       }

package/lib/api/git/pull.d.ts

@@ -17,19 +17,19 @@ interface PullParameters {
     auth: GitHubAppAuth;
     dir: string;
     /**
-     * The branch to merge into
+     * The local branch to fast forward.
      */
     ref: string;
     remote?: string;
     /**
-     * The destination branch or tag on the remote.
+     * The branch or tag on the remote to reference.
      *
      * This defaults to `ref`.
      */
     remoteRef?: string;
 }
 /**
- * Fast forwards the local branch to the remote state
+ * Fast forwards the specified `ref` on the local Git repository to match the remote branch.
  */
 export declare const fastForwardBranch: ({ auth, dir, ref, remote, remoteRef, }: PullParameters) => Promise<void>;
 export {};

package/lib/api/git/pull.js

@@ -10,7 +10,7 @@ const node_1 = __importDefault(require("isomorphic-git/http/node"));
 const environment_1 = require("../github/environment");
 const remote_1 = require("./remote");
 /**
- * Fast forwards the local branch to the remote state
+ * Fast forwards the specified `ref` on the local Git repository to match the remote branch.
  */
 const fastForwardBranch = async ({ auth, dir, ref, remote, remoteRef, }) => {
     const { owner, repo } = await (0, remote_1.getOwnerAndRepo)({ dir });

package/lib/api/github/index.d.ts

@@ -4,4 +4,4 @@ export { createCheckRun } from './checkRun';
 export { enabledFromEnvironment } from './environment';
 export { getPullRequestNumber } from './pullRequest';
 export { putIssueComment } from './issueComment';
-export { commitAndPush, commitAndPushAllChanges, mapChangedFilesToFileChanges, } from './push';
+export { readFileChanges, uploadAllFileChanges, uploadFileChanges, } from './push';

package/lib/api/github/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapChangedFilesToFileChanges = exports.commitAndPushAllChanges = exports.commitAndPush = exports.putIssueComment = exports.getPullRequestNumber = exports.enabledFromEnvironment = exports.createCheckRun = exports.buildNameFromEnvironment = void 0;
+exports.uploadFileChanges = exports.uploadAllFileChanges = exports.readFileChanges = exports.putIssueComment = exports.getPullRequestNumber = exports.enabledFromEnvironment = exports.createCheckRun = exports.buildNameFromEnvironment = void 0;
 var environment_1 = require("./environment");
 Object.defineProperty(exports, "buildNameFromEnvironment", { enumerable: true, get: function () { return environment_1.buildNameFromEnvironment; } });
 var checkRun_1 = require("./checkRun");
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "getPullRequestNumber", { enumerable: true, get:
 var issueComment_1 = require("./issueComment");
 Object.defineProperty(exports, "putIssueComment", { enumerable: true, get: function () { return issueComment_1.putIssueComment; } });
 var push_1 = require("./push");
-Object.defineProperty(exports, "commitAndPush", { enumerable: true, get: function () { return push_1.commitAndPush; } });
-Object.defineProperty(exports, "commitAndPushAllChanges", { enumerable: true, get: function () { return push_1.commitAndPushAllChanges; } });
-Object.defineProperty(exports, "mapChangedFilesToFileChanges", { enumerable: true, get: function () { return push_1.mapChangedFilesToFileChanges; } });
+Object.defineProperty(exports, "readFileChanges", { enumerable: true, get: function () { return push_1.readFileChanges; } });
+Object.defineProperty(exports, "uploadAllFileChanges", { enumerable: true, get: function () { return push_1.uploadAllFileChanges; } });
+Object.defineProperty(exports, "uploadFileChanges", { enumerable: true, get: function () { return push_1.uploadFileChanges; } });
 //# sourceMappingURL=index.js.map

package/lib/api/github/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/github/index.ts"],"names":[],"mappings":";;;AACA,6CAAyD;AAAhD,uHAAA,wBAAwB,OAAA;AACjC,uCAA4C;AAAnC,0GAAA,cAAc,OAAA;AACvB,6CAAuD;AAA9C,qHAAA,sBAAsB,OAAA;AAC/B,6CAAqD;AAA5C,mHAAA,oBAAoB,OAAA;AAC7B,+CAAiD;AAAxC,+GAAA,eAAe,OAAA;AACxB,+BAIgB;AAHd,qGAAA,aAAa,OAAA;AACb,+GAAA,uBAAuB,OAAA;AACvB,oHAAA,4BAA4B,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/github/index.ts"],"names":[],"mappings":";;;AACA,6CAAyD;AAAhD,uHAAA,wBAAwB,OAAA;AACjC,uCAA4C;AAAnC,0GAAA,cAAc,OAAA;AACvB,6CAAuD;AAA9C,qHAAA,sBAAsB,OAAA;AAC/B,6CAAqD;AAA5C,mHAAA,oBAAoB,OAAA;AAC7B,+CAAiD;AAAxC,+GAAA,eAAe,OAAA;AACxB,+BAIgB;AAHd,uGAAA,eAAe,OAAA;AACf,4GAAA,oBAAoB,OAAA;AACpB,yGAAA,iBAAiB,OAAA"}

package/lib/api/github/push.d.ts

@@ -1,6 +1,6 @@
 import type { FileAddition, FileDeletion } from '@octokit/graphql-schema';
 import type { ChangedFile } from '../git/getChangedFiles';
-interface CommitAndPushAllChangesParams {
+interface UploadAllFileChangesParams {
     dir: string;
     /**
      * The branch name
@@ -15,24 +15,35 @@ interface CommitAndPushAllChangesParams {
      */
     messageBody?: string;
     /**
-     * Updates the local git working directory to reflect the new remote state
+     * Updates the local Git repository to match the new remote branch state
      */
     updateLocal?: boolean;
 }
 /**
- * Commits and pushes all changes from the local git repository up to a GitHub branch.
- * Returns the commit id or `undefined` if there are no changes to commit.
+ * Retrieves all file changes from the local Git repository using
+ * `getChangedFiles`, then uploads the changes to a specified GitHub branch
+ * using `uploadFileChanges`.
+ *
+ * Returns the commit ID, or `undefined` if there are no changes to commit.
+ *
+ * The file changes will appear as verified commits on GitHub.
+ *
+ * This will not update the local Git repository unless `updateLocal` is
+ * specified.
  */
-export declare const commitAndPushAllChanges: ({ dir, branch, messageHeadline, messageBody, updateLocal, }: CommitAndPushAllChangesParams) => Promise<string | undefined>;
+export declare const uploadAllFileChanges: ({ dir, branch, messageHeadline, messageBody, updateLocal, }: UploadAllFileChangesParams) => Promise<string | undefined>;
 export interface FileChanges {
     additions: FileAddition[];
     deletions: FileDeletion[];
 }
 /**
- * Maps ChangedFiles to {@link https://docs.github.com/en/graphql/reference/input-objects#filechanges| FileChanges}
+ * Takes a list of `ChangedFiles`, reads them from the file system, and maps
+ * them to GitHub GraphQL `FileChanges`.
+ *
+ * https://docs.github.com/en/graphql/reference/input-objects#filechanges
  */
-export declare const mapChangedFilesToFileChanges: (changedFiles: ChangedFile[]) => Promise<FileChanges>;
-interface CommitAndPushParams {
+export declare const readFileChanges: (changedFiles: ChangedFile[]) => Promise<FileChanges>;
+interface UploadFileChangesParams {
     dir: string;
     /**
      * The branch name
@@ -50,13 +61,13 @@ interface CommitAndPushParams {
      * File additions and deletions
      */
     fileChanges: FileChanges;
-    /**
-     * Updates the local git working directory to reflect the new remote state
-     */
-    updateLocal?: boolean;
 }
 /**
- * Commits and pushes file changes up to a GitHub branch
+ * Uploads file changes from the local workspace to a specified GitHub branch.
+ *
+ * The file changes will appear as verified commits on GitHub.
+ *
+ * This will not update the local Git repository.
  */
-export declare const commitAndPush: ({ dir, branch, messageHeadline, messageBody, fileChanges, updateLocal, }: CommitAndPushParams) => Promise<string>;
+export declare const uploadFileChanges: ({ dir, branch, messageHeadline, messageBody, fileChanges, }: UploadFileChangesParams) => Promise<string>;
 export {};

package/lib/api/github/push.js

@@ -26,35 +26,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.commitAndPush = exports.mapChangedFilesToFileChanges = exports.commitAndPushAllChanges = void 0;
+exports.uploadFileChanges = exports.readFileChanges = exports.uploadAllFileChanges = void 0;
 const graphql_1 = require("@octokit/graphql");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const Git = __importStar(require("../git"));
 const environment_1 = require("./environment");
 /**
- * Commits and pushes all changes from the local git repository up to a GitHub branch.
- * Returns the commit id or `undefined` if there are no changes to commit.
+ * Retrieves all file changes from the local Git repository using
+ * `getChangedFiles`, then uploads the changes to a specified GitHub branch
+ * using `uploadFileChanges`.
+ *
+ * Returns the commit ID, or `undefined` if there are no changes to commit.
+ *
+ * The file changes will appear as verified commits on GitHub.
+ *
+ * This will not update the local Git repository unless `updateLocal` is
+ * specified.
  */
-const commitAndPushAllChanges = async ({ dir, branch, messageHeadline, messageBody, updateLocal, }) => {
+const uploadAllFileChanges = async ({ dir, branch, messageHeadline, messageBody, updateLocal = false, }) => {
     const changedFiles = await Git.getChangedFiles({ dir });
     if (!changedFiles.length) {
         return undefined;
     }
-    const fileChanges = await (0, exports.mapChangedFilesToFileChanges)(changedFiles);
-    return await (0, exports.commitAndPush)({
+    const fileChanges = await (0, exports.readFileChanges)(changedFiles);
+    const commitId = await (0, exports.uploadFileChanges)({
         dir,
         branch,
         messageHeadline,
         messageBody,
         fileChanges,
-        updateLocal,
     });
+    if (updateLocal) {
+        await Promise.all([...fileChanges.additions, ...fileChanges.deletions].map((file) => fs_extra_1.default.rm(file.path)));
+        await Git.fastForwardBranch({
+            ref: branch,
+            auth: { type: 'gitHubApp' },
+            dir,
+        });
+    }
+    return commitId;
 };
-exports.commitAndPushAllChanges = commitAndPushAllChanges;
+exports.uploadAllFileChanges = uploadAllFileChanges;
 /**
- * Maps ChangedFiles to {@link https://docs.github.com/en/graphql/reference/input-objects#filechanges| FileChanges}
+ * Takes a list of `ChangedFiles`, reads them from the file system, and maps
+ * them to GitHub GraphQL `FileChanges`.
+ *
+ * https://docs.github.com/en/graphql/reference/input-objects#filechanges
  */
-const mapChangedFilesToFileChanges = async (changedFiles) => {
+const readFileChanges = async (changedFiles) => {
     const { added, deleted } = changedFiles.reduce((files, changedFile) => {
         const filePath = changedFile.path;
         if (changedFile.state === 'deleted') {
@@ -79,14 +98,18 @@ const mapChangedFilesToFileChanges = async (changedFiles) => {
         deletions,
     };
 };
-exports.mapChangedFilesToFileChanges = mapChangedFilesToFileChanges;
+exports.readFileChanges = readFileChanges;
 /**
- * Commits and pushes file changes up to a GitHub branch
+ * Uploads file changes from the local workspace to a specified GitHub branch.
+ *
+ * The file changes will appear as verified commits on GitHub.
+ *
+ * This will not update the local Git repository.
  */
-const commitAndPush = async ({ dir, branch, messageHeadline, messageBody, fileChanges, updateLocal = false, }) => {
+const uploadFileChanges = async ({ dir, branch, messageHeadline, messageBody, fileChanges, }) => {
     const authToken = (0, environment_1.apiTokenFromEnvironment)();
     if (!authToken) {
-        throw new Error('Could not determine API token from the environment');
+        throw new Error('Could not read a GitHub API token from the environment. Please set GITHUB_API_TOKEN or GITHUB_TOKEN.');
     }
     const [{ owner, repo }, headCommitId] = await Promise.all([
         Git.getOwnerAndRepo({ dir }),
@@ -109,25 +132,17 @@ const commitAndPush = async ({ dir, branch, messageHeadline, messageBody, fileCh
       mutation Mutation($input: CreateCommitOnBranchInput!) {
         createCommitOnBranch(input: $input) {
           commit {
-            id
+            oid
           }
         }
       }
     `, {
         input,
         headers: {
-            authorization: `bearer ${authToken}`,
+            authorization: `Bearer ${authToken}`,
         },
     });
-    if (updateLocal) {
-        await Promise.all([...fileChanges.additions, ...fileChanges.deletions].map((file) => fs_extra_1.default.rm(file.path)));
-        await Git.fastForwardBranch({
-            ref: branch,
-            auth: { type: 'gitHubApp' },
-            dir,
-        });
-    }
-    return result.createCommitOnBranch.commit.id;
+    return result.createCommitOnBranch.commit.oid;
 };
-exports.commitAndPush = commitAndPush;
+exports.uploadFileChanges = uploadFileChanges;
 //# sourceMappingURL=push.js.map

package/lib/api/github/push.js.map

@@ -1 +1 @@
-{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/api/github/push.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/api/github/push.ts"],"names":[],"mappings":"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"}

package/lib/api/jest/index.d.ts

@@ -5,13 +5,13 @@ import type { Config } from '@jest/types';
  * While we technically accept anything compatible with `Config.InitialOptions`,
  * these are tacitly endorsed for our use cases and receive IntelliSense.
  */
-declare type DefaultOptions = 'collectCoverage' | 'collectCoverageFrom' | 'collectCoverageOnlyFrom' | 'coveragePathIgnorePatterns' | 'coverageThreshold' | 'displayName' | 'globals' | 'globalSetup' | 'globalTeardown' | 'projects' | 'setupFiles' | 'setupFilesAfterEnv' | 'snapshotSerializers' | 'testEnvironment' | 'testPathIgnorePatterns' | 'testTimeout' | 'watchPathIgnorePatterns';
+declare type DefaultOptions = 'collectCoverage' | 'collectCoverageFrom' | 'coveragePathIgnorePatterns' | 'coverageThreshold' | 'displayName' | 'globals' | 'globalSetup' | 'globalTeardown' | 'projects' | 'setupFiles' | 'setupFilesAfterEnv' | 'snapshotSerializers' | 'testEnvironment' | 'testPathIgnorePatterns' | 'testTimeout' | 'watchPathIgnorePatterns';
 /**
  * Merge additional Jest options into the **skuba** preset.
  *
  * This concatenates array options like `testPathIgnorePatterns`.
  */
-export declare const mergePreset: <AdditionalOptions extends "filter" | "json" | "silent" | "cache" | "runner" | "projects" | "id" | "automock" | "cacheDirectory" | "clearMocks" | "coveragePathIgnorePatterns" | "dependencyExtractor" | "detectLeaks" | "detectOpenHandles" | "displayName" | "errorOnDeprecated" | "extensionsToTreatAsEsm" | "fakeTimers" | "forceCoverageMatch" | "globalSetup" | "globalTeardown" | "globals" | "haste" | "injectGlobals" | "moduleDirectories" | "moduleFileExtensions" | "moduleNameMapper" | "modulePathIgnorePatterns" | "modulePaths" | "prettierPath" | "resetMocks" | "resetModules" | "resolver" | "restoreMocks" | "rootDir" | "roots" | "runtime" | "sandboxInjectedGlobals" | "setupFiles" | "setupFilesAfterEnv" | "skipFilter" | "skipNodeResolution" | "slowTestThreshold" | "snapshotResolver" | "snapshotSerializers" | "snapshotFormat" | "testEnvironment" | "testEnvironmentOptions" | "testMatch" | "testLocationInResults" | "testPathIgnorePatterns" | "testRegex" | "testRunner" | "transform" | "transformIgnorePatterns" | "watchPathIgnorePatterns" | "unmockedModulePathPatterns" | "bail" | "ci" | "changedFilesWithAncestor" | "changedSince" | "collectCoverage" | "collectCoverageFrom" | "collectCoverageOnlyFrom" | "coverageDirectory" | "coverageProvider" | "coverageReporters" | "coverageThreshold" | "expand" | "findRelatedTests" | "forceExit" | "reporters" | "logHeapUsage" | "lastCommit" | "listTests" | "maxConcurrency" | "maxWorkers" | "noStackTrace" | "notify" | "notifyMode" | "onlyChanged" | "onlyFailures" | "outputFile" | "passWithNoTests" | "preset" | "replname" | "runTestsByPath" | "testFailureExitCode" | "testNamePattern" | "testResultsProcessor" | "testSequencer" | "testTimeout" | "updateSnapshot" | "useStderr" | "verbose" | "watch" | "watchAll" | "watchman" | "watchPlugins">(options: Pick<Partial<{
+export declare const mergePreset: <AdditionalOptions extends "filter" | "json" | "silent" | "cache" | "runtime" | "runner" | "projects" | "id" | "automock" | "cacheDirectory" | "clearMocks" | "coveragePathIgnorePatterns" | "dependencyExtractor" | "detectLeaks" | "detectOpenHandles" | "displayName" | "errorOnDeprecated" | "extensionsToTreatAsEsm" | "fakeTimers" | "forceCoverageMatch" | "globalSetup" | "globalTeardown" | "globals" | "haste" | "injectGlobals" | "moduleDirectories" | "moduleFileExtensions" | "moduleNameMapper" | "modulePathIgnorePatterns" | "modulePaths" | "prettierPath" | "resetMocks" | "resetModules" | "resolver" | "restoreMocks" | "rootDir" | "roots" | "sandboxInjectedGlobals" | "setupFiles" | "setupFilesAfterEnv" | "skipFilter" | "skipNodeResolution" | "slowTestThreshold" | "snapshotResolver" | "snapshotSerializers" | "snapshotFormat" | "testEnvironment" | "testEnvironmentOptions" | "testMatch" | "testLocationInResults" | "testPathIgnorePatterns" | "testRegex" | "testRunner" | "transform" | "transformIgnorePatterns" | "watchPathIgnorePatterns" | "unmockedModulePathPatterns" | "workerIdleMemoryLimit" | "bail" | "ci" | "changedFilesWithAncestor" | "changedSince" | "collectCoverage" | "collectCoverageFrom" | "coverageDirectory" | "coverageProvider" | "coverageReporters" | "coverageThreshold" | "expand" | "findRelatedTests" | "forceExit" | "reporters" | "logHeapUsage" | "lastCommit" | "listTests" | "maxConcurrency" | "maxWorkers" | "noStackTrace" | "notify" | "notifyMode" | "onlyChanged" | "onlyFailures" | "outputFile" | "passWithNoTests" | "preset" | "replname" | "runTestsByPath" | "testFailureExitCode" | "testNamePattern" | "testResultsProcessor" | "testSequencer" | "testTimeout" | "updateSnapshot" | "useStderr" | "verbose" | "watch" | "watchAll" | "watchman" | "watchPlugins">(options: Pick<Partial<{
     automock: boolean;
     bail: number | boolean;
     cache: boolean;
@@ -22,9 +22,6 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
     changedSince: string;
     collectCoverage: boolean;
     collectCoverageFrom: string[];
-    collectCoverageOnlyFrom: {
-        [key: string]: boolean;
-    };
     coverageDirectory: string;
     coveragePathIgnorePatterns: string[];
     coverageProvider: "v8" | "babel";
@@ -95,25 +92,26 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
     slowTestThreshold: number;
     snapshotResolver: string;
     snapshotSerializers: string[];
-    snapshotFormat: {
-        readonly callToJSON?: boolean | undefined;
-        readonly escapeRegex?: boolean | undefined;
-        readonly escapeString?: boolean | undefined;
-        readonly highlight?: boolean | undefined;
-        readonly indent?: number | undefined;
-        readonly maxDepth?: number | undefined;
-        readonly maxWidth?: number | undefined;
-        readonly min?: boolean | undefined;
-        readonly printBasicPrototype?: boolean | undefined;
-        readonly printFunctionName?: boolean | undefined;
-        readonly theme?: {
-            readonly value?: string | undefined;
-            readonly tag?: string | undefined;
-            readonly content?: string | undefined;
-            readonly comment?: string | undefined;
-            readonly prop?: string | undefined;
-        } | undefined;
-    };
+    snapshotFormat: Partial<{
+        readonly callToJSON: boolean;
+        readonly compareKeys: null;
+        readonly escapeRegex: boolean;
+        readonly escapeString: boolean;
+        readonly highlight: boolean;
+        readonly indent: number;
+        readonly maxDepth: number;
+        readonly maxWidth: number;
+        readonly min: boolean;
+        readonly printBasicPrototype: boolean;
+        readonly printFunctionName: boolean;
+        readonly theme: Partial<{
+            readonly value: string;
+            readonly tag: string;
+            readonly content: string;
+            readonly comment: string;
+            readonly prop: string;
+        }>;
+    }>;
     errorOnDeprecated: boolean;
     testEnvironment: string;
     testEnvironmentOptions: Record<string, unknown>;
@@ -140,5 +138,6 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
     watchAll: boolean;
     watchman: boolean;
     watchPlugins: (string | [string, Record<string, unknown>])[];
+    workerIdleMemoryLimit: string | number;
 }>, DefaultOptions | AdditionalOptions>) => Config.InitialOptions;
 export {};

package/lib/api/jest/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/jest/index.ts"],"names":[],"mappings":";;;;;;AAEA,uEAA8C;AAC9C,kEAAiE;AA2BjE;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAGzB,OAAwE,EACjD,EAAE,CAAC,IAAA,iBAAQ,EAAC,qBAAU,EAAE,OAAO,CAAC,CAAC;AAJ7C,QAAA,WAAW,eAIkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/jest/index.ts"],"names":[],"mappings":";;;;;;AAEA,uEAA8C;AAC9C,kEAAiE;AA0BjE;;;;GAIG;AACI,MAAM,WAAW,GAAG,CAGzB,OAAwE,EACjD,EAAE,CAAC,IAAA,iBAAQ,EAAC,qBAAU,EAAE,OAAO,CAAC,CAAC;AAJ7C,QAAA,WAAW,eAIkC"}

package/lib/cli/configure/analyseDependencies.js

@@ -29,7 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyseDependencies = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const latest_version_1 = __importDefault(require("latest-version"));
 const copy_1 = require("../../utils/copy");
 const logging_1 = require("../../utils/logging");
 const version_1 = require("../../utils/version");
@@ -53,7 +52,7 @@ const pinUnspecifiedVersions = async (dependencies) => {
         .map(async ([name]) => {
         const version = await (name === 'skuba'
             ? (0, version_1.getSkubaVersion)()
-            : (0, latest_version_1.default)(name));
+            : (0, version_1.latestNpmVersion)(name));
         return [name, version];
     }));
     updates.forEach(([name, version]) => {

package/lib/cli/configure/analyseDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"analyseDependencies.js","sourceRoot":"","sources":["../../../src/cli/configure/analyseDependencies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analyseDependencies.js","sourceRoot":"","sources":["../../../src/cli/configure/analyseDependencies.ts"],"names":[],"mappings":"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"}

package/lib/cli/configure/ensureTemplateCompletion.js

@@ -12,7 +12,7 @@ const logging_1 = require("../../utils/logging");
 const template_1 = require("../../utils/template");
 const validation_1 = require("../../utils/validation");
 const getConfig_1 = require("../init/getConfig");
-const json_1 = require("./processing/json");
+const package_1 = require("./processing/package");
 const ensureTemplateCompletion = async ({ destinationRoot, include, manifest, }) => {
     const templateConfig = (0, getConfig_1.getTemplateConfig)(destinationRoot);
     if (templateConfig.fields.length === 0) {
@@ -27,7 +27,7 @@ const ensureTemplateCompletion = async ({ destinationRoot, include, manifest, })
         message: chalk_1.default.bold(`Complete ${chalk_1.default.cyan(templateName)}:`),
         name: 'customAnswers',
     });
-    const updatedPackageJson = (0, json_1.formatObject)(manifest.packageJson);
+    const updatedPackageJson = (0, package_1.formatPackage)(manifest.packageJson);
     const packageJsonFilepath = path_1.default.join(destinationRoot, 'package.json');
     await fs_extra_1.default.promises.writeFile(packageJsonFilepath, updatedPackageJson);
     await (0, copy_1.copyFiles)({

package/lib/cli/configure/ensureTemplateCompletion.js.map

@@ -1 +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"}
+{"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,kDAAqD;AAQ9C,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,uBAAa,EAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/D,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"}

package/lib/cli/configure/modules/tsconfig.js

@@ -40,14 +40,15 @@ const tsconfigModule = async ({ firstRun, type, }) => {
             }
             const outputData = (0, record_1.merge)(inputData ?? {}, baseData);
             // Remove `lib/**/*` and `lib`, which duplicate `lib*/**/*`
-            if (Array.isArray(outputData.exclude)) {
+            if ((0, validation_1.hasProp)(outputData, 'exclude') && Array.isArray(outputData.exclude)) {
                 const { exclude } = outputData;
                 const hasLibStar = exclude.includes('lib*/**/*');
                 outputData.exclude = exclude.filter((pattern) => !(hasLibStar && new Set(['lib', 'lib/**/*']).has(pattern)));
             }
             // for optimal ESLinting, base config should compile all files and leave
             // exclusions to .eslintignore and tsconfig.build.json
-            if (!initialFiles['tsconfig.json']?.includes('skuba/config/tsconfig.json')) {
+            if ((0, validation_1.hasProp)(outputData, 'include') &&
+                !initialFiles['tsconfig.json']?.includes('skuba/config/tsconfig.json')) {
                 delete outputData.include;
             }
             // Retain comments for package documentation

package/lib/cli/configure/modules/tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsconfig.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/tsconfig.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tsconfig.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/tsconfig.ts"],"names":[],"mappings":"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"}

package/lib/cli/configure/processing/package.d.ts

@@ -1,5 +1,5 @@
 import type { PackageJson } from '../types';
-export declare const formatPackage: (data: PackageJson) => string;
+export declare const formatPackage: (rawData: PackageJson) => string;
 export declare const parsePackage: (input: string | undefined) => PackageJson | undefined;
 export declare const createDependencyFilter: (names: readonly string[], type: 'dependencies' | 'devDependencies') => (data: PackageJson) => {
     [x: string]: unknown;
@@ -46,7 +46,7 @@ export declare const createDependencyFilter: (names: readonly string[], type: 'd
     } | undefined;
     engineStrict?: boolean | undefined;
     os?: import("type-fest").LiteralUnion<"aix" | "darwin" | "freebsd" | "linux" | "openbsd" | "sunos" | "win32" | "!aix" | "!darwin" | "!freebsd" | "!linux" | "!openbsd" | "!sunos" | "!win32", string>[] | undefined;
-    cpu?: import("type-fest").LiteralUnion<"arm" | "arm64" | "ia32" | "mips" | "mipsel" | "ppc" | "ppc64" | "s390" | "s390x" | "x32" | "x64" | "!arm" | "!arm64" | "!ia32" | "!mips" | "!mipsel" | "!ppc" | "!ppc64" | "!s390" | "!s390x" | "!x32" | "!x64", string>[] | undefined;
+    cpu?: import("type-fest").LiteralUnion<"arm" | "arm64" | "ia32" | "mips" | "mipsel" | "ppc" | "ppc64" | "s390" | "s390x" | "x64" | "x32" | "!arm" | "!arm64" | "!ia32" | "!mips" | "!mipsel" | "!ppc" | "!ppc64" | "!s390" | "!s390x" | "!x32" | "!x64", string>[] | undefined;
     preferGlobal?: boolean | undefined;
     private?: boolean | undefined;
     publishConfig?: import("type-fest").PackageJson.PublishConfig | undefined;

package/lib/cli/configure/processing/package.js

@@ -5,16 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withPackage = exports.createDependencyFilter = exports.parsePackage = exports.formatPackage = void 0;
 const normalize_package_data_1 = __importDefault(require("normalize-package-data"));
-const validation_1 = require("../../../utils/validation");
+const sort_package_json_1 = __importDefault(require("sort-package-json"));
 const json_1 = require("./json");
-const sortRecord = (record) => Object.fromEntries(Object.entries(record).sort(([keyA], [keyB]) => keyA.localeCompare(keyB)));
-const formatPackage = (data) => {
-    (0, normalize_package_data_1.default)(data);
-    for (const [key, value] of Object.entries(data)) {
-        if (key !== 'scripts' && (0, validation_1.isObject)(value) && !Array.isArray(value)) {
-            data[key] = sortRecord(value);
-        }
-    }
+const prettier_1 = require("./prettier");
+const formatPackage = (rawData) => {
+    (0, normalize_package_data_1.default)(rawData);
+    const data = (0, sort_package_json_1.default)(rawData);
     // normalize-package-data fields that aren't useful for applications
     delete data._id;
     if (data.name === '') {
@@ -26,7 +22,9 @@ const formatPackage = (data) => {
     if (data.version === '') {
         delete data.version;
     }
-    return (0, json_1.formatObject)(data, 'package.json');
+    return (0, prettier_1.formatPrettier)(JSON.stringify(data), {
+        filepath: 'package.json',
+    });
 };
 exports.formatPackage = formatPackage;
 const parsePackage = (input) => {

package/lib/cli/configure/processing/package.js.map

@@ -1 +1 @@
-{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/processing/package.ts"],"names":[],"mappings":";;;;;;AAAA,oFAAmD;AAEnD,0DAAqD;AAGrD,iCAAmD;AAEnD,MAAM,UAAU,GAAG,CAAI,MAAyB,EAAqB,EAAE,CACrE,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAC1E,CAAC;AAEG,MAAM,aAAa,GAAG,CAAC,IAAiB,EAAE,EAAE;IACjD,IAAA,gCAAa,EAAC,IAAI,CAAC,CAAC;IAEpB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC/C,IAAI,GAAG,KAAK,SAAS,IAAI,IAAA,qBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACjE,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;SAC/B;KACF;IAED,oEAAoE;IAEpE,OAAO,IAAI,CAAC,GAAG,CAAC;IAEhB,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,EAAE;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC;KAClB;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,8BAA8B,EAAE;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC;KACpB;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,EAAE,EAAE;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC;KACrB;IAED,OAAO,IAAA,mBAAY,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;AAC5C,CAAC,CAAC;AA1BW,QAAA,aAAa,iBA0BxB;AAEK,MAAM,YAAY,GAAG,CAC1B,KAAyB,EACA,EAAE;IAC3B,MAAM,IAAI,GAAG,IAAA,kBAAW,EAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO;KACR;IAED,IAAA,gCAAa,EAAC,IAAI,CAAC,CAAC;IAEpB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAZW,QAAA,YAAY,gBAYvB;AAEK,MAAM,sBAAsB,GAAG,CACpC,KAAwB,EACxB,IAAwC,EACxC,EAAE;IACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAE3B,OAAO,CAAC,IAAiB,EAAE,EAAE,CAAC,CAAC;QAC7B,GAAG,IAAI;QACP,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CACpE;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC;AAEK,MAAM,WAAW,GACtB,CAAC,EAAsC,EAAE,EAAE,CAAC,CAAC,KAAyB,EAAE,EAAE;IACxE,MAAM,WAAW,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;IAExC,MAAM,YAAY,GAAG,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAE3C,OAAO,IAAA,qBAAa,EAAC,YAAY,CAAC,CAAC;AACrC,CAAC,CAAC;AAPS,QAAA,WAAW,eAOpB"}
+{"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/processing/package.ts"],"names":[],"mappings":";;;;;;AAAA,oFAAmD;AACnD,0EAAgD;AAIhD,iCAAqC;AACrC,yCAA4C;AAErC,MAAM,aAAa,GAAG,CAAC,OAAoB,EAAE,EAAE;IACpD,IAAA,gCAAa,EAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,IAAI,GAAG,IAAA,2BAAe,EAAC,OAAO,CAAC,CAAC;IAEtC,oEAAoE;IAEpE,OAAO,IAAI,CAAC,GAAG,CAAC;IAEhB,IAAI,IAAI,CAAC,IAAI,KAAK,EAAE,EAAE;QACpB,OAAO,IAAI,CAAC,IAAI,CAAC;KAClB;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,8BAA8B,EAAE;QAClD,OAAO,IAAI,CAAC,MAAM,CAAC;KACpB;IAED,IAAI,IAAI,CAAC,OAAO,KAAK,EAAE,EAAE;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC;KACrB;IAED,OAAO,IAAA,yBAAc,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;QAC1C,QAAQ,EAAE,cAAc;KACzB,CAAC,CAAC;AACL,CAAC,CAAC;AAxBW,QAAA,aAAa,iBAwBxB;AAEK,MAAM,YAAY,GAAG,CAC1B,KAAyB,EACA,EAAE;IAC3B,MAAM,IAAI,GAAG,IAAA,kBAAW,EAAC,KAAK,CAAC,CAAC;IAEhC,IAAI,IAAI,KAAK,SAAS,EAAE;QACtB,OAAO;KACR;IAED,IAAA,gCAAa,EAAC,IAAI,CAAC,CAAC;IAEpB,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAZW,QAAA,YAAY,gBAYvB;AAEK,MAAM,sBAAsB,GAAG,CACpC,KAAwB,EACxB,IAAwC,EACxC,EAAE;IACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAE3B,OAAO,CAAC,IAAiB,EAAE,EAAE,CAAC,CAAC;QAC7B,GAAG,IAAI;QACP,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CACpE;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAZW,QAAA,sBAAsB,0BAYjC;AAEK,MAAM,WAAW,GACtB,CAAC,EAAsC,EAAE,EAAE,CAAC,CAAC,KAAyB,EAAE,EAAE;IACxE,MAAM,WAAW,GAAG,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAC;IAExC,MAAM,YAAY,GAAG,EAAE,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IAE3C,OAAO,IAAA,qBAAa,EAAC,YAAY,CAAC,CAAC;AACrC,CAAC,CAAC;AAPS,QAAA,WAAW,eAOpB"}

package/lib/cli/lint/autofix.js

@@ -103,10 +103,11 @@ const autofix = async (params) => {
         }
         // Other CI Environments, use GitHub API
         if (!currentBranch) {
-            logging_1.log.warn('Could not determine the current branch');
+            logging_1.log.warn('Could not determine the current branch.');
+            logging_1.log.warn('Please propagate BUILDKITE_BRANCH, GITHUB_HEAD_REF, GITHUB_REF_NAME, or the .git directory to your container.');
             return;
         }
-        const ref = await (0, wait_1.throwOnTimeout)(GitHub.commitAndPushAllChanges({
+        const ref = await (0, wait_1.throwOnTimeout)(GitHub.uploadAllFileChanges({
             dir,
             branch: currentBranch,
             messageHeadline: AUTOFIX_COMMIT_MESSAGE,