npm - skuba - Versions diffs - 3.17.2 → 4.1.1 - Mend

skuba 3.17.2 → 4.1.1

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.

Files changed (37) hide show

package/jest/moduleNameMapper.js +4 -7
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/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/package.json +81 -67
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/Dockerfile +3 -0
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/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/Dockerfile +3 -0
package/template/koa-rest-api/README.md +1 -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 +17 -22
package/template/lambda-sqs-worker/.env +1 -0
package/template/lambda-sqs-worker/package.json +3 -3
package/template/lambda-sqs-worker/serverless.yml +20 -21
package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +14 -20
package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +4 -0
package/template/lambda-sqs-worker-cdk/infra/appStack.ts +4 -0
package/template/private-npm-package/.buildkite/pipeline.yml +3 -2

package/jest/moduleNameMapper.js CHANGED Viewed

@@ -11,7 +11,7 @@ const {
 /**
  * Set a default `src` module alias for backward compatibility.
  *
- * TODO: drop this default in skuba v4.
+ * TODO: drop this default in skuba v5.
  */
 const DEFAULT_PATHS = { src: ['src'], 'src/*': ['src/*'] };
@@ -20,8 +20,7 @@ const DEFAULT_PATHS = { src: ['src'], 'src/*': ['src/*'] };
  */
 const getConfigFromDisk = () => {
   const filename =
-    // TODO: drop Node.js 12 compatibility and switch to ?? in skuba v4.
-    findConfigFile('.', sys.fileExists.bind(this)) || 'tsconfig.json';
+    findConfigFile('.', sys.fileExists.bind(this)) ?? 'tsconfig.json';
   return readConfigFile(filename, sys.readFile.bind(this)).config;
 };
@@ -33,8 +32,7 @@ module.exports.createModuleNameMapper = (getConfig = getConfigFromDisk) => {
     const parsedConfig = parseJsonConfigFileContent(json, sys, '.');
     const paths = Object.fromEntries(
-      // TODO: drop Node.js 12 compatibility and switch to ?? in skuba v4.
-      Object.entries(parsedConfig.options.paths || DEFAULT_PATHS).flatMap(
+      Object.entries(parsedConfig.options.paths ?? DEFAULT_PATHS).flatMap(
         ([key, values]) => [
           // Pass through the input path entry almost verbatim.
           // We trim a trailing slash because TypeScript allows `import 'src'`
@@ -66,8 +64,7 @@ module.exports.createModuleNameMapper = (getConfig = getConfigFromDisk) => {
       ),
     );
-    // TODO: drop Node.js 12 compatibility and switch to ?? in skuba v4.
-    const prefix = path.join('<rootDir>', parsedConfig.options.baseUrl || '.');
+    const prefix = path.join('<rootDir>', parsedConfig.options.baseUrl ?? '.');
     const moduleNameMapper = pathsToModuleNameMapper(paths, { prefix });

package/lib/cli/adapter/eslint.js CHANGED Viewed

@@ -34,10 +34,25 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
     const cwd = process.cwd();
     logger.debug('Processing files...');
     const start = process.hrtime.bigint();
+    /* eslint-disable no-console */
+    const ogConsoleError = console.error;
+    console.error = (...args) => {
+        if (args[0] !==
+            // `eslint-plugin-react` prints this annoying error on non-React repos.
+            // We still want to support React linting for repos that have React code,
+            // so we have to manually suppress it.
+            //
+            // https://github.com/yannickcr/eslint-plugin-react/blob/7484acaca8351a8568fa99344bc811c5cd8396bd/lib/util/version.js#L61-L65
+            '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.') {
+            ogConsoleError(...args);
+        }
+    };
     const [formatter, results] = yield Promise.all([
         engine.loadFormatter(),
         engine.lintFiles('.'),
     ]);
+    console.error = ogConsoleError;
+    /* eslint-enable no-console */
     const end = process.hrtime.bigint();
     logger.plain(`Processed ${(0, logging_1.pluralise)(results.length, 'file')} in ${logger.timing(start, end)}.`);
     const errors = [];
@@ -60,7 +75,7 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
     }
     const ok = errors.length === 0;
     yield eslint_1.ESLint.outputFixes(results);
-    const output = formatter.format(results);
+    const output = yield formatter.format(results);
     if (output) {
         logger.plain(output);
     }

package/lib/cli/adapter/eslint.js.map CHANGED Viewed

	@@ -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;~~IAEzC~~,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;~~AAlEW~~,QAAA,SAAS,~~aAkEpB~~"}
1	+ {"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":"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"}

package/lib/cli/configure/analysis/package.js CHANGED Viewed

@@ -56,7 +56,7 @@ const generateNotices = ({ dependencies, devDependencies, }) => {
             logging_1.log.newline();
             logging_1.log.warn("We're going to tweak your output directories,", 'so double check your bundle once this is done.');
             logging_1.log.newline();
-            logging_1.log.warn('Read more:', logging_1.log.bold('https://github.com/seek-oss/skuba/blob/master/docs/migrating-from-seek-module-toolkit.md#building'));
+            logging_1.log.warn('Read more:', logging_1.log.bold('https://seek-oss.github.io/skuba/docs/migration-guides/seek-module-toolkit.html#building'));
         };
     }
     return () => { };

package/lib/cli/configure/analysis/package.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/package.ts"],"names":[],"mappings":"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~~mGAAmG~~,~~CACpG~~,CACF,CAAC;QACJ,CAAC,CAAC;KACH;IAED,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;AAClB,CAAC,CAAC;AA3BW,QAAA,eAAe,mBA2B1B"}
1	+ {"version":3,"file":"package.js","sourceRoot":"","sources":["../../../../src/cli/configure/analysis/package.ts"],"names":[],"mappings":"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"}

package/lib/cli/configure/modules/package.js CHANGED Viewed

@@ -24,7 +24,7 @@ const packageModule = ({ entryPoint, type, }) => __awaiter(void 0, void 0, void
     const version = yield (0, version_1.getSkubaVersion)();
     const initialData = {
         private: type !== 'package',
-        scripts: Object.assign(Object.assign({ build: type === 'package' ? 'skuba build-package' : 'skuba build', format: 'skuba format', lint: 'skuba lint' }, (type === 'package' ? {} : { start: 'ENVIRONMENT=local skuba start' })), { test: 'skuba test --coverage', 'test:watch': 'skuba test --watch' }),
+        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' }),
         skuba: {
             entryPoint,
             template: null,

package/lib/cli/configure/modules/package.js.map CHANGED Viewed

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

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

@@ -21,6 +21,7 @@ export declare const createDependencyFilter: (names: readonly string[], type: 'd
     type?: "module" | "commonjs" | undefined;
     main?: string | undefined;
     exports?: import("type-fest").PackageJson.Exports | undefined;
+    imports?: import("type-fest").PackageJson.Imports | undefined;
     bin?: string | Record<string, string> | undefined;
     man?: string | string[] | undefined;
     directories?: import("type-fest").PackageJson.DirectoryLocations | undefined;

package/lib/cli/node.js CHANGED Viewed

@@ -50,13 +50,16 @@ const node = () => __awaiter(void 0, void 0, void 0, function* () {
         });
         // Run a script with plain `node` to support inspector options.
         // https://github.com/TypeStrong/ts-node#programmatic
-        return exec('node', ...args.node, '--require', 'tsconfig-paths/register', '--require', 'ts-node/register/transpile-only', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
+        return exec('node', ...args.node, '--require', 'dotenv/config', '--require', 'tsconfig-paths/register', '--require', 'ts-node/register/transpile-only',
+        // Override dangerously warn-only default on Node.js <15 so that we
+        // predictably return a non-zero exit code on an unhandled rejection.
+        '--unhandled-rejections=throw', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
     }
     // REPL with `ts-node` to support import statements.
     return tsNode
         .createRepl({
         service: tsNode.register({
-            require: ['tsconfig-paths/register'],
+            require: ['dotenv/config', 'tsconfig-paths/register'],
             transpileOnly: true,
         }),
     })

package/lib/cli/node.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAC/B,gDAAkC;AAElC,wCAA6C;AAC7C,wCAA2C;AAC3C,oDAA+C;AAExC,MAAM,IAAI,GAAG,GAAS,EAAE;IAC7B,MAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEtC,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;YACtB,GAAG,EAAE;gBACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;gBACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;aACtE;SACF,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qDAAqD;QACrD,OAAO,IAAI,CACT,MAAM,EACN,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,iCAAiC,~~EACjC~~,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;KACH;IAED,oDAAoD;IACpD,OAAO,MAAM;SACV,UAAU,CAAC;QACV,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,CAAC,yBAAyB,CAAC;~~YACpC~~,aAAa,EAAE,IAAI;SACpB,CAAC;KACH,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC,CAAA,CAAC;~~AApCW~~,QAAA,IAAI,~~QAoCf~~"}
1	+ {"version":3,"file":"node.js","sourceRoot":"","sources":["../../src/cli/node.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAC/B,gDAAkC;AAElC,wCAA6C;AAC7C,wCAA2C;AAC3C,oDAA+C;AAExC,MAAM,IAAI,GAAG,GAAS,EAAE;IAC7B,MAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,aAAa,GAAG,MAAM,IAAA,kBAAO,GAAE,CAAC;IAEtC,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC;YACtB,GAAG,EAAE;gBACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;gBACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;aACtE;SACF,CAAC,CAAC;QAEH,+DAA+D;QAC/D,qDAAqD;QACrD,OAAO,IAAI,CACT,MAAM,EACN,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,iCAAiC;QACjC,mEAAmE;QACnE,qEAAqE;QACrE,8BAA8B,EAC9B,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;KACH;IAED,oDAAoD;IACpD,OAAO,MAAM;SACV,UAAU,CAAC;QACV,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,CAAC,eAAe,EAAE,yBAAyB,CAAC;YACrD,aAAa,EAAE,IAAI;SACpB,CAAC;KACH,CAAC;SACD,KAAK,EAAE,CAAC;AACb,CAAC,CAAA,CAAC;AAzCW,QAAA,IAAI,QAyCf"}

package/lib/cli/start.js CHANGED Viewed

@@ -20,20 +20,19 @@ const exec_1 = require("../utils/exec");
 const manifest_1 = require("../utils/manifest");
 const validation_1 = require("../utils/validation");
 const start = () => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const [args, availablePort] = yield Promise.all([
         (0, args_1.parseRunArgs)(process.argv.slice(2)),
         (0, get_port_1.default)(),
     ]);
-    if (!args.entryPoint) {
-        args.entryPoint = yield (0, manifest_1.getEntryPointFromManifest)();
-    }
+    (_a = args.entryPoint) !== null && _a !== void 0 ? _a : (args.entryPoint = yield (0, manifest_1.getEntryPointFromManifest)());
     const execProcess = (0, exec_1.createExec)({
         env: {
             __SKUBA_ENTRY_POINT: args.entryPoint,
             __SKUBA_PORT: String((0, validation_1.isIpPort)(args.port) ? args.port : availablePort),
         },
     });
-    return execProcess('ts-node-dev', ...args.node, '--require', 'tsconfig-paths/register', '--respawn', '--transpile-only', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
+    return execProcess('ts-node-dev', ...args.node, '--require', 'dotenv/config', '--require', 'tsconfig-paths/register', '--respawn', '--transpile-only', path_1.default.join(__dirname, '..', 'wrapper'), ...args.script);
 });
 exports.start = start;
 //# sourceMappingURL=start.js.map

package/lib/cli/start.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/cli/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAE/B,wCAA6C;AAC7C,wCAA2C;AAC3C,gDAA8D;AAC9D,oDAA+C;AAExC,MAAM,KAAK,GAAG,GAAS,EAAE;IAC9B,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAA,kBAAO,GAAE;KACV,CAAC,CAAC;IAEH,~~IAAI~~,~~CAAC,~~IAAI,CAAC,UAAU,~~EAAE;QACpB~~,IAAI,CAAC,UAAU,~~GAAG~~,MAAM,IAAA,oCAAyB,GAAE,~~CAAC~~;~~KACrD;IAED~~,MAAM,WAAW,GAAG,IAAA,iBAAU,EAAC;QAC7B,GAAG,EAAE;YACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;YACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;SACtE;KACF,CAAC,CAAC;IAEH,OAAO,WAAW,CAChB,aAAa,EACb,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,kBAAkB,EAClB,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;AACJ,CAAC,CAAA,CAAC;AA3BW,QAAA,KAAK,SA2BhB"}
1	+ {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/cli/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,wDAA+B;AAE/B,wCAA6C;AAC7C,wCAA2C;AAC3C,gDAA8D;AAC9D,oDAA+C;AAExC,MAAM,KAAK,GAAG,GAAS,EAAE;;IAC9B,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,mBAAY,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnC,IAAA,kBAAO,GAAE;KACV,CAAC,CAAC;IAEH,MAAA,IAAI,CAAC,UAAU,oCAAf,IAAI,CAAC,UAAU,GAAK,MAAM,IAAA,oCAAyB,GAAE,EAAC;IAEtD,MAAM,WAAW,GAAG,IAAA,iBAAU,EAAC;QAC7B,GAAG,EAAE;YACH,mBAAmB,EAAE,IAAI,CAAC,UAAU;YACpC,YAAY,EAAE,MAAM,CAAC,IAAA,qBAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC;SACtE;KACF,CAAC,CAAC;IAEH,OAAO,WAAW,CAChB,aAAa,EACb,GAAG,IAAI,CAAC,IAAI,EACZ,WAAW,EACX,eAAe,EACf,WAAW,EACX,yBAAyB,EACzB,WAAW,EACX,kBAAkB,EAClB,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,SAAS,CAAC,EACrC,GAAG,IAAI,CAAC,MAAM,CACf,CAAC;AACJ,CAAC,CAAA,CAAC;AA3BW,QAAA,KAAK,SA2BhB"}

package/package.json CHANGED Viewed

@@ -1,76 +1,22 @@
 {
-  "name": "skuba",
-  "description": "Toolkit for backend TypeScript development",
   "bin": {
     "skuba": "lib/skuba.js"
   },
-  "engines": {
-    "node": ">=12"
-  },
-  "version": "3.17.2",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
-  "files": [
-    "config/**/*",
-    "jest/**/*",
-    "lib*/**/*.d.ts",
-    "lib*/**/*.js",
-    "lib*/**/*.js.map",
-    "template/**/*",
-    "jest-preset.js"
-  ],
-  "sideEffects": false,
-  "license": "MIT",
-  "scripts": {
-    "build": "ts-node --transpile-only src/skuba build && scripts/postbuild.sh",
-    "changeset:add": "changeset add && prettier --loglevel silent --write '.changeset/*.md'",
-    "deploy": "scripts/deploy.sh",
-    "format": "yarn skuba format",
-    "lint": "yarn skuba lint",
-    "release": "yarn build && changeset publish",
-    "stage": "changeset version && yarn format",
-    "skuba": "yarn build && node lib/skuba",
-    "test": "yarn skuba test",
-    "test:ci": "yarn skuba test --config jest.config.int.ts --runInBand",
-    "test:int": "yarn skuba test --config jest.config.int.ts --runInBand",
-    "test:template": "scripts/test-template.sh",
-    "test:watch": "yarn skuba test --config jest.config.int.ts --runInBand --watch"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/seek-oss/skuba.git"
-  },
-  "devDependencies": {
-    "@changesets/cli": "2.19.0",
-    "@changesets/get-github-info": "0.5.0",
-    "@jest/reporters": "27.4.6",
-    "@types/ejs": "3.1.0",
-    "@types/express": "4.17.13",
-    "@types/fs-extra": "9.0.13",
-    "@types/koa": "2.13.4",
-    "@types/lodash.mergewith": "4.6.6",
-    "@types/module-alias": "2.0.1",
-    "@types/npm-which": "3.0.1",
-    "@types/picomatch": "2.3.0",
-    "@types/supertest": "2.0.11",
-    "express": "4.17.2",
-    "jsonfile": "6.1.0",
-    "koa": "2.13.4",
-    "memfs": "3.4.1",
-    "semver": "7.3.5",
-    "supertest": "6.2.1",
-    "type-fest": "2.9.0"
+  "bugs": {
+    "url": "https://github.com/seek-oss/skuba/issues"
   },
   "dependencies": {
     "@octokit/rest": "^18.12.0",
     "@octokit/types": "^6.34.0",
     "@types/jest": "^27.4.0",
+    "@types/node": ">=14.18",
     "chalk": "^4.1.0",
     "concurrently": "^7.0.0",
+    "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
     "eslint": "^7.27.0",
-    "eslint-config-skuba": "1.0.13",
+    "eslint-config-skuba": "1.0.15",
     "execa": "^5.0.0",
     "fdir": "^5.0.0",
     "fs-extra": "^10.0.0",
@@ -78,37 +24,105 @@
     "get-port": "^5.1.1",
     "ignore": "^5.1.8",
     "is-installed-globally": "^0.4.0",
-    "isomorphic-git": "^1.10.1",
+    "isomorphic-git": "^1.11.1",
     "jest": "^27.4.5",
     "latest-version": "^5.1.0",
     "lodash.mergewith": "^4.6.2",
-    "normalize-package-data": "^3.0.0",
+    "normalize-package-data": "^4.0.0",
     "npm-run-path": "^4.0.1",
     "npm-which": "^3.0.1",
     "picomatch": "^2.2.2",
-    "prettier": "~2.5.0",
+    "prettier": "~2.6.0",
     "read-pkg-up": "^7.0.1",
     "runtypes": "^6.0.0",
-    "semantic-release": "^17.4.7",
+    "semantic-release": "^19.0.0",
     "serialize-error": "^8.0.1",
     "simple-git": "^3.0.0",
     "strip-ansi": "^6.0.1",
     "ts-jest": "^27.1.2",
-    "ts-node": "^9.1.1",
-    "ts-node-dev": "^1.1.8",
+    "ts-node": "^10.5.0",
+    "ts-node-dev": "^2.0.0-0",
     "tsconfig-paths": "^3.11.0",
     "tsconfig-seek": "1.0.2",
     "typescript": "~4.4.4"
   },
+  "description": "SEEK development toolkit for backend applications and packages",
+  "devDependencies": {
+    "@changesets/cli": "2.21.1",
+    "@changesets/get-github-info": "0.5.0",
+    "@jest/reporters": "27.5.1",
+    "@types/ejs": "3.1.0",
+    "@types/express": "4.17.13",
+    "@types/fs-extra": "9.0.13",
+    "@types/koa": "2.13.4",
+    "@types/lodash.mergewith": "4.6.6",
+    "@types/module-alias": "2.0.1",
+    "@types/npm-which": "3.0.1",
+    "@types/picomatch": "2.3.0",
+    "@types/supertest": "2.0.11",
+    "express": "4.17.3",
+    "jsonfile": "6.1.0",
+    "koa": "2.13.4",
+    "memfs": "3.4.1",
+    "semver": "7.3.5",
+    "supertest": "6.2.2",
+    "type-fest": "2.12.0"
+  },
+  "engines": {
+    "node": ">=14.18"
+  },
+  "files": [
+    "config/**/*",
+    "jest/**/*",
+    "lib*/**/*.d.ts",
+    "lib*/**/*.js",
+    "lib*/**/*.js.map",
+    "template/**/*",
+    "jest-preset.js"
+  ],
+  "homepage": "https://github.com/seek-oss/skuba#readme",
+  "license": "MIT",
+  "main": "lib/index.js",
+  "name": "skuba",
   "peerDependencies": {
-    "skuba-dive": "1"
+    "skuba-dive": "1 || 2"
   },
   "peerDependenciesMeta": {
     "skuba-dive": {
       "optional": true
     }
   },
+  "private": false,
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/seek-oss/skuba.git"
+  },
   "resolutions": {
+    "**/@types/node": ">=14.18",
     "semantic-release/@semantic-release/npm/npm/**/ansi-regex": "5.0.1"
-  }
+  },
+  "scripts": {
+    "build": "ts-node --transpile-only src/skuba build && scripts/postbuild.sh",
+    "changeset:add": "changeset add && prettier --loglevel silent --write '.changeset/*.md'",
+    "deploy": "scripts/deploy.sh",
+    "format": "yarn skuba format",
+    "lint": "yarn skuba lint",
+    "release": "yarn build && changeset publish",
+    "stage": "changeset version && yarn format",
+    "skuba": "yarn build && node lib/skuba",
+    "test": "yarn skuba test",
+    "test:ci": "yarn skuba test --config jest.config.int.ts --runInBand",
+    "test:int": "yarn skuba test --config jest.config.int.ts --runInBand",
+    "test:template": "scripts/test-template.sh",
+    "test:watch": "yarn skuba test --config jest.config.int.ts --runInBand --watch"
+  },
+  "sideEffects": false,
+  "skuba": {
+    "entryPoint": "src/index.ts",
+    "template": null,
+    "type": "package",
+    "version": "4.0.0"
+  },
+  "types": "./lib/index.d.ts",
+  "version": "4.1.1"
 }

package/template/base/jest.config.ts CHANGED Viewed

@@ -10,6 +10,12 @@ export default Jest.mergePreset({
       statements: 0,
     },
   },
+  globals: {
+    'ts-jest': {
+      // seek-oss/skuba#626
+      isolatedModules: true,
+    },
+  },
   setupFiles: ['<rootDir>/jest.setup.ts'],
   testPathIgnorePatterns: ['/test\\.ts'],
 });

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

@@ -1,13 +1,7 @@
-configs:
-  environments:
-    - &dev
-      agents:
-        queue: <%- devBuildkiteQueueName %>
-    - &prod
-      agents:
-        queue: <%- prodBuildkiteQueueName %>
+agents:
+  queue: <%- prodBuildkiteQueueName %>
+configs:
   plugins:
     - &aws-sm
       seek-oss/aws-sm#v2.3.1:
@@ -36,8 +30,7 @@ configs:
           permit_on_passed: true
 steps:
-  - <<: *prod
-    label: 🧖‍♀️ Warm Prod
+  - label: 🧖‍♀️ Warm Prod
     command: ':'
     key: warm-prod
     plugins:
@@ -45,8 +38,7 @@ steps:
       - *private-npm
       - *docker-ecr-cache
-  - <<: *prod
-    label: 🧪 Test & Lint
+  - label: 🧪 Test & Lint
     commands:
       - echo '+++ yarn test:ci'
       - yarn test:ci
@@ -62,14 +54,13 @@ steps:
       - docker-compose#v3.9.0:
           run: app
-  - <<: *prod
-    label: 📦 Build & Package
+  - label: 📦 Build & Package
     depends_on: warm-prod
     plugins:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.5.2:
+      - seek-jobs/gantry#v1.6.2:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -79,13 +70,14 @@ steps:
   - block: 🙋🏻‍♀️ Deploy Dev
     branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-  - <<: *dev
-    <<: *deploy
+  - <<: *deploy
+    agents:
+      queue: <%- devBuildkiteQueueName %>
     label: 🤞 Deploy Dev
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.5.2:
+      - seek-jobs/gantry#v1.6.2:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -94,14 +86,13 @@ steps:
             - .gantry/common.yml
             - .gantry/dev.yml
-  - <<: *prod
-    <<: *deploy
+  - <<: *deploy
     label: 🚀 Deploy Prod
     branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.5.2:
+      - seek-jobs/gantry#v1.6.2:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/express-rest-api/.env ADDED Viewed

	@@ -0,0 +1 @@
1	+ ENVIRONMENT=local

package/template/express-rest-api/Dockerfile CHANGED Viewed

@@ -27,6 +27,9 @@ COPY --from=deps /workdir/node_modules node_modules
 ENV NODE_ENV production
+# https://nodejs.org/api/cli.html#cli_node_options_options
+ENV NODE_OPTIONS --enable-source-maps
 ARG PORT=8001
 ENV PORT ${PORT}
 EXPOSE ${PORT}

package/template/express-rest-api/gantry.apply.yml CHANGED Viewed

@@ -108,6 +108,8 @@ cpu: 256
 memory: 512
 deployment:
+  # SEEK-Jobs/gantry#488
+  ignoreAlarms: true
   smokeTest:
     path: /smoke
     useExternalDns: true

package/template/express-rest-api/gantry.build.yml CHANGED Viewed

@@ -9,4 +9,5 @@ buildArgs:
   BASE_IMAGE: '{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_IMAGE}}'
   BASE_TAG: '{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_TAG}}'
-failOnScanFindings: true
+# SEEK-Jobs/gantry#1661
+failOnScanFindings: false

package/template/express-rest-api/package.json CHANGED Viewed

@@ -2,7 +2,7 @@
   "dependencies": {
     "@seek/logger": "^5.0.1",
     "express": "^4.17.1",
-    "skuba-dive": "^1.2.0"
+    "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
@@ -21,7 +21,7 @@
     "build": "skuba build",
     "format": "skuba format",
     "lint": "skuba lint",
-    "start": "ENVIRONMENT=local skuba start --port <%- port %>",
+    "start": "skuba start --port <%- port %>",
     "start:debug": "yarn start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",

package/template/greeter/.buildkite/pipeline.yml CHANGED Viewed

@@ -1,11 +1,7 @@
-configs:
-  environments:
-    - &prod
-      agents:
-        queue: <%- prodBuildkiteQueueName %>
-      env:
-        ENVIRONMENT: prod
+agents:
+  queue: <%- prodBuildkiteQueueName %>
+configs:
   plugins:
     - &aws-sm
       seek-oss/aws-sm#v2.3.1:
@@ -24,8 +20,7 @@ configs:
         env: NPM_READ_TOKEN
 steps:
-  - <<: *prod
-    label: 🧪 Test & Lint
+  - label: 🧪 Test & Lint
     commands:
       - echo '+++ yarn test:ci'
       - yarn test:ci

package/template/greeter/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "skuba-dive": "^1.2.0"
+    "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
     "@types/node": "^16.0.0",
@@ -15,7 +15,7 @@
     "build": "skuba build",
     "format": "skuba format",
     "lint": "skuba lint",
-    "start": "ENVIRONMENT=local skuba start",
+    "start": "skuba start",
     "start:debug": "yarn start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",

package/template/koa-rest-api/.buildkite/pipeline.yml CHANGED Viewed

@@ -1,13 +1,7 @@
-configs:
-  environments:
-    - &dev
-      agents:
-        queue: <%- devBuildkiteQueueName %>
-    - &prod
-      agents:
-        queue: <%- prodBuildkiteQueueName %>
+agents:
+  queue: <%- prodBuildkiteQueueName %>
+configs:
   plugins:
     - &aws-sm
       seek-oss/aws-sm#v2.3.1:
@@ -36,8 +30,7 @@ configs:
           permit_on_passed: true
 steps:
-  - <<: *prod
-    label: 🧖‍♀️ Warm Prod
+  - label: 🧖‍♀️ Warm Prod
     command: ':'
     key: warm-prod
     plugins:
@@ -45,8 +38,7 @@ steps:
       - *private-npm
       - *docker-ecr-cache
-  - <<: *prod
-    label: 🧪 Test & Lint
+  - label: 🧪 Test & Lint
     commands:
       - echo '+++ yarn test:ci'
       - yarn test:ci
@@ -62,14 +54,13 @@ steps:
       - docker-compose#v3.9.0:
           run: app
-  - <<: *prod
-    label: 📦 Build & Package
+  - label: 📦 Build & Package
     depends_on: warm-prod
     plugins:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.5.2:
+      - seek-jobs/gantry#v1.6.2:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -79,13 +70,14 @@ steps:
   - block: 🙋🏻‍♀️ Deploy Dev
     branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-  - <<: *dev
-    <<: *deploy
+  - <<: *deploy
+    agents:
+      queue: <%- devBuildkiteQueueName %>
     label: 🤞 Deploy Dev
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.5.2:
+      - seek-jobs/gantry#v1.6.2:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -94,14 +86,13 @@ steps:
             - .gantry/common.yml
             - .gantry/dev.yml
-  - <<: *prod
-    <<: *deploy
+  - <<: *deploy
     label: 🚀 Deploy Prod
     branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.5.2:
+      - seek-jobs/gantry#v1.6.2:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/koa-rest-api/.env ADDED Viewed

	@@ -0,0 +1 @@
1	+ ENVIRONMENT=local

package/template/koa-rest-api/Dockerfile CHANGED Viewed

@@ -27,6 +27,9 @@ COPY --from=deps /workdir/node_modules node_modules
 ENV NODE_ENV production
+# https://nodejs.org/api/cli.html#cli_node_options_options
+ENV NODE_OPTIONS --enable-source-maps
 ARG PORT=8001
 ENV PORT ${PORT}
 EXPOSE ${PORT}

package/template/koa-rest-api/README.md CHANGED Viewed

@@ -36,7 +36,7 @@ This would be replaced with an external data store in production.
 This project is deployed as a containerised application with [Gantry].
 A typical resource API instance does not require more than 1 vCPU,
-so we eskew clustering configurations in favour of a single Node.js process per container.
+so we eschew clustering configurations in favour of a single Node.js process per container.
 Under load, we autoscale horizontally in terms of container count up to `autoScaling.maxCount`.
 Gantry configures [CodeDeploy] for a blue-green deployment approach.

package/template/koa-rest-api/gantry.apply.yml CHANGED Viewed

@@ -115,6 +115,8 @@ cpu: 256
 memory: 512
 deployment:
+  # SEEK-Jobs/gantry#488
+  ignoreAlarms: true
   smokeTest:
     path: /smoke
     useExternalDns: true

package/template/koa-rest-api/gantry.build.yml CHANGED Viewed

@@ -9,4 +9,5 @@ buildArgs:
   BASE_IMAGE: '{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_IMAGE}}'
   BASE_TAG: '{{.Env.BUILDKITE_PLUGIN_DOCKER_ECR_CACHE_EXPORT_TAG}}'
-failOnScanFindings: true
+# SEEK-Jobs/gantry#1661
+failOnScanFindings: false

package/template/koa-rest-api/package.json CHANGED Viewed

@@ -3,7 +3,7 @@
     "@koa/router": "^10.1.1",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-collector-grpc": "^0.25.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.4.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.6.0",
     "@opentelemetry/instrumentation-http": "^0.27.0",
     "@opentelemetry/sdk-node": "^0.27.0",
     "@seek/logger": "^5.0.1",
@@ -16,7 +16,7 @@
     "runtypes-filter": "^0.6.0",
     "seek-datadog-custom-metrics": "^4.0.0",
     "seek-koala": "^5.1.0",
-    "skuba-dive": "^1.2.0",
+    "skuba-dive": "^2.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
@@ -41,7 +41,7 @@
     "build": "skuba build",
     "format": "skuba format",
     "lint": "skuba lint",
-    "start": "ENVIRONMENT=local skuba start --port <%- port %>",
+    "start": "skuba start --port <%- port %>",
     "start:debug": "yarn start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",

package/template/lambda-sqs-worker/.buildkite/pipeline.yml CHANGED Viewed

@@ -1,20 +1,7 @@
-env:
-  VERSION: ${BUILDKITE_COMMIT:0:7}.${BUILDKITE_BUILD_NUMBER}
+agents:
+  queue: <%- prodBuildkiteQueueName %>
 configs:
-  environments:
-    - &dev
-      agents:
-        queue: <%- devBuildkiteQueueName %>
-      env:
-        ENVIRONMENT: dev
-    - &prod
-      agents:
-        queue: <%- prodBuildkiteQueueName %>
-      env:
-        ENVIRONMENT: prod
   plugins:
     - &aws-sm
       seek-oss/aws-sm#v2.3.1:
@@ -48,15 +35,18 @@ configs:
         - docker-compose#v3.9.0:
             dependencies: false
             run: app
+            tty: false
       retry:
         manual:
           # Only use this if you need to roll back a deployment ASAP.
           # Always follow up with a proper revert or fix in Git history.
           permit_on_passed: true
+env:
+  VERSION: ${BUILDKITE_COMMIT:0:7}.${BUILDKITE_BUILD_NUMBER}
 steps:
-  - <<: *prod
-    label: 🧪 Test, Lint & Build
+  - label: 🧪 Test, Lint & Build
     artifact_paths: lib/**/*
     commands:
       - echo '+++ yarn test:ci'
@@ -74,7 +64,8 @@ steps:
       - docker-compose#v3.9.0:
           run: app
-  - <<: *dev
+  - agents:
+      queue: <%- devBuildkiteQueueName %>
     branches: '!renovate/*'
     label: 🧖‍♀️ Warm Dev
     command: ':'
@@ -87,15 +78,19 @@ steps:
   - block: 🙋🏻‍♀️ Deploy Dev
     branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-  - <<: *dev
-    <<: *deploy
+  - <<: *deploy
+    agents:
+      queue: <%- devBuildkiteQueueName %>
+    env:
+      ENVIRONMENT: dev
     concurrency_group: <%- repoName %>/deploy/dev
     label: 🤞 Deploy Dev
   - wait
-  - <<: *prod
-    <<: *deploy
+  - <<: *deploy
+    env:
+      ENVIRONMENT: prod
     branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
     concurrency_group: <%- repoName %>/deploy/prod
     label: 🚀 Deploy Prod

package/template/lambda-sqs-worker/.env ADDED Viewed

	@@ -0,0 +1 @@
1	+ ENVIRONMENT=local

package/template/lambda-sqs-worker/package.json CHANGED Viewed

@@ -3,7 +3,7 @@
     "@seek/logger": "^5.0.1",
     "aws-sdk": "^2.1011.0",
     "seek-datadog-custom-metrics": "^4.0.0",
-    "skuba-dive": "^1.2.0",
+    "skuba-dive": "^2.0.0",
     "runtypes": "^6.4.1",
     "runtypes-filter": "^0.6.0"
   },
@@ -13,7 +13,7 @@
     "@types/node": "^14.0.0",
     "chance": "^1.1.8",
     "pino-pretty": "^7.1.0",
-    "serverless": "^2.63.0",
+    "serverless": "^3.0.0",
     "serverless-plugin-canary-deployments": "^0.7.0",
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
@@ -29,7 +29,7 @@
     "format": "skuba format",
     "lint": "skuba lint",
     "smoke": "serverless invoke --data '{}' --function Worker",
-    "start": "ENVIRONMENT=local skuba start --port <%- port %>",
+    "start": "skuba start --port <%- port %>",
     "start:debug": "yarn start --inspect-brk",
     "test": "skuba test",
     "test:ci": "skuba test --coverage",

package/template/lambda-sqs-worker/serverless.yml CHANGED Viewed

@@ -1,18 +1,18 @@
 service: <%- serviceName %>
 configValidationMode: error
-variablesResolutionMode: 20210326
+params:
+  default:
+    description: <%- description %>
+  dev:
+    deploymentBucket: 'TODO: deploymentBucketName'
+    isProduction: false
+  prod:
+    deploymentBucket: 'TODO: deploymentBucketName'
+    isProduction: true
 custom:
-  description: <%- description %>
-  env: ${self:custom.envs.${env:ENVIRONMENT}}
-  envs:
-    dev:
-      deploymentBucket: 'TODO: deploymentBucketName'
-      isProduction: false
-    prod:
-      deploymentBucket: 'TODO: deploymentBucketName'
-      isProduction: true
   prune:
     automatic: true
     number: 3
@@ -22,7 +22,6 @@ plugins:
   - serverless-prune-plugin
 provider:
-  lambdaHashingVersion: 20201221
   logRetentionInDays: 30
   name: aws
   region: ap-southeast-2
@@ -34,7 +33,13 @@ provider:
   deploymentBucket:
     # Use a shared account-level bucket for Lambda bundles and other artefacts.
     # This is easier to manage in terms of access, deployment, and tagging.
-    name: ${self:custom.env.deploymentBucket}
+    name: ${param:deploymentBucket}
+  environment:
+    # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
+    AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1
+    NODE_ENV: production
+    # https://nodejs.org/api/cli.html#cli_node_options_options
+    NODE_OPTIONS: --enable-source-maps
   iam:
     role:
       statements:
@@ -59,7 +64,7 @@ provider:
     # https://rfc.skinfra.xyz/RFC019-AWS-Tagging-Standard.html#seekdatatypes
     # seek:data:types:restricted: job-ads
     seek:env:label: ${env:ENVIRONMENT}
-    seek:env:production: ${self:custom.env.isProduction}
+    seek:env:production: ${param:isProduction}
     seek:owner:team: '<%- teamName %>'
     seek:source:sha: ${env:BUILDKITE_COMMIT, 'na'}
     seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
@@ -74,7 +79,7 @@ functions:
   Worker:
     name: ${self:service}
     handler: lib/app.handler
-    description: ${self:custom.description}
+    description: ${param:description}
     memorySize: 128
     reservedConcurrency: 20
     timeout: 30
@@ -83,9 +88,6 @@ functions:
       alias: Live
       preTrafficHook: WorkerPreHook
     environment:
-      # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
-      AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1
       ENVIRONMENT: ${env:ENVIRONMENT}
       SERVICE: ${self:service}
       VERSION: ${env:VERSION, 'local'}
@@ -102,14 +104,11 @@ functions:
     # This is generous because a timeout will hang the deployment
     timeout: 300
     environment:
-      # https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
-      AWS_NODEJS_CONNECTION_REUSE_ENABLED: 1
       FUNCTION_NAME_TO_INVOKE: ${self:functions.Worker.name}
 resources:
   # This becomes the Lambda application's description
-  Description: ${self:custom.description}
+  Description: ${param:description}
   Resources:
     DeadLetterQueue:

package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml CHANGED Viewed

@@ -1,17 +1,7 @@
-configs:
-  environments:
-    - &dev
-      agents:
-        queue: <%- devBuildkiteQueueName %>
-      env:
-        ENVIRONMENT: dev
-    - &prod
-      agents:
-        queue: <%- prodBuildkiteQueueName %>
-      env:
-        ENVIRONMENT: prod
+agents:
+  queue: <%- prodBuildkiteQueueName %>
+configs:
   plugins:
     - &aws-sm
       seek-oss/aws-sm#v2.3.1:
@@ -52,8 +42,7 @@ configs:
           permit_on_passed: true
 steps:
-  - <<: *prod
-    label: 🧪 Test, Lint & Build
+  - label: 🧪 Test, Lint & Build
     artifact_paths: lib/**/*
     commands:
       - echo '+++ yarn test:ci'
@@ -71,7 +60,8 @@ steps:
       - docker-compose#v3.9.0:
           run: app
-  - <<: *dev
+  - agents:
+      queue: <%- devBuildkiteQueueName %>
     branches: '!renovate/*'
     label: 🧖‍♀️ Warm Dev
     command: ':'
@@ -84,14 +74,18 @@ steps:
   - block: 🙋🏻‍♀️ Deploy Dev
     branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-  - <<: *dev
-    <<: *deploy
+  - <<: *deploy
+    agents:
+      queue: <%- devBuildkiteQueueName %>
+    env:
+      ENVIRONMENT: dev
     label: 🤞 Deploy Dev
     concurrency_group: '<%- repoName %>/deploy/dev'
     key: deploy-dev
-  - <<: *prod
-    <<: *deploy
+  - <<: *deploy
+    env:
+      ENVIRONMENT: prod
     label: 🚀 Deploy Prod
     branches: ${BUILDKITE_PIPELINE_DEFAULT_BRANCH}
     concurrency_group: '<%- repoName %>/deploy/prod'

package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap CHANGED Viewed

@@ -155,6 +155,8 @@ Object {
         "Environment": Object {
           "Variables": Object {
             "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1",
+            "NODE_ENV": "production",
+            "NODE_OPTIONS": "--enable-source-maps",
             "SOMETHING": "dev",
           },
         },
@@ -509,6 +511,8 @@ Object {
         "Environment": Object {
           "Variables": Object {
             "AWS_NODEJS_CONNECTION_REUSE_ENABLED": "1",
+            "NODE_ENV": "production",
+            "NODE_OPTIONS": "--enable-source-maps",
             "SOMETHING": "prod",
           },
         },

package/template/lambda-sqs-worker-cdk/infra/appStack.ts CHANGED Viewed

@@ -57,7 +57,11 @@ export class AppStack extends Stack {
       functionName: '<%- serviceName %>',
       environmentEncryption: kmsKey,
       environment: {
+        // https://docs.aws.amazon.com/sdk-for-javascript/v2/developer-guide/node-reusing-connections.html
         AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',
+        NODE_ENV: 'production',
+        // https://nodejs.org/api/cli.html#cli_node_options_options
+        NODE_OPTIONS: '--enable-source-maps',
         ...context.workerLambda.environment,
       },
     });

package/template/private-npm-package/.buildkite/pipeline.yml CHANGED Viewed

@@ -1,4 +1,5 @@
+agents:
+  queue: artefacts:npm
 steps:
   - command: aws s3 cp s3://seek-npm-package-buildkite-pipeline/pipeline-latest.sh - | bash | buildkite-agent pipeline upload
-    agents:
-      queue: artefacts:npm