skuba 12.4.1-add-ci-true-20250929053152 → 12.4.1

package/lib/cli/lint/internalLints/upgrade/patches/12.4.0/patchDockerfileCIVariable.js

@@ -36,7 +36,8 @@ var import_util = require("util");
 var import_fast_glob = __toESM(require("fast-glob"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_logging = require("../../../../../../utils/logging.js");
-const dockerRegex = /FROM \$\{BASE_IMAGE\} AS build/;
+const pnpmInstallTestRegex = /^RUN pnpm install.*--prod/m;
+const pnpmInstallReplaceRegex = /^RUN pnpm install.*--prod/gm;
 const patchDockerfileCIVariable = async (mode) => {
   const dockerfilePaths = await (0, import_fast_glob.default)(["**/Dockerfile*"], {
     ignore: ["**/.git", "**/node_modules"]
@@ -57,7 +58,7 @@ const patchDockerfileCIVariable = async (mode) => {
     })
   );
   const dockerfilesToPatch = dockerfiles.filter(
-    ({ contents }) => contents.includes("FROM ${BASE_IMAGE} AS build")
+    ({ contents }) => pnpmInstallTestRegex.test(contents)
   );
   if (dockerfilesToPatch.length === 0) {
     return {
@@ -73,8 +74,8 @@ const patchDockerfileCIVariable = async (mode) => {
   await Promise.all(
     dockerfilesToPatch.map(async ({ file, contents }) => {
       const updatedContents = contents.replace(
-        dockerRegex,
-        "FROM ${BASE_IMAGE} AS build\n\nENV CI=true\n"
+        pnpmInstallReplaceRegex,
+        (match) => match.replace("RUN pnpm", "RUN CI=true pnpm")
       );
       await import_fs_extra.default.writeFile(file, updatedContents, "utf8");
     })

package/lib/cli/lint/internalLints/upgrade/patches/12.4.0/patchDockerfileCIVariable.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.4.0/patchDockerfileCIVariable.ts"],
-  "sourcesContent": ["import { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../../../../utils/logging.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst dockerRegex = /FROM \\$\\{BASE_IMAGE\\} AS build/;\n\nexport const patchDockerfileCIVariable = async (\n  mode: 'lint' | 'format',\n): Promise<PatchReturnType> => {\n  const dockerfilePaths = await fg(['**/Dockerfile*'], {\n    ignore: ['**/.git', '**/node_modules'],\n  });\n\n  if (dockerfilePaths.length === 0) {\n    return {\n      result: 'skip',\n      reason: 'no dockerfiles found',\n    };\n  }\n\n  const dockerfiles = await Promise.all(\n    dockerfilePaths.map(async (file) => {\n      const contents = await fs.readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n\n  const dockerfilesToPatch = dockerfiles.filter(({ contents }) =>\n    contents.includes('FROM ${BASE_IMAGE} AS build'),\n  );\n\n  if (dockerfilesToPatch.length === 0) {\n    return {\n      result: 'skip',\n      reason: 'no dockerfiles to patch',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  await Promise.all(\n    dockerfilesToPatch.map(async ({ file, contents }) => {\n      const updatedContents = contents.replace(\n        dockerRegex,\n        'FROM ${BASE_IMAGE} AS build\\n\\nENV CI=true\\n',\n      );\n      await fs.writeFile(file, updatedContents, 'utf8');\n    }),\n  );\n\n  return {\n    result: 'apply',\n  };\n};\n\nexport const tryPatchDockerfileCIVariable: PatchFunction = async ({ mode }) => {\n  try {\n    return await patchDockerfileCIVariable(mode);\n  } catch (err) {\n    log.warn('Failed to apply Dockerfile CI variable patch.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAe;AACf,sBAAe;AAEf,qBAAoB;AAGpB,MAAM,cAAc;AAEb,MAAM,4BAA4B,OACvC,SAC6B;AAC7B,QAAM,kBAAkB,UAAM,iBAAAA,SAAG,CAAC,gBAAgB,GAAG;AAAA,IACnD,QAAQ,CAAC,WAAW,iBAAiB;AAAA,EACvC,CAAC;AAED,MAAI,gBAAgB,WAAW,GAAG;AAChC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,cAAc,MAAM,QAAQ;AAAA,IAChC,gBAAgB,IAAI,OAAO,SAAS;AAClC,YAAM,WAAW,MAAM,gBAAAC,QAAG,SAAS,MAAM,MAAM;AAE/C,aAAO;AAAA,QACL;AAAA,QACA;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,qBAAqB,YAAY;AAAA,IAAO,CAAC,EAAE,SAAS,MACxD,SAAS,SAAS,6BAA6B;AAAA,EACjD;AAEA,MAAI,mBAAmB,WAAW,GAAG;AACnC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,mBAAmB,IAAI,OAAO,EAAE,MAAM,SAAS,MAAM;AACnD,YAAM,kBAAkB,SAAS;AAAA,QAC/B;AAAA,QACA;AAAA,MACF;AACA,YAAM,gBAAAA,QAAG,UAAU,MAAM,iBAAiB,MAAM;AAAA,IAClD,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,QAAQ;AAAA,EACV;AACF;AAEO,MAAM,+BAA8C,OAAO,EAAE,KAAK,MAAM;AAC7E,MAAI;AACF,WAAO,MAAM,0BAA0B,IAAI;AAAA,EAC7C,SAAS,KAAK;AACZ,uBAAI,KAAK,+CAA+C;AACxD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
+  "sourcesContent": ["import { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../../../../utils/logging.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst pnpmInstallTestRegex = /^RUN pnpm install.*--prod/m;\nconst pnpmInstallReplaceRegex = /^RUN pnpm install.*--prod/gm;\n\nexport const patchDockerfileCIVariable = async (\n  mode: 'lint' | 'format',\n): Promise<PatchReturnType> => {\n  const dockerfilePaths = await fg(['**/Dockerfile*'], {\n    ignore: ['**/.git', '**/node_modules'],\n  });\n\n  if (dockerfilePaths.length === 0) {\n    return {\n      result: 'skip',\n      reason: 'no dockerfiles found',\n    };\n  }\n\n  const dockerfiles = await Promise.all(\n    dockerfilePaths.map(async (file) => {\n      const contents = await fs.readFile(file, 'utf8');\n\n      return {\n        file,\n        contents,\n      };\n    }),\n  );\n\n  const dockerfilesToPatch = dockerfiles.filter(({ contents }) =>\n    pnpmInstallTestRegex.test(contents),\n  );\n\n  if (dockerfilesToPatch.length === 0) {\n    return {\n      result: 'skip',\n      reason: 'no dockerfiles to patch',\n    };\n  }\n\n  if (mode === 'lint') {\n    return {\n      result: 'apply',\n    };\n  }\n\n  await Promise.all(\n    dockerfilesToPatch.map(async ({ file, contents }) => {\n      const updatedContents = contents.replace(\n        pnpmInstallReplaceRegex,\n        (match) => match.replace('RUN pnpm', 'RUN CI=true pnpm'),\n      );\n      await fs.writeFile(file, updatedContents, 'utf8');\n    }),\n  );\n\n  return {\n    result: 'apply',\n  };\n};\n\nexport const tryPatchDockerfileCIVariable: PatchFunction = async ({ mode }) => {\n  try {\n    return await patchDockerfileCIVariable(mode);\n  } catch (err) {\n    log.warn('Failed to apply Dockerfile CI variable patch.');\n    log.subtle(inspect(err));\n    return { result: 'skip', reason: 'due to an error' };\n  }\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAe;AACf,sBAAe;AAEf,qBAAoB;AAGpB,MAAM,uBAAuB;AAC7B,MAAM,0BAA0B;AAEzB,MAAM,4BAA4B,OACvC,SAC6B;AAC7B,QAAM,kBAAkB,UAAM,iBAAAA,SAAG,CAAC,gBAAgB,GAAG;AAAA,IACnD,QAAQ,CAAC,WAAW,iBAAiB;AAAA,EACvC,CAAC;AAED,MAAI,gBAAgB,WAAW,GAAG;AAChC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,cAAc,MAAM,QAAQ;AAAA,IAChC,gBAAgB,IAAI,OAAO,SAAS;AAClC,YAAM,WAAW,MAAM,gBAAAC,QAAG,SAAS,MAAM,MAAM;AAE/C,aAAO;AAAA,QACL;AAAA,QACA;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,qBAAqB,YAAY;AAAA,IAAO,CAAC,EAAE,SAAS,MACxD,qBAAqB,KAAK,QAAQ;AAAA,EACpC;AAEA,MAAI,mBAAmB,WAAW,GAAG;AACnC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,mBAAmB,IAAI,OAAO,EAAE,MAAM,SAAS,MAAM;AACnD,YAAM,kBAAkB,SAAS;AAAA,QAC/B;AAAA,QACA,CAAC,UAAU,MAAM,QAAQ,YAAY,kBAAkB;AAAA,MACzD;AACA,YAAM,gBAAAA,QAAG,UAAU,MAAM,iBAAiB,MAAM;AAAA,IAClD,CAAC;AAAA,EACH;AAEA,SAAO;AAAA,IACL,QAAQ;AAAA,EACV;AACF;AAEO,MAAM,+BAA8C,OAAO,EAAE,KAAK,MAAM;AAC7E,MAAI;AACF,WAAO,MAAM,0BAA0B,IAAI;AAAA,EAC7C,SAAS,KAAK;AACZ,uBAAI,KAAK,+CAA+C;AACxD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
   "names": ["fg", "fs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skuba",
-  "version": "12.4.1-add-ci-true-20250929053152",
+  "version": "12.4.1",
   "private": false,
   "description": "SEEK development toolkit for backend applications and packages",
   "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -146,7 +146,7 @@
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "12.4.0"
+    "version": "12.4.1"
   },
   "scripts": {
     "build": "scripts/build.sh",

package/template/express-rest-api/Dockerfile

@@ -8,7 +8,7 @@ COPY . .
 
 RUN pnpm install --offline
 RUN pnpm build
-RUN pnpm install --offline --prod
+RUN CI=true pnpm install --offline --prod
 
 ###
 

package/template/greeter/package.json

@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "@types/node": "^22.13.10",
-    "skuba": "12.4.1-add-ci-true-20250929053152"
+    "skuba": "*"
   },
   "packageManager": "pnpm@10.17.1",
   "engines": {

package/template/koa-rest-api/Dockerfile

@@ -4,13 +4,11 @@ ARG BASE_IMAGE
 
 FROM ${BASE_IMAGE} AS build
 
-ENV CI=true
-
 COPY . .
 
 RUN pnpm install --offline
 RUN pnpm build
-RUN pnpm install --offline --prod
+RUN CI=true pnpm install --offline --prod
 
 ###
 

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

@@ -35,7 +35,7 @@
     "datadog-lambda-js": "^12.0.0",
     "dd-trace": "^5.0.0",
     "pino-pretty": "^13.0.0",
-    "skuba": "12.4.1-add-ci-true-20250929053152"
+    "skuba": "*"
   },
   "packageManager": "pnpm@10.17.1",
   "engines": {

package/template/oss-npm-package/.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - $default-branch
+      - main
       - beta
 
 permissions: {}

package/template/oss-npm-package/README.md

@@ -82,7 +82,7 @@ on:
   push:
     branches:
       # add others as necessary
-      - $default-branch
+      - main
       - beta
       # - alpha
 ```