skuba 16.0.6 → 16.0.8
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.
- package/lib/api/vitest/index.js +7 -6
- package/lib/api/vitest/index.js.map +2 -2
- package/lib/cli/configure/modules/package.js +17 -10
- package/lib/cli/configure/modules/package.js.map +2 -2
- package/lib/cli/migrate/esm/patchInstrumentation.js +8 -5
- package/lib/cli/migrate/esm/patchInstrumentation.js.map +2 -2
- package/lib/cli/migrate/esm/vitest/vitest.js +3 -3
- package/lib/cli/migrate/esm/vitest/vitest.js.map +2 -2
- package/package.json +4 -4
- package/template/express-rest-api/package.json +5 -5
- package/template/koa-rest-api/package.json +5 -5
- package/template/lambda-sqs-worker-cdk/package.json +4 -4
- package/template/oss-npm-package/.github/workflows/release.yml +1 -1
- package/template/oss-npm-package/.github/workflows/validate.yml +1 -1
package/lib/api/vitest/index.js
CHANGED
|
@@ -6,12 +6,13 @@ export const defaults = {
|
|
|
6
6
|
include: ["**/*.ts", "**/*.tsx"],
|
|
7
7
|
exclude: [
|
|
8
8
|
"**/node_modules*/**",
|
|
9
|
-
"coverage
|
|
10
|
-
"dist
|
|
11
|
-
"lib
|
|
12
|
-
"
|
|
13
|
-
"
|
|
14
|
-
"
|
|
9
|
+
"**/coverage/**",
|
|
10
|
+
"**/dist/**",
|
|
11
|
+
"**/lib/**",
|
|
12
|
+
"**/lib-*/**",
|
|
13
|
+
"**/tmp/**",
|
|
14
|
+
"**/vitest.*.ts",
|
|
15
|
+
"**/tsdown.config.*ts"
|
|
15
16
|
]
|
|
16
17
|
},
|
|
17
18
|
exclude: defaultExclude
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/api/vitest/index.ts"],
|
|
4
|
-
"sourcesContent": ["import { type ViteUserConfig, defaultExclude } from 'vitest/config';\n\nimport { mergeRaw } from '../../cli/configure/processing/record.js';\n\nexport const defaults = {\n coverage: {\n include: ['**/*.ts', '**/*.tsx'],\n exclude: [\n '**/node_modules*/**',\n 'coverage
|
|
5
|
-
"mappings": ";AAAA,SAA8B,sBAAsB;AAEpD,SAAS,gBAAgB;AAElB,aAAM,WAAW;AAAA,EACtB,UAAU;AAAA,IACR,SAAS,CAAC,WAAW,UAAU;AAAA,IAC/B,SAAS;AAAA,MACP;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EACA,SAAS;AACX;AAEA,MAAM,iBAAiB;AAAA,EACrB,MAAM;AACR;AAEO,aAAM,cAAc,CAA2B,WACpD,SAAS,gBAAgB,MAAM;",
|
|
4
|
+
"sourcesContent": ["import { type ViteUserConfig, defaultExclude } from 'vitest/config';\n\nimport { mergeRaw } from '../../cli/configure/processing/record.js';\n\nexport const defaults = {\n coverage: {\n include: ['**/*.ts', '**/*.tsx'],\n exclude: [\n '**/node_modules*/**',\n '**/coverage/**',\n '**/dist/**',\n '**/lib/**',\n '**/lib-*/**',\n '**/tmp/**',\n '**/vitest.*.ts',\n '**/tsdown.config.*ts',\n ],\n },\n exclude: defaultExclude,\n} satisfies ViteUserConfig['test'];\n\nconst configDefaults = {\n test: defaults,\n} satisfies ViteUserConfig;\n\nexport const mergePreset = <T extends ViteUserConfig>(config: T): T =>\n mergeRaw(configDefaults, config);\n"],
|
|
5
|
+
"mappings": ";AAAA,SAA8B,sBAAsB;AAEpD,SAAS,gBAAgB;AAElB,aAAM,WAAW;AAAA,EACtB,UAAU;AAAA,IACR,SAAS,CAAC,WAAW,UAAU;AAAA,IAC/B,SAAS;AAAA,MACP;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF;AAAA,EACA,SAAS;AACX;AAEA,MAAM,iBAAiB;AAAA,EACrB,MAAM;AACR;AAEO,aAAM,cAAc,CAA2B,WACpD,SAAS,gBAAgB,MAAM;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -3,18 +3,17 @@ import { getSkubaVersion } from "../../../utils/version.js";
|
|
|
3
3
|
import { deleteFiles } from "../processing/deleteFiles.js";
|
|
4
4
|
import { withPackage } from "../processing/package.js";
|
|
5
5
|
import { merge } from "../processing/record.js";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
"lib*/**/*.js",
|
|
9
|
-
"lib*/**/*.js.map",
|
|
10
|
-
"lib*/**/*.json"
|
|
11
|
-
];
|
|
6
|
+
import { getOwnerAndRepo } from "@skuba-lib/api/git";
|
|
7
|
+
const DEFAULT_PACKAGE_FILES = ["lib"];
|
|
12
8
|
export const packageModule = async ({
|
|
13
9
|
entryPoint,
|
|
14
10
|
packageManager,
|
|
15
11
|
type
|
|
16
12
|
}) => {
|
|
17
|
-
const version = await
|
|
13
|
+
const [{ repo }, version] = await Promise.all([
|
|
14
|
+
getOwnerAndRepo({ dir: process.cwd() }),
|
|
15
|
+
getSkubaVersion()
|
|
16
|
+
]);
|
|
18
17
|
const initialData = {
|
|
19
18
|
private: type !== "package",
|
|
20
19
|
scripts: {
|
|
@@ -77,9 +76,17 @@ export const packageModule = async ({
|
|
|
77
76
|
).replace(/^smt /, "skuba ").trim()
|
|
78
77
|
).filter(Boolean).join(" && ");
|
|
79
78
|
if (outputData.scripts.build === "skuba build-package") {
|
|
80
|
-
outputData.main = "./lib
|
|
81
|
-
outputData.module = "./lib
|
|
82
|
-
outputData.types = "./lib
|
|
79
|
+
outputData.main = "./lib/index.cjs";
|
|
80
|
+
outputData.module = "./lib/index.mjs";
|
|
81
|
+
outputData.types = "./lib/index.d.cts";
|
|
82
|
+
outputData.exports = {
|
|
83
|
+
".": {
|
|
84
|
+
[`@seek/${repo}/source`]: "./src/index.ts",
|
|
85
|
+
require: "./lib/index.cjs",
|
|
86
|
+
import: "./lib/index.mjs"
|
|
87
|
+
},
|
|
88
|
+
"./package.json": "./package.json"
|
|
89
|
+
};
|
|
83
90
|
} else {
|
|
84
91
|
outputData.main = "./lib/index.js";
|
|
85
92
|
outputData.module = "./lib/index.js";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/cli/configure/modules/package.ts"],
|
|
4
|
-
"sourcesContent": ["import { getSkubaVersion } from '../../../utils/version.js';\nimport { deleteFiles } from '../processing/deleteFiles.js';\nimport { withPackage } from '../processing/package.js';\nimport { merge } from '../processing/record.js';\nimport type { Module, Options } from '../types.js';\n\nconst DEFAULT_PACKAGE_FILES = [
|
|
5
|
-
"mappings": ";AAAA,SAAS,uBAAuB;AAChC,SAAS,mBAAmB;AAC5B,SAAS,mBAAmB;AAC5B,SAAS,aAAa;AAGtB,
|
|
4
|
+
"sourcesContent": ["import { getSkubaVersion } from '../../../utils/version.js';\nimport { deleteFiles } from '../processing/deleteFiles.js';\nimport { withPackage } from '../processing/package.js';\nimport { merge } from '../processing/record.js';\nimport type { Module, Options } from '../types.js';\n\nimport { getOwnerAndRepo } from '@skuba-lib/api/git';\n\nconst DEFAULT_PACKAGE_FILES = ['lib'];\n\nexport const packageModule = async ({\n entryPoint,\n packageManager,\n type,\n}: Options): Promise<Module> => {\n const [{ repo }, version] = await Promise.all([\n getOwnerAndRepo({ dir: process.cwd() }),\n getSkubaVersion(),\n ]);\n\n const initialData = {\n private: type !== 'package',\n\n scripts: {\n build: type === 'package' ? 'skuba build-package' : 'skuba build',\n format: 'skuba format',\n lint: 'skuba lint',\n ...(type === 'package' ? {} : { start: 'skuba start' }),\n test: 'skuba test --coverage',\n 'test:watch': 'skuba test --watch',\n },\n skuba: {\n entryPoint,\n template: null,\n type,\n version,\n },\n };\n\n const recurringData = {\n skuba: {\n entryPoint,\n type,\n version,\n },\n };\n\n return {\n ...deleteFiles('.npmignore', 'package-lock.json'),\n\n 'package.json': (inputFile) =>\n withPackage((inputData) => {\n const outputData = merge(\n inputData,\n 'skuba' in inputData ? recurringData : initialData,\n );\n\n outputData.license ??= 'UNLICENSED';\n outputData.scripts ??= {};\n\n // Workspaces can only be enabled in private projects\n if (outputData.workspaces && !outputData.private) {\n outputData.private = true;\n }\n\n delete outputData.scripts.commit;\n delete outputData.scripts['format:check'];\n delete outputData.scripts['lint:build'];\n delete outputData.scripts['lint:compile'];\n delete outputData.scripts['lint:eslint'];\n delete outputData.scripts['lint:prettier'];\n delete outputData.scripts['lint:tslint'];\n delete outputData.scripts['test:build'];\n delete outputData.scripts['test:jest'];\n delete outputData.typings;\n\n if (type === 'package') {\n outputData.files = (\n outputData.files ?? DEFAULT_PACKAGE_FILES\n ).flatMap((filePattern) =>\n filePattern === 'lib' ? DEFAULT_PACKAGE_FILES : [filePattern],\n );\n\n outputData.version ??= '0.0.0-semantically-released';\n\n // User-defined pre- and post-scripts are confusing and dropped by e.g.\n // Yarn 2.\n outputData.scripts.release = [\n outputData.scripts.prepublish,\n outputData.scripts.prerelease,\n outputData.scripts.release ?? 'skuba release',\n ]\n .filter((script): script is string => typeof script === 'string')\n .map((script) =>\n script\n .replace(\n /^smt build$/,\n `${packageManager.print.runSilent} build`,\n )\n .replace(/^smt /, 'skuba ')\n .trim(),\n )\n .filter(Boolean)\n .join(' && ');\n\n // Align with the required syntax for package.json#/paths\n if (outputData.scripts.build === 'skuba build-package') {\n outputData.main = './lib/index.cjs';\n outputData.module = './lib/index.mjs';\n outputData.types = './lib/index.d.cts';\n outputData.exports = {\n '.': {\n [`@seek/${repo}/source`]: './src/index.ts',\n require: './lib/index.cjs',\n import: './lib/index.mjs',\n },\n './package.json': './package.json',\n };\n } else {\n outputData.main = './lib/index.js';\n outputData.module = './lib/index.js';\n outputData.types = './lib/index.d.ts';\n }\n\n delete outputData.scripts.prepublish;\n delete outputData.scripts.prerelease;\n }\n\n return outputData;\n })(inputFile),\n };\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -43,32 +43,35 @@ export const patchInstrumentation = async ({
|
|
|
43
43
|
const hasDDTraceImport = tsFiles.some(
|
|
44
44
|
({ content }) => /from\s+['"]dd-trace['"]/.test(content)
|
|
45
45
|
);
|
|
46
|
+
const hasDDTraceInitImport = tsFiles.some(
|
|
47
|
+
({ content }) => /from\s+['"]dd-trace\/init['"]/.test(content)
|
|
48
|
+
);
|
|
46
49
|
const otelImports = tsFiles.filter(
|
|
47
50
|
({ content }) => /from\s+['"]@opentelemetry\/api['"]/.test(content)
|
|
48
51
|
);
|
|
49
52
|
const hasOpenTelemetryImport = otelImports.length > 0;
|
|
50
|
-
if (!hasDDTraceImport && !hasOpenTelemetryImport) {
|
|
53
|
+
if (!hasDDTraceImport && !hasDDTraceInitImport && !hasOpenTelemetryImport) {
|
|
51
54
|
return {
|
|
52
55
|
result: "skip",
|
|
53
56
|
reason: "no imports for Datadog or OpenTelemetry instrumentation found in source files"
|
|
54
57
|
};
|
|
55
58
|
}
|
|
56
|
-
const confused = hasDDTraceImport && hasOpenTelemetryImport;
|
|
59
|
+
const confused = (hasDDTraceImport || hasDDTraceInitImport) && hasOpenTelemetryImport;
|
|
57
60
|
if (confused) {
|
|
58
61
|
log.warn(
|
|
59
62
|
"Found imports for both Datadog and OpenTelemetry instrumentation in source files, unsure which to patch"
|
|
60
63
|
);
|
|
61
64
|
}
|
|
62
|
-
const warning =
|
|
65
|
+
const warning = confused ? "TODO: skuba failed to determine whether to add dd-trace or OpenTelemetry flags, please choose the appropriate flags to add to your Dockerfile " : "";
|
|
63
66
|
const commandsToAdd = [
|
|
64
|
-
hasDDTraceImport ? "--import dd-trace/
|
|
67
|
+
hasDDTraceImport ? "--import dd-trace/register.js" : "",
|
|
65
68
|
hasOpenTelemetryImport ? "--experimental-loader @opentelemetry/instrumentation/hook.mjs" : ""
|
|
66
69
|
].filter(Boolean);
|
|
67
70
|
const patched = dockerFiles.map(({ filePath, content }) => {
|
|
68
71
|
if (filePath.includes("dev-deps")) {
|
|
69
72
|
return null;
|
|
70
73
|
}
|
|
71
|
-
if (content.includes("dd-trace/initialize.mjs") || content.includes("@opentelemetry/instrumentation/hook.mjs")) {
|
|
74
|
+
if (content.includes("dd-trace/initialize.mjs") || content.includes("dd-trace/register.js") || content.includes("@opentelemetry/instrumentation/hook.mjs")) {
|
|
72
75
|
return null;
|
|
73
76
|
}
|
|
74
77
|
const cmd = /^CMD\s+(.+)$/m.exec(content)?.[1];
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/cli/migrate/esm/patchInstrumentation.ts"],
|
|
4
|
-
"sourcesContent": ["import { dirname } from 'path';\nimport { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport fs from 'fs-extra';\nimport latestVersion from 'latest-version';\n\nimport { createExec } from '../../../utils/exec.js';\nimport { log } from '../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../utils/manifest.js';\nimport type { PatchFunction } from '../../lint/internalLints/upgrade/index.js';\n\nimport { Git } from '@skuba-lib/api';\n\nexport const patchInstrumentation: PatchFunction = async ({\n mode,\n packageManager,\n}) => {\n const [dockerfilePaths, tsPaths] = await Promise.all([\n fg(['**/Dockerfile*'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n fg(['**/*.ts'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n ]);\n\n if (!dockerfilePaths.length) {\n return {\n result: 'skip',\n reason: 'no Dockerfile files found',\n };\n }\n\n const [dockerFiles, tsFiles] = await Promise.all([\n Promise.all(\n dockerfilePaths.map(async (filePath) => ({\n filePath,\n content: await fs.promises.readFile(filePath, 'utf-8'),\n })),\n ),\n Promise.all(\n tsPaths.map(async (filePath) => ({\n filePath,\n content: await fs.promises.readFile(filePath, 'utf-8'),\n })),\n ),\n ]);\n\n const hasDDTraceImport = tsFiles.some(({ content }) =>\n /from\\s+['\"]dd-trace['\"]/.test(content),\n );\n const otelImports = tsFiles.filter(({ content }) =>\n /from\\s+['\"]@opentelemetry\\/api['\"]/.test(content),\n );\n\n const hasOpenTelemetryImport = otelImports.length > 0;\n\n if (!hasDDTraceImport && !hasOpenTelemetryImport) {\n return {\n result: 'skip',\n reason:\n 'no imports for Datadog or OpenTelemetry instrumentation found in source files',\n };\n }\n\n const confused
|
|
5
|
-
"mappings": ";AAAA,SAAS,eAAe;AACxB,SAAS,eAAe;AAExB,OAAO,QAAQ;AACf,OAAO,QAAQ;AACf,OAAO,mBAAmB;AAE1B,SAAS,kBAAkB;AAC3B,SAAS,WAAW;AACpB,SAAS,2BAA2B;AAGpC,SAAS,WAAW;AAEb,aAAM,uBAAsC,OAAO;AAAA,EACxD;AAAA,EACA;AACF,MAAM;AACJ,QAAM,CAAC,iBAAiB,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,IACnD,GAAG,CAAC,gBAAgB,GAAG;AAAA,MACrB,QAAQ,CAAC,WAAW,iBAAiB;AAAA,IACvC,CAAC;AAAA,IACD,GAAG,CAAC,SAAS,GAAG;AAAA,MACd,QAAQ,CAAC,WAAW,iBAAiB;AAAA,IACvC,CAAC;AAAA,EACH,CAAC;AAED,MAAI,CAAC,gBAAgB,QAAQ;AAC3B,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,CAAC,aAAa,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,IAC/C,QAAQ;AAAA,MACN,gBAAgB,IAAI,OAAO,cAAc;AAAA,QACvC;AAAA,QACA,SAAS,MAAM,GAAG,SAAS,SAAS,UAAU,OAAO;AAAA,MACvD,EAAE;AAAA,IACJ;AAAA,IACA,QAAQ;AAAA,MACN,QAAQ,IAAI,OAAO,cAAc;AAAA,QAC/B;AAAA,QACA,SAAS,MAAM,GAAG,SAAS,SAAS,UAAU,OAAO;AAAA,MACvD,EAAE;AAAA,IACJ;AAAA,EACF,CAAC;AAED,QAAM,mBAAmB,QAAQ;AAAA,IAAK,CAAC,EAAE,QAAQ,MAC/C,0BAA0B,KAAK,OAAO;AAAA,EACxC;AACA,QAAM,cAAc,QAAQ;AAAA,IAAO,CAAC,EAAE,QAAQ,MAC5C,qCAAqC,KAAK,OAAO;AAAA,EACnD;AAEA,QAAM,yBAAyB,YAAY,SAAS;AAEpD,MAAI,CAAC,oBAAoB,CAAC,wBAAwB;
|
|
4
|
+
"sourcesContent": ["import { dirname } from 'path';\nimport { inspect } from 'util';\n\nimport fg from 'fast-glob';\nimport fs from 'fs-extra';\nimport latestVersion from 'latest-version';\n\nimport { createExec } from '../../../utils/exec.js';\nimport { log } from '../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../utils/manifest.js';\nimport type { PatchFunction } from '../../lint/internalLints/upgrade/index.js';\n\nimport { Git } from '@skuba-lib/api';\n\nexport const patchInstrumentation: PatchFunction = async ({\n mode,\n packageManager,\n}) => {\n const [dockerfilePaths, tsPaths] = await Promise.all([\n fg(['**/Dockerfile*'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n fg(['**/*.ts'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n ]);\n\n if (!dockerfilePaths.length) {\n return {\n result: 'skip',\n reason: 'no Dockerfile files found',\n };\n }\n\n const [dockerFiles, tsFiles] = await Promise.all([\n Promise.all(\n dockerfilePaths.map(async (filePath) => ({\n filePath,\n content: await fs.promises.readFile(filePath, 'utf-8'),\n })),\n ),\n Promise.all(\n tsPaths.map(async (filePath) => ({\n filePath,\n content: await fs.promises.readFile(filePath, 'utf-8'),\n })),\n ),\n ]);\n\n const hasDDTraceImport = tsFiles.some(({ content }) =>\n /from\\s+['\"]dd-trace['\"]/.test(content),\n );\n const hasDDTraceInitImport = tsFiles.some(({ content }) =>\n /from\\s+['\"]dd-trace\\/init['\"]/.test(content),\n );\n const otelImports = tsFiles.filter(({ content }) =>\n /from\\s+['\"]@opentelemetry\\/api['\"]/.test(content),\n );\n\n const hasOpenTelemetryImport = otelImports.length > 0;\n\n if (!hasDDTraceImport && !hasDDTraceInitImport && !hasOpenTelemetryImport) {\n return {\n result: 'skip',\n reason:\n 'no imports for Datadog or OpenTelemetry instrumentation found in source files',\n };\n }\n\n const confused =\n (hasDDTraceImport || hasDDTraceInitImport) && hasOpenTelemetryImport;\n\n if (confused) {\n log.warn(\n 'Found imports for both Datadog and OpenTelemetry instrumentation in source files, unsure which to patch',\n );\n }\n\n const warning = confused\n ? 'TODO: skuba failed to determine whether to add dd-trace or OpenTelemetry flags, please choose the appropriate flags to add to your Dockerfile '\n : '';\n\n const commandsToAdd = [\n hasDDTraceImport ? '--import dd-trace/register.js' : '',\n hasOpenTelemetryImport\n ? '--experimental-loader @opentelemetry/instrumentation/hook.mjs'\n : '',\n ].filter(Boolean);\n\n const patched = dockerFiles\n .map(({ filePath, content }) => {\n if (filePath.includes('dev-deps')) {\n return null;\n }\n\n if (\n content.includes('dd-trace/initialize.mjs') ||\n content.includes('dd-trace/register.js') ||\n content.includes('@opentelemetry/instrumentation/hook.mjs')\n ) {\n return null;\n }\n\n const cmd = /^CMD\\s+(.+)$/m.exec(content)?.[1];\n\n if (!cmd) {\n return null;\n }\n\n // check if CMD is in shell or exec form\n const isShellForm = !cmd.startsWith('[');\n\n if (isShellForm) {\n if (cmd.startsWith('node ')) {\n const patchedCmd = cmd.replace(\n 'node ',\n `node ${warning}${commandsToAdd.join(' ')} `,\n );\n return { filePath, content: content.replace(cmd, patchedCmd) };\n }\n\n return {\n filePath,\n content: content.replace(\n cmd,\n `${warning}${commandsToAdd.join(' ')} ${cmd}`,\n ),\n };\n }\n\n const flags = commandsToAdd\n .map((f) => f.split(' '))\n .flat()\n .map((f) => `\"${f}\"`)\n .join(', ');\n\n if (/^\\s*\\[\\s*\"node\"\\s*[,\\]]/.test(cmd)) {\n const patchedCmd = cmd.replace(\n /^(\\s*\\[\\s*\"node\"\\s*)([,\\]])/,\n `$1, ${warning}${flags}$2`,\n );\n\n return { filePath, content: content.replace(cmd, patchedCmd) };\n }\n\n const patchedCmd = cmd.replace(/^\\s*\\[/, `[${warning}${flags}, `);\n return { filePath, content: content.replace(cmd, patchedCmd) };\n })\n .filter((patch) => patch !== null);\n\n if (!patched.length) {\n return {\n result: 'skip',\n reason: 'no CMD instructions found in Dockerfiles to patch',\n };\n }\n\n if (mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n if (hasOpenTelemetryImport) {\n const packageJsons = await Promise.all(\n otelImports.map(async ({ filePath }) =>\n getConsumerManifest(dirname(filePath)),\n ),\n );\n\n const filteredPackageJsons = packageJsons.filter(\n (pkg) => pkg !== undefined,\n );\n await Promise.all(\n filteredPackageJsons.map(async (pkg) => {\n const { packageJson, path } = pkg;\n\n if (\n packageJson.dependencies?.['@opentelemetry/instrumentation'] ||\n packageJson.devDependencies?.['@opentelemetry/instrumentation']\n ) {\n return;\n }\n\n const fallbackVersion = '0.216.0';\n\n const existingVersion =\n packageJson.dependencies?.['@opentelemetry/instrumentation-http'] ??\n packageJson.dependencies?.['@opentelemetry/sdk-node'];\n\n const versionToUse =\n existingVersion?.startsWith('catalog:') ||\n existingVersion === undefined\n ? fallbackVersion\n : await latestVersion('@opentelemetry/instrumentation', {\n version: `<=${existingVersion}`,\n });\n\n packageJson.dependencies ??= {};\n\n packageJson.dependencies['@opentelemetry/instrumentation'] =\n versionToUse;\n\n await fs.promises.writeFile(\n path,\n JSON.stringify(packageJson, null, 2),\n 'utf-8',\n );\n }),\n );\n\n const gitRoot =\n (await Git.findRoot({ dir: process.cwd() })) ?? process.cwd();\n\n const rootExec = createExec({ cwd: gitRoot });\n\n try {\n await rootExec(\n packageManager.command,\n 'install',\n ...(packageManager.command === 'pnpm'\n ? ['--frozen-lockfile=false']\n : []),\n '--prefer-offline',\n '--ignore-scripts',\n );\n } catch (error) {\n log.warn('Failed to install dependencies after OpenTelemetry patch');\n log.subtle(inspect(error));\n }\n }\n\n await Promise.all(\n patched.map(({ filePath, content }) =>\n fs.promises.writeFile(filePath, content, 'utf-8'),\n ),\n );\n\n return {\n result: 'apply',\n };\n};\n\nexport const tryPatchInstrumentation: PatchFunction = async (opts) => {\n try {\n return await patchInstrumentation(opts);\n } catch (err) {\n log.warn(\n 'Failed to patch Datadog or OpenTelemetry instrumentation, skipping',\n );\n log.subtle(inspect(err));\n return { result: 'skip', reason: 'due to an error' };\n }\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["patchedCmd"]
|
|
7
7
|
}
|
|
@@ -92,10 +92,10 @@ export const migrateToVitest = async (opts) => {
|
|
|
92
92
|
const vitestConfigFiles = await fg(["**/vitest.config.{ts,js,mjs,mts,cts}"], {
|
|
93
93
|
ignore: ["**/.git", "**/node_modules"]
|
|
94
94
|
});
|
|
95
|
-
if (vitestConfigFiles.length > 0) {
|
|
95
|
+
if (vitestConfigFiles.length > 0 && process.env.SKUBA_FORCE_MIGRATE_VITEST !== "true") {
|
|
96
96
|
return {
|
|
97
97
|
result: "skip",
|
|
98
|
-
reason: "vitest is already configured in this project"
|
|
98
|
+
reason: "vitest is already configured in this project, re-run the migration with SKUBA_FORCE_MIGRATE_VITEST=true to skip this check"
|
|
99
99
|
};
|
|
100
100
|
}
|
|
101
101
|
const [packageJsonFiles, pnpmWorkspaceFiles, buildkiteFiles] = await Promise.all([
|
|
@@ -181,7 +181,7 @@ export const migrateToVitest = async (opts) => {
|
|
|
181
181
|
).replace(/\.calls\[(\d+)\]\[/g, ".calls[$1]?.[").replaceAll(
|
|
182
182
|
"eslint-disable-next-line jest",
|
|
183
183
|
"eslint-disable-next-line vitest"
|
|
184
|
-
).replaceAll("eslint-disable jest", "eslint-disable vitest").replaceAll("Mock<any, any>", "Mock").replaceAll("advanceTimers: true", "
|
|
184
|
+
).replaceAll("eslint-disable jest", "eslint-disable vitest").replaceAll("Mock<any, any>", "Mock").replaceAll("advanceTimers: true", "shouldAdvanceTime: true");
|
|
185
185
|
if (finalUpdated !== content) {
|
|
186
186
|
return fs.promises.writeFile(file, finalUpdated, "utf8");
|
|
187
187
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/cli/migrate/esm/vitest/vitest.ts"],
|
|
4
|
-
"sourcesContent": ["import path from 'node:path';\nimport { inspect } from 'node:util';\n\nimport fg from 'fast-glob';\nimport fs from 'fs-extra';\nimport latestVersion from 'latest-version';\n\nimport { createExec, exec } from '../../../../utils/exec.js';\nimport { log } from '../../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../../utils/manifest.js';\nimport {\n type PackageManagerConfig,\n detectPackageManager,\n} from '../../../../utils/packageManager.js';\nimport type { PatchReturnType } from '../../../lint/internalLints/upgrade/index.js';\n\nimport { editLifeCycleHooks } from './lifeCycleEdits.js';\nimport { postFixVitestMigration } from './postFixVitestMigration.js';\nimport { scaffoldVitestConfig } from './vitestConfig.js';\n\nimport { Git } from '@skuba-lib/api';\n\nexport type FileContent = {\n file: string;\n content: string;\n};\n\nconst getLatestVitestKoaMocksVersion = async (): Promise<string> => {\n try {\n return await latestVersion('@skuba-lib/vitest-koa-mocks');\n } catch {\n return '1.0.1';\n }\n};\n\nexport const readFiles = async (paths: string[]): Promise<FileContent[]> =>\n Promise.all(\n paths.map(async (file) => {\n const content = await fs.promises.readFile(file, 'utf8');\n return {\n file,\n content,\n };\n }),\n );\n\nconst patchFiles = async ({\n packageJsons,\n pnpmWorkspaces,\n buildkitePipelines,\n}: {\n packageJsons: FileContent[];\n pnpmWorkspaces: FileContent[];\n buildkitePipelines: FileContent[];\n}): Promise<FileContent[]> => {\n const latestVitestKoaMocksVersion = await getLatestVitestKoaMocksVersion();\n const updatedPackageJsons = packageJsons\n .map(({ file, content }) => {\n const updatedContent = content\n .replace(\n /\"aws-sdk-client-mock-jest\":\\s*\"([^\"]*)\"/g,\n (_match, version: string) => {\n const newVersion = version.startsWith('catalog:')\n ? version\n : '7.0.1';\n return `\"aws-sdk-client-mock-vitest\": \"${newVersion}\"`;\n },\n )\n .replace(\n /\"@shopify\\/jest-koa-mocks\":\\s*\"([^\"]*)\"/g,\n (_match, version: string) => {\n const newVersion = version.startsWith('catalog:')\n ? version\n : latestVitestKoaMocksVersion;\n return `\"@skuba-lib/vitest-koa-mocks\": \"${newVersion}\"`;\n },\n )\n .replace(/--runInBand/g, '--maxWorkers=1')\n .replace(/jest.config/g, 'vitest.config');\n\n return {\n file,\n content: updatedContent === content ? undefined : updatedContent,\n };\n })\n .filter((file): file is FileContent => file.content !== undefined);\n\n const updatedPnpmWorkspaces = pnpmWorkspaces\n .map(({ file, content }) => {\n const updatedContent = content\n .replace(\n /aws-sdk-client-mock-jest:\\s*\\S+/g,\n 'aws-sdk-client-mock-vitest: 7.0.1',\n )\n .replace(\n /'?@shopify\\/jest-koa-mocks'?:\\s*\\S+/g,\n `'@skuba-lib/vitest-koa-mocks': ${latestVitestKoaMocksVersion}`,\n );\n\n return {\n file,\n content: updatedContent === content ? undefined : updatedContent,\n };\n })\n .filter((file): file is FileContent => file.content !== undefined);\n\n const updatedBuildkiteFiles = buildkitePipelines\n .map(({ file, content }) => {\n const updatedContent = content\n .replace(/--runInBand/g, '--maxWorkers=1')\n .replace(/jest.config/g, 'vitest.config');\n return {\n file,\n content: updatedContent === content ? undefined : updatedContent,\n };\n })\n .filter((file): file is FileContent => file.content !== undefined);\n return [\n ...updatedPackageJsons,\n ...updatedPnpmWorkspaces,\n ...updatedBuildkiteFiles,\n ];\n};\n\nexport const migrateToVitest = async (opts: {\n mode: 'lint' | 'format';\n packageManager?: PackageManagerConfig;\n}): Promise<PatchReturnType> => {\n const mode = opts.mode;\n // Adding `vitest.config.ts` to all the integration tests causes the vscode extension\n // to freak out about having too many vitest configs\n if (process.env.SKUBA_INT_TEST === 'true') {\n return {\n result: 'skip',\n reason: 'skipping in integration test environment',\n };\n }\n\n const vitestConfigFiles = await fg(['**/vitest.config.{ts,js,mjs,mts,cts}'], {\n ignore: ['**/.git', '**/node_modules'],\n });\n\n if (vitestConfigFiles.length > 0) {\n return {\n result: 'skip',\n reason: 'vitest is already configured in this project',\n };\n }\n\n const [packageJsonFiles, pnpmWorkspaceFiles, buildkiteFiles] =\n await Promise.all([\n fg(['**/package.json'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n fg(['**/pnpm-workspace.yaml'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n fg(['**/.buildkite/**/*.{yml,yaml}'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n ]);\n\n const [packageJsons, pnpmWorkspaces, buildkitePipelines] = await Promise.all([\n readFiles(packageJsonFiles),\n readFiles(pnpmWorkspaceFiles),\n readFiles(buildkiteFiles),\n ]);\n\n const filesToUpdate = await patchFiles({\n packageJsons,\n pnpmWorkspaces,\n buildkitePipelines,\n });\n\n if (filesToUpdate.length && mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n await Promise.all(\n filesToUpdate.map(({ file, content }) =>\n fs.promises.writeFile(file, content, 'utf8'),\n ),\n );\n\n const vitestKoaMockPathsWithoutNodeTypes = new Set(\n filesToUpdate\n .filter(\n ({ content }) =>\n (content.includes('@skuba-lib/vitest-koa-mocks') ||\n content.includes('aws-sdk-client-mock-vitest')) &&\n !content.includes('@types/node'),\n )\n .map(({ file }) => path.dirname(file)),\n );\n\n const configFilesToUpdate = await scaffoldVitestConfig();\n\n if (configFilesToUpdate.length && mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n const folders = configFilesToUpdate.map(({ file }) => path.dirname(file));\n const uniqueFolders = Array.from(new Set(folders));\n\n await Promise.all(\n uniqueFolders.map((folder) =>\n fs.promises.mkdir(folder, { recursive: true }),\n ),\n );\n\n await Promise.all(\n configFilesToUpdate.map(({ file, content }) =>\n fs.promises.writeFile(file, content, 'utf8'),\n ),\n );\n\n const packageManager = opts.packageManager ?? (await detectPackageManager());\n\n if (packageManager.command === 'pnpm') {\n await exec('pnpm', 'dlx', '@sku-lib/codemod', 'jest-to-vitest', '.');\n } else {\n await exec('npx', '@sku-lib/codemod', 'jest-to-vitest', '.');\n }\n\n // The sku migration doesn't handle async hooks nicely so we have to go back and re-patch them\n const tsFilePaths = await fg(['**/*.ts', '**/*.tsx'], {\n ignore: ['**/.git', '**/node_modules'],\n });\n const tsFiles = await readFiles(tsFilePaths);\n const lifeCyclesToCheck: string[] = [];\n\n await Promise.all(\n tsFiles.map(async ({ file, content }) => {\n const { updated, hasLifeCyclesToCheck } = await postFixVitestMigration(\n file,\n content,\n );\n\n if (hasLifeCyclesToCheck) {\n lifeCyclesToCheck.push(file);\n }\n\n // replace import 'aws-sdk-client-mock-jest'; with import 'aws-sdk-client-mock-vitest/extend';\n // replace imports from @shopify/jest-koa-mocks with @skuba-lib/vitest-koa-mocks\n // replace .mockImplementation() with .mockImplementation(() => undefined) to account for the fact that Vitest requires an implementation for mocks whereas Jest does not\n // replace istanbul ignore with v8 ignore for coverage purposes\n const finalUpdated = updated\n .replace(\n /import\\s+['\"]aws-sdk-client-mock-jest['\"];?/g,\n \"import 'aws-sdk-client-mock-vitest/extend';\",\n )\n .replace(/@shopify\\/jest-koa-mocks/g, '@skuba-lib/vitest-koa-mocks')\n .replace(\n /\\.mockImplementation\\(\\)/g,\n '.mockImplementation(() => undefined)',\n )\n .replace(/\\.calls\\[(\\d+)\\]\\[/g, '.calls[$1]?.[')\n .replaceAll(\n 'eslint-disable-next-line jest',\n 'eslint-disable-next-line vitest',\n )\n .replaceAll('eslint-disable jest', 'eslint-disable vitest')\n .replaceAll('Mock<any, any>', 'Mock')\n .replaceAll('advanceTimers: true', 'shouldAdvanceTimers: true');\n\n if (finalUpdated !== content) {\n return fs.promises.writeFile(file, finalUpdated, 'utf8');\n }\n }),\n );\n\n const lifeCycleFiles = await readFiles(lifeCyclesToCheck);\n\n await editLifeCycleHooks(lifeCycleFiles);\n\n const existingNodeTypesVersion = packageJsons\n .map(({ content }) => {\n const match = /\"@types\\/node\":\\s*\"([^\"]*)\"/.exec(content);\n return match ? match[1] : null;\n })\n .find((version) => version !== null);\n\n const nodeTypeVersionToPatch = existingNodeTypesVersion ?? '24.12.2';\n\n const gitRoot = (await Git.findRoot({ dir: process.cwd() })) ?? process.cwd();\n\n await Promise.all(\n Array.from(vitestKoaMockPathsWithoutNodeTypes).map(async (folder) => {\n const manifest = await getConsumerManifest(folder);\n\n if (!manifest || manifest.packageJson.devDependencies?.['@types/node']) {\n return;\n }\n\n manifest.packageJson.devDependencies ??= {};\n manifest.packageJson.devDependencies['@types/node'] =\n nodeTypeVersionToPatch;\n\n await fs.promises.writeFile(\n manifest.path,\n JSON.stringify(manifest.packageJson, null, 2),\n 'utf8',\n );\n }),\n );\n\n const rootExec = createExec({ cwd: gitRoot });\n\n try {\n await rootExec(\n packageManager.command,\n 'install',\n ...(packageManager.command === 'pnpm' ? ['--frozen-lockfile=false'] : []),\n '--prefer-offline',\n '--ignore-scripts',\n );\n\n if (packageManager.command === 'pnpm') {\n await rootExec('pnpm', 'dedupe', '--prefer-offline', '--ignore-scripts');\n }\n } catch (error) {\n log.warn('Failed to install dependencies after Vitest migration');\n log.subtle(inspect(error));\n }\n\n return {\n result: 'apply',\n };\n};\n"],
|
|
5
|
-
"mappings": ";AAAA,OAAO,UAAU;AACjB,SAAS,eAAe;AAExB,OAAO,QAAQ;AACf,OAAO,QAAQ;AACf,OAAO,mBAAmB;AAE1B,SAAS,YAAY,YAAY;AACjC,SAAS,WAAW;AACpB,SAAS,2BAA2B;AACpC;AAAA,EAEE;AAAA,OACK;AAGP,SAAS,0BAA0B;AACnC,SAAS,8BAA8B;AACvC,SAAS,4BAA4B;AAErC,SAAS,WAAW;AAOpB,MAAM,iCAAiC,YAA6B;AAClE,MAAI;AACF,WAAO,MAAM,cAAc,6BAA6B;AAAA,EAC1D,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,aAAM,YAAY,OAAO,UAC9B,QAAQ;AAAA,EACN,MAAM,IAAI,OAAO,SAAS;AACxB,UAAM,UAAU,MAAM,GAAG,SAAS,SAAS,MAAM,MAAM;AACvD,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEF,MAAM,aAAa,OAAO;AAAA,EACxB;AAAA,EACA;AAAA,EACA;AACF,MAI8B;AAC5B,QAAM,8BAA8B,MAAM,+BAA+B;AACzE,QAAM,sBAAsB,aACzB,IAAI,CAAC,EAAE,MAAM,QAAQ,MAAM;AAC1B,UAAM,iBAAiB,QACpB;AAAA,MACC;AAAA,MACA,CAAC,QAAQ,YAAoB;AAC3B,cAAM,aAAa,QAAQ,WAAW,UAAU,IAC5C,UACA;AACJ,eAAO,kCAAkC,UAAU;AAAA,MACrD;AAAA,IACF,EACC;AAAA,MACC;AAAA,MACA,CAAC,QAAQ,YAAoB;AAC3B,cAAM,aAAa,QAAQ,WAAW,UAAU,IAC5C,UACA;AACJ,eAAO,mCAAmC,UAAU;AAAA,MACtD;AAAA,IACF,EACC,QAAQ,gBAAgB,gBAAgB,EACxC,QAAQ,gBAAgB,eAAe;AAE1C,WAAO;AAAA,MACL;AAAA,MACA,SAAS,mBAAmB,UAAU,SAAY;AAAA,IACpD;AAAA,EACF,CAAC,EACA,OAAO,CAAC,SAA8B,KAAK,YAAY,MAAS;AAEnE,QAAM,wBAAwB,eAC3B,IAAI,CAAC,EAAE,MAAM,QAAQ,MAAM;AAC1B,UAAM,iBAAiB,QACpB;AAAA,MACC;AAAA,MACA;AAAA,IACF,EACC;AAAA,MACC;AAAA,MACA,kCAAkC,2BAA2B;AAAA,IAC/D;AAEF,WAAO;AAAA,MACL;AAAA,MACA,SAAS,mBAAmB,UAAU,SAAY;AAAA,IACpD;AAAA,EACF,CAAC,EACA,OAAO,CAAC,SAA8B,KAAK,YAAY,MAAS;AAEnE,QAAM,wBAAwB,mBAC3B,IAAI,CAAC,EAAE,MAAM,QAAQ,MAAM;AAC1B,UAAM,iBAAiB,QACpB,QAAQ,gBAAgB,gBAAgB,EACxC,QAAQ,gBAAgB,eAAe;AAC1C,WAAO;AAAA,MACL;AAAA,MACA,SAAS,mBAAmB,UAAU,SAAY;AAAA,IACpD;AAAA,EACF,CAAC,EACA,OAAO,CAAC,SAA8B,KAAK,YAAY,MAAS;AACnE,SAAO;AAAA,IACL,GAAG;AAAA,IACH,GAAG;AAAA,IACH,GAAG;AAAA,EACL;AACF;AAEO,aAAM,kBAAkB,OAAO,SAGN;AAC9B,QAAM,OAAO,KAAK;AAGlB,MAAI,QAAQ,IAAI,mBAAmB,QAAQ;AACzC,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,oBAAoB,MAAM,GAAG,CAAC,sCAAsC,GAAG;AAAA,IAC3E,QAAQ,CAAC,WAAW,iBAAiB;AAAA,EACvC,CAAC;AAED,
|
|
4
|
+
"sourcesContent": ["import path from 'node:path';\nimport { inspect } from 'node:util';\n\nimport fg from 'fast-glob';\nimport fs from 'fs-extra';\nimport latestVersion from 'latest-version';\n\nimport { createExec, exec } from '../../../../utils/exec.js';\nimport { log } from '../../../../utils/logging.js';\nimport { getConsumerManifest } from '../../../../utils/manifest.js';\nimport {\n type PackageManagerConfig,\n detectPackageManager,\n} from '../../../../utils/packageManager.js';\nimport type { PatchReturnType } from '../../../lint/internalLints/upgrade/index.js';\n\nimport { editLifeCycleHooks } from './lifeCycleEdits.js';\nimport { postFixVitestMigration } from './postFixVitestMigration.js';\nimport { scaffoldVitestConfig } from './vitestConfig.js';\n\nimport { Git } from '@skuba-lib/api';\n\nexport type FileContent = {\n file: string;\n content: string;\n};\n\nconst getLatestVitestKoaMocksVersion = async (): Promise<string> => {\n try {\n return await latestVersion('@skuba-lib/vitest-koa-mocks');\n } catch {\n return '1.0.1';\n }\n};\n\nexport const readFiles = async (paths: string[]): Promise<FileContent[]> =>\n Promise.all(\n paths.map(async (file) => {\n const content = await fs.promises.readFile(file, 'utf8');\n return {\n file,\n content,\n };\n }),\n );\n\nconst patchFiles = async ({\n packageJsons,\n pnpmWorkspaces,\n buildkitePipelines,\n}: {\n packageJsons: FileContent[];\n pnpmWorkspaces: FileContent[];\n buildkitePipelines: FileContent[];\n}): Promise<FileContent[]> => {\n const latestVitestKoaMocksVersion = await getLatestVitestKoaMocksVersion();\n const updatedPackageJsons = packageJsons\n .map(({ file, content }) => {\n const updatedContent = content\n .replace(\n /\"aws-sdk-client-mock-jest\":\\s*\"([^\"]*)\"/g,\n (_match, version: string) => {\n const newVersion = version.startsWith('catalog:')\n ? version\n : '7.0.1';\n return `\"aws-sdk-client-mock-vitest\": \"${newVersion}\"`;\n },\n )\n .replace(\n /\"@shopify\\/jest-koa-mocks\":\\s*\"([^\"]*)\"/g,\n (_match, version: string) => {\n const newVersion = version.startsWith('catalog:')\n ? version\n : latestVitestKoaMocksVersion;\n return `\"@skuba-lib/vitest-koa-mocks\": \"${newVersion}\"`;\n },\n )\n .replace(/--runInBand/g, '--maxWorkers=1')\n .replace(/jest.config/g, 'vitest.config');\n\n return {\n file,\n content: updatedContent === content ? undefined : updatedContent,\n };\n })\n .filter((file): file is FileContent => file.content !== undefined);\n\n const updatedPnpmWorkspaces = pnpmWorkspaces\n .map(({ file, content }) => {\n const updatedContent = content\n .replace(\n /aws-sdk-client-mock-jest:\\s*\\S+/g,\n 'aws-sdk-client-mock-vitest: 7.0.1',\n )\n .replace(\n /'?@shopify\\/jest-koa-mocks'?:\\s*\\S+/g,\n `'@skuba-lib/vitest-koa-mocks': ${latestVitestKoaMocksVersion}`,\n );\n\n return {\n file,\n content: updatedContent === content ? undefined : updatedContent,\n };\n })\n .filter((file): file is FileContent => file.content !== undefined);\n\n const updatedBuildkiteFiles = buildkitePipelines\n .map(({ file, content }) => {\n const updatedContent = content\n .replace(/--runInBand/g, '--maxWorkers=1')\n .replace(/jest.config/g, 'vitest.config');\n return {\n file,\n content: updatedContent === content ? undefined : updatedContent,\n };\n })\n .filter((file): file is FileContent => file.content !== undefined);\n return [\n ...updatedPackageJsons,\n ...updatedPnpmWorkspaces,\n ...updatedBuildkiteFiles,\n ];\n};\n\nexport const migrateToVitest = async (opts: {\n mode: 'lint' | 'format';\n packageManager?: PackageManagerConfig;\n}): Promise<PatchReturnType> => {\n const mode = opts.mode;\n // Adding `vitest.config.ts` to all the integration tests causes the vscode extension\n // to freak out about having too many vitest configs\n if (process.env.SKUBA_INT_TEST === 'true') {\n return {\n result: 'skip',\n reason: 'skipping in integration test environment',\n };\n }\n\n const vitestConfigFiles = await fg(['**/vitest.config.{ts,js,mjs,mts,cts}'], {\n ignore: ['**/.git', '**/node_modules'],\n });\n\n if (\n vitestConfigFiles.length > 0 &&\n process.env.SKUBA_FORCE_MIGRATE_VITEST !== 'true'\n ) {\n return {\n result: 'skip',\n reason:\n 'vitest is already configured in this project, re-run the migration with SKUBA_FORCE_MIGRATE_VITEST=true to skip this check',\n };\n }\n\n const [packageJsonFiles, pnpmWorkspaceFiles, buildkiteFiles] =\n await Promise.all([\n fg(['**/package.json'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n fg(['**/pnpm-workspace.yaml'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n fg(['**/.buildkite/**/*.{yml,yaml}'], {\n ignore: ['**/.git', '**/node_modules'],\n }),\n ]);\n\n const [packageJsons, pnpmWorkspaces, buildkitePipelines] = await Promise.all([\n readFiles(packageJsonFiles),\n readFiles(pnpmWorkspaceFiles),\n readFiles(buildkiteFiles),\n ]);\n\n const filesToUpdate = await patchFiles({\n packageJsons,\n pnpmWorkspaces,\n buildkitePipelines,\n });\n\n if (filesToUpdate.length && mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n await Promise.all(\n filesToUpdate.map(({ file, content }) =>\n fs.promises.writeFile(file, content, 'utf8'),\n ),\n );\n\n const vitestKoaMockPathsWithoutNodeTypes = new Set(\n filesToUpdate\n .filter(\n ({ content }) =>\n (content.includes('@skuba-lib/vitest-koa-mocks') ||\n content.includes('aws-sdk-client-mock-vitest')) &&\n !content.includes('@types/node'),\n )\n .map(({ file }) => path.dirname(file)),\n );\n\n const configFilesToUpdate = await scaffoldVitestConfig();\n\n if (configFilesToUpdate.length && mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n const folders = configFilesToUpdate.map(({ file }) => path.dirname(file));\n const uniqueFolders = Array.from(new Set(folders));\n\n await Promise.all(\n uniqueFolders.map((folder) =>\n fs.promises.mkdir(folder, { recursive: true }),\n ),\n );\n\n await Promise.all(\n configFilesToUpdate.map(({ file, content }) =>\n fs.promises.writeFile(file, content, 'utf8'),\n ),\n );\n\n const packageManager = opts.packageManager ?? (await detectPackageManager());\n\n if (packageManager.command === 'pnpm') {\n await exec('pnpm', 'dlx', '@sku-lib/codemod', 'jest-to-vitest', '.');\n } else {\n await exec('npx', '@sku-lib/codemod', 'jest-to-vitest', '.');\n }\n\n // The sku migration doesn't handle async hooks nicely so we have to go back and re-patch them\n const tsFilePaths = await fg(['**/*.ts', '**/*.tsx'], {\n ignore: ['**/.git', '**/node_modules'],\n });\n const tsFiles = await readFiles(tsFilePaths);\n const lifeCyclesToCheck: string[] = [];\n\n await Promise.all(\n tsFiles.map(async ({ file, content }) => {\n const { updated, hasLifeCyclesToCheck } = await postFixVitestMigration(\n file,\n content,\n );\n\n if (hasLifeCyclesToCheck) {\n lifeCyclesToCheck.push(file);\n }\n\n // replace import 'aws-sdk-client-mock-jest'; with import 'aws-sdk-client-mock-vitest/extend';\n // replace imports from @shopify/jest-koa-mocks with @skuba-lib/vitest-koa-mocks\n // replace .mockImplementation() with .mockImplementation(() => undefined) to account for the fact that Vitest requires an implementation for mocks whereas Jest does not\n // replace istanbul ignore with v8 ignore for coverage purposes\n const finalUpdated = updated\n .replace(\n /import\\s+['\"]aws-sdk-client-mock-jest['\"];?/g,\n \"import 'aws-sdk-client-mock-vitest/extend';\",\n )\n .replace(/@shopify\\/jest-koa-mocks/g, '@skuba-lib/vitest-koa-mocks')\n .replace(\n /\\.mockImplementation\\(\\)/g,\n '.mockImplementation(() => undefined)',\n )\n .replace(/\\.calls\\[(\\d+)\\]\\[/g, '.calls[$1]?.[')\n .replaceAll(\n 'eslint-disable-next-line jest',\n 'eslint-disable-next-line vitest',\n )\n .replaceAll('eslint-disable jest', 'eslint-disable vitest')\n .replaceAll('Mock<any, any>', 'Mock')\n .replaceAll('advanceTimers: true', 'shouldAdvanceTime: true');\n\n if (finalUpdated !== content) {\n return fs.promises.writeFile(file, finalUpdated, 'utf8');\n }\n }),\n );\n\n const lifeCycleFiles = await readFiles(lifeCyclesToCheck);\n\n await editLifeCycleHooks(lifeCycleFiles);\n\n const existingNodeTypesVersion = packageJsons\n .map(({ content }) => {\n const match = /\"@types\\/node\":\\s*\"([^\"]*)\"/.exec(content);\n return match ? match[1] : null;\n })\n .find((version) => version !== null);\n\n const nodeTypeVersionToPatch = existingNodeTypesVersion ?? '24.12.2';\n\n const gitRoot = (await Git.findRoot({ dir: process.cwd() })) ?? process.cwd();\n\n await Promise.all(\n Array.from(vitestKoaMockPathsWithoutNodeTypes).map(async (folder) => {\n const manifest = await getConsumerManifest(folder);\n\n if (!manifest || manifest.packageJson.devDependencies?.['@types/node']) {\n return;\n }\n\n manifest.packageJson.devDependencies ??= {};\n manifest.packageJson.devDependencies['@types/node'] =\n nodeTypeVersionToPatch;\n\n await fs.promises.writeFile(\n manifest.path,\n JSON.stringify(manifest.packageJson, null, 2),\n 'utf8',\n );\n }),\n );\n\n const rootExec = createExec({ cwd: gitRoot });\n\n try {\n await rootExec(\n packageManager.command,\n 'install',\n ...(packageManager.command === 'pnpm' ? ['--frozen-lockfile=false'] : []),\n '--prefer-offline',\n '--ignore-scripts',\n );\n\n if (packageManager.command === 'pnpm') {\n await rootExec('pnpm', 'dedupe', '--prefer-offline', '--ignore-scripts');\n }\n } catch (error) {\n log.warn('Failed to install dependencies after Vitest migration');\n log.subtle(inspect(error));\n }\n\n return {\n result: 'apply',\n };\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "skuba",
|
|
3
|
-
"version": "16.0.
|
|
3
|
+
"version": "16.0.8",
|
|
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",
|
|
@@ -106,8 +106,8 @@
|
|
|
106
106
|
"typescript": "~5.9.0",
|
|
107
107
|
"vitest": "^4.1.4",
|
|
108
108
|
"zod": "^4.3.5",
|
|
109
|
-
"@skuba-lib/api": "^2.1.2",
|
|
110
109
|
"eslint-config-skuba": "9.0.0",
|
|
110
|
+
"@skuba-lib/api": "^2.1.2",
|
|
111
111
|
"pnpm-plugin-skuba": "3.0.0"
|
|
112
112
|
},
|
|
113
113
|
"devDependencies": {
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
"@types/picomatch": "4.0.3",
|
|
128
128
|
"@types/semver": "7.7.1",
|
|
129
129
|
"@types/supertest": "7.2.0",
|
|
130
|
-
"enhanced-resolve": "5.21.
|
|
130
|
+
"enhanced-resolve": "5.21.3",
|
|
131
131
|
"express": "5.2.1",
|
|
132
132
|
"fastify": "5.8.5",
|
|
133
133
|
"jsonfile": "6.2.1",
|
|
@@ -135,7 +135,7 @@
|
|
|
135
135
|
"memfs": "4.57.2",
|
|
136
136
|
"remark-cli": "12.0.1",
|
|
137
137
|
"remark-preset-lint-recommended": "7.0.1",
|
|
138
|
-
"semver": "7.
|
|
138
|
+
"semver": "7.8.0",
|
|
139
139
|
"supertest": "7.2.2",
|
|
140
140
|
"type-fest": "2.19.0",
|
|
141
141
|
"@skuba-lib/changesets-changelog": "^1.0.1"
|
|
@@ -22,12 +22,12 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@opentelemetry/api": "^1.9.0",
|
|
24
24
|
"@opentelemetry/core": "~2.7.0",
|
|
25
|
-
"@opentelemetry/exporter-trace-otlp-grpc": "~0.
|
|
26
|
-
"@opentelemetry/instrumentation": "~0.
|
|
27
|
-
"@opentelemetry/instrumentation-aws-sdk": "^0.
|
|
28
|
-
"@opentelemetry/instrumentation-http": "~0.
|
|
25
|
+
"@opentelemetry/exporter-trace-otlp-grpc": "~0.218.0",
|
|
26
|
+
"@opentelemetry/instrumentation": "~0.218.0",
|
|
27
|
+
"@opentelemetry/instrumentation-aws-sdk": "^0.73.0",
|
|
28
|
+
"@opentelemetry/instrumentation-http": "~0.218.0",
|
|
29
29
|
"@opentelemetry/propagator-b3": "^2.0.0",
|
|
30
|
-
"@opentelemetry/sdk-node": "~0.
|
|
30
|
+
"@opentelemetry/sdk-node": "~0.218.0",
|
|
31
31
|
"@seek/logger": "^12.0.0",
|
|
32
32
|
"express": "^5.0.0",
|
|
33
33
|
"hot-shots": "^14.3.1",
|
|
@@ -24,12 +24,12 @@
|
|
|
24
24
|
"@koa/router": "15.5.0",
|
|
25
25
|
"@opentelemetry/api": "^1.9.0",
|
|
26
26
|
"@opentelemetry/core": "~2.7.0",
|
|
27
|
-
"@opentelemetry/exporter-trace-otlp-grpc": "~0.
|
|
28
|
-
"@opentelemetry/instrumentation": "~0.
|
|
29
|
-
"@opentelemetry/instrumentation-aws-sdk": "^0.
|
|
30
|
-
"@opentelemetry/instrumentation-http": "~0.
|
|
27
|
+
"@opentelemetry/exporter-trace-otlp-grpc": "~0.218.0",
|
|
28
|
+
"@opentelemetry/instrumentation": "~0.218.0",
|
|
29
|
+
"@opentelemetry/instrumentation-aws-sdk": "^0.73.0",
|
|
30
|
+
"@opentelemetry/instrumentation-http": "~0.218.0",
|
|
31
31
|
"@opentelemetry/propagator-b3": "^2.0.0",
|
|
32
|
-
"@opentelemetry/sdk-node": "~0.
|
|
32
|
+
"@opentelemetry/sdk-node": "~0.218.0",
|
|
33
33
|
"@seek/logger": "^12.0.0",
|
|
34
34
|
"hot-shots": "^14.3.1",
|
|
35
35
|
"koa": "^3.0.1",
|
|
@@ -23,23 +23,23 @@
|
|
|
23
23
|
"@aws-sdk/client-lambda": "^3.363.0",
|
|
24
24
|
"@aws-sdk/client-secrets-manager": "^3.363.0",
|
|
25
25
|
"@aws-sdk/client-sns": "^3.363.0",
|
|
26
|
-
"@seek/aws-codedeploy-hooks": "^
|
|
26
|
+
"@seek/aws-codedeploy-hooks": "^4.0.0",
|
|
27
27
|
"@seek/logger": "^12.0.0",
|
|
28
28
|
"skuba-dive": "^4.1.0",
|
|
29
29
|
"zod": "^4.3.5"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
|
-
"@seek/aws-codedeploy-infra": "^
|
|
32
|
+
"@seek/aws-codedeploy-infra": "^5.0.0",
|
|
33
33
|
"@types/aws-lambda": "^8.10.82",
|
|
34
34
|
"@types/chance": "^1.1.3",
|
|
35
35
|
"@types/node": "^24.10.2",
|
|
36
36
|
"aws-cdk": "^2.1010.0",
|
|
37
|
-
"aws-cdk-lib": "
|
|
37
|
+
"aws-cdk-lib": "^2.253.0",
|
|
38
38
|
"aws-sdk-client-mock": "^4.0.0",
|
|
39
39
|
"aws-sdk-client-mock-vitest": "^7.0.0",
|
|
40
40
|
"chance": "^1.1.8",
|
|
41
41
|
"constructs": "^10.0.17",
|
|
42
|
-
"datadog-cdk-constructs-v2": "^
|
|
42
|
+
"datadog-cdk-constructs-v2": "^4.0.0",
|
|
43
43
|
"datadog-lambda-js": "^12.0.0",
|
|
44
44
|
"dd-trace": "^5.0.0",
|
|
45
45
|
"pino-pretty": "^13.0.0",
|
|
@@ -23,7 +23,7 @@ jobs:
|
|
|
23
23
|
fetch-depth: 0
|
|
24
24
|
|
|
25
25
|
- name: Set up pnpm
|
|
26
|
-
uses: pnpm/action-setup@
|
|
26
|
+
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
|
|
27
27
|
|
|
28
28
|
- name: Set up Node.js
|
|
29
29
|
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|
|
@@ -19,7 +19,7 @@ jobs:
|
|
|
19
19
|
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
|
20
20
|
|
|
21
21
|
- name: Set up pnpm
|
|
22
|
-
uses: pnpm/action-setup@
|
|
22
|
+
uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6.0.8
|
|
23
23
|
|
|
24
24
|
- name: Set up Node.js
|
|
25
25
|
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
|