skuba 10.0.0-node-22-20250226231811 → 10.0.1-consider-current-path-20250314071804

package/lib/utils/version.js

@@ -28,31 +28,60 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var version_exports = {};
 __export(version_exports, {
+  getLatestNpmVersion: () => getLatestNpmVersion,
+  getNpmVersions: () => getNpmVersions,
   getSkubaVersion: () => getSkubaVersion,
-  getSkubaVersionInfo: () => getSkubaVersionInfo,
-  latestNpmVersion: () => latestNpmVersion
+  getSkubaVersionInfo: () => getSkubaVersionInfo
 });
 module.exports = __toCommonJS(version_exports);
-var import_libnpmsearch = __toESM(require("libnpmsearch"));
-var import_validate_npm_package_name = __toESM(require("validate-npm-package-name"));
+var import_npm_registry_fetch = __toESM(require("npm-registry-fetch"));
+var import_zod = require("zod");
 var import_manifest = require("./manifest");
 var import_wait = require("./wait");
-const latestNpmVersion = async (packageName) => {
-  const { validForNewPackages } = (0, import_validate_npm_package_name.default)(packageName);
-  if (!validForNewPackages) {
-    throw new Error(`Package "${packageName}" does not have a valid name`);
-  }
-  const [result] = await (0, import_libnpmsearch.default)(packageName, { limit: 1, timeout: 5e3 });
-  if (result?.name !== packageName) {
-    throw new Error(
-      `Package "${packageName}" does not exist on the npm registry`
-    );
+const NpmVersions = import_zod.z.record(
+  import_zod.z.string(),
+  import_zod.z.object({
+    name: import_zod.z.string(),
+    version: import_zod.z.string(),
+    deprecated: import_zod.z.string().optional()
+  })
+);
+const PackageResponse = import_zod.z.object({
+  "dist-tags": import_zod.z.record(import_zod.z.string(), import_zod.z.string()).optional(),
+  versions: NpmVersions
+});
+const getNpmPackage = async (packageName) => {
+  try {
+    const response = await import_npm_registry_fetch.default.json(packageName, {
+      headers: {
+        Accept: "application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*"
+      }
+    });
+    const parsedResponse = PackageResponse.safeParse(response);
+    if (!parsedResponse.success) {
+      throw new Error(
+        `Failed to parse package response from npm for package ${packageName}`
+      );
+    }
+    return parsedResponse.data;
+  } catch (error) {
+    if (error instanceof Error && "statusCode" in error && error.statusCode === 404) {
+      return null;
+    }
+    throw error;
   }
-  return result.version;
+};
+const getNpmVersions = async (packageName) => {
+  const response = await getNpmPackage(packageName);
+  return response?.versions ?? null;
+};
+const getLatestNpmVersion = async (packageName) => {
+  const response = await getNpmPackage(packageName);
+  return response?.["dist-tags"]?.latest ?? null;
 };
 const latestSkubaVersion = async () => {
   try {
-    const result = await (0, import_wait.withTimeout)(latestNpmVersion("skuba"), { s: 2 });
+    const result = await (0, import_wait.withTimeout)(getLatestNpmVersion("skuba"), { s: 2 });
     return result.ok ? result.value : null;
   } catch {
     return null;
@@ -82,8 +111,9 @@ const getSkubaVersionInfo = async () => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getLatestNpmVersion,
+  getNpmVersions,
   getSkubaVersion,
-  getSkubaVersionInfo,
-  latestNpmVersion
+  getSkubaVersionInfo
 });
 //# sourceMappingURL=version.js.map

package/lib/utils/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/utils/version.ts"],
-  "sourcesContent": ["import searchNpm from 'libnpmsearch';\nimport validatePackageName from 'validate-npm-package-name';\n\nimport { getSkubaManifest } from './manifest';\nimport { withTimeout } from './wait';\n\nexport const latestNpmVersion = async (\n  packageName: string,\n): Promise<string> => {\n  const { validForNewPackages } = validatePackageName(packageName);\n\n  if (!validForNewPackages) {\n    throw new Error(`Package \"${packageName}\" does not have a valid name`);\n  }\n\n  const [result] = await searchNpm(packageName, { limit: 1, timeout: 5_000 });\n\n  if (result?.name !== packageName) {\n    throw new Error(\n      `Package \"${packageName}\" does not exist on the npm registry`,\n    );\n  }\n\n  return result.version;\n};\n\nconst latestSkubaVersion = async (): Promise<string | null> => {\n  try {\n    const result = await withTimeout(latestNpmVersion('skuba'), { s: 2 });\n\n    return result.ok ? result.value : null;\n  } catch {\n    return null;\n  }\n};\n\nexport const getSkubaVersion = async (): Promise<string> => {\n  const { version } = await getSkubaManifest();\n\n  return version;\n};\n\ntype SkubaVersionInfo =\n  | {\n      isStale: true;\n\n      local: string;\n      latest: string;\n    }\n  | {\n      isStale: false;\n\n      local: string;\n      latest: string | null;\n    };\n\nexport const getSkubaVersionInfo = async (): Promise<SkubaVersionInfo> => {\n  const [local, latest] = await Promise.all([\n    getSkubaVersion(),\n    latestSkubaVersion(),\n  ]);\n\n  if (latest === null) {\n    // Assume we're up to date if we can't reach the npm registry\n    return {\n      isStale: false,\n      local,\n      latest,\n    };\n  }\n\n  return {\n    isStale: latest !== local,\n    local,\n    latest,\n  };\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,0BAAsB;AACtB,uCAAgC;AAEhC,sBAAiC;AACjC,kBAA4B;AAErB,MAAM,mBAAmB,OAC9B,gBACoB;AACpB,QAAM,EAAE,oBAAoB,QAAI,iCAAAA,SAAoB,WAAW;AAE/D,MAAI,CAAC,qBAAqB;AACxB,UAAM,IAAI,MAAM,YAAY,WAAW,8BAA8B;AAAA,EACvE;AAEA,QAAM,CAAC,MAAM,IAAI,UAAM,oBAAAC,SAAU,aAAa,EAAE,OAAO,GAAG,SAAS,IAAM,CAAC;AAE1E,MAAI,QAAQ,SAAS,aAAa;AAChC,UAAM,IAAI;AAAA,MACR,YAAY,WAAW;AAAA,IACzB;AAAA,EACF;AAEA,SAAO,OAAO;AAChB;AAEA,MAAM,qBAAqB,YAAoC;AAC7D,MAAI;AACF,UAAM,SAAS,UAAM,yBAAY,iBAAiB,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;AAEpE,WAAO,OAAO,KAAK,OAAO,QAAQ;AAAA,EACpC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,MAAM,kBAAkB,YAA6B;AAC1D,QAAM,EAAE,QAAQ,IAAI,UAAM,kCAAiB;AAE3C,SAAO;AACT;AAgBO,MAAM,sBAAsB,YAAuC;AACxE,QAAM,CAAC,OAAO,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxC,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,EACrB,CAAC;AAED,MAAI,WAAW,MAAM;AAEnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,SAAS,WAAW;AAAA,IACpB;AAAA,IACA;AAAA,EACF;AACF;",
-  "names": ["validatePackageName", "searchNpm"]
+  "sourcesContent": ["import npmFetch from 'npm-registry-fetch';\nimport { z } from 'zod';\n\nimport { getSkubaManifest } from './manifest';\nimport { withTimeout } from './wait';\n\nconst NpmVersions = z.record(\n  z.string(),\n  z.object({\n    name: z.string(),\n    version: z.string(),\n    deprecated: z.string().optional(),\n  }),\n);\n\nexport type NpmVersions = z.infer<typeof NpmVersions>;\n\nconst PackageResponse = z.object({\n  'dist-tags': z.record(z.string(), z.string()).optional(),\n  versions: NpmVersions,\n});\n\nconst getNpmPackage = async (packageName: string) => {\n  try {\n    const response = await npmFetch.json(packageName, {\n      headers: {\n        Accept:\n          'application/vnd.npm.install-v1+json; q=1.0, application/json; q=0.8, */*',\n      },\n    });\n\n    const parsedResponse = PackageResponse.safeParse(response);\n    if (!parsedResponse.success) {\n      throw new Error(\n        `Failed to parse package response from npm for package ${packageName}`,\n      );\n    }\n\n    return parsedResponse.data;\n  } catch (error) {\n    if (\n      error instanceof Error &&\n      'statusCode' in error &&\n      error.statusCode === 404\n    ) {\n      return null;\n    }\n    throw error;\n  }\n};\n\nexport const getNpmVersions = async (\n  packageName: string,\n): Promise<NpmVersions | null> => {\n  const response = await getNpmPackage(packageName);\n  return response?.versions ?? null;\n};\n\nexport const getLatestNpmVersion = async (\n  packageName: string,\n): Promise<string | null> => {\n  const response = await getNpmPackage(packageName);\n  return response?.['dist-tags']?.latest ?? null;\n};\n\nconst latestSkubaVersion = async (): Promise<string | null> => {\n  try {\n    const result = await withTimeout(getLatestNpmVersion('skuba'), { s: 2 });\n\n    return result.ok ? result.value : null;\n  } catch {\n    return null;\n  }\n};\n\nexport const getSkubaVersion = async (): Promise<string> => {\n  const { version } = await getSkubaManifest();\n\n  return version;\n};\n\ntype SkubaVersionInfo =\n  | {\n      isStale: true;\n\n      local: string;\n      latest: string;\n    }\n  | {\n      isStale: false;\n\n      local: string;\n      latest: string | null;\n    };\n\nexport const getSkubaVersionInfo = async (): Promise<SkubaVersionInfo> => {\n  const [local, latest] = await Promise.all([\n    getSkubaVersion(),\n    latestSkubaVersion(),\n  ]);\n\n  if (latest === null) {\n    // Assume we're up to date if we can't reach the npm registry\n    return {\n      isStale: false,\n      local,\n      latest,\n    };\n  }\n\n  return {\n    isStale: latest !== local,\n    local,\n    latest,\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,gCAAqB;AACrB,iBAAkB;AAElB,sBAAiC;AACjC,kBAA4B;AAE5B,MAAM,cAAc,aAAE;AAAA,EACpB,aAAE,OAAO;AAAA,EACT,aAAE,OAAO;AAAA,IACP,MAAM,aAAE,OAAO;AAAA,IACf,SAAS,aAAE,OAAO;AAAA,IAClB,YAAY,aAAE,OAAO,EAAE,SAAS;AAAA,EAClC,CAAC;AACH;AAIA,MAAM,kBAAkB,aAAE,OAAO;AAAA,EAC/B,aAAa,aAAE,OAAO,aAAE,OAAO,GAAG,aAAE,OAAO,CAAC,EAAE,SAAS;AAAA,EACvD,UAAU;AACZ,CAAC;AAED,MAAM,gBAAgB,OAAO,gBAAwB;AACnD,MAAI;AACF,UAAM,WAAW,MAAM,0BAAAA,QAAS,KAAK,aAAa;AAAA,MAChD,SAAS;AAAA,QACP,QACE;AAAA,MACJ;AAAA,IACF,CAAC;AAED,UAAM,iBAAiB,gBAAgB,UAAU,QAAQ;AACzD,QAAI,CAAC,eAAe,SAAS;AAC3B,YAAM,IAAI;AAAA,QACR,yDAAyD,WAAW;AAAA,MACtE;AAAA,IACF;AAEA,WAAO,eAAe;AAAA,EACxB,SAAS,OAAO;AACd,QACE,iBAAiB,SACjB,gBAAgB,SAChB,MAAM,eAAe,KACrB;AACA,aAAO;AAAA,IACT;AACA,UAAM;AAAA,EACR;AACF;AAEO,MAAM,iBAAiB,OAC5B,gBACgC;AAChC,QAAM,WAAW,MAAM,cAAc,WAAW;AAChD,SAAO,UAAU,YAAY;AAC/B;AAEO,MAAM,sBAAsB,OACjC,gBAC2B;AAC3B,QAAM,WAAW,MAAM,cAAc,WAAW;AAChD,SAAO,WAAW,WAAW,GAAG,UAAU;AAC5C;AAEA,MAAM,qBAAqB,YAAoC;AAC7D,MAAI;AACF,UAAM,SAAS,UAAM,yBAAY,oBAAoB,OAAO,GAAG,EAAE,GAAG,EAAE,CAAC;AAEvE,WAAO,OAAO,KAAK,OAAO,QAAQ;AAAA,EACpC,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,MAAM,kBAAkB,YAA6B;AAC1D,QAAM,EAAE,QAAQ,IAAI,UAAM,kCAAiB;AAE3C,SAAO;AACT;AAgBO,MAAM,sBAAsB,YAAuC;AACxE,QAAM,CAAC,OAAO,MAAM,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxC,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,EACrB,CAAC;AAED,MAAI,WAAW,MAAM;AAEnB,WAAO;AAAA,MACL,SAAS;AAAA,MACT;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AAAA,IACL,SAAS,WAAW;AAAA,IACpB;AAAA,IACA;AAAA,EACF;AACF;",
+  "names": ["npmFetch"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "10.0.0-node-22-20250226231811",
+  "version": "10.0.1-consider-current-path-20250314071804",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -78,7 +78,6 @@
     "isomorphic-git": "^1.11.1",
     "jest": "^29.0.1",
     "jest-watch-typeahead": "^2.1.1",
-    "libnpmsearch": "^8.0.0",
     "lodash.mergewith": "^4.6.2",
     "minimist": "^1.2.6",
     "normalize-package-data": "^7.0.0",
@@ -97,13 +96,12 @@
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "2.0.0",
     "tsx": "^4.16.2",
-    "typescript": "~5.7.0",
-    "validate-npm-package-name": "^6.0.0",
+    "typescript": "~5.8.0",
     "zod": "^3.22.4",
-    "eslint-config-skuba": "5.1.0-node-22-20250226231811"
+    "eslint-config-skuba": "5.1.0"
   },
   "devDependencies": {
-    "@changesets/cli": "2.27.12",
+    "@changesets/cli": "2.28.1",
     "@changesets/get-github-info": "0.6.0",
     "@jest/reporters": "29.7.0",
     "@jest/test-result": "29.7.0",
@@ -111,7 +109,6 @@
     "@types/express": "5.0.0",
     "@types/fs-extra": "11.0.4",
     "@types/koa": "2.15.0",
-    "@types/libnpmsearch": "2.0.7",
     "@types/lodash.mergewith": "4.6.9",
     "@types/minimist": "1.2.5",
     "@types/module-alias": "2.0.4",
@@ -120,13 +117,12 @@
     "@types/picomatch": "3.0.2",
     "@types/semver": "7.5.8",
     "@types/supertest": "6.0.2",
-    "@types/validate-npm-package-name": "4.0.2",
     "enhanced-resolve": "5.18.1",
     "express": "5.0.1",
     "fastify": "5.2.1",
     "jest-diff": "29.7.0",
     "jsonfile": "6.1.0",
-    "koa": "2.15.4",
+    "koa": "2.16.0",
     "memfs": "4.17.0",
     "remark-cli": "12.0.1",
     "remark-preset-lint-recommended": "7.0.1",
@@ -153,7 +149,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "9.1.0"
+    "version": "10.0.0"
   },
   "scripts": {
     "build": "scripts/build.sh",

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

@@ -9,5 +9,4 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
   # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.13
+# syntax=docker/dockerfile:1.14
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

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

@@ -21,14 +21,14 @@
   },
   "devDependencies": {
     "@types/express": "^5.0.0",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "@types/supertest": "^6.0.0",
     "mime": "^4.0.1",
     "pino-pretty": "^13.0.0",
     "skuba": "*",
     "supertest": "^7.0.0"
   },
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@10.6.3",
   "engines": {
     "node": ">=22"
   }

package/template/greeter/Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.13
+# syntax=docker/dockerfile:1.14
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

package/template/greeter/package.json

@@ -16,10 +16,10 @@
     "skuba-dive": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.1",
-    "skuba": "10.0.0-node-22-20250226231811"
+    "@types/node": "^22.13.10",
+    "skuba": "10.0.1-consider-current-path-20250314071804"
   },
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@10.6.3",
   "engines": {
     "node": ">=22"
   }

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

@@ -9,5 +9,4 @@ image: '{{values "prodAccountId"}}.dkr.ecr.<%- region %>.amazonaws.com/{{values
 # datadogSecretId: arn:aws:secretsmanager:<%- region %>:<aws-account-id>:secret:<secret-name>
 
 tags:
-  seek:source:url: 'https://github.com/SEEK-Jobs/<%- repoName %>'
   # seek:system:name: 'TODO: https://rfc.skinfra.xyz/RFC051-AWS-Tagging-Standard.html#tagging-schema'

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.13
+# syntax=docker/dockerfile:1.14
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

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

@@ -36,7 +36,7 @@
     "@types/co-body": "^6.1.3",
     "@types/koa": "^2.13.4",
     "@types/koa__router": "^12.0.0",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "@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.15.4",
+  "packageManager": "pnpm@10.6.3",
   "engines": {
     "node": ">=22"
   }

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

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.13
+# syntax=docker/dockerfile:1.14
 
 FROM public.ecr.aws/docker/library/node:22-alpine AS dev-deps
 

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

@@ -13,7 +13,7 @@ import {
   aws_sqs,
 } from 'aws-cdk-lib';
 import type { Construct } from 'constructs';
-import { Datadog } from 'datadog-cdk-constructs-v2';
+import { DatadogLambda } from 'datadog-cdk-constructs-v2';
 
 import { config } from './config';
 
@@ -117,7 +117,7 @@ export class AppStack extends Stack {
       config.datadogApiKeySecretArn,
     );
 
-    const datadog = new Datadog(this, 'datadog', {
+    const datadog = new DatadogLambda(this, 'datadog', {
       apiKeySecret: datadogSecret,
       addLayers: false,
       enableDatadogLogs: false,

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

@@ -18,7 +18,7 @@
     "@aws-sdk/client-lambda": "^3.363.0",
     "@aws-sdk/client-sns": "^3.363.0",
     "@seek/logger": "^9.0.0",
-    "datadog-lambda-js": "^9.0.0",
+    "datadog-lambda-js": "^10.0.0",
     "dd-trace": "^5.0.0",
     "skuba-dive": "^2.0.0",
     "zod": "^3.19.1"
@@ -27,18 +27,18 @@
     "@seek/aws-codedeploy-infra": "^2.1.0",
     "@types/aws-lambda": "^8.10.82",
     "@types/chance": "^1.1.3",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "aws-cdk": "^2.167.1",
     "aws-cdk-lib": "^2.167.1",
     "aws-sdk-client-mock": "^4.0.0",
     "aws-sdk-client-mock-jest": "^4.0.0",
     "chance": "^1.1.8",
     "constructs": "^10.0.17",
-    "datadog-cdk-constructs-v2": "^1.18.0",
+    "datadog-cdk-constructs-v2": "^2.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "10.0.0-node-22-20250226231811"
+    "skuba": "10.0.1-consider-current-path-20250314071804"
   },
-  "packageManager": "pnpm@9.15.4",
+  "packageManager": "pnpm@10.6.3",
   "engines": {
     "node": ">=22"
   }

package/template/oss-npm-package/_package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },

package/template/private-npm-package/_package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.10",
     "commitizen": "^4.2.4",
     "skuba": "*"
   },