skuba 7.4.0-master-20240207024454 → 7.4.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 (8) hide show
  1. package/lib/cli/lint/internalLints/deleteFiles.js +6 -0
  2. package/lib/cli/lint/internalLints/deleteFiles.js.map +2 -2
  3. package/package.json +2 -2
  4. package/template/express-rest-api/Dockerfile.dev-deps +2 -2
  5. package/template/greeter/Dockerfile +2 -2
  6. package/template/koa-rest-api/Dockerfile.dev-deps +2 -2
  7. package/template/lambda-sqs-worker/Dockerfile +2 -2
  8. package/template/lambda-sqs-worker-cdk/Dockerfile +2 -2
package/lib/cli/lint/internalLints/deleteFiles.js CHANGED
@@ -41,6 +41,12 @@ const AUTOFIX_DELETE_FILES = [
41
41
  "Dockerfile-incunabulum"
42
42
  ];
43
43
  const deleteFilesLint = async (mode, logger) => {
44
+ if (mode === "lint") {
45
+ return {
46
+ ok: true,
47
+ fixable: false
48
+ };
49
+ }
44
50
  const dir = process.cwd();
45
51
  const toDelete = (await Promise.all(
46
52
  AUTOFIX_DELETE_FILES.map(
package/lib/cli/lint/internalLints/deleteFiles.js.map CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/cli/lint/internalLints/deleteFiles.ts"],
4
- "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { pathExists, rm } from 'fs-extra';\n\nimport type { Logger } from '../../../utils/logging';\nimport { detectPackageManager } from '../../../utils/packageManager';\nimport type { InternalLintResult } from '../internal';\n\nconst AUTOFIX_DELETE_FILES = [\n // Try to delete this SEEK-Jobs/gutenberg automation file that may have been\n // accidentally committed in old versions of skuba.\n 'Dockerfile-incunabulum',\n];\n\nexport const deleteFilesLint = async (\n mode: 'format' | 'lint',\n logger: Logger,\n): Promise<InternalLintResult> => {\n const dir = process.cwd();\n\n const toDelete = (\n await Promise.all(\n AUTOFIX_DELETE_FILES.map(\n async (filename) =>\n [filename, await pathExists(path.join(dir, filename))] as const,\n ),\n )\n )\n .filter(([, exists]) => exists)\n .map(([filename]) => filename);\n\n if (mode === 'format') {\n if (toDelete.length === 0) {\n return { ok: true, fixable: false };\n }\n\n try {\n await Promise.all(\n toDelete.map((filename) => {\n logger.warn(`Deleting ${logger.bold(filename)}.`);\n return rm(path.join(dir, filename), { force: true });\n }),\n );\n\n return {\n ok: true,\n fixable: false,\n };\n } catch (err) {\n logger.warn(logger.bold('Failed to delete files.'));\n logger.subtle(inspect(err));\n\n return {\n ok: true, // It's not really a huge deal if we can't delete these files\n fixable: false,\n };\n }\n }\n\n if (toDelete.length) {\n const packageManager = await detectPackageManager();\n\n logger.warn(\n `Some files should be deleted. Run ${logger.bold(\n packageManager.exec,\n 'skuba',\n 'format',\n )} to delete them. ${logger.dim('delete-files')}`,\n );\n\n return {\n ok: false,\n fixable: true,\n annotations: toDelete.map((filename) => ({\n path: filename,\n message: 'This file should be deleted.',\n })),\n };\n }\n\n return {\n ok: true,\n fixable: false,\n };\n};\n"],
5
- "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAA+B;AAG/B,4BAAqC;AAGrC,MAAM,uBAAuB;AAAA;AAAA;AAAA,EAG3B;AACF;AAEO,MAAM,kBAAkB,OAC7B,MACA,WACgC;AAChC,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,YACJ,MAAM,QAAQ;AAAA,IACZ,qBAAqB;AAAA,MACnB,OAAO,aACL,CAAC,UAAU,UAAM,4BAAW,YAAAA,QAAK,KAAK,KAAK,QAAQ,CAAC,CAAC;AAAA,IACzD;AAAA,EACF,GAEC,OAAO,CAAC,CAAC,EAAE,MAAM,MAAM,MAAM,EAC7B,IAAI,CAAC,CAAC,QAAQ,MAAM,QAAQ;AAE/B,MAAI,SAAS,UAAU;AACrB,QAAI,SAAS,WAAW,GAAG;AACzB,aAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,IACpC;AAEA,QAAI;AACF,YAAM,QAAQ;AAAA,QACZ,SAAS,IAAI,CAAC,aAAa;AACzB,iBAAO,KAAK,YAAY,OAAO,KAAK,QAAQ,CAAC,GAAG;AAChD,qBAAO,oBAAG,YAAAA,QAAK,KAAK,KAAK,QAAQ,GAAG,EAAE,OAAO,KAAK,CAAC;AAAA,QACrD,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,QACL,IAAI;AAAA,QACJ,SAAS;AAAA,MACX;AAAA,IACF,SAAS,KAAK;AACZ,aAAO,KAAK,OAAO,KAAK,yBAAyB,CAAC;AAClD,aAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,aAAO;AAAA,QACL,IAAI;AAAA;AAAA,QACJ,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,UAAM,iBAAiB,UAAM,4CAAqB;AAElD,WAAO;AAAA,MACL,qCAAqC,OAAO;AAAA,QAC1C,eAAe;AAAA,QACf;AAAA,QACA;AAAA,MACF,CAAC,oBAAoB,OAAO,IAAI,cAAc,CAAC;AAAA,IACjD;AAEA,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa,SAAS,IAAI,CAAC,cAAc;AAAA,QACvC,MAAM;AAAA,QACN,SAAS;AAAA,MACX,EAAE;AAAA,IACJ;AAAA,EACF;AAEA,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,SAAS;AAAA,EACX;AACF;",
4
+ "sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { pathExists, rm } from 'fs-extra';\n\nimport type { Logger } from '../../../utils/logging';\nimport { detectPackageManager } from '../../../utils/packageManager';\nimport type { InternalLintResult } from '../internal';\n\nconst AUTOFIX_DELETE_FILES = [\n // Try to delete this SEEK-Jobs/gutenberg automation file that may have been\n // accidentally committed in old versions of skuba.\n 'Dockerfile-incunabulum',\n];\n\nexport const deleteFilesLint = async (\n mode: 'format' | 'lint',\n logger: Logger,\n): Promise<InternalLintResult> => {\n if (mode === 'lint') {\n // Flagging Dockerfile-incunabulum for deletion is breaking gutenberg installs of skuba as it's (typically) not in source control\n // TODO: Handle this better (only flag for deletion / delete if in source control)\n\n return {\n ok: true,\n fixable: false,\n };\n }\n\n const dir = process.cwd();\n\n const toDelete = (\n await Promise.all(\n AUTOFIX_DELETE_FILES.map(\n async (filename) =>\n [filename, await pathExists(path.join(dir, filename))] as const,\n ),\n )\n )\n .filter(([, exists]) => exists)\n .map(([filename]) => filename);\n\n if (mode === 'format') {\n if (toDelete.length === 0) {\n return { ok: true, fixable: false };\n }\n\n try {\n await Promise.all(\n toDelete.map((filename) => {\n logger.warn(`Deleting ${logger.bold(filename)}.`);\n return rm(path.join(dir, filename), { force: true });\n }),\n );\n\n return {\n ok: true,\n fixable: false,\n };\n } catch (err) {\n logger.warn(logger.bold('Failed to delete files.'));\n logger.subtle(inspect(err));\n\n return {\n ok: true, // It's not really a huge deal if we can't delete these files\n fixable: false,\n };\n }\n }\n\n if (toDelete.length) {\n const packageManager = await detectPackageManager();\n\n logger.warn(\n `Some files should be deleted. Run ${logger.bold(\n packageManager.exec,\n 'skuba',\n 'format',\n )} to delete them. ${logger.dim('delete-files')}`,\n );\n\n return {\n ok: false,\n fixable: true,\n annotations: toDelete.map((filename) => ({\n path: filename,\n message: 'This file should be deleted.',\n })),\n };\n }\n\n return {\n ok: true,\n fixable: false,\n };\n};\n"],
5
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AACjB,kBAAwB;AAExB,sBAA+B;AAG/B,4BAAqC;AAGrC,MAAM,uBAAuB;AAAA;AAAA;AAAA,EAG3B;AACF;AAEO,MAAM,kBAAkB,OAC7B,MACA,WACgC;AAChC,MAAI,SAAS,QAAQ;AAInB,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,IACX;AAAA,EACF;AAEA,QAAM,MAAM,QAAQ,IAAI;AAExB,QAAM,YACJ,MAAM,QAAQ;AAAA,IACZ,qBAAqB;AAAA,MACnB,OAAO,aACL,CAAC,UAAU,UAAM,4BAAW,YAAAA,QAAK,KAAK,KAAK,QAAQ,CAAC,CAAC;AAAA,IACzD;AAAA,EACF,GAEC,OAAO,CAAC,CAAC,EAAE,MAAM,MAAM,MAAM,EAC7B,IAAI,CAAC,CAAC,QAAQ,MAAM,QAAQ;AAE/B,MAAI,SAAS,UAAU;AACrB,QAAI,SAAS,WAAW,GAAG;AACzB,aAAO,EAAE,IAAI,MAAM,SAAS,MAAM;AAAA,IACpC;AAEA,QAAI;AACF,YAAM,QAAQ;AAAA,QACZ,SAAS,IAAI,CAAC,aAAa;AACzB,iBAAO,KAAK,YAAY,OAAO,KAAK,QAAQ,CAAC,GAAG;AAChD,qBAAO,oBAAG,YAAAA,QAAK,KAAK,KAAK,QAAQ,GAAG,EAAE,OAAO,KAAK,CAAC;AAAA,QACrD,CAAC;AAAA,MACH;AAEA,aAAO;AAAA,QACL,IAAI;AAAA,QACJ,SAAS;AAAA,MACX;AAAA,IACF,SAAS,KAAK;AACZ,aAAO,KAAK,OAAO,KAAK,yBAAyB,CAAC;AAClD,aAAO,WAAO,qBAAQ,GAAG,CAAC;AAE1B,aAAO;AAAA,QACL,IAAI;AAAA;AAAA,QACJ,SAAS;AAAA,MACX;AAAA,IACF;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,UAAM,iBAAiB,UAAM,4CAAqB;AAElD,WAAO;AAAA,MACL,qCAAqC,OAAO;AAAA,QAC1C,eAAe;AAAA,QACf;AAAA,QACA;AAAA,MACF,CAAC,oBAAoB,OAAO,IAAI,cAAc,CAAC;AAAA,IACjD;AAEA,WAAO;AAAA,MACL,IAAI;AAAA,MACJ,SAAS;AAAA,MACT,aAAa,SAAS,IAAI,CAAC,cAAc;AAAA,QACvC,MAAM;AAAA,QACN,SAAS;AAAA,MACX,EAAE;AAAA,IACJ;AAAA,EACF;AAEA,SAAO;AAAA,IACL,IAAI;AAAA,IACJ,SAAS;AAAA,EACX;AACF;",
6
6
  "names": ["path"]
7
7
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "skuba",
3
- "version": "7.4.0-master-20240207024454",
3
+ "version": "7.4.1",
4
4
  "private": false,
5
5
  "description": "SEEK development toolkit for backend applications and packages",
6
6
  "homepage": "https://github.com/seek-oss/skuba#readme",
@@ -151,7 +151,7 @@
151
151
  "entryPoint": "src/index.ts",
152
152
  "template": null,
153
153
  "type": "package",
154
- "version": "7.3.1"
154
+ "version": "7.4.0"
155
155
  },
156
156
  "scripts": {
157
157
  "build": "scripts/build.sh",
package/template/express-rest-api/Dockerfile.dev-deps CHANGED
@@ -7,7 +7,7 @@ RUN pnpm config set store-dir /root/.pnpm-store
7
7
 
8
8
  WORKDIR /workdir
9
9
 
10
- RUN --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
11
- --mount=type=bind,source=.npmrc,target=.npmrc \
10
+ RUN --mount=type=bind,source=.npmrc,target=.npmrc \
11
+ --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
12
12
  --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
13
13
  pnpm fetch
package/template/greeter/Dockerfile CHANGED
@@ -7,7 +7,7 @@ RUN pnpm config set store-dir /root/.pnpm-store
7
7
 
8
8
  WORKDIR /workdir
9
9
 
10
- RUN --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
11
- --mount=type=bind,source=.npmrc,target=.npmrc \
10
+ RUN --mount=type=bind,source=.npmrc,target=.npmrc \
11
+ --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
12
12
  --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
13
13
  pnpm fetch
package/template/koa-rest-api/Dockerfile.dev-deps CHANGED
@@ -7,7 +7,7 @@ RUN pnpm config set store-dir /root/.pnpm-store
7
7
 
8
8
  WORKDIR /workdir
9
9
 
10
- RUN --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
11
- --mount=type=bind,source=.npmrc,target=.npmrc \
10
+ RUN --mount=type=bind,source=.npmrc,target=.npmrc \
11
+ --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
12
12
  --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
13
13
  pnpm fetch
package/template/lambda-sqs-worker/Dockerfile CHANGED
@@ -7,7 +7,7 @@ RUN pnpm config set store-dir /root/.pnpm-store
7
7
 
8
8
  WORKDIR /workdir
9
9
 
10
- RUN --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
11
- --mount=type=bind,source=.npmrc,target=.npmrc \
10
+ RUN --mount=type=bind,source=.npmrc,target=.npmrc \
11
+ --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
12
12
  --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
13
13
  pnpm fetch
package/template/lambda-sqs-worker-cdk/Dockerfile CHANGED
@@ -10,7 +10,7 @@ RUN pnpm config set store-dir /root/.pnpm-store
10
10
 
11
11
  WORKDIR /workdir
12
12
 
13
- RUN --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
14
- --mount=type=bind,source=.npmrc,target=.npmrc \
13
+ RUN --mount=type=bind,source=.npmrc,target=.npmrc \
14
+ --mount=type=bind,source=pnpm-lock.yaml,target=pnpm-lock.yaml \
15
15
  --mount=type=secret,id=npm,dst=/root/.npmrc,required=true \
16
16
  pnpm fetch