skuba 8.2.0 → 9.0.0-main-20240918063050

package/lib/cli/start.js

@@ -50,14 +50,14 @@ const start = async () => {
     }
   });
   return execProcess(
-    "ts-node-dev",
+    "tsx",
+    "watch",
+    "--clear-screen=false",
     ...args.node,
     "--require",
     "dotenv/config",
     "--require",
     "tsconfig-paths/register",
-    "--respawn",
-    "--transpile-only",
     import_path.default.join(__dirname, "..", "wrapper"),
     ...args.script
   );

package/lib/cli/start.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/cli/start.ts"],
-  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../utils/args';\nimport { createExec } from '../utils/exec';\nimport { getEntryPointFromManifest } from '../utils/manifest';\nimport { isIpPort } from '../utils/validation';\n\nexport const start = async () => {\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'ts-node-dev',\n    ...args.node,\n    '--require',\n    'dotenv/config',\n    '--require',\n    'tsconfig-paths/register',\n    '--respawn',\n    '--transpile-only',\n    path.join(__dirname, '..', 'wrapper'),\n    ...args.script,\n  );\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,sBAA0C;AAC1C,wBAAyB;AAElB,MAAM,QAAQ,YAAY;AAC/B,QAAM,CAAC,MAAM,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,QAClC,gBAAAA,SAAQ;AAAA,EACV,CAAC;AAED,OAAK,eAAe,UAAM,2CAA0B;AAEpD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,qBAAqB,KAAK;AAAA,MAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,IACtE;AAAA,EACF,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,SAAS;AAAA,IACpC,GAAG,KAAK;AAAA,EACV;AACF;",
+  "sourcesContent": ["import path from 'path';\n\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../utils/args';\nimport { createExec } from '../utils/exec';\nimport { getEntryPointFromManifest } from '../utils/manifest';\nimport { isIpPort } from '../utils/validation';\n\nexport const start = async () => {\n  const [args, availablePort] = await Promise.all([\n    parseRunArgs(process.argv.slice(2)),\n    getPort(),\n  ]);\n\n  args.entryPoint ??= await getEntryPointFromManifest();\n\n  const execProcess = createExec({\n    env: {\n      __SKUBA_ENTRY_POINT: args.entryPoint,\n      __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n    },\n  });\n\n  return execProcess(\n    'tsx',\n    'watch',\n    '--clear-screen=false',\n    ...args.node,\n    '--require',\n    'dotenv/config',\n    '--require',\n    'tsconfig-paths/register',\n    path.join(__dirname, '..', 'wrapper'),\n    ...args.script,\n  );\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,sBAA0C;AAC1C,wBAAyB;AAElB,MAAM,QAAQ,YAAY;AAC/B,QAAM,CAAC,MAAM,aAAa,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAAA,QAClC,gBAAAA,SAAQ;AAAA,EACV,CAAC;AAED,OAAK,eAAe,UAAM,2CAA0B;AAEpD,QAAM,kBAAc,wBAAW;AAAA,IAC7B,KAAK;AAAA,MACH,qBAAqB,KAAK;AAAA,MAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,IACtE;AAAA,EACF,CAAC;AAED,SAAO;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG,KAAK;AAAA,IACR;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAAC,QAAK,KAAK,WAAW,MAAM,SAAS;AAAA,IACpC,GAAG,KAAK;AAAA,EACV;AACF;",
   "names": ["getPort", "path"]
 }

package/lib/utils/template.d.ts

@@ -28,12 +28,12 @@ export declare const templateConfigSchema: z.ZodObject<{
         message: string;
         name: string;
         initial: string;
-        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+        validate?: ((args_0: string, ...args: unknown[]) => string | boolean) | undefined;
     }, {
         message: string;
         name: string;
         initial: string;
-        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+        validate?: ((args_0: string, ...args: unknown[]) => string | boolean) | undefined;
     }>, "many">;
     entryPoint: z.ZodOptional<z.ZodString>;
     noSkip: z.ZodOptional<z.ZodBoolean>;
@@ -44,7 +44,7 @@ export declare const templateConfigSchema: z.ZodObject<{
         message: string;
         name: string;
         initial: string;
-        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+        validate?: ((args_0: string, ...args: unknown[]) => string | boolean) | undefined;
     }[];
     packageManager: "yarn" | "pnpm";
     type?: "package" | "application" | undefined;
@@ -55,7 +55,7 @@ export declare const templateConfigSchema: z.ZodObject<{
         message: string;
         name: string;
         initial: string;
-        validate?: ((args_0: string, ...args_1: unknown[]) => string | boolean) | undefined;
+        validate?: ((args_0: string, ...args: unknown[]) => string | boolean) | undefined;
     }[];
     type?: "package" | "application" | undefined;
     entryPoint?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "8.2.0",
+  "version": "9.0.0-main-20240918063050",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -57,13 +57,13 @@
     "@octokit/rest": "^21.0.0",
     "@octokit/types": "^13.0.0",
     "@types/jest": "^29.0.0",
-    "@types/node": ">=18.12",
+    "@types/node": "^20.16.5",
     "chalk": "^4.1.0",
     "concurrently": "^8.0.0",
     "dotenv": "^16.0.0",
     "ejs": "^3.1.6",
     "enquirer": "^2.3.6",
-    "esbuild": "~0.21.0",
+    "esbuild": "~0.23.0",
     "eslint": "^8.56.0",
     "execa": "^5.0.0",
     "fast-glob": "^3.3.2",
@@ -94,16 +94,16 @@
     "ts-dedent": "^2.2.0",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.2",
-    "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
-    "typescript": "~5.5.0",
+    "tsx": "^4.16.2",
+    "typescript": "~5.6.0",
     "validate-npm-package-name": "^5.0.0",
     "zod": "^3.22.4",
     "eslint-config-skuba": "4.1.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.6",
+    "@changesets/cli": "2.27.8",
     "@changesets/get-github-info": "0.6.0",
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
@@ -116,19 +116,19 @@
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
     "@types/npm-which": "3.0.3",
-    "@types/picomatch": "2.3.3",
+    "@types/picomatch": "3.0.1",
     "@types/supertest": "6.0.2",
     "@types/validate-npm-package-name": "4.0.2",
-    "enhanced-resolve": "5.17.0",
-    "express": "4.19.2",
-    "fastify": "4.28.0",
+    "enhanced-resolve": "5.17.1",
+    "express": "4.20.0",
+    "fastify": "4.28.1",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
     "koa": "2.15.3",
-    "memfs": "4.9.3",
+    "memfs": "4.11.1",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.0",
-    "semver": "7.6.2",
+    "semver": "7.6.3",
     "supertest": "7.0.0",
     "type-fest": "2.19.0"
   },
@@ -151,7 +151,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "8.1.0"
+    "version": "8.2.1"
   },
   "scripts": {
     "build": "scripts/build.sh",
@@ -168,6 +168,7 @@
     "test:ci": "pnpm --silent skuba test --runInBand",
     "test:int": "pnpm --silent skuba test --selectProjects integration --runInBand",
     "test:template": "scripts/test-template.sh",
+    "test:template:updateSnapshot": "scripts/test-template.sh -u",
     "test:watch": "pnpm --silent skuba test --runInBand --watch"
   }
 }

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

@@ -1,4 +1,3 @@
-$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 agents:
   queue: <%- prodBuildkiteQueueName %>
 
@@ -58,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/express-rest-api/Dockerfile.dev-deps

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -21,14 +21,14 @@
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.16.5",
     "@types/supertest": "^6.0.0",
     "mime": "^4.0.1",
     "pino-pretty": "^11.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.4.0",
+  "packageManager": "pnpm@9.10.0",
   "engines": {
     "node": ">=20"
   }

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

@@ -1,4 +1,3 @@
-$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 agents:
   queue: <%- prodBuildkiteQueueName %>
 
@@ -39,7 +38,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/greeter/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

package/template/greeter/package.json

@@ -17,9 +17,9 @@
   },
   "devDependencies": {
     "@types/node": "^20.9.0",
-    "skuba": "*"
+    "skuba": "9.0.0-main-20240918063050"
   },
-  "packageManager": "pnpm@9.4.0",
+  "packageManager": "pnpm@9.10.0",
   "engines": {
     "node": ">=20"
   }

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

@@ -1,4 +1,3 @@
-$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 agents:
   queue: <%- prodBuildkiteQueueName %>
 
@@ -58,7 +57,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/koa-rest-api/Dockerfile.dev-deps

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -16,11 +16,11 @@
     "@koa/router": "^12.0.0",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "^1.25.0",
-    "@opentelemetry/exporter-trace-otlp-grpc": "^0.52.0",
-    "@opentelemetry/instrumentation-aws-sdk": "^0.42.0",
-    "@opentelemetry/instrumentation-http": "^0.52.0",
+    "@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.44.0",
+    "@opentelemetry/instrumentation-http": "^0.53.0",
     "@opentelemetry/propagator-b3": "^1.25.0",
-    "@opentelemetry/sdk-node": "^0.52.0",
+    "@opentelemetry/sdk-node": "^0.53.0",
     "@seek/logger": "^6.0.0",
     "hot-shots": "^10.0.0",
     "koa": "^2.13.4",
@@ -36,7 +36,7 @@
     "@types/koa": "^2.13.4",
     "@types/koa-bodyparser": "^5.0.2",
     "@types/koa__router": "^12.0.0",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.16.5",
     "@types/supertest": "^6.0.0",
     "chance": "^1.1.8",
     "mime": "^4.0.1",
@@ -44,7 +44,7 @@
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.4.0",
+  "packageManager": "pnpm@9.10.0",
   "engines": {
     "node": ">=20"
   }

package/template/koa-rest-api/src/framework/server.ts

@@ -4,7 +4,7 @@ import {
   ErrorMiddleware,
   MetricsMiddleware,
   RequestLogging,
-  // SecureHeaders,
+  SecureHeaders,
   VersionMiddleware,
 } from 'seek-koala';
 
@@ -39,10 +39,8 @@ export const createApp = <State, Context>(
   ...middleware: Array<Koa.Middleware<State, Context>>
 ) =>
   new Koa()
-    // TODO: consider using a middleware that adds secure HTTP headers.
-    // https://github.com/seek-oss/koala/tree/master/src/secureHeaders
-    // https://github.com/venables/koa-helmet
-    // .use(SecureHeaders.middleware)
+    // Read: https://github.com/seek-oss/koala/tree/master/src/secureHeaders
+    .use(SecureHeaders.middleware)
     .use(contextMiddleware)
     .use(requestLogging)
     .use(metrics)

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

@@ -1,4 +1,3 @@
-$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 agents:
   queue: <%- prodBuildkiteQueueName %>
 
@@ -31,13 +30,13 @@ configs:
         - pnpm run deploy
       concurrency: 1
       plugins:
-        - artifacts#v1.9.3:
+        - artifacts#v1.9.4:
             build: ${BUILDKITE_BUILD_ID}
             download: lib/*
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.2.0:
+        - docker-compose#v5.4.0:
             dependencies: false
             run: app
             propagate-environment: true
@@ -68,7 +67,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN

package/template/lambda-sqs-worker/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps
 

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

@@ -27,7 +27,7 @@
   "devDependencies": {
     "@types/aws-lambda": "^8.10.84",
     "@types/chance": "^1.1.3",
-    "@types/node": "^20.9.0",
+    "@types/node": "^20.16.5",
     "aws-sdk-client-mock": "^4.0.0",
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
@@ -38,7 +38,7 @@
     "serverless-prune-plugin": "^2.0.0",
     "skuba": "*"
   },
-  "packageManager": "pnpm@9.4.0",
+  "packageManager": "pnpm@9.10.0",
   "engines": {
     "node": ">=20"
   }

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

@@ -1,4 +1,3 @@
-$schema: https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
 agents:
   queue: <%- prodBuildkiteQueueName %>
 
@@ -34,7 +33,7 @@ configs:
         - *aws-sm
         - *private-npm
         - *docker-ecr-cache
-        - docker-compose#v5.2.0:
+        - docker-compose#v5.4.0:
             dependencies: false
             run: app
             environment:
@@ -64,7 +63,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - docker-compose#v5.2.0:
+      - docker-compose#v5.4.0:
           run: app
           environment:
             - GITHUB_API_TOKEN
@@ -84,6 +83,7 @@ steps:
           skip-pull-from-cache: true
 
   - wait
+
   - block: 🙋🏻‍♀️ Deploy Dev
     branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
 
@@ -96,25 +96,6 @@ steps:
     concurrency_group: '<%- repoName %>/deploy/dev'
     key: deploy-dev
 
-  - block: 🙋🏻‍♀️ Deploy Dev (Hotswap)
-    key: deploy-dev-hotswap-block
-    branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-
-  - <<: *deploy
-    branches: '!${BUILDKITE_PIPELINE_DEFAULT_BRANCH}'
-    depends_on: deploy-dev-hotswap-block
-    agents:
-      queue: <%- devBuildkiteQueueName %>
-    env:
-      ENVIRONMENT: dev
-    commands:
-      - echo '--- pnpm install --offline'
-      - pnpm install --offline
-      - echo '+++ pnpm run deploy:hotswap'
-      - pnpm run deploy:hotswap
-    label: 🤞 Deploy Dev (Hotswap)
-    concurrency_group: '<%- repoName %>/deploy/dev'
-
   - <<: *deploy
     env:
       ENVIRONMENT: prod

package/template/lambda-sqs-worker-cdk/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.10
 
 FROM --platform=<%- platformName %> node:20-alpine AS dev-deps