skuba 4.3.0 → 4.4.1

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/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" | "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" | "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/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;

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/test/reporters/github/annotations.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateAnnotationEntries = exports.createAnnotations = void 0;
 const path_1 = __importDefault(require("path"));
 const strip_ansi_1 = __importDefault(require("strip-ansi"));
+const ts_dedent_1 = __importDefault(require("ts-dedent"));
 /**
  * Matches the first stack trace location in a Jest failure message.
  *
@@ -49,7 +50,9 @@ const createAnnotations = (testResults) => {
                 path: path_1.default.relative(cwd, testResult.testFilePath),
                 start_line: 1,
                 end_line: 1,
-                message: (0, strip_ansi_1.default)(testResult.testExecError.message),
+                message: (0, strip_ansi_1.default)(testResult.failureMessage
+                    ? (0, ts_dedent_1.default)(testResult.failureMessage)
+                    : testResult.testExecError.message),
                 title: 'Jest',
             };
         }

package/lib/cli/test/reporters/github/annotations.js.map

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

package/lib/utils/args.d.ts

@@ -15,7 +15,7 @@ export declare const hasSerialFlag: (args?: string[], env?: NodeJS.ProcessEnv) =
  * ```
  */
 export declare const parseProcessArgs: (args?: string[]) => {
-    commandName: "format" | "node" | "test" | "release" | "build" | "build-package" | "configure" | "help" | "init" | "lint" | "start" | "version";
+    commandName: "format" | "node" | "test" | "release" | "version" | "build" | "build-package" | "configure" | "help" | "init" | "lint" | "start";
     args: string[];
 };
 interface RunArgs {

package/lib/utils/version.js

@@ -1,16 +1,59 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSkubaVersionInfo = exports.getSkubaVersion = exports.latestNpmVersion = void 0;
-const package_json_1 = __importDefault(require("package-json"));
+const path_1 = __importDefault(require("path"));
+const validate_npm_package_name_1 = __importDefault(require("validate-npm-package-name"));
 const manifest_1 = require("./manifest");
+const validation_1 = require("./validation");
 const wait_1 = require("./wait");
+const loadPackageJson = async (packageName) => {
+    const { validForNewPackages } = (0, validate_npm_package_name_1.default)(packageName);
+    if (!validForNewPackages) {
+        throw new Error(`Package "${packageName}" does not have a valid name`);
+    }
+    const message = `Package "${packageName}" does not have a valid package.json manifest`;
+    let packageJson;
+    try {
+        packageJson = await Promise.resolve().then(() => __importStar(require(path_1.default.posix.join(packageName, 'package.json'))));
+    }
+    catch {
+        throw new Error(message);
+    }
+    if (!(0, validation_1.isObject)(packageJson)) {
+        throw new Error(message);
+    }
+    return packageJson;
+};
 const latestNpmVersion = async (packageName) => {
-    const { version } = await (0, package_json_1.default)(packageName);
+    const { version } = await loadPackageJson(packageName);
     if (typeof version !== 'string') {
-        throw new Error(`No version found for package "${packageName}"`);
+        throw new Error(`Package "${packageName}" does not have a valid version in its package.json manifest`);
     }
     return version;
 };

package/lib/utils/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAuC;AAEvC,yCAA8C;AAC9C,iCAAqC;AAE9B,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAmB,EACF,EAAE;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,sBAAW,EAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,iCAAiC,WAAW,GAAG,CAAC,CAAC;KAClE;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B;AAEF,MAAM,kBAAkB,GAAG,KAAK,IAA4B,EAAE;IAC5D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEtE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;KACxC;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"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,0FAA4D;AAE5D,yCAA8C;AAC9C,6CAAwC;AACxC,iCAAqC;AAErC,MAAM,eAAe,GAAG,KAAK,EAC3B,WAAmB,EACe,EAAE;IACpC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,mCAAmB,EAAC,WAAW,CAAC,CAAC;IAEjE,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,8BAA8B,CAAC,CAAC;KACxE;IAED,MAAM,OAAO,GAAG,YAAY,WAAW,+CAA+C,CAAC;IAEvF,IAAI,WAAoB,CAAC;IACzB,IAAI;QACF,WAAW,GAAG,wDAAa,cAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,GAAC,CAAC;KAC1E;IAAC,MAAM;QACN,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC1B;IAED,IAAI,CAAC,IAAA,qBAAQ,EAAC,WAAW,CAAC,EAAE;QAC1B,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC1B;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAmB,EACF,EAAE;IACnB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,eAAe,CAAC,WAAW,CAAC,CAAC;IAEvD,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CACb,YAAY,WAAW,8DAA8D,CACtF,CAAC;KACH;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAZW,QAAA,gBAAgB,oBAY3B;AAEF,MAAM,kBAAkB,GAAG,KAAK,IAA4B,EAAE;IAC5D,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAW,EAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAEtE,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;KACxC;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"}

package/package.json

@@ -6,11 +6,12 @@
     "url": "https://github.com/seek-oss/skuba/issues"
   },
   "dependencies": {
-    "@octokit/graphql": "^4.8.0",
-    "@octokit/graphql-schema": "^10.73.0",
-    "@octokit/rest": "^18.12.0",
-    "@octokit/types": "^6.34.0",
-    "@types/jest": "^28.0.0",
+    "@jest/types": "^29.0.0",
+    "@octokit/graphql": "^5.0.0",
+    "@octokit/graphql-schema": "^12.0.0",
+    "@octokit/rest": "^19.0.0",
+    "@octokit/types": "^7.0.0",
+    "@types/jest": "^29.0.0",
     "@types/node": ">=14.18",
     "chalk": "^4.1.0",
     "concurrently": "^7.0.0",
@@ -18,7 +19,7 @@
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "eslint": "^8.11.0",
-    "eslint-config-skuba": "1.1.1",
+    "eslint-config-skuba": "1.1.4",
     "execa": "^5.0.0",
     "fdir": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -27,13 +28,12 @@
     "ignore": "^5.1.8",
     "is-installed-globally": "^0.4.0",
     "isomorphic-git": "^1.11.1",
-    "jest": "^28.1.0",
-    "jest-watch-typeahead": "^1.1.0",
+    "jest": "^29.0.1",
+    "jest-watch-typeahead": "^2.1.1",
     "lodash.mergewith": "^4.6.2",
     "normalize-package-data": "^4.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
-    "package-json": "^7.0.0",
     "picomatch": "^2.2.2",
     "prettier": "~2.7.0",
     "read-pkg-up": "^7.0.1",
@@ -41,36 +41,42 @@
     "semantic-release": "^19.0.0",
     "serialize-error": "^8.0.1",
     "simple-git": "^3.5.0",
+    "sort-package-json": "^1.57.0",
     "strip-ansi": "^6.0.1",
-    "ts-jest": "^28.0.2",
+    "ts-dedent": "^2.2.0",
+    "ts-jest": "^29.0.0-next.0",
     "ts-node": "^10.7.0",
     "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.7.0"
+    "typescript": "~4.8.2",
+    "validate-npm-package-name": "^4.0.0"
   },
   "description": "SEEK development toolkit for backend applications and packages",
   "devDependencies": {
-    "@changesets/cli": "2.23.0",
+    "@changesets/cli": "2.24.3",
     "@changesets/get-github-info": "0.5.1",
-    "@jest/reporters": "28.1.1",
+    "@jest/reporters": "29.0.1",
     "@types/ejs": "3.1.1",
     "@types/express": "4.17.13",
     "@types/fs-extra": "9.0.13",
-    "@types/koa": "2.13.4",
+    "@types/koa": "2.13.5",
     "@types/lodash.mergewith": "4.6.7",
     "@types/module-alias": "2.0.1",
     "@types/npm-which": "3.0.1",
     "@types/picomatch": "2.3.0",
     "@types/supertest": "2.0.12",
-    "enhanced-resolve": "5.9.3",
+    "@types/validate-npm-package-name": "4.0.0",
+    "enhanced-resolve": "5.10.0",
     "express": "4.18.1",
     "jsonfile": "6.1.0",
     "koa": "2.13.4",
-    "memfs": "3.4.6",
+    "memfs": "3.4.7",
+    "remark-cli": "11.0.0",
+    "remark-preset-lint-recommended": "6.1.2",
     "semver": "7.3.7",
-    "supertest": "6.2.3",
-    "type-fest": "2.13.1"
+    "supertest": "6.2.4",
+    "type-fest": "2.18.0"
   },
   "engines": {
     "node": ">=14.18"
@@ -97,9 +103,31 @@
     }
   },
   "private": false,
+  "remarkConfig": {
+    "plugins": [
+      "remark-preset-lint-recommended",
+      [
+        "remark-lint-list-item-indent",
+        false
+      ],
+      [
+        "remark-lint-no-shortcut-reference-link",
+        false
+      ],
+      [
+        "remark-lint-no-undefined-references",
+        {
+          "allow": [
+            " ",
+            "x"
+          ]
+        }
+      ]
+    ]
+  },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/seek-oss/skuba.git"
+    "url": "git+ssh://git@github.com/seek-oss/skuba.git"
   },
   "resolutions": {
     "**/@types/node": ">=14.18"
@@ -108,7 +136,8 @@
     "build": "ts-node --transpile-only src/skuba build && scripts/postbuild.sh",
     "deploy": "scripts/deploy.sh",
     "format": "yarn skuba format",
-    "lint": "yarn skuba lint",
+    "lint": "yarn skuba lint && yarn lint:md",
+    "lint:md": "remark --frail --quiet .",
     "release": "yarn build && changeset publish",
     "stage": "changeset version && yarn format",
     "skuba": "yarn build && node lib/skuba",
@@ -126,5 +155,5 @@
     "version": "4.0.0"
   },
   "types": "./lib/index.d.ts",
-  "version": "4.3.0"
+  "version": "4.4.1"
 }

package/template/base/_.eslintignore

@@ -1,7 +1,10 @@
 # managed by skuba
-.idea/
+.idea/*
+.vscode/*
+
+.cdk.staging/
 .serverless/
-.vscode/
+cdk.out/
 node_modules*/
 
 /coverage*/

package/template/base/_.gitignore

@@ -1,8 +1,9 @@
 # managed by skuba
+.idea/*
+.vscode/*
+
 .cdk.staging/
-.idea/
 .serverless/
-.vscode/
 cdk.out/
 node_modules*/
 

package/template/base/_.prettierignore

@@ -1,7 +1,10 @@
 # managed by skuba
-.idea/
+.idea/*
+.vscode/*
+
+.cdk.staging/
 .serverless/
-.vscode/
+cdk.out/
 node_modules*/
 
 /coverage*/

package/template/express-rest-api/.buildkite/pipeline.yml

@@ -51,7 +51,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v3.9.0:
+      - docker-compose#v3.10.0:
           run: app
     timeout_in_minutes: 10
 
@@ -61,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.8.1:
+      - seek-jobs/gantry#v2.0.0:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -78,7 +78,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.8.1:
+      - seek-jobs/gantry#v2.0.0:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -93,7 +93,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.8.1:
+      - seek-jobs/gantry#v2.0.0:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/express-rest-api/.gantry/common.yml

@@ -4,7 +4,7 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 service: '<%- serviceName %>'
 
 # TODO: enable Datadog agent
-# https://gantry.ssod.skinfra.xyz/docs/v1/resources/service.html#datadogSecretId
+# https://backstage.myseek.xyz/docs/default/component/gantry/v1/reference/resources/service/#datadogSecretId
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags: