skuba 4.4.1 → 5.0.0

package/lib/cli/configure/modules/eslint.js

@@ -1,29 +1,60 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslintModule = void 0;
-const template_1 = require("../../../utils/template");
-const deleteFiles_1 = require("../processing/deleteFiles");
-const ignoreFile_1 = require("../processing/ignoreFile");
-const package_1 = require("../processing/package");
-const prettier_1 = require("../processing/prettier");
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var eslint_exports = {};
+__export(eslint_exports, {
+  eslintModule: () => eslintModule
+});
+module.exports = __toCommonJS(eslint_exports);
+var import_template = require("../../../utils/template");
+var import_deleteFiles = require("../processing/deleteFiles");
+var import_ignoreFile = require("../processing/ignoreFile");
+var import_package = require("../processing/package");
+var import_prettier = require("../processing/prettier");
 const eslintModule = async () => {
-    const [configFile, ignoreFile] = await Promise.all([
-        (0, template_1.readBaseTemplateFile)('_.eslintrc.js'),
-        (0, template_1.readBaseTemplateFile)('_.eslintignore'),
-    ]);
-    return {
-        ...(0, deleteFiles_1.deleteFiles)('.eslintrc.cjs', '.eslintrc.yaml', '.eslintrc.yml', '.eslintrc.json', '.eslintrc'),
-        // allow customised ESLint configs that extend skuba
-        '.eslintrc.js': (inputFile) => {
-            if (inputFile?.includes('skuba')) {
-                const processedFile = inputFile.replace(/require.resolve\(['"](@seek\/)?skuba\/config\/eslint['"]\)/, "'skuba'");
-                return (0, prettier_1.formatPrettier)(processedFile, { parser: 'typescript' });
-            }
-            return configFile;
-        },
-        '.eslintignore': (0, ignoreFile_1.mergeWithIgnoreFile)(ignoreFile),
-        'package.json': (0, package_1.withPackage)(({ eslintConfig, ...data }) => data),
-    };
+  const [configFile, ignoreFile] = await Promise.all([
+    (0, import_template.readBaseTemplateFile)("_.eslintrc.js"),
+    (0, import_template.readBaseTemplateFile)("_.eslintignore")
+  ]);
+  return {
+    ...(0, import_deleteFiles.deleteFiles)(
+      ".eslintrc.cjs",
+      ".eslintrc.yaml",
+      ".eslintrc.yml",
+      ".eslintrc.json",
+      ".eslintrc"
+    ),
+    ".eslintrc.js": (inputFile) => {
+      if (inputFile?.includes("skuba")) {
+        const processedFile = inputFile.replace(
+          /require.resolve\(['"](@seek\/)?skuba\/config\/eslint['"]\)/,
+          "'skuba'"
+        );
+        return (0, import_prettier.formatPrettier)(processedFile, { parser: "typescript" });
+      }
+      return configFile;
+    },
+    ".eslintignore": (0, import_ignoreFile.mergeWithIgnoreFile)(ignoreFile),
+    "package.json": (0, import_package.withPackage)(({ eslintConfig, ...data }) => data)
+  };
 };
-exports.eslintModule = eslintModule;
-//# sourceMappingURL=eslint.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  eslintModule
+});
+//# sourceMappingURL=eslint.js.map

package/lib/cli/configure/modules/eslint.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/eslint.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,yDAA+D;AAC/D,mDAAoD;AACpD,qDAAwD;AAGjD,MAAM,YAAY,GAAG,KAAK,IAAqB,EAAE;IACtD,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjD,IAAA,+BAAoB,EAAC,eAAe,CAAC;QACrC,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;KACvC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,IAAA,yBAAW,EACZ,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,WAAW,CACZ;QAED,oDAAoD;QACpD,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE;YAC5B,IAAI,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAChC,MAAM,aAAa,GAAG,SAAS,CAAC,OAAO,CACrC,4DAA4D,EAC5D,SAAS,CACV,CAAC;gBAEF,OAAO,IAAA,yBAAc,EAAC,aAAa,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;aAChE;YAED,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,eAAe,EAAE,IAAA,gCAAmB,EAAC,UAAU,CAAC;QAEhD,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;KACjE,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,YAAY,gBAiCvB"}
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/configure/modules/eslint.ts"],
+  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { mergeWithIgnoreFile } from '../processing/ignoreFile';\nimport { withPackage } from '../processing/package';\nimport { formatPrettier } from '../processing/prettier';\nimport type { Module } from '../types';\n\nexport const eslintModule = async (): Promise<Module> => {\n  const [configFile, ignoreFile] = await Promise.all([\n    readBaseTemplateFile('_.eslintrc.js'),\n    readBaseTemplateFile('_.eslintignore'),\n  ]);\n\n  return {\n    ...deleteFiles(\n      '.eslintrc.cjs',\n      '.eslintrc.yaml',\n      '.eslintrc.yml',\n      '.eslintrc.json',\n      '.eslintrc',\n    ),\n\n    // allow customised ESLint configs that extend skuba\n    '.eslintrc.js': (inputFile) => {\n      if (inputFile?.includes('skuba')) {\n        const processedFile = inputFile.replace(\n          /require.resolve\\(['\"](@seek\\/)?skuba\\/config\\/eslint['\"]\\)/,\n          \"'skuba'\",\n        );\n\n        return formatPrettier(processedFile, { parser: 'typescript' });\n      }\n\n      return configFile;\n    },\n\n    '.eslintignore': mergeWithIgnoreFile(ignoreFile),\n\n    'package.json': withPackage(({ eslintConfig, ...data }) => data),\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,yBAA4B;AAC5B,wBAAoC;AACpC,qBAA4B;AAC5B,sBAA+B;AAGxB,MAAM,eAAe,YAA6B;AACvD,QAAM,CAAC,YAAY,UAAU,IAAI,MAAM,QAAQ,IAAI;AAAA,QACjD,sCAAqB,eAAe;AAAA,QACpC,sCAAqB,gBAAgB;AAAA,EACvC,CAAC;AAED,SAAO;AAAA,IACL,OAAG;AAAA,MACD;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,IAGA,gBAAgB,CAAC,cAAc;AAC7B,UAAI,WAAW,SAAS,OAAO,GAAG;AAChC,cAAM,gBAAgB,UAAU;AAAA,UAC9B;AAAA,UACA;AAAA,QACF;AAEA,mBAAO,gCAAe,eAAe,EAAE,QAAQ,aAAa,CAAC;AAAA,MAC/D;AAEA,aAAO;AAAA,IACT;AAAA,IAEA,qBAAiB,uCAAoB,UAAU;AAAA,IAE/C,oBAAgB,4BAAY,CAAC,EAAE,iBAAiB,KAAK,MAAM,IAAI;AAAA,EACjE;AACF;",
+  "names": []
+}

package/lib/cli/configure/modules/ignore.js

@@ -1,17 +1,40 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ignoreModule = void 0;
-const template_1 = require("../../../utils/template");
-const ignoreFile_1 = require("../processing/ignoreFile");
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ignore_exports = {};
+__export(ignore_exports, {
+  ignoreModule: () => ignoreModule
+});
+module.exports = __toCommonJS(ignore_exports);
+var import_template = require("../../../utils/template");
+var import_ignoreFile = require("../processing/ignoreFile");
 const ignoreModule = async () => {
-    const [dockerFile, gitFile] = await Promise.all([
-        (0, template_1.readBaseTemplateFile)('_.dockerignore'),
-        (0, template_1.readBaseTemplateFile)('_.gitignore'),
-    ]);
-    return {
-        '.dockerignore': (0, ignoreFile_1.mergeWithIgnoreFile)(dockerFile),
-        '.gitignore': (0, ignoreFile_1.mergeWithIgnoreFile)(gitFile),
-    };
+  const [dockerFile, gitFile] = await Promise.all([
+    (0, import_template.readBaseTemplateFile)("_.dockerignore"),
+    (0, import_template.readBaseTemplateFile)("_.gitignore")
+  ]);
+  return {
+    ".dockerignore": (0, import_ignoreFile.mergeWithIgnoreFile)(dockerFile),
+    ".gitignore": (0, import_ignoreFile.mergeWithIgnoreFile)(gitFile)
+  };
 };
-exports.ignoreModule = ignoreModule;
-//# sourceMappingURL=ignore.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ignoreModule
+});
+//# sourceMappingURL=ignore.js.map

package/lib/cli/configure/modules/ignore.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"ignore.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/ignore.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,yDAA+D;AAGxD,MAAM,YAAY,GAAG,KAAK,IAAqB,EAAE;IACtD,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAC9C,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;QACtC,IAAA,+BAAoB,EAAC,aAAa,CAAC;KACpC,CAAC,CAAC;IAEH,OAAO;QACL,eAAe,EAAE,IAAA,gCAAmB,EAAC,UAAU,CAAC;QAEhD,YAAY,EAAE,IAAA,gCAAmB,EAAC,OAAO,CAAC;KAC3C,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,YAAY,gBAWvB"}
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/configure/modules/ignore.ts"],
+  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { mergeWithIgnoreFile } from '../processing/ignoreFile';\nimport type { Module } from '../types';\n\nexport const ignoreModule = async (): Promise<Module> => {\n  const [dockerFile, gitFile] = await Promise.all([\n    readBaseTemplateFile('_.dockerignore'),\n    readBaseTemplateFile('_.gitignore'),\n  ]);\n\n  return {\n    '.dockerignore': mergeWithIgnoreFile(dockerFile),\n\n    '.gitignore': mergeWithIgnoreFile(gitFile),\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,wBAAoC;AAG7B,MAAM,eAAe,YAA6B;AACvD,QAAM,CAAC,YAAY,OAAO,IAAI,MAAM,QAAQ,IAAI;AAAA,QAC9C,sCAAqB,gBAAgB;AAAA,QACrC,sCAAqB,aAAa;AAAA,EACpC,CAAC;AAED,SAAO;AAAA,IACL,qBAAiB,uCAAoB,UAAU;AAAA,IAE/C,kBAAc,uCAAoB,OAAO;AAAA,EAC3C;AACF;",
+  "names": []
+}

package/lib/cli/configure/modules/index.js

@@ -1,29 +1,54 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadModules = void 0;
-const eslint_1 = require("./eslint");
-const ignore_1 = require("./ignore");
-const jest_1 = require("./jest");
-const nodemon_1 = require("./nodemon");
-const package_1 = require("./package");
-const prettier_1 = require("./prettier");
-const renovate_1 = require("./renovate");
-const serverless_1 = require("./serverless");
-const skubaDive_1 = require("./skubaDive");
-const tsconfig_1 = require("./tsconfig");
-const tslint_1 = require("./tslint");
-const loadModules = (opts) => Promise.all([
-    eslint_1.eslintModule,
-    ignore_1.ignoreModule,
-    jest_1.jestModule,
-    nodemon_1.nodemonModule,
-    package_1.packageModule,
-    prettier_1.prettierModule,
-    renovate_1.renovateModule,
-    serverless_1.serverlessModule,
-    skubaDive_1.skubaDiveModule,
-    tsconfig_1.tsconfigModule,
-    tslint_1.tslintModule,
-].map((createModule) => createModule(opts)));
-exports.loadModules = loadModules;
-//# sourceMappingURL=index.js.map
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var modules_exports = {};
+__export(modules_exports, {
+  loadModules: () => loadModules
+});
+module.exports = __toCommonJS(modules_exports);
+var import_eslint = require("./eslint");
+var import_ignore = require("./ignore");
+var import_jest = require("./jest");
+var import_nodemon = require("./nodemon");
+var import_package = require("./package");
+var import_prettier = require("./prettier");
+var import_renovate = require("./renovate");
+var import_serverless = require("./serverless");
+var import_skubaDive = require("./skubaDive");
+var import_tsconfig = require("./tsconfig");
+var import_tslint = require("./tslint");
+const loadModules = (opts) => Promise.all(
+  [
+    import_eslint.eslintModule,
+    import_ignore.ignoreModule,
+    import_jest.jestModule,
+    import_nodemon.nodemonModule,
+    import_package.packageModule,
+    import_prettier.prettierModule,
+    import_renovate.renovateModule,
+    import_serverless.serverlessModule,
+    import_skubaDive.skubaDiveModule,
+    import_tsconfig.tsconfigModule,
+    import_tslint.tslintModule
+  ].map((createModule) => createModule(opts))
+);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  loadModules
+});
+//# sourceMappingURL=index.js.map

package/lib/cli/configure/modules/index.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/index.ts"],"names":[],"mappings":";;;AAEA,qCAAwC;AACxC,qCAAwC;AACxC,iCAAoC;AACpC,uCAA0C;AAC1C,uCAA0C;AAC1C,yCAA4C;AAC5C,yCAA4C;AAC5C,6CAAgD;AAChD,2CAA8C;AAC9C,yCAA4C;AAC5C,qCAAwC;AAEjC,MAAM,WAAW,GAAG,CAAC,IAAa,EAAqB,EAAE,CAC9D,OAAO,CAAC,GAAG,CACT;IACE,qBAAY;IACZ,qBAAY;IACZ,iBAAU;IACV,uBAAa;IACb,uBAAa;IACb,yBAAc;IACd,yBAAc;IACd,6BAAgB;IAChB,2BAAe;IACf,yBAAc;IACd,qBAAY;CACb,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAC5C,CAAC;AAfS,QAAA,WAAW,eAepB"}
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/configure/modules/index.ts"],
+  "sourcesContent": ["import type { Module, Options } from '../types';\n\nimport { eslintModule } from './eslint';\nimport { ignoreModule } from './ignore';\nimport { jestModule } from './jest';\nimport { nodemonModule } from './nodemon';\nimport { packageModule } from './package';\nimport { prettierModule } from './prettier';\nimport { renovateModule } from './renovate';\nimport { serverlessModule } from './serverless';\nimport { skubaDiveModule } from './skubaDive';\nimport { tsconfigModule } from './tsconfig';\nimport { tslintModule } from './tslint';\n\nexport const loadModules = (opts: Options): Promise<Module[]> =>\n  Promise.all(\n    [\n      eslintModule,\n      ignoreModule,\n      jestModule,\n      nodemonModule,\n      packageModule,\n      prettierModule,\n      renovateModule,\n      serverlessModule,\n      skubaDiveModule,\n      tsconfigModule,\n      tslintModule,\n    ].map((createModule) => createModule(opts)),\n  );\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,oBAA6B;AAC7B,oBAA6B;AAC7B,kBAA2B;AAC3B,qBAA8B;AAC9B,qBAA8B;AAC9B,sBAA+B;AAC/B,sBAA+B;AAC/B,wBAAiC;AACjC,uBAAgC;AAChC,sBAA+B;AAC/B,oBAA6B;AAEtB,MAAM,cAAc,CAAC,SAC1B,QAAQ;AAAA,EACN;AAAA,IACE;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,EAAE,IAAI,CAAC,iBAAiB,aAAa,IAAI,CAAC;AAC5C;",
+  "names": []
+}

package/lib/cli/configure/modules/jest.js

@@ -1,51 +1,86 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.jestModule = void 0;
-const template_1 = require("../../../utils/template");
-const deleteFiles_1 = require("../processing/deleteFiles");
-const loadFiles_1 = require("../processing/loadFiles");
-const package_1 = require("../processing/package");
-const typescript_1 = require("../processing/typescript");
-// Jest options to preserve during migration
-const filterProps = (0, typescript_1.createPropFilter)([
-    'collectCoverageFrom',
-    'coverageThreshold',
-    'globalSetup',
-    'globalTeardown',
-    'setupFiles',
-    'setupFilesAfterEnv',
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var jest_exports = {};
+__export(jest_exports, {
+  jestModule: () => jestModule
+});
+module.exports = __toCommonJS(jest_exports);
+var import_template = require("../../../utils/template");
+var import_deleteFiles = require("../processing/deleteFiles");
+var import_package = require("../processing/package");
+var import_typescript = require("../processing/typescript");
+const OUTDATED_ISOLATED_MODULES_CONFIG_SNIPPETS = [
+  `
+  globals: {
+    'ts-jest': {
+      // seek-oss/skuba#626
+      isolatedModules: true,
+    },
+  },`,
+  `
+  globals: {
+    'ts-jest': {
+      isolatedModules: true,
+    },
+  },`
+];
+const filterProps = (0, import_typescript.createPropFilter)([
+  "collectCoverageFrom",
+  "coverageThreshold",
+  "globalSetup",
+  "globalTeardown",
+  "setupFiles",
+  "setupFilesAfterEnv"
 ]);
 const jestModule = async () => {
-    const [configFile, setupFile] = await Promise.all([
-        (0, template_1.readBaseTemplateFile)('jest.config.ts'),
-        (0, template_1.readBaseTemplateFile)('jest.setup.ts'),
-    ]);
-    return {
-        ...(0, deleteFiles_1.deleteFiles)('jest.config.js'),
-        ...(0, loadFiles_1.loadFiles)('jest.setup.js'),
-        'jest.config.ts': (tsFile, currentFiles, initialFiles) => {
-            // Allow customised TS Jest config that extends skuba
-            if (tsFile?.includes('skuba')) {
-                return tsFile;
-            }
-            const jsFile = initialFiles['jest.config.js'];
-            // Migrate a JS config that extends skuba, retaining all existing props
-            if (jsFile?.includes('skuba')) {
-                return (0, typescript_1.transformModuleImportsAndExports)(jsFile, (_, p) => p);
-            }
-            currentFiles['jest.setup.ts'] ?? (currentFiles['jest.setup.ts'] = setupFile);
-            const inputFile = tsFile ?? jsFile;
-            const props = inputFile === undefined ? undefined : (0, typescript_1.readModuleExports)(inputFile);
-            if (props === undefined) {
-                return configFile;
-            }
-            const filteredProps = filterProps(null, props);
-            const appendProps = (0, typescript_1.createPropAppender)(filteredProps);
-            // Append a subset of custom props to our base `jest.config.ts`
-            return (0, typescript_1.transformModuleImportsAndExports)(configFile, appendProps);
-        },
-        'package.json': (0, package_1.withPackage)(({ jest, ...data }) => data),
-    };
+  const [configFile, setupFile] = await Promise.all([
+    (0, import_template.readBaseTemplateFile)("jest.config.ts"),
+    (0, import_template.readBaseTemplateFile)("jest.setup.ts")
+  ]);
+  return {
+    ...(0, import_deleteFiles.deleteFiles)("jest.config.js", "jest.setup.js"),
+    "jest.config.ts": (tsFile, currentFiles, initialFiles) => {
+      if (tsFile?.includes("skuba")) {
+        return OUTDATED_ISOLATED_MODULES_CONFIG_SNIPPETS.reduce(
+          (acc, snippet) => acc.replace(snippet, ""),
+          tsFile
+        );
+      }
+      const jsFile = initialFiles["jest.config.js"];
+      if (jsFile?.includes("skuba")) {
+        return (0, import_typescript.transformModuleImportsAndExports)(jsFile, (_, p) => p);
+      }
+      currentFiles["jest.setup.ts"] ?? (currentFiles["jest.setup.ts"] = initialFiles["jest.setup.js"] ?? setupFile);
+      const inputFile = tsFile ?? jsFile;
+      const props = inputFile === void 0 ? void 0 : (0, import_typescript.readModuleExports)(inputFile);
+      if (props === void 0) {
+        return configFile;
+      }
+      const filteredProps = filterProps(null, props);
+      const appendProps = (0, import_typescript.createPropAppender)(filteredProps);
+      return (0, import_typescript.transformModuleImportsAndExports)(configFile, appendProps);
+    },
+    "package.json": (0, import_package.withPackage)(({ jest, ...data }) => data)
+  };
 };
-exports.jestModule = jestModule;
-//# sourceMappingURL=jest.js.map
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  jestModule
+});
+//# sourceMappingURL=jest.js.map

package/lib/cli/configure/modules/jest.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"jest.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/jest.ts"],"names":[],"mappings":";;;AAAA,sDAA+D;AAC/D,2DAAwD;AACxD,uDAAoD;AACpD,mDAAoD;AACpD,yDAKkC;AAGlC,4CAA4C;AAC5C,MAAM,WAAW,GAAG,IAAA,6BAAgB,EAAC;IACnC,qBAAqB;IACrB,mBAAmB;IACnB,aAAa;IACb,gBAAgB;IAChB,YAAY;IACZ,oBAAoB;CACrB,CAAC,CAAC;AAEI,MAAM,UAAU,GAAG,KAAK,IAAqB,EAAE;IACpD,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChD,IAAA,+BAAoB,EAAC,gBAAgB,CAAC;QACtC,IAAA,+BAAoB,EAAC,eAAe,CAAC;KACtC,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,IAAA,yBAAW,EAAC,gBAAgB,CAAC;QAChC,GAAG,IAAA,qBAAS,EAAC,eAAe,CAAC;QAE7B,gBAAgB,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE;YACvD,qDAAqD;YACrD,IAAI,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC7B,OAAO,MAAM,CAAC;aACf;YAED,MAAM,MAAM,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;YAE9C,uEAAuE;YACvE,IAAI,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC7B,OAAO,IAAA,6CAAgC,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;aAC9D;YAED,YAAY,CAAC,eAAe,MAA5B,YAAY,CAAC,eAAe,IAAM,SAAS,EAAC;YAE5C,MAAM,SAAS,GAAG,MAAM,IAAI,MAAM,CAAC;YAEnC,MAAM,KAAK,GACT,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,8BAAiB,EAAC,SAAS,CAAC,CAAC;YAErE,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,OAAO,UAAU,CAAC;aACnB;YAED,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAE/C,MAAM,WAAW,GAAG,IAAA,+BAAkB,EAAC,aAAa,CAAC,CAAC;YAEtD,+DAA+D;YAC/D,OAAO,IAAA,6CAAgC,EAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC;QAED,cAAc,EAAE,IAAA,qBAAW,EAAC,CAAC,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;KACzD,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,UAAU,cA4CrB"}
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/configure/modules/jest.ts"],
+  "sourcesContent": ["import { readBaseTemplateFile } from '../../../utils/template';\nimport { deleteFiles } from '../processing/deleteFiles';\nimport { withPackage } from '../processing/package';\nimport {\n  createPropAppender,\n  createPropFilter,\n  readModuleExports,\n  transformModuleImportsAndExports,\n} from '../processing/typescript';\nimport type { Module } from '../types';\n\nconst OUTDATED_ISOLATED_MODULES_CONFIG_SNIPPETS = [\n  `\n  globals: {\n    'ts-jest': {\n      // seek-oss/skuba#626\n      isolatedModules: true,\n    },\n  },`,\n  `\n  globals: {\n    'ts-jest': {\n      isolatedModules: true,\n    },\n  },`,\n];\n\n// Jest options to preserve during migration\nconst filterProps = createPropFilter([\n  'collectCoverageFrom',\n  'coverageThreshold',\n  'globalSetup',\n  'globalTeardown',\n  'setupFiles',\n  'setupFilesAfterEnv',\n]);\n\nexport const jestModule = async (): Promise<Module> => {\n  const [configFile, setupFile] = await Promise.all([\n    readBaseTemplateFile('jest.config.ts'),\n    readBaseTemplateFile('jest.setup.ts'),\n  ]);\n\n  return {\n    ...deleteFiles('jest.config.js', 'jest.setup.js'),\n\n    'jest.config.ts': (tsFile, currentFiles, initialFiles) => {\n      // Allow customised TS Jest config that extends skuba\n      if (tsFile?.includes('skuba')) {\n        return OUTDATED_ISOLATED_MODULES_CONFIG_SNIPPETS.reduce(\n          (acc, snippet) => acc.replace(snippet, ''),\n          tsFile,\n        );\n      }\n\n      const jsFile = initialFiles['jest.config.js'];\n\n      // Migrate a JS config that extends skuba, retaining all existing props\n      if (jsFile?.includes('skuba')) {\n        return transformModuleImportsAndExports(jsFile, (_, p) => p);\n      }\n\n      currentFiles['jest.setup.ts'] ??=\n        initialFiles['jest.setup.js'] ?? setupFile;\n\n      const inputFile = tsFile ?? jsFile;\n\n      const props =\n        inputFile === undefined ? undefined : readModuleExports(inputFile);\n\n      if (props === undefined) {\n        return configFile;\n      }\n\n      const filteredProps = filterProps(null, props);\n\n      const appendProps = createPropAppender(filteredProps);\n\n      // Append a subset of custom props to our base `jest.config.ts`\n      return transformModuleImportsAndExports(configFile, appendProps);\n    },\n\n    'package.json': withPackage(({ jest, ...data }) => data),\n  };\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAqC;AACrC,yBAA4B;AAC5B,qBAA4B;AAC5B,wBAKO;AAGP,MAAM,4CAA4C;AAAA,EAChD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMF;AAGA,MAAM,kBAAc,oCAAiB;AAAA,EACnC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,CAAC;AAEM,MAAM,aAAa,YAA6B;AACrD,QAAM,CAAC,YAAY,SAAS,IAAI,MAAM,QAAQ,IAAI;AAAA,QAChD,sCAAqB,gBAAgB;AAAA,QACrC,sCAAqB,eAAe;AAAA,EACtC,CAAC;AAED,SAAO;AAAA,IACL,OAAG,gCAAY,kBAAkB,eAAe;AAAA,IAEhD,kBAAkB,CAAC,QAAQ,cAAc,iBAAiB;AAExD,UAAI,QAAQ,SAAS,OAAO,GAAG;AAC7B,eAAO,0CAA0C;AAAA,UAC/C,CAAC,KAAK,YAAY,IAAI,QAAQ,SAAS,EAAE;AAAA,UACzC;AAAA,QACF;AAAA,MACF;AAEA,YAAM,SAAS,aAAa;AAG5B,UAAI,QAAQ,SAAS,OAAO,GAAG;AAC7B,mBAAO,oDAAiC,QAAQ,CAAC,GAAG,MAAM,CAAC;AAAA,MAC7D;AAEA,wEACE,aAAa,oBAAoB;AAEnC,YAAM,YAAY,UAAU;AAE5B,YAAM,QACJ,cAAc,SAAY,aAAY,qCAAkB,SAAS;AAEnE,UAAI,UAAU,QAAW;AACvB,eAAO;AAAA,MACT;AAEA,YAAM,gBAAgB,YAAY,MAAM,KAAK;AAE7C,YAAM,kBAAc,sCAAmB,aAAa;AAGpD,iBAAO,oDAAiC,YAAY,WAAW;AAAA,IACjE;AAAA,IAEA,oBAAgB,4BAAY,CAAC,EAAE,SAAS,KAAK,MAAM,IAAI;AAAA,EACzD;AACF;",
+  "names": []
+}

package/lib/cli/configure/modules/nodemon.js

@@ -1,7 +1,30 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodemonModule = void 0;
-const deleteFiles_1 = require("../processing/deleteFiles");
-const nodemonModule = () => (0, deleteFiles_1.deleteFiles)('nodemon.json');
-exports.nodemonModule = nodemonModule;
-//# sourceMappingURL=nodemon.js.map
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var nodemon_exports = {};
+__export(nodemon_exports, {
+  nodemonModule: () => nodemonModule
+});
+module.exports = __toCommonJS(nodemon_exports);
+var import_deleteFiles = require("../processing/deleteFiles");
+const nodemonModule = () => (0, import_deleteFiles.deleteFiles)("nodemon.json");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  nodemonModule
+});
+//# sourceMappingURL=nodemon.js.map

package/lib/cli/configure/modules/nodemon.js.map

@@ -1 +1,7 @@
-{"version":3,"file":"nodemon.js","sourceRoot":"","sources":["../../../../src/cli/configure/modules/nodemon.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAGjD,MAAM,aAAa,GAAG,GAAW,EAAE,CAAC,IAAA,yBAAW,EAAC,cAAc,CAAC,CAAC;AAA1D,QAAA,aAAa,iBAA6C"}
+{
+  "version": 3,
+  "sources": ["../../../../src/cli/configure/modules/nodemon.ts"],
+  "sourcesContent": ["import { deleteFiles } from '../processing/deleteFiles';\nimport type { Module } from '../types';\n\nexport const nodemonModule = (): Module => deleteFiles('nodemon.json');\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,yBAA4B;AAGrB,MAAM,gBAAgB,UAAc,gCAAY,cAAc;",
+  "names": []
+}