skuba 13.0.0-custom-conditions-exports-20250730235248 → 13.0.0-custom-conditions-exports-20250923005538
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/README.md +1 -2
- package/config/tsconfig.json +2 -1
- package/jest/moduleNameMapper.js +3 -0
- package/lib/cli/build/assets.js +1 -1
- package/lib/cli/build/assets.js.map +2 -2
- package/lib/cli/build/esbuild.js +1 -1
- package/lib/cli/build/esbuild.js.map +2 -2
- package/lib/cli/build/index.js +1 -1
- package/lib/cli/build/index.js.map +2 -2
- package/lib/cli/build/tsc.d.ts +9 -2
- package/lib/cli/build/tsc.js +76 -40
- package/lib/cli/build/tsc.js.map +3 -3
- package/lib/cli/configure/analyseDependencies.d.ts +2 -2
- package/lib/cli/configure/analyseDependencies.js.map +1 -1
- package/lib/cli/configure/analysis/package.d.ts +1 -1
- package/lib/cli/configure/analysis/package.js +1 -1
- package/lib/cli/configure/analysis/package.js.map +2 -2
- package/lib/cli/configure/ensureTemplateCompletion.d.ts +2 -2
- package/lib/cli/configure/ensureTemplateCompletion.js.map +1 -1
- package/lib/cli/configure/getEntryPoint.d.ts +2 -2
- package/lib/cli/configure/getEntryPoint.js.map +1 -1
- package/lib/cli/configure/getProjectType.d.ts +2 -2
- package/lib/cli/configure/getProjectType.js.map +1 -1
- package/lib/cli/configure/processing/package.js +8 -2
- package/lib/cli/configure/processing/package.js.map +2 -2
- package/lib/cli/init/getConfig.js +1 -1
- package/lib/cli/init/getConfig.js.map +2 -2
- package/lib/cli/lint/internal.js +1 -1
- package/lib/cli/lint/internal.js.map +2 -2
- package/lib/cli/lint/internalLints/patchRenovateConfig.js +2 -2
- package/lib/cli/lint/internalLints/patchRenovateConfig.js.map +1 -1
- package/lib/cli/lint/internalLints/upgrade/index.d.ts +2 -2
- package/lib/cli/lint/internalLints/upgrade/index.js.map +1 -1
- package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/index.js +3 -8
- package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/index.js.map +2 -2
- package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/unhandledRejections.d.ts +4 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/unhandledRejections.js +162 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/unhandledRejections.js.map +7 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.1.1/index.d.ts +2 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.1.1/index.js +35 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.1.1/index.js.map +7 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.1.1/patchJestSnapshots.d.ts +3 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.1.1/patchJestSnapshots.js +105 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.1.1/patchJestSnapshots.js.map +7 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.2.0/configureTsConfigForESM.d.ts +23 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.2.0/configureTsConfigForESM.js +321 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.2.0/configureTsConfigForESM.js.map +7 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.2.0/index.d.ts +2 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.2.0/index.js +40 -0
- package/lib/cli/lint/internalLints/upgrade/patches/12.2.0/index.js.map +7 -0
- package/lib/cli/lint/internalLints/upgrade/patches/{12.0.2 → 12.2.0}/rewriteSrcImports.js +7 -4
- package/lib/cli/lint/internalLints/upgrade/patches/{12.0.2 → 12.2.0}/rewriteSrcImports.js.map +3 -3
- package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.js +1 -1
- package/lib/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.js.map +2 -2
- package/lib/cli/node/index.js +6 -0
- package/lib/cli/node/index.js.map +2 -2
- package/lib/cli/start/index.js +6 -0
- package/lib/cli/start/index.js.map +2 -2
- package/lib/cli/test/index.d.ts +1 -1
- package/lib/cli/test/index.js +18 -4
- package/lib/cli/test/index.js.map +2 -2
- package/lib/utils/args.d.ts +2 -0
- package/lib/utils/args.js +5 -0
- package/lib/utils/args.js.map +2 -2
- package/lib/utils/manifest.d.ts +1 -1
- package/lib/utils/manifest.js +1 -1
- package/lib/utils/manifest.js.map +2 -2
- package/lib/utils/template.d.ts +1 -1
- package/package.json +17 -20
- package/template/base/_.prettierrc.js +1 -1
- package/template/base/_eslint.config.js +1 -1
- package/template/base/_pnpm-workspace.yaml +1 -0
- package/template/base/jest.setup.ts +1 -1
- package/template/base/tsconfig.build.json +3 -0
- package/template/base/tsconfig.json +0 -1
- package/template/express-rest-api/.buildkite/pipeline.yml +6 -0
- package/template/express-rest-api/.env +1 -1
- package/template/express-rest-api/.gantry/dev.yml +5 -1
- package/template/express-rest-api/.gantry/prod.yml +5 -1
- package/template/express-rest-api/Dockerfile +1 -1
- package/template/express-rest-api/Dockerfile.dev-deps +1 -1
- package/template/express-rest-api/README.md +5 -5
- package/template/express-rest-api/gantry.apply.yml +17 -1
- package/template/express-rest-api/package.json +11 -5
- package/template/express-rest-api/src/api/healthCheck.ts +2 -2
- package/template/express-rest-api/src/config.ts +7 -7
- package/template/express-rest-api/src/framework/logging.ts +11 -7
- package/template/express-rest-api/src/framework/metrics.ts +1 -1
- package/template/express-rest-api/src/listen.ts +6 -0
- package/template/express-rest-api/src/tracing.ts +56 -0
- package/template/greeter/Dockerfile +1 -1
- package/template/greeter/README.md +2 -2
- package/template/greeter/package.json +2 -2
- package/template/koa-rest-api/.buildkite/pipeline.yml +6 -0
- package/template/koa-rest-api/.env +1 -1
- package/template/koa-rest-api/.gantry/dev.yml +3 -3
- package/template/koa-rest-api/.gantry/prod.yml +3 -3
- package/template/koa-rest-api/Dockerfile.dev-deps +1 -1
- package/template/koa-rest-api/README.md +6 -6
- package/template/koa-rest-api/gantry.apply.yml +15 -3
- package/template/koa-rest-api/package.json +10 -11
- package/template/koa-rest-api/skuba.template.js +1 -1
- package/template/koa-rest-api/src/api/healthCheck.ts +2 -2
- package/template/koa-rest-api/src/config.ts +7 -7
- package/template/koa-rest-api/src/framework/logging.ts +12 -8
- package/template/koa-rest-api/src/framework/metrics.ts +1 -1
- package/template/koa-rest-api/src/framework/server.test.ts +7 -8
- package/template/koa-rest-api/src/framework/server.ts +1 -4
- package/template/koa-rest-api/src/listen.ts +6 -0
- package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +6 -2
- package/template/lambda-sqs-worker-cdk/.env +1 -1
- package/template/lambda-sqs-worker-cdk/Dockerfile +1 -1
- package/template/lambda-sqs-worker-cdk/README.md +8 -8
- package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +54 -26
- package/template/lambda-sqs-worker-cdk/infra/appStack.test.ts +5 -22
- package/template/lambda-sqs-worker-cdk/infra/appStack.ts +16 -9
- package/template/lambda-sqs-worker-cdk/infra/config.ts +34 -20
- package/template/lambda-sqs-worker-cdk/infra/index.ts +1 -1
- package/template/lambda-sqs-worker-cdk/package.json +7 -9
- package/template/lambda-sqs-worker-cdk/src/app.test.ts +91 -51
- package/template/lambda-sqs-worker-cdk/src/app.ts +10 -9
- package/template/lambda-sqs-worker-cdk/src/config.ts +11 -16
- package/template/lambda-sqs-worker-cdk/src/framework/handler.test.ts +10 -5
- package/template/lambda-sqs-worker-cdk/src/framework/handler.ts +48 -24
- package/template/lambda-sqs-worker-cdk/src/framework/logging.ts +23 -11
- package/template/lambda-sqs-worker-cdk/src/framework/metrics.ts +1 -4
- package/template/lambda-sqs-worker-cdk/src/testing/handler.ts +4 -1
- package/template/lambda-sqs-worker-cdk/tsconfig.json +1 -2
- package/template/oss-npm-package/.github/workflows/release.yml +5 -6
- package/template/oss-npm-package/.github/workflows/validate.yml +5 -5
- package/template/oss-npm-package/_package.json +0 -3
- package/template/oss-npm-package/skuba.template.js +1 -1
- package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/configureTsConfigForESM.d.ts +0 -6
- package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/configureTsConfigForESM.js +0 -248
- package/lib/cli/lint/internalLints/upgrade/patches/12.0.2/configureTsConfigForESM.js.map +0 -7
- /package/lib/cli/lint/internalLints/upgrade/patches/{12.0.2 → 12.2.0}/rewriteSrcImports.d.ts +0 -0
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.1.1/patchJestSnapshots.ts"],
|
|
4
|
+
"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 JEST_SNAPSHOT_OLD_URL = 'https://goo.gl/fbAQLP';\nconst JEST_SNAPSHOT_NEW_URL = 'https://jestjs.io/docs/snapshot-testing';\n\nexport const patchJestSnapshots = async (\n mode: 'lint' | 'format',\n): Promise<PatchReturnType> => {\n const testFilePaths = await fg(['**/*.test.ts', '**/*.test.ts.snap'], {\n ignore: [\n '**/.git',\n '**/node_modules',\n 'src/cli/lint/internalLints/upgrade/patches/12.1.1/patchJestSnapshots.test.ts',\n ],\n });\n\n if (testFilePaths.length === 0) {\n return {\n result: 'skip',\n reason: 'no test files found',\n };\n }\n\n const testsFiles = await Promise.all(\n testFilePaths.map(async (file) => {\n const contents = await fs.readFile(file, 'utf8');\n\n return {\n file,\n contents,\n };\n }),\n );\n\n const testFilesToPatch = testsFiles.filter(({ contents }) =>\n contents.includes(JEST_SNAPSHOT_OLD_URL),\n );\n\n if (testFilesToPatch.length === 0) {\n return {\n result: 'skip',\n reason: 'no test files to patch',\n };\n }\n\n if (mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n await Promise.all(\n testFilesToPatch.map(async ({ file, contents }) => {\n const updatedContents = contents.replaceAll(\n JEST_SNAPSHOT_OLD_URL,\n JEST_SNAPSHOT_NEW_URL,\n );\n await fs.writeFile(file, updatedContents, 'utf8');\n }),\n );\n\n return {\n result: 'apply',\n };\n};\n\nexport const tryPatchJestSnapshots: PatchFunction = async ({ mode }) => {\n try {\n return await patchJestSnapshots(mode);\n } catch (err) {\n log.warn('Failed to apply Jest snapshot URL patch.');\n log.subtle(inspect(err));\n return { result: 'skip', reason: 'due to an error' };\n }\n};\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAe;AACf,sBAAe;AAEf,qBAAoB;AAGpB,MAAM,wBAAwB;AAC9B,MAAM,wBAAwB;AAEvB,MAAM,qBAAqB,OAChC,SAC6B;AAC7B,QAAM,gBAAgB,UAAM,iBAAAA,SAAG,CAAC,gBAAgB,mBAAmB,GAAG;AAAA,IACpE,QAAQ;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AAED,MAAI,cAAc,WAAW,GAAG;AAC9B,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,aAAa,MAAM,QAAQ;AAAA,IAC/B,cAAc,IAAI,OAAO,SAAS;AAChC,YAAM,WAAW,MAAM,gBAAAC,QAAG,SAAS,MAAM,MAAM;AAE/C,aAAO;AAAA,QACL;AAAA,QACA;AAAA,MACF;AAAA,IACF,CAAC;AAAA,EACH;AAEA,QAAM,mBAAmB,WAAW;AAAA,IAAO,CAAC,EAAE,SAAS,MACrD,SAAS,SAAS,qBAAqB;AAAA,EACzC;AAEA,MAAI,iBAAiB,WAAW,GAAG;AACjC,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,iBAAiB,IAAI,OAAO,EAAE,MAAM,SAAS,MAAM;AACjD,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,wBAAuC,OAAO,EAAE,KAAK,MAAM;AACtE,MAAI;AACF,WAAO,MAAM,mBAAmB,IAAI;AAAA,EACtC,SAAS,KAAK;AACZ,uBAAI,KAAK,0CAA0C;AACnD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
|
|
6
|
+
"names": ["fg", "fs"]
|
|
7
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import * as z from 'zod';
|
|
2
|
+
import type { PatchFunction } from '../../index.js';
|
|
3
|
+
declare const packageJsonSchema: z.ZodObject<{
|
|
4
|
+
imports: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>>>;
|
|
5
|
+
}, z.core.$loose>;
|
|
6
|
+
type PackageJson = z.infer<typeof packageJsonSchema>;
|
|
7
|
+
export declare const addJestModuleNameMapper: (contents: string, srcPaths: string[]) => string;
|
|
8
|
+
export declare const parsePackageJson: (contents: string) => {
|
|
9
|
+
original: PackageJson;
|
|
10
|
+
parsed: PackageJson;
|
|
11
|
+
} | null;
|
|
12
|
+
export declare const updatePackageJson: ({ parsed, customCondition, }: {
|
|
13
|
+
parsed: PackageJson;
|
|
14
|
+
customCondition: string;
|
|
15
|
+
}) => {
|
|
16
|
+
parsed: {
|
|
17
|
+
[x: string]: unknown;
|
|
18
|
+
imports?: Record<string, Record<string, string>> | undefined;
|
|
19
|
+
};
|
|
20
|
+
};
|
|
21
|
+
export declare const tryConfigureTsConfigForESM: PatchFunction;
|
|
22
|
+
export declare const configureTsConfigForESM: PatchFunction;
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,321 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
17
|
+
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
var configureTsConfigForESM_exports = {};
|
|
30
|
+
__export(configureTsConfigForESM_exports, {
|
|
31
|
+
addJestModuleNameMapper: () => addJestModuleNameMapper,
|
|
32
|
+
configureTsConfigForESM: () => configureTsConfigForESM,
|
|
33
|
+
parsePackageJson: () => parsePackageJson,
|
|
34
|
+
tryConfigureTsConfigForESM: () => tryConfigureTsConfigForESM,
|
|
35
|
+
updatePackageJson: () => updatePackageJson
|
|
36
|
+
});
|
|
37
|
+
module.exports = __toCommonJS(configureTsConfigForESM_exports);
|
|
38
|
+
var import_path = __toESM(require("path"));
|
|
39
|
+
var import_util = require("util");
|
|
40
|
+
var import_fast_glob = require("fast-glob");
|
|
41
|
+
var import_fs_extra = __toESM(require("fs-extra"));
|
|
42
|
+
var z = __toESM(require("zod"));
|
|
43
|
+
var import__ = require("../../../../../../index.js");
|
|
44
|
+
var import_logging = require("../../../../../../utils/logging.js");
|
|
45
|
+
const packageJsonSchema = z.looseObject({
|
|
46
|
+
imports: z.record(z.string(), z.record(z.string(), z.string())).optional()
|
|
47
|
+
});
|
|
48
|
+
const tsConfigSchema = z.looseObject({
|
|
49
|
+
compilerOptions: z.looseObject({
|
|
50
|
+
customConditions: z.array(z.string()).optional(),
|
|
51
|
+
rootDir: z.string().optional(),
|
|
52
|
+
paths: z.record(z.string(), z.union([z.array(z.string()), z.null()])).optional()
|
|
53
|
+
}).optional()
|
|
54
|
+
});
|
|
55
|
+
const fetchFiles = async (patterns) => {
|
|
56
|
+
const files = await (0, import_fast_glob.glob)(patterns, {
|
|
57
|
+
ignore: ["**/.git", "**/node_modules"]
|
|
58
|
+
});
|
|
59
|
+
return Promise.all(
|
|
60
|
+
files.map(async (file) => {
|
|
61
|
+
const contents = await import_fs_extra.default.promises.readFile(file, "utf8");
|
|
62
|
+
return {
|
|
63
|
+
file,
|
|
64
|
+
contents
|
|
65
|
+
};
|
|
66
|
+
})
|
|
67
|
+
);
|
|
68
|
+
};
|
|
69
|
+
const addJestModuleNameMapper = (contents, srcPaths) => {
|
|
70
|
+
const moduleNameRegex = /moduleNameMapper:\s*\{([\s\S]*?)\}/;
|
|
71
|
+
const match = moduleNameRegex.exec(contents);
|
|
72
|
+
const srcPathArray = srcPaths.map(
|
|
73
|
+
(subfolderPath) => subfolderPath === "." || subfolderPath === "./" ? "<rootDir>/src/$1" : `<rootDir>/${subfolderPath}/src/$1`
|
|
74
|
+
);
|
|
75
|
+
const srcModuleMappers = JSON.stringify({
|
|
76
|
+
"^#src/(.*)\\.js$": srcPathArray,
|
|
77
|
+
"^#src/(.*)$": srcPathArray
|
|
78
|
+
});
|
|
79
|
+
const newModuleNameMapper = srcModuleMappers.replace(/^{/, "").replace(/}$/, "");
|
|
80
|
+
if (match?.[1] !== void 0) {
|
|
81
|
+
const existingModuleMappers = match[1];
|
|
82
|
+
const newContents = `${contents.slice(
|
|
83
|
+
0,
|
|
84
|
+
match.index
|
|
85
|
+
)}moduleNameMapper: {${existingModuleMappers},${newModuleNameMapper}}${contents.slice(
|
|
86
|
+
match.index + match[0].length
|
|
87
|
+
)}`;
|
|
88
|
+
return newContents;
|
|
89
|
+
}
|
|
90
|
+
const insertionPointRegex = /(\b(jest|export\s+default)\b[\s\S]*?{)/;
|
|
91
|
+
const insertionMatch = insertionPointRegex.exec(contents);
|
|
92
|
+
if (insertionMatch?.[1] !== void 0) {
|
|
93
|
+
const insertionIndex = insertionMatch.index + insertionMatch[0].length;
|
|
94
|
+
const moduleNameMapperString = `
|
|
95
|
+
moduleNameMapper: {${newModuleNameMapper}},`;
|
|
96
|
+
const newContents = contents.slice(0, insertionIndex) + moduleNameMapperString + contents.slice(insertionIndex);
|
|
97
|
+
return newContents;
|
|
98
|
+
}
|
|
99
|
+
import_logging.log.warn(
|
|
100
|
+
"Could not find a suitable place to insert moduleNameMapper in jest config"
|
|
101
|
+
);
|
|
102
|
+
return contents;
|
|
103
|
+
};
|
|
104
|
+
const parsePackageJson = (contents) => {
|
|
105
|
+
try {
|
|
106
|
+
const parsedJson = JSON.parse(contents);
|
|
107
|
+
return {
|
|
108
|
+
original: parsedJson,
|
|
109
|
+
parsed: packageJsonSchema.parse(parsedJson)
|
|
110
|
+
};
|
|
111
|
+
} catch (error) {
|
|
112
|
+
import_logging.log.warn(`Failed to parse package.json as JSON: ${String(error)}`);
|
|
113
|
+
return null;
|
|
114
|
+
}
|
|
115
|
+
};
|
|
116
|
+
const updatePackageJson = ({
|
|
117
|
+
parsed,
|
|
118
|
+
customCondition
|
|
119
|
+
}) => {
|
|
120
|
+
parsed.imports ??= {};
|
|
121
|
+
parsed.imports["#src/*"] ??= {
|
|
122
|
+
[customCondition]: "./src/*",
|
|
123
|
+
default: "./lib/*"
|
|
124
|
+
};
|
|
125
|
+
return {
|
|
126
|
+
parsed
|
|
127
|
+
};
|
|
128
|
+
};
|
|
129
|
+
const parseTsconfig = (contents) => {
|
|
130
|
+
try {
|
|
131
|
+
const parsedJson = JSON.parse(contents);
|
|
132
|
+
const tsconfig = tsConfigSchema.parse(parsedJson);
|
|
133
|
+
return {
|
|
134
|
+
original: parsedJson,
|
|
135
|
+
parsed: tsconfig
|
|
136
|
+
};
|
|
137
|
+
} catch (error) {
|
|
138
|
+
import_logging.log.warn(`Failed to parse root tsconfig.json as JSON: ${String(error)}`);
|
|
139
|
+
return null;
|
|
140
|
+
}
|
|
141
|
+
};
|
|
142
|
+
const updateTsConfig = ({
|
|
143
|
+
parsed,
|
|
144
|
+
customCondition,
|
|
145
|
+
file
|
|
146
|
+
}) => {
|
|
147
|
+
if (file === "tsconfig.json") {
|
|
148
|
+
parsed.compilerOptions ??= {};
|
|
149
|
+
parsed.compilerOptions.customConditions ??= [];
|
|
150
|
+
if (!parsed.compilerOptions.customConditions.includes(customCondition)) {
|
|
151
|
+
parsed.compilerOptions.customConditions.push(customCondition);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
let srcPaths = [];
|
|
155
|
+
["./src/*", "src/*", "src"].forEach((key) => {
|
|
156
|
+
if (parsed.compilerOptions?.paths?.[key]) {
|
|
157
|
+
srcPaths = parsed.compilerOptions.paths[key];
|
|
158
|
+
delete parsed.compilerOptions.paths[key];
|
|
159
|
+
}
|
|
160
|
+
});
|
|
161
|
+
if (parsed.compilerOptions?.paths && Object.keys(parsed.compilerOptions.paths).length === 0) {
|
|
162
|
+
delete parsed.compilerOptions.paths;
|
|
163
|
+
}
|
|
164
|
+
return {
|
|
165
|
+
parsed,
|
|
166
|
+
srcPaths
|
|
167
|
+
};
|
|
168
|
+
};
|
|
169
|
+
const tryConfigureTsConfigForESM = async ({
|
|
170
|
+
mode
|
|
171
|
+
}) => {
|
|
172
|
+
let customCondition;
|
|
173
|
+
try {
|
|
174
|
+
const { repo } = await import__.Git.getOwnerAndRepo({ dir: process.cwd() });
|
|
175
|
+
customCondition = `@seek/${repo}/source`;
|
|
176
|
+
} catch {
|
|
177
|
+
return { result: "skip", reason: "no repository name found" };
|
|
178
|
+
}
|
|
179
|
+
const tsconfigJsonPatterns = ["**/tsconfig.json"];
|
|
180
|
+
const tsconfigBuildJsonPatterns = ["**/tsconfig.build.json"];
|
|
181
|
+
const jestConfigPatterns = ["**/jest.config.ts", "**/jest.config.*.ts"];
|
|
182
|
+
const [tsconfigJsonFiles, tsconfigBuildJsonFiles, jestConfigFiles] = await Promise.all([
|
|
183
|
+
fetchFiles(tsconfigJsonPatterns),
|
|
184
|
+
fetchFiles(tsconfigBuildJsonPatterns),
|
|
185
|
+
fetchFiles(jestConfigPatterns)
|
|
186
|
+
]);
|
|
187
|
+
const parsedTsconfigFiles = tsconfigJsonFiles.flatMap(
|
|
188
|
+
({ file, contents }) => {
|
|
189
|
+
const parsed = parseTsconfig(contents);
|
|
190
|
+
return parsed ? [{ file, ...parsed }] : [];
|
|
191
|
+
}
|
|
192
|
+
);
|
|
193
|
+
const parsedTsconfigBuildFiles = tsconfigBuildJsonFiles.flatMap(
|
|
194
|
+
({ file, contents }) => {
|
|
195
|
+
const parsed = parseTsconfig(contents);
|
|
196
|
+
return parsed ? [{ file, ...parsed }] : [];
|
|
197
|
+
}
|
|
198
|
+
);
|
|
199
|
+
if (parsedTsconfigFiles.length === 0) {
|
|
200
|
+
return { result: "skip", reason: "no valid tsconfig.json files found" };
|
|
201
|
+
}
|
|
202
|
+
const updatedTsconfigFiles = parsedTsconfigFiles.map(
|
|
203
|
+
({ file, parsed, original }) => ({
|
|
204
|
+
file,
|
|
205
|
+
original,
|
|
206
|
+
...updateTsConfig({ parsed, customCondition, file })
|
|
207
|
+
})
|
|
208
|
+
);
|
|
209
|
+
const allSrcPaths = [
|
|
210
|
+
...new Set(
|
|
211
|
+
updatedTsconfigFiles.flatMap(
|
|
212
|
+
({ srcPaths, file }) => srcPaths.flatMap((p) => {
|
|
213
|
+
const regex = /(.*)src\/?\*?$/;
|
|
214
|
+
const match = regex.exec(p);
|
|
215
|
+
if (match?.[1] !== void 0) {
|
|
216
|
+
return [import_path.default.join(import_path.default.dirname(file), match[1])];
|
|
217
|
+
}
|
|
218
|
+
import_logging.log.warn(
|
|
219
|
+
`Unexpected src path format in ${file}: ${p}. Expected format like "apps/api/src/*"`
|
|
220
|
+
);
|
|
221
|
+
return [];
|
|
222
|
+
})
|
|
223
|
+
)
|
|
224
|
+
)
|
|
225
|
+
];
|
|
226
|
+
const packageJsonPatterns = allSrcPaths.map(
|
|
227
|
+
(srcPath) => import_path.default.join(srcPath, "package.json")
|
|
228
|
+
);
|
|
229
|
+
const packageJsonFiles = await fetchFiles(packageJsonPatterns);
|
|
230
|
+
const parsedPackageJsonFiles = packageJsonFiles.flatMap(
|
|
231
|
+
({ file, contents }) => {
|
|
232
|
+
const parsed = parsePackageJson(contents);
|
|
233
|
+
return parsed ? [{ file, ...parsed }] : [];
|
|
234
|
+
}
|
|
235
|
+
);
|
|
236
|
+
parsedPackageJsonFiles.forEach(({ parsed, file }) => {
|
|
237
|
+
updatePackageJson({ parsed, customCondition });
|
|
238
|
+
const relativeTsconfigPath = import_path.default.join(import_path.default.dirname(file), "tsconfig.json");
|
|
239
|
+
const relativeTsconfig = updatedTsconfigFiles.find(
|
|
240
|
+
(tsconfig) => tsconfig.file === relativeTsconfigPath
|
|
241
|
+
);
|
|
242
|
+
if (relativeTsconfig) {
|
|
243
|
+
relativeTsconfig.parsed.compilerOptions ??= {};
|
|
244
|
+
relativeTsconfig.parsed.compilerOptions.rootDir ??= ".";
|
|
245
|
+
} else {
|
|
246
|
+
import_logging.log.warn(
|
|
247
|
+
`No corresponding tsconfig.json found for package.json at ${file}. Expected at ${relativeTsconfigPath}`
|
|
248
|
+
);
|
|
249
|
+
}
|
|
250
|
+
const relativeTsconfigBuildPath = import_path.default.join(
|
|
251
|
+
import_path.default.dirname(file),
|
|
252
|
+
"tsconfig.build.json"
|
|
253
|
+
);
|
|
254
|
+
const relativeTsconfigBuild = parsedTsconfigBuildFiles.find(
|
|
255
|
+
(tsconfig) => tsconfig.file === relativeTsconfigBuildPath
|
|
256
|
+
);
|
|
257
|
+
if (relativeTsconfigBuild) {
|
|
258
|
+
relativeTsconfigBuild.parsed.compilerOptions ??= {};
|
|
259
|
+
relativeTsconfigBuild.parsed.compilerOptions.rootDir ??= "src";
|
|
260
|
+
} else {
|
|
261
|
+
import_logging.log.warn(
|
|
262
|
+
`No corresponding tsconfig.build.json found for package.json at ${file}. Expected at ${relativeTsconfigBuildPath}`
|
|
263
|
+
);
|
|
264
|
+
}
|
|
265
|
+
});
|
|
266
|
+
const updatedJestConfigFiles = jestConfigFiles.map(({ file, contents }) => {
|
|
267
|
+
const parsed = addJestModuleNameMapper(contents, allSrcPaths);
|
|
268
|
+
return { file, original: contents, parsed };
|
|
269
|
+
});
|
|
270
|
+
const hasJestConfigsChanged = updatedJestConfigFiles.some(
|
|
271
|
+
({ parsed, original }) => original !== parsed
|
|
272
|
+
);
|
|
273
|
+
const hasRelativeTsconfigBuildsChanged = parsedTsconfigBuildFiles.some(
|
|
274
|
+
({ original, parsed }) => JSON.stringify(original) !== JSON.stringify(parsed)
|
|
275
|
+
);
|
|
276
|
+
const hasPackageJsonsChanged = parsedPackageJsonFiles.some(
|
|
277
|
+
({ original, parsed }) => JSON.stringify(original) !== JSON.stringify(parsed)
|
|
278
|
+
);
|
|
279
|
+
const hasRootTsconfigChanged = updatedTsconfigFiles.some(
|
|
280
|
+
({ original, parsed }) => JSON.stringify(original) !== JSON.stringify(parsed)
|
|
281
|
+
);
|
|
282
|
+
if (mode === "lint" && (hasRootTsconfigChanged || hasPackageJsonsChanged || hasRelativeTsconfigBuildsChanged || hasJestConfigsChanged)) {
|
|
283
|
+
return { result: "apply" };
|
|
284
|
+
}
|
|
285
|
+
if (!hasRootTsconfigChanged && !hasPackageJsonsChanged && !hasRelativeTsconfigBuildsChanged && !hasJestConfigsChanged) {
|
|
286
|
+
return { result: "skip", reason: "no changes required" };
|
|
287
|
+
}
|
|
288
|
+
await Promise.all(
|
|
289
|
+
[
|
|
290
|
+
...updatedTsconfigFiles,
|
|
291
|
+
...parsedTsconfigBuildFiles,
|
|
292
|
+
...parsedPackageJsonFiles,
|
|
293
|
+
...updatedJestConfigFiles
|
|
294
|
+
].map(async ({ file, parsed, original }) => {
|
|
295
|
+
if (JSON.stringify(original) === JSON.stringify(parsed)) {
|
|
296
|
+
return;
|
|
297
|
+
}
|
|
298
|
+
const updatedContents = JSON.stringify(parsed, null, 2);
|
|
299
|
+
await import_fs_extra.default.promises.writeFile(file, updatedContents);
|
|
300
|
+
})
|
|
301
|
+
);
|
|
302
|
+
return { result: "apply" };
|
|
303
|
+
};
|
|
304
|
+
const configureTsConfigForESM = async (config) => {
|
|
305
|
+
try {
|
|
306
|
+
return await tryConfigureTsConfigForESM(config);
|
|
307
|
+
} catch (err) {
|
|
308
|
+
import_logging.log.warn("Failed to write configure `tsconfig.json` and `package.json`");
|
|
309
|
+
import_logging.log.subtle((0, import_util.inspect)(err));
|
|
310
|
+
return { result: "skip", reason: "due to an error" };
|
|
311
|
+
}
|
|
312
|
+
};
|
|
313
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
314
|
+
0 && (module.exports = {
|
|
315
|
+
addJestModuleNameMapper,
|
|
316
|
+
configureTsConfigForESM,
|
|
317
|
+
parsePackageJson,
|
|
318
|
+
tryConfigureTsConfigForESM,
|
|
319
|
+
updatePackageJson
|
|
320
|
+
});
|
|
321
|
+
//# sourceMappingURL=configureTsConfigForESM.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.2.0/configureTsConfigForESM.ts"],
|
|
4
|
+
"sourcesContent": ["import path from 'path';\nimport { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\nimport * as z from 'zod';\n\nimport { Git } from '../../../../../../index.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst packageJsonSchema = z.looseObject({\n imports: z.record(z.string(), z.record(z.string(), z.string())).optional(),\n});\n\ntype PackageJson = z.infer<typeof packageJsonSchema>;\n\nconst tsConfigSchema = z.looseObject({\n compilerOptions: z\n .looseObject({\n customConditions: z.array(z.string()).optional(),\n rootDir: z.string().optional(),\n paths: z\n .record(z.string(), z.union([z.array(z.string()), z.null()]))\n .optional(),\n })\n .optional(),\n});\n\ntype TsConfig = z.infer<typeof tsConfigSchema>;\n\nconst fetchFiles = async (patterns: string[]) => {\n const files = await glob(patterns, {\n ignore: ['**/.git', '**/node_modules'],\n });\n\n return Promise.all(\n files.map(async (file) => {\n const contents = await fs.promises.readFile(file, 'utf8');\n\n return {\n file,\n contents,\n };\n }),\n );\n};\n\nexport const addJestModuleNameMapper = (\n contents: string,\n srcPaths: string[],\n) => {\n const moduleNameRegex = /moduleNameMapper:\\s*\\{([\\s\\S]*?)\\}/;\n const match = moduleNameRegex.exec(contents);\n\n const srcPathArray = srcPaths.map((subfolderPath) =>\n subfolderPath === '.' || subfolderPath === './'\n ? '<rootDir>/src/$1'\n : `<rootDir>/${subfolderPath}/src/$1`,\n );\n\n const srcModuleMappers = JSON.stringify({\n '^#src/(.*)\\\\.js$': srcPathArray,\n '^#src/(.*)$': srcPathArray,\n });\n\n // strip the surrounding { } from the JSON stringify result\n const newModuleNameMapper = srcModuleMappers\n .replace(/^{/, '')\n .replace(/}$/, '');\n\n if (match?.[1] !== undefined) {\n // insert srcModuleMappers into existing moduleNameMapper\n const existingModuleMappers = match[1];\n\n const newContents = `${contents.slice(\n 0,\n match.index,\n )}moduleNameMapper: {${existingModuleMappers},${newModuleNameMapper}}${contents.slice(\n match.index + match[0].length,\n )}`;\n\n return newContents;\n }\n\n // Add moduleNameMapper if not present\n\n const insertionPointRegex = /(\\b(jest|export\\s+default)\\b[\\s\\S]*?{)/;\n const insertionMatch = insertionPointRegex.exec(contents);\n\n if (insertionMatch?.[1] !== undefined) {\n const insertionIndex = insertionMatch.index + insertionMatch[0].length;\n const moduleNameMapperString = `\\n moduleNameMapper: {${newModuleNameMapper}},`;\n\n const newContents =\n contents.slice(0, insertionIndex) +\n moduleNameMapperString +\n contents.slice(insertionIndex);\n\n return newContents;\n }\n\n log.warn(\n 'Could not find a suitable place to insert moduleNameMapper in jest config',\n );\n return contents;\n};\n\nexport const parsePackageJson = (\n contents: string,\n): {\n original: PackageJson;\n parsed: PackageJson;\n} | null => {\n try {\n const parsedJson: unknown = JSON.parse(contents);\n return {\n original: parsedJson as PackageJson,\n parsed: packageJsonSchema.parse(parsedJson),\n };\n } catch (error) {\n log.warn(`Failed to parse package.json as JSON: ${String(error)}`);\n return null;\n }\n};\n\nexport const updatePackageJson = ({\n parsed,\n customCondition,\n}: {\n parsed: PackageJson;\n customCondition: string;\n}) => {\n parsed.imports ??= {};\n parsed.imports['#src/*'] ??= {\n [customCondition]: './src/*',\n default: './lib/*',\n };\n\n return {\n parsed,\n };\n};\n\nconst parseTsconfig = (\n contents: string,\n): {\n original: TsConfig;\n parsed: TsConfig;\n} | null => {\n try {\n const parsedJson: unknown = JSON.parse(contents);\n const tsconfig = tsConfigSchema.parse(parsedJson);\n\n return {\n original: parsedJson as TsConfig,\n parsed: tsconfig,\n };\n } catch (error) {\n log.warn(`Failed to parse root tsconfig.json as JSON: ${String(error)}`);\n return null;\n }\n};\n\nconst updateTsConfig = ({\n parsed,\n customCondition,\n file,\n}: {\n parsed: TsConfig;\n customCondition: string;\n file: string;\n}) => {\n if (file === 'tsconfig.json') {\n parsed.compilerOptions ??= {};\n parsed.compilerOptions.customConditions ??= [];\n\n if (!parsed.compilerOptions.customConditions.includes(customCondition)) {\n parsed.compilerOptions.customConditions.push(customCondition);\n }\n }\n\n let srcPaths: string[] = [];\n ['./src/*', 'src/*', 'src'].forEach((key) => {\n if (parsed.compilerOptions?.paths?.[key]) {\n srcPaths = parsed.compilerOptions.paths[key];\n delete parsed.compilerOptions.paths[key];\n }\n });\n\n if (\n parsed.compilerOptions?.paths &&\n Object.keys(parsed.compilerOptions.paths).length === 0\n ) {\n delete parsed.compilerOptions.paths;\n }\n\n return {\n parsed,\n srcPaths,\n };\n};\n\nexport const tryConfigureTsConfigForESM: PatchFunction = async ({\n mode,\n}): Promise<PatchReturnType> => {\n let customCondition: string;\n try {\n const { repo } = await Git.getOwnerAndRepo({ dir: process.cwd() });\n customCondition = `@seek/${repo}/source`;\n } catch {\n return { result: 'skip', reason: 'no repository name found' };\n }\n\n const tsconfigJsonPatterns = ['**/tsconfig.json'];\n const tsconfigBuildJsonPatterns = ['**/tsconfig.build.json'];\n const jestConfigPatterns = ['**/jest.config.ts', '**/jest.config.*.ts'];\n\n const [tsconfigJsonFiles, tsconfigBuildJsonFiles, jestConfigFiles] =\n await Promise.all([\n fetchFiles(tsconfigJsonPatterns),\n fetchFiles(tsconfigBuildJsonPatterns),\n fetchFiles(jestConfigPatterns),\n ]);\n\n const parsedTsconfigFiles = tsconfigJsonFiles.flatMap(\n ({ file, contents }) => {\n const parsed = parseTsconfig(contents);\n return parsed ? [{ file, ...parsed }] : [];\n },\n );\n\n const parsedTsconfigBuildFiles = tsconfigBuildJsonFiles.flatMap(\n ({ file, contents }) => {\n const parsed = parseTsconfig(contents);\n return parsed ? [{ file, ...parsed }] : [];\n },\n );\n\n if (parsedTsconfigFiles.length === 0) {\n return { result: 'skip', reason: 'no valid tsconfig.json files found' };\n }\n\n const updatedTsconfigFiles = parsedTsconfigFiles.map(\n ({ file, parsed, original }) => ({\n file,\n original,\n ...updateTsConfig({ parsed, customCondition, file }),\n }),\n );\n\n const allSrcPaths = [\n ...new Set(\n updatedTsconfigFiles.flatMap(({ srcPaths, file }) =>\n srcPaths.flatMap((p) => {\n const regex = /(.*)src\\/?\\*?$/;\n const match = regex.exec(p);\n if (match?.[1] !== undefined) {\n return [path.join(path.dirname(file), match[1])];\n }\n\n log.warn(\n `Unexpected src path format in ${file}: ${p}. Expected format like \"apps/api/src/*\"`,\n );\n return [];\n }),\n ),\n ),\n ];\n\n // Fetch all package.json paths which may be in allSrcPaths\n const packageJsonPatterns = allSrcPaths.map((srcPath) =>\n path.join(srcPath, 'package.json'),\n );\n\n const packageJsonFiles = await fetchFiles(packageJsonPatterns);\n\n const parsedPackageJsonFiles = packageJsonFiles.flatMap(\n ({ file, contents }) => {\n const parsed = parsePackageJson(contents);\n return parsed ? [{ file, ...parsed }] : [];\n },\n );\n\n parsedPackageJsonFiles.forEach(({ parsed, file }) => {\n updatePackageJson({ parsed, customCondition });\n\n const relativeTsconfigPath = path.join(path.dirname(file), 'tsconfig.json');\n\n const relativeTsconfig = updatedTsconfigFiles.find(\n (tsconfig) => tsconfig.file === relativeTsconfigPath,\n );\n\n if (relativeTsconfig) {\n relativeTsconfig.parsed.compilerOptions ??= {};\n relativeTsconfig.parsed.compilerOptions.rootDir ??= '.';\n } else {\n log.warn(\n `No corresponding tsconfig.json found for package.json at ${file}. Expected at ${relativeTsconfigPath}`,\n );\n }\n\n const relativeTsconfigBuildPath = path.join(\n path.dirname(file),\n 'tsconfig.build.json',\n );\n\n const relativeTsconfigBuild = parsedTsconfigBuildFiles.find(\n (tsconfig) => tsconfig.file === relativeTsconfigBuildPath,\n );\n\n if (relativeTsconfigBuild) {\n relativeTsconfigBuild.parsed.compilerOptions ??= {};\n relativeTsconfigBuild.parsed.compilerOptions.rootDir ??= 'src';\n } else {\n log.warn(\n `No corresponding tsconfig.build.json found for package.json at ${file}. Expected at ${relativeTsconfigBuildPath}`,\n );\n }\n });\n\n const updatedJestConfigFiles = jestConfigFiles.map(({ file, contents }) => {\n const parsed = addJestModuleNameMapper(contents, allSrcPaths);\n return { file, original: contents, parsed };\n });\n\n const hasJestConfigsChanged = updatedJestConfigFiles.some(\n ({ parsed, original }) => original !== parsed,\n );\n\n const hasRelativeTsconfigBuildsChanged = parsedTsconfigBuildFiles.some(\n ({ original, parsed }) =>\n JSON.stringify(original) !== JSON.stringify(parsed),\n );\n\n const hasPackageJsonsChanged = parsedPackageJsonFiles.some(\n ({ original, parsed }) =>\n JSON.stringify(original) !== JSON.stringify(parsed),\n );\n\n const hasRootTsconfigChanged = updatedTsconfigFiles.some(\n ({ original, parsed }) =>\n JSON.stringify(original) !== JSON.stringify(parsed),\n );\n\n if (\n mode === 'lint' &&\n (hasRootTsconfigChanged ||\n hasPackageJsonsChanged ||\n hasRelativeTsconfigBuildsChanged ||\n hasJestConfigsChanged)\n ) {\n return { result: 'apply' };\n }\n\n if (\n !hasRootTsconfigChanged &&\n !hasPackageJsonsChanged &&\n !hasRelativeTsconfigBuildsChanged &&\n !hasJestConfigsChanged\n ) {\n return { result: 'skip', reason: 'no changes required' };\n }\n\n await Promise.all(\n [\n ...updatedTsconfigFiles,\n ...parsedTsconfigBuildFiles,\n ...parsedPackageJsonFiles,\n ...updatedJestConfigFiles,\n ].map(async ({ file, parsed, original }) => {\n if (JSON.stringify(original) === JSON.stringify(parsed)) {\n return;\n }\n const updatedContents = JSON.stringify(parsed, null, 2);\n await fs.promises.writeFile(file, updatedContents);\n }),\n );\n\n return { result: 'apply' };\n};\n\nexport const configureTsConfigForESM: PatchFunction = async (config) => {\n try {\n return await tryConfigureTsConfigForESM(config);\n } catch (err) {\n log.warn('Failed to write configure `tsconfig.json` and `package.json`');\n log.subtle(inspect(err));\n return { result: 'skip', reason: 'due to an error' };\n }\n};\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["fs", "path"]
|
|
7
|
+
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __defProp = Object.defineProperty;
|
|
3
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
6
|
+
var __export = (target, all) => {
|
|
7
|
+
for (var name in all)
|
|
8
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
9
|
+
};
|
|
10
|
+
var __copyProps = (to, from, except, desc) => {
|
|
11
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
12
|
+
for (let key of __getOwnPropNames(from))
|
|
13
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
14
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
15
|
+
}
|
|
16
|
+
return to;
|
|
17
|
+
};
|
|
18
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
19
|
+
var __exports = {};
|
|
20
|
+
__export(__exports, {
|
|
21
|
+
patches: () => patches
|
|
22
|
+
});
|
|
23
|
+
module.exports = __toCommonJS(__exports);
|
|
24
|
+
var import_configureTsConfigForESM = require("./configureTsConfigForESM.js");
|
|
25
|
+
var import_rewriteSrcImports = require("./rewriteSrcImports.js");
|
|
26
|
+
const patches = [
|
|
27
|
+
{
|
|
28
|
+
apply: import_rewriteSrcImports.rewriteSrcImports,
|
|
29
|
+
description: "Rewrite all 'src' imports to be '#src'"
|
|
30
|
+
},
|
|
31
|
+
{
|
|
32
|
+
apply: import_configureTsConfigForESM.configureTsConfigForESM,
|
|
33
|
+
description: "Configure `tsconfig.json`, `package.json` and `jest.config.ts` for ESM"
|
|
34
|
+
}
|
|
35
|
+
];
|
|
36
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
37
|
+
0 && (module.exports = {
|
|
38
|
+
patches
|
|
39
|
+
});
|
|
40
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.2.0/index.ts"],
|
|
4
|
+
"sourcesContent": ["import type { Patches } from '../../index.js';\n\nimport { configureTsConfigForESM } from './configureTsConfigForESM.js';\nimport { rewriteSrcImports } from './rewriteSrcImports.js';\n\nexport const patches: Patches = [\n {\n apply: rewriteSrcImports,\n description: \"Rewrite all 'src' imports to be '#src'\",\n },\n {\n apply: configureTsConfigForESM,\n description:\n 'Configure `tsconfig.json`, `package.json` and `jest.config.ts` for ESM',\n },\n];\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,qCAAwC;AACxC,+BAAkC;AAE3B,MAAM,UAAmB;AAAA,EAC9B;AAAA,IACE,OAAO;AAAA,IACP,aAAa;AAAA,EACf;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,aACE;AAAA,EACJ;AACF;",
|
|
6
|
+
"names": []
|
|
7
|
+
}
|
|
@@ -59,10 +59,13 @@ const replaceAllImports = (contents) => removeSkubaDiveRegisterImport(replaceSrc
|
|
|
59
59
|
const tryRewriteSrcImports = async ({
|
|
60
60
|
mode
|
|
61
61
|
}) => {
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
62
|
+
const tsFileNames = await (0, import_fast_glob.glob)(["**/*.ts", "**/*.test.ts"], {
|
|
63
|
+
ignore: [
|
|
64
|
+
"**/.git",
|
|
65
|
+
"**/node_modules",
|
|
66
|
+
"src/cli/lint/internalLints/upgrade/patches/**/*"
|
|
67
|
+
]
|
|
68
|
+
});
|
|
66
69
|
if (!tsFileNames.length) {
|
|
67
70
|
return {
|
|
68
71
|
result: "skip",
|
package/lib/cli/lint/internalLints/upgrade/patches/{12.0.2 → 12.2.0}/rewriteSrcImports.js.map
RENAMED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
|
-
"sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.0
|
|
4
|
-
"sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../../../../utils/logging.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst fetchFiles = async (files: string[]) =>\n Promise.all(\n files.map(async (file) => {\n const contents = await fs.promises.readFile(file, 'utf8');\n\n return {\n file,\n contents,\n };\n }),\n );\n\nexport const hasSkubaDiveRegisterImportRegex =\n /import\\s+['\"](?:skuba-dive\\/register|\\.\\.?\\/.*?register)(?:\\.js)?['\"];?\\s*/gm;\n\nexport const hasSrcImportRegex =\n /import\\s+(?:type\\s+\\{[^}]*\\}|\\{[^}]*\\}|\\*\\s+as\\s+\\w+|\\w+(?:\\s*,\\s*\\{[^}]*\\})?)\\s+from\\s+['\"]src\\/[^'\"]*['\"]/gm;\n\nexport const replaceSrcImport = (contents: string) =>\n contents.replace(hasSrcImportRegex, (match) =>\n match.replace(/(['\"])src\\//g, '$1#src/'),\n );\n\nconst removeSkubaDiveRegisterImport = (contents: string) =>\n contents.replace(hasSkubaDiveRegisterImportRegex, '');\n\nconst replaceAllImports = (contents: string) =>\n removeSkubaDiveRegisterImport(replaceSrcImport(contents));\n\nexport const tryRewriteSrcImports: PatchFunction = async ({\n mode,\n}): Promise<PatchReturnType> => {\n const
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAAe;AAEf,qBAAoB;AAGpB,MAAM,aAAa,OAAO,UACxB,QAAQ;AAAA,EACN,MAAM,IAAI,OAAO,SAAS;AACxB,UAAM,WAAW,MAAM,gBAAAA,QAAG,SAAS,SAAS,MAAM,MAAM;AAExD,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEK,MAAM,kCACX;AAEK,MAAM,oBACX;AAEK,MAAM,mBAAmB,CAAC,aAC/B,SAAS;AAAA,EAAQ;AAAA,EAAmB,CAAC,UACnC,MAAM,QAAQ,gBAAgB,SAAS;AACzC;AAEF,MAAM,gCAAgC,CAAC,aACrC,SAAS,QAAQ,iCAAiC,EAAE;AAEtD,MAAM,oBAAoB,CAAC,aACzB,8BAA8B,iBAAiB,QAAQ,CAAC;AAEnD,MAAM,uBAAsC,OAAO;AAAA,EACxD;AACF,MAAgC;AAC9B,QAAM,
|
|
3
|
+
"sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/12.2.0/rewriteSrcImports.ts"],
|
|
4
|
+
"sourcesContent": ["import { inspect } from 'util';\n\nimport { glob } from 'fast-glob';\nimport fs from 'fs-extra';\n\nimport { log } from '../../../../../../utils/logging.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst fetchFiles = async (files: string[]) =>\n Promise.all(\n files.map(async (file) => {\n const contents = await fs.promises.readFile(file, 'utf8');\n\n return {\n file,\n contents,\n };\n }),\n );\n\nexport const hasSkubaDiveRegisterImportRegex =\n /import\\s+['\"](?:skuba-dive\\/register|\\.\\.?\\/.*?register)(?:\\.js)?['\"];?\\s*/gm;\n\nexport const hasSrcImportRegex =\n /import\\s+(?:type\\s+\\{[^}]*\\}|\\{[^}]*\\}|\\*\\s+as\\s+\\w+|\\w+(?:\\s*,\\s*\\{[^}]*\\})?)\\s+from\\s+['\"]src\\/[^'\"]*['\"]/gm;\n\nexport const replaceSrcImport = (contents: string) =>\n contents.replace(hasSrcImportRegex, (match) =>\n match.replace(/(['\"])src\\//g, '$1#src/'),\n );\n\nconst removeSkubaDiveRegisterImport = (contents: string) =>\n contents.replace(hasSkubaDiveRegisterImportRegex, '');\n\nconst replaceAllImports = (contents: string) =>\n removeSkubaDiveRegisterImport(replaceSrcImport(contents));\n\nexport const tryRewriteSrcImports: PatchFunction = async ({\n mode,\n}): Promise<PatchReturnType> => {\n const tsFileNames = await glob(['**/*.ts', '**/*.test.ts'], {\n ignore: [\n '**/.git',\n '**/node_modules',\n 'src/cli/lint/internalLints/upgrade/patches/**/*',\n ],\n });\n\n if (!tsFileNames.length) {\n return {\n result: 'skip',\n reason: 'no .ts or test.ts files found',\n };\n }\n\n const tsFiles = await fetchFiles(tsFileNames);\n\n const mapped = tsFiles.map(({ file, contents }) => ({\n file,\n before: contents,\n after: replaceAllImports(contents),\n }));\n\n if (mode === 'lint') {\n return {\n result: 'apply',\n };\n }\n\n await Promise.all(\n mapped.map(async ({ file, after }) => {\n await fs.promises.writeFile(file, after);\n }),\n );\n\n return { result: 'apply' };\n};\n\nexport const rewriteSrcImports: PatchFunction = async (config) => {\n try {\n return await tryRewriteSrcImports(config);\n } catch (err) {\n log.warn('Failed to rewrite src imports to #src');\n log.subtle(inspect(err));\n return { result: 'skip', reason: 'due to an error' };\n }\n};\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAwB;AAExB,uBAAqB;AACrB,sBAAe;AAEf,qBAAoB;AAGpB,MAAM,aAAa,OAAO,UACxB,QAAQ;AAAA,EACN,MAAM,IAAI,OAAO,SAAS;AACxB,UAAM,WAAW,MAAM,gBAAAA,QAAG,SAAS,SAAS,MAAM,MAAM;AAExD,WAAO;AAAA,MACL;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AACH;AAEK,MAAM,kCACX;AAEK,MAAM,oBACX;AAEK,MAAM,mBAAmB,CAAC,aAC/B,SAAS;AAAA,EAAQ;AAAA,EAAmB,CAAC,UACnC,MAAM,QAAQ,gBAAgB,SAAS;AACzC;AAEF,MAAM,gCAAgC,CAAC,aACrC,SAAS,QAAQ,iCAAiC,EAAE;AAEtD,MAAM,oBAAoB,CAAC,aACzB,8BAA8B,iBAAiB,QAAQ,CAAC;AAEnD,MAAM,uBAAsC,OAAO;AAAA,EACxD;AACF,MAAgC;AAC9B,QAAM,cAAc,UAAM,uBAAK,CAAC,WAAW,cAAc,GAAG;AAAA,IAC1D,QAAQ;AAAA,MACN;AAAA,MACA;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AAED,MAAI,CAAC,YAAY,QAAQ;AACvB,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,UAAU,MAAM,WAAW,WAAW;AAE5C,QAAM,SAAS,QAAQ,IAAI,CAAC,EAAE,MAAM,SAAS,OAAO;AAAA,IAClD;AAAA,IACA,QAAQ;AAAA,IACR,OAAO,kBAAkB,QAAQ;AAAA,EACnC,EAAE;AAEF,MAAI,SAAS,QAAQ;AACnB,WAAO;AAAA,MACL,QAAQ;AAAA,IACV;AAAA,EACF;AAEA,QAAM,QAAQ;AAAA,IACZ,OAAO,IAAI,OAAO,EAAE,MAAM,MAAM,MAAM;AACpC,YAAM,gBAAAA,QAAG,SAAS,UAAU,MAAM,KAAK;AAAA,IACzC,CAAC;AAAA,EACH;AAEA,SAAO,EAAE,QAAQ,QAAQ;AAC3B;AAEO,MAAM,oBAAmC,OAAO,WAAW;AAChE,MAAI;AACF,WAAO,MAAM,qBAAqB,MAAM;AAAA,EAC1C,SAAS,KAAK;AACZ,uBAAI,KAAK,uCAAuC;AAChD,uBAAI,WAAO,qBAAQ,GAAG,CAAC;AACvB,WAAO,EAAE,QAAQ,QAAQ,QAAQ,kBAAkB;AAAA,EACrD;AACF;",
|
|
6
6
|
"names": ["fs"]
|
|
7
7
|
}
|
|
@@ -100,7 +100,7 @@ const writeTemporaryFiles = async (contents) => {
|
|
|
100
100
|
const dir = await fsp.mkdtemp("eslint-migrate-config");
|
|
101
101
|
await Promise.all(
|
|
102
102
|
Object.entries(contents).map(
|
|
103
|
-
([file, content]) => fsp.writeFile(import_path.default.join(dir, file), content)
|
|
103
|
+
async ([file, content]) => fsp.writeFile(import_path.default.join(dir, file), content)
|
|
104
104
|
)
|
|
105
105
|
);
|
|
106
106
|
return dir;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../../../src/cli/lint/internalLints/upgrade/patches/8.2.1/upgradeESLint.ts"],
|
|
4
|
-
"sourcesContent": ["// eslint-disable-next-line no-restricted-imports -- fs-extra is mocked\nimport * as fsp from 'fs/promises';\nimport path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport { createExec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project.js';\nimport { mergeWithConfigFile } from '../../../../../configure/processing/configFile.js';\nimport { formatPrettier } from '../../../../../configure/processing/prettier.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst IGNORE_FILE = '.eslintignore';\nconst OLD_CONFIG_FILE = '.eslintrc.js';\nconst NEW_CONFIG_FILE_CJS = 'eslint.config.cjs';\nconst NEW_CONFIG_FILE_JS = 'eslint.config.js';\n\nconst upgradeESLint: PatchFunction = async ({\n mode,\n dir: cwd = process.cwd(),\n}): Promise<PatchReturnType> => {\n const readFile = createDestinationFileReader(cwd);\n const [ignoreFileContents, oldConfig] = await Promise.all([\n readFile(IGNORE_FILE),\n readFile(OLD_CONFIG_FILE),\n ]);\n\n if (oldConfig === undefined) {\n return {\n result: 'skip',\n reason: `no ${OLD_CONFIG_FILE} - have you already migrated?`,\n };\n }\n\n if (mode === 'lint') {\n return { result: 'apply' };\n }\n\n const ignoreContentsWithoutSkubaManaged = mergeWithConfigFile(\n '',\n 'ignore',\n )(ignoreFileContents);\n\n const exec = createExec({\n cwd: process.cwd(),\n stdio: 'ignore',\n });\n\n // eslint-migrate-config require()s the file, so for testability, put it in a temporary location\n const dir = await writeTemporaryFiles({\n [OLD_CONFIG_FILE]: oldConfig,\n ...(ignoreContentsWithoutSkubaManaged.trim().length > 0\n ? { [IGNORE_FILE]: ignoreContentsWithoutSkubaManaged }\n : {}),\n });\n try {\n await exec(\n 'eslint-migrate-config',\n path.join(dir, OLD_CONFIG_FILE),\n '--commonjs',\n );\n\n const output = fiddleWithOutput(\n await fsp.readFile(path.join(dir, NEW_CONFIG_FILE_CJS), 'utf-8'),\n );\n await fs.promises.writeFile(\n NEW_CONFIG_FILE_JS,\n await formatPrettier(output, { filepath: NEW_CONFIG_FILE_JS }),\n );\n\n await Promise.all([\n ignoreFileContents === undefined\n ? Promise.resolve()\n : fs.promises.rm(IGNORE_FILE),\n fs.promises.rm(OLD_CONFIG_FILE),\n ]);\n\n return { result: 'apply' };\n } finally {\n await fsp.rm(dir, { recursive: true });\n }\n};\n\nconst writeTemporaryFiles = async (contents: Record<string, string>) => {\n const dir = await fsp.mkdtemp('eslint-migrate-config');\n\n await Promise.all(\n Object.entries(contents).map(([file, content]) =>\n fsp.writeFile(path.join(dir, file), content),\n ),\n );\n\n return dir;\n};\n\nconst fiddleWithOutput = (input: string) => {\n let output = input.replace(/compat.extends\\([\"']skuba[\"']\\)/, 'skuba');\n\n if (!output.includes('eslint-config-skuba')) {\n output = `const skuba = require('eslint-config-skuba');\\n\\n${output}`;\n }\n\n if (!output.includes('compat.')) {\n output = output.replace(/const compat = new FlatCompat\\(\\{[^}]+\\}\\);/m, '');\n output = output.replace(\n /const \\{\\s*FlatCompat,?\\s*\\}\\s*=\\s*require\\([\"']@eslint\\/eslintrc[\"']\\);/m,\n '',\n );\n }\n\n if (!output.includes('js.')) {\n output = output.replace(/const js = require\\(['\"]@eslint\\/js['\"]\\);/, '');\n }\n\n output = output.replace(\n /^const skuba = require\\('eslint-config-skuba'\\);\\s*module.exports = \\[...skuba\\];$/m,\n \"module.exports = require('eslint-config-skuba');\",\n );\n\n return output;\n};\n\nexport const tryUpgradeESLint: PatchFunction = async (config) => {\n try {\n return await upgradeESLint(config);\n } catch (err) {\n log.warn('Failed to upgrade ESLint to flat config.');\n log.subtle(inspect(err));\n return { result: 'skip', reason: 'due to an error' };\n }\n};\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,UAAqB;AACrB,kBAAiB;AACjB,kBAAwB;AAExB,sBAAe;AAEf,kBAA2B;AAC3B,qBAAoB;AACpB,qBAA4C;AAC5C,wBAAoC;AACpC,sBAA+B;AAG/B,MAAM,cAAc;AACpB,MAAM,kBAAkB;AACxB,MAAM,sBAAsB;AAC5B,MAAM,qBAAqB;AAE3B,MAAM,gBAA+B,OAAO;AAAA,EAC1C;AAAA,EACA,KAAK,MAAM,QAAQ,IAAI;AACzB,MAAgC;AAC9B,QAAM,eAAW,4CAA4B,GAAG;AAChD,QAAM,CAAC,oBAAoB,SAAS,IAAI,MAAM,QAAQ,IAAI;AAAA,IACxD,SAAS,WAAW;AAAA,IACpB,SAAS,eAAe;AAAA,EAC1B,CAAC;AAED,MAAI,cAAc,QAAW;AAC3B,WAAO;AAAA,MACL,QAAQ;AAAA,MACR,QAAQ,MAAM,eAAe;AAAA,IAC/B;AAAA,EACF;AAEA,MAAI,SAAS,QAAQ;AACnB,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B;AAEA,QAAM,wCAAoC;AAAA,IACxC;AAAA,IACA;AAAA,EACF,EAAE,kBAAkB;AAEpB,QAAM,WAAO,wBAAW;AAAA,IACtB,KAAK,QAAQ,IAAI;AAAA,IACjB,OAAO;AAAA,EACT,CAAC;AAGD,QAAM,MAAM,MAAM,oBAAoB;AAAA,IACpC,CAAC,eAAe,GAAG;AAAA,IACnB,GAAI,kCAAkC,KAAK,EAAE,SAAS,IAClD,EAAE,CAAC,WAAW,GAAG,kCAAkC,IACnD,CAAC;AAAA,EACP,CAAC;AACD,MAAI;AACF,UAAM;AAAA,MACJ;AAAA,MACA,YAAAA,QAAK,KAAK,KAAK,eAAe;AAAA,MAC9B;AAAA,IACF;AAEA,UAAM,SAAS;AAAA,MACb,MAAM,IAAI,SAAS,YAAAA,QAAK,KAAK,KAAK,mBAAmB,GAAG,OAAO;AAAA,IACjE;AACA,UAAM,gBAAAC,QAAG,SAAS;AAAA,MAChB;AAAA,MACA,UAAM,gCAAe,QAAQ,EAAE,UAAU,mBAAmB,CAAC;AAAA,IAC/D;AAEA,UAAM,QAAQ,IAAI;AAAA,MAChB,uBAAuB,SACnB,QAAQ,QAAQ,IAChB,gBAAAA,QAAG,SAAS,GAAG,WAAW;AAAA,MAC9B,gBAAAA,QAAG,SAAS,GAAG,eAAe;AAAA,IAChC,CAAC;AAED,WAAO,EAAE,QAAQ,QAAQ;AAAA,EAC3B,UAAE;AACA,UAAM,IAAI,GAAG,KAAK,EAAE,WAAW,KAAK,CAAC;AAAA,EACvC;AACF;AAEA,MAAM,sBAAsB,OAAO,aAAqC;AACtE,QAAM,MAAM,MAAM,IAAI,QAAQ,uBAAuB;AAErD,QAAM,QAAQ;AAAA,IACZ,OAAO,QAAQ,QAAQ,EAAE;AAAA,MAAI,
|
|
4
|
+
"sourcesContent": ["// eslint-disable-next-line no-restricted-imports -- fs-extra is mocked\nimport * as fsp from 'fs/promises';\nimport path from 'path';\nimport { inspect } from 'util';\n\nimport fs from 'fs-extra';\n\nimport { createExec } from '../../../../../../utils/exec.js';\nimport { log } from '../../../../../../utils/logging.js';\nimport { createDestinationFileReader } from '../../../../../configure/analysis/project.js';\nimport { mergeWithConfigFile } from '../../../../../configure/processing/configFile.js';\nimport { formatPrettier } from '../../../../../configure/processing/prettier.js';\nimport type { PatchFunction, PatchReturnType } from '../../index.js';\n\nconst IGNORE_FILE = '.eslintignore';\nconst OLD_CONFIG_FILE = '.eslintrc.js';\nconst NEW_CONFIG_FILE_CJS = 'eslint.config.cjs';\nconst NEW_CONFIG_FILE_JS = 'eslint.config.js';\n\nconst upgradeESLint: PatchFunction = async ({\n mode,\n dir: cwd = process.cwd(),\n}): Promise<PatchReturnType> => {\n const readFile = createDestinationFileReader(cwd);\n const [ignoreFileContents, oldConfig] = await Promise.all([\n readFile(IGNORE_FILE),\n readFile(OLD_CONFIG_FILE),\n ]);\n\n if (oldConfig === undefined) {\n return {\n result: 'skip',\n reason: `no ${OLD_CONFIG_FILE} - have you already migrated?`,\n };\n }\n\n if (mode === 'lint') {\n return { result: 'apply' };\n }\n\n const ignoreContentsWithoutSkubaManaged = mergeWithConfigFile(\n '',\n 'ignore',\n )(ignoreFileContents);\n\n const exec = createExec({\n cwd: process.cwd(),\n stdio: 'ignore',\n });\n\n // eslint-migrate-config require()s the file, so for testability, put it in a temporary location\n const dir = await writeTemporaryFiles({\n [OLD_CONFIG_FILE]: oldConfig,\n ...(ignoreContentsWithoutSkubaManaged.trim().length > 0\n ? { [IGNORE_FILE]: ignoreContentsWithoutSkubaManaged }\n : {}),\n });\n try {\n await exec(\n 'eslint-migrate-config',\n path.join(dir, OLD_CONFIG_FILE),\n '--commonjs',\n );\n\n const output = fiddleWithOutput(\n await fsp.readFile(path.join(dir, NEW_CONFIG_FILE_CJS), 'utf-8'),\n );\n await fs.promises.writeFile(\n NEW_CONFIG_FILE_JS,\n await formatPrettier(output, { filepath: NEW_CONFIG_FILE_JS }),\n );\n\n await Promise.all([\n ignoreFileContents === undefined\n ? Promise.resolve()\n : fs.promises.rm(IGNORE_FILE),\n fs.promises.rm(OLD_CONFIG_FILE),\n ]);\n\n return { result: 'apply' };\n } finally {\n await fsp.rm(dir, { recursive: true });\n }\n};\n\nconst writeTemporaryFiles = async (contents: Record<string, string>) => {\n const dir = await fsp.mkdtemp('eslint-migrate-config');\n\n await Promise.all(\n Object.entries(contents).map(async ([file, content]) =>\n fsp.writeFile(path.join(dir, file), content),\n ),\n );\n\n return dir;\n};\n\nconst fiddleWithOutput = (input: string) => {\n let output = input.replace(/compat.extends\\([\"']skuba[\"']\\)/, 'skuba');\n\n if (!output.includes('eslint-config-skuba')) {\n output = `const skuba = require('eslint-config-skuba');\\n\\n${output}`;\n }\n\n if (!output.includes('compat.')) {\n output = output.replace(/const compat = new FlatCompat\\(\\{[^}]+\\}\\);/m, '');\n output = output.replace(\n /const \\{\\s*FlatCompat,?\\s*\\}\\s*=\\s*require\\([\"']@eslint\\/eslintrc[\"']\\);/m,\n '',\n );\n }\n\n if (!output.includes('js.')) {\n output = output.replace(/const js = require\\(['\"]@eslint\\/js['\"]\\);/, '');\n }\n\n output = output.replace(\n /^const skuba = require\\('eslint-config-skuba'\\);\\s*module.exports = \\[...skuba\\];$/m,\n \"module.exports = require('eslint-config-skuba');\",\n );\n\n return output;\n};\n\nexport const tryUpgradeESLint: PatchFunction = async (config) => {\n try {\n return await upgradeESLint(config);\n } catch (err) {\n log.warn('Failed to upgrade ESLint to flat config.');\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": ["path", "fs"]
|
|
7
7
|
}
|
package/lib/cli/node/index.js
CHANGED
|
@@ -38,12 +38,18 @@ var import_get_port = __toESM(require("get-port"));
|
|
|
38
38
|
var import_args = require("../../utils/args.js");
|
|
39
39
|
var import_exec = require("../../utils/exec.js");
|
|
40
40
|
var import_validation = require("../../utils/validation.js");
|
|
41
|
+
var import_tsc = require("../build/tsc.js");
|
|
41
42
|
const longRunning = true;
|
|
42
43
|
const node = async () => {
|
|
43
44
|
const args = (0, import_args.parseRunArgs)(process.argv.slice(2));
|
|
45
|
+
const customConditions = (0, import_tsc.getCustomConditions)();
|
|
46
|
+
const uniqueConditions = [
|
|
47
|
+
.../* @__PURE__ */ new Set([...args.conditions ?? [], ...customConditions])
|
|
48
|
+
];
|
|
44
49
|
const availablePort = await (0, import_get_port.default)();
|
|
45
50
|
const commonArgs = [
|
|
46
51
|
...args.node,
|
|
52
|
+
...uniqueConditions.map((condition) => `--conditions=${condition}`),
|
|
47
53
|
"--env-file-if-exists",
|
|
48
54
|
".env",
|
|
49
55
|
"--require",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/cli/node/index.ts"],
|
|
4
|
-
"sourcesContent": ["import path from 'path';\n\nimport execa from 'execa';\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { isIpPort } from '../../utils/validation.js';\n\nexport const longRunning = true;\n\nexport const node = async () => {\n const args = parseRunArgs(process.argv.slice(2));\n\n const availablePort = await getPort();\n\n const commonArgs = [\n ...args.node,\n '--env-file-if-exists',\n '.env',\n '--require',\n require.resolve('tsconfig-paths/register'),\n ];\n\n if (args.entryPoint) {\n const exec = createExec({\n env: {\n __SKUBA_ENTRY_POINT: args.entryPoint,\n __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n },\n });\n\n return exec(\n 'tsx',\n ...commonArgs,\n path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n ...args.script,\n );\n }\n\n return execa(\n require.resolve('tsx/cli'),\n [\n ...commonArgs,\n '--require',\n // Unsure if bug or feature that this is needed, but tsx appears to not do anything typescript in the REPL without this!\n // Doesn't occur when just running the tsx binary directly \uD83E\uDDD0\n require.resolve('tsx/patch-repl'),\n ],\n {\n stdio: 'inherit',\n },\n );\n};\n"],
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,wBAAyB;
|
|
4
|
+
"sourcesContent": ["import path from 'path';\n\nimport execa from 'execa';\nimport getPort from 'get-port';\n\nimport { parseRunArgs } from '../../utils/args.js';\nimport { createExec } from '../../utils/exec.js';\nimport { isIpPort } from '../../utils/validation.js';\nimport { getCustomConditions } from '../build/tsc.js';\n\nexport const longRunning = true;\n\nexport const node = async () => {\n const args = parseRunArgs(process.argv.slice(2));\n const customConditions = getCustomConditions();\n\n const uniqueConditions = [\n ...new Set([...(args.conditions ?? []), ...customConditions]),\n ];\n\n const availablePort = await getPort();\n\n const commonArgs = [\n ...args.node,\n ...uniqueConditions.map((condition) => `--conditions=${condition}`),\n '--env-file-if-exists',\n '.env',\n '--require',\n require.resolve('tsconfig-paths/register'),\n ];\n\n if (args.entryPoint) {\n const exec = createExec({\n env: {\n __SKUBA_ENTRY_POINT: args.entryPoint,\n __SKUBA_PORT: String(isIpPort(args.port) ? args.port : availablePort),\n },\n });\n\n return exec(\n 'tsx',\n ...commonArgs,\n path.join(__dirname, '..', '..', 'wrapper', 'index.js'),\n ...args.script,\n );\n }\n\n return execa(\n require.resolve('tsx/cli'),\n [\n ...commonArgs,\n '--require',\n // Unsure if bug or feature that this is needed, but tsx appears to not do anything typescript in the REPL without this!\n // Doesn't occur when just running the tsx binary directly \uD83E\uDDD0\n require.resolve('tsx/patch-repl'),\n ],\n {\n stdio: 'inherit',\n },\n );\n};\n"],
|
|
5
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAAiB;AAEjB,mBAAkB;AAClB,sBAAoB;AAEpB,kBAA6B;AAC7B,kBAA2B;AAC3B,wBAAyB;AACzB,iBAAoC;AAE7B,MAAM,cAAc;AAEpB,MAAM,OAAO,YAAY;AAC9B,QAAM,WAAO,0BAAa,QAAQ,KAAK,MAAM,CAAC,CAAC;AAC/C,QAAM,uBAAmB,gCAAoB;AAE7C,QAAM,mBAAmB;AAAA,IACvB,GAAG,oBAAI,IAAI,CAAC,GAAI,KAAK,cAAc,CAAC,GAAI,GAAG,gBAAgB,CAAC;AAAA,EAC9D;AAEA,QAAM,gBAAgB,UAAM,gBAAAA,SAAQ;AAEpC,QAAM,aAAa;AAAA,IACjB,GAAG,KAAK;AAAA,IACR,GAAG,iBAAiB,IAAI,CAAC,cAAc,gBAAgB,SAAS,EAAE;AAAA,IAClE;AAAA,IACA;AAAA,IACA;AAAA,IACA,gBAAgB,yBAAyB;AAAA,EAC3C;AAEA,MAAI,KAAK,YAAY;AACnB,UAAM,WAAO,wBAAW;AAAA,MACtB,KAAK;AAAA,QACH,qBAAqB,KAAK;AAAA,QAC1B,cAAc,WAAO,4BAAS,KAAK,IAAI,IAAI,KAAK,OAAO,aAAa;AAAA,MACtE;AAAA,IACF,CAAC;AAED,WAAO;AAAA,MACL;AAAA,MACA,GAAG;AAAA,MACH,YAAAC,QAAK,KAAK,WAAW,MAAM,MAAM,WAAW,UAAU;AAAA,MACtD,GAAG,KAAK;AAAA,IACV;AAAA,EACF;AAEA,aAAO,aAAAC;AAAA,IACL,gBAAgB,SAAS;AAAA,IACzB;AAAA,MACE,GAAG;AAAA,MACH;AAAA;AAAA;AAAA,MAGA,gBAAgB,gBAAgB;AAAA,IAClC;AAAA,IACA;AAAA,MACE,OAAO;AAAA,IACT;AAAA,EACF;AACF;",
|
|
6
6
|
"names": ["getPort", "path", "execa"]
|
|
7
7
|
}
|
package/lib/cli/start/index.js
CHANGED
|
@@ -37,11 +37,16 @@ var import_args = require("../../utils/args.js");
|
|
|
37
37
|
var import_exec = require("../../utils/exec.js");
|
|
38
38
|
var import_manifest = require("../../utils/manifest.js");
|
|
39
39
|
var import_validation = require("../../utils/validation.js");
|
|
40
|
+
var import_tsc = require("../build/tsc.js");
|
|
40
41
|
const start = async () => {
|
|
42
|
+
const customConditions = (0, import_tsc.getCustomConditions)();
|
|
41
43
|
const [args, availablePort] = await Promise.all([
|
|
42
44
|
(0, import_args.parseRunArgs)(process.argv.slice(2)),
|
|
43
45
|
(0, import_get_port.default)()
|
|
44
46
|
]);
|
|
47
|
+
const uniqueConditions = [
|
|
48
|
+
.../* @__PURE__ */ new Set([...args.conditions ?? [], ...customConditions])
|
|
49
|
+
];
|
|
45
50
|
args.entryPoint ??= await (0, import_manifest.getEntryPointFromManifest)();
|
|
46
51
|
const execProcess = (0, import_exec.createExec)({
|
|
47
52
|
env: {
|
|
@@ -54,6 +59,7 @@ const start = async () => {
|
|
|
54
59
|
"watch",
|
|
55
60
|
"--clear-screen=false",
|
|
56
61
|
...args.node,
|
|
62
|
+
...uniqueConditions.map((condition) => `--conditions=${condition}`),
|
|
57
63
|
"--env-file-if-exists",
|
|
58
64
|
".env",
|
|
59
65
|
"--require",
|