@useinsider/eslint-config 1.13.0-beta.8 → 1.14.0-beta.1

package/README.md

@@ -84,8 +84,8 @@ pins):
 - `typescript-eslint`
 
 Vue, Jest, or Vitest answers add the matching plugin set (e.g. `eslint-plugin-vue`,
-`vue-eslint-parser`, `eslint-plugin-vue-scoped-css`, `@vue/eslint-config-typescript`,
-`@rushstack/eslint-patch`, `eslint-plugin-jest`, or `@vitest/eslint-plugin`).
+`vue-eslint-parser`, `eslint-plugin-vue-scoped-css`, `eslint-plugin-jest`,
+or `@vitest/eslint-plugin`).
 
 ## Manual setup
 

package/dist/builders/scopeBlocks.d.ts

@@ -1,21 +1,25 @@
 import type { Linter } from 'eslint';
-export interface JsEntry {
+export interface CommonEntryFields {
+    ignores?: string[];
+    globals?: Linter.Globals;
+}
+export interface JsEntry extends CommonEntryFields {
     files: string[];
 }
-export interface TsEntry {
+export interface TsEntry extends CommonEntryFields {
     files: string[];
     tsconfigPaths: string[];
 }
-export interface VueEntry {
+export interface VueEntry extends CommonEntryFields {
     files: string[];
     globalComponents?: string[];
 }
-export interface VueTsEntry {
+export interface VueTsEntry extends CommonEntryFields {
     files: string[];
     globalComponents?: string[];
     tsconfigPaths: string[];
 }
-export interface TestEntry {
+export interface TestEntry extends CommonEntryFields {
     files: string[];
 }
 export type ScopeEntry = JsEntry | TsEntry | VueEntry | VueTsEntry | TestEntry;

package/dist/{chunk-C2EiDwsr.cjs → chunk-CKQMccvm.cjs}

@@ -5,7 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
@@ -21,12 +20,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-Object.defineProperty(exports, "__commonJSMin", {
-	enumerable: true,
-	get: function() {
-		return __commonJSMin;
-	}
-});
 Object.defineProperty(exports, "__toESM", {
 	enumerable: true,
 	get: function() {

package/dist/cli.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_chunk = require("./chunk-C2EiDwsr.cjs");
+const require_chunk = require("./chunk-CKQMccvm.cjs");
 let globals = require("globals");
 globals = require_chunk.__toESM(globals, 1);
 let node_fs = require("node:fs");
@@ -355,6 +355,56 @@ async function dispatch(argv, cwd, deps) {
 	return 1;
 }
 //#endregion
+//#region src/configs/jest/dependencies.ts
+var dependencies$14 = { "eslint-plugin-jest": true };
+//#endregion
+//#region src/configs/typescript/dependencies.ts
+var dependencies$13 = {
+	typescript: false,
+	"typescript-eslint": false,
+	"@typescript-eslint/parser": false,
+	"@typescript-eslint/eslint-plugin": false
+};
+//#endregion
+//#region src/configs/vitest/dependencies.ts
+var dependencies$12 = { "@vitest/eslint-plugin": true };
+//#endregion
+//#region src/configs/vue2/dependencies.ts
+var dependencies$11 = {
+	"eslint-plugin-vue": true,
+	"eslint-plugin-vue-scoped-css": true,
+	"vue-eslint-parser": true
+};
+//#endregion
+//#region src/configs/vue2-typescript/dependencies.ts
+var dependencies$10 = {
+	"eslint-plugin-vue": true,
+	"eslint-plugin-vue-scoped-css": true,
+	"vue-eslint-parser": true,
+	typescript: false,
+	"typescript-eslint": false,
+	"@typescript-eslint/parser": false,
+	"@typescript-eslint/eslint-plugin": false
+};
+//#endregion
+//#region src/configs/vue3/dependencies.ts
+var dependencies$9 = {
+	"eslint-plugin-vue": true,
+	"eslint-plugin-vue-scoped-css": true,
+	"vue-eslint-parser": true
+};
+//#endregion
+//#region src/configs/vue3-typescript/dependencies.ts
+var dependencies$8 = {
+	"eslint-plugin-vue": true,
+	"eslint-plugin-vue-scoped-css": true,
+	"vue-eslint-parser": true,
+	typescript: false,
+	"typescript-eslint": false,
+	"@typescript-eslint/parser": false,
+	"@typescript-eslint/eslint-plugin": false
+};
+//#endregion
 //#region src/cli/resolveEslintConfigManifest.ts
 function tryReadManifest(candidate) {
 	try {
@@ -391,17 +441,27 @@ function toRequiredManifest(manifest) {
 		version: manifest.version ?? "0.0.0",
 		dependencies: manifest.dependencies ?? {},
 		devDependencies: manifest.devDependencies ?? {},
+		peerDependencies: manifest.peerDependencies ?? {},
 		optionalDependencies: manifest.optionalDependencies ?? {}
 	};
 }
 function lookup(manifest, name) {
-	return manifest.dependencies[name] ?? manifest.devDependencies[name] ?? manifest.optionalDependencies[name];
+	return manifest.dependencies[name] ?? manifest.devDependencies[name] ?? manifest.peerDependencies[name] ?? manifest.optionalDependencies[name];
 }
 function pinned(manifest, name) {
 	const version = lookup(manifest, name);
 	if (!version) throw new Error(`Unable to resolve pinned version for ${name} from @useinsider/eslint-config manifest`);
 	return `${name}@${version.replace(/^(?:\^|~|>=|<=|>|<|=)/u, "")}`;
 }
+function vueDepsFor(major, wantsTypescript) {
+	if (wantsTypescript) return major === 2 ? dependencies$10 : dependencies$8;
+	return major === 2 ? dependencies$11 : dependencies$9;
+}
+function applyRecord(deps, manifest, record) {
+	Object.entries(record).forEach(([name, install]) => {
+		if (install) deps.add(pinned(manifest, name));
+	});
+}
 function buildDependencyList(answers, rawManifest = readOwnEslintConfigManifest$1()) {
 	const manifest = toRequiredManifest(rawManifest);
 	const deps = /* @__PURE__ */ new Set();
@@ -409,21 +469,10 @@ function buildDependencyList(answers, rawManifest = readOwnEslintConfigManifest$
 	deps.add(pinned(manifest, "eslint"));
 	deps.add(pinned(manifest, "globals"));
 	const wantsTypescript = answers.languages.includes("typescript");
-	if (wantsTypescript) {
-		deps.add(pinned(manifest, "typescript"));
-		deps.add(pinned(manifest, "typescript-eslint"));
-	}
-	if (answers.framework === "vue") {
-		deps.add(pinned(manifest, "eslint-plugin-vue"));
-		deps.add(pinned(manifest, "vue-eslint-parser"));
-		deps.add(pinned(manifest, "eslint-plugin-vue-scoped-css"));
-		if (wantsTypescript) {
-			deps.add(pinned(manifest, "@vue/eslint-config-typescript"));
-			deps.add(pinned(manifest, "@rushstack/eslint-patch"));
-		}
-	}
-	if (answers.testFramework === "jest") deps.add(pinned(manifest, "eslint-plugin-jest"));
-	if (answers.testFramework === "vitest") deps.add(pinned(manifest, "@vitest/eslint-plugin"));
+	if (answers.framework === "vue") applyRecord(deps, manifest, vueDepsFor(answers.vueMajor ?? 3, wantsTypescript));
+	else if (wantsTypescript) applyRecord(deps, manifest, dependencies$13);
+	if (answers.testFramework === "jest") applyRecord(deps, manifest, dependencies$14);
+	if (answers.testFramework === "vitest") applyRecord(deps, manifest, dependencies$12);
 	return [...deps];
 }
 async function installDependencies(deps) {
@@ -1325,97 +1374,48 @@ function clearSession(options) {
 }
 /* v8 ignore stop */
 //#endregion
+//#region src/configs/config/dependencies.ts
+var dependencies$7 = {};
+//#endregion
 //#region src/configs/javascript/dependencies.ts
-var dependencies$12 = [];
+var dependencies$6 = {};
 //#endregion
 //#region src/configs/javascript-dom/dependencies.ts
-var dependencies$11 = [];
+var dependencies$5 = {};
 //#endregion
 //#region src/configs/javascript-node/dependencies.ts
-var dependencies$10 = [];
-//#endregion
-//#region src/configs/jest/dependencies.ts
-var dependencies$9 = ["eslint-plugin-jest", "globals"];
+var dependencies$4 = {};
 //#endregion
 //#region src/configs/jsdoc-based-ts/dependencies.ts
-var dependencies$8 = [
-	"typescript",
-	"typescript-eslint",
-	"@typescript-eslint/parser",
-	"@typescript-eslint/eslint-plugin"
-];
+var dependencies$3 = {
+	typescript: false,
+	"typescript-eslint": false,
+	"@typescript-eslint/parser": false,
+	"@typescript-eslint/eslint-plugin": false
+};
 //#endregion
-//#region src/configs/typescript/dependencies.ts
-var dependencies$7 = [
-	"typescript",
-	"typescript-eslint",
-	"@typescript-eslint/parser",
-	"@typescript-eslint/eslint-plugin"
-];
+//#region src/configs/strict/dependencies.ts
+var dependencies$2 = { "eslint-plugin-sonarjs": false };
 //#endregion
 //#region src/configs/typescript-dom/dependencies.ts
-var dependencies$6 = [
-	"typescript",
-	"typescript-eslint",
-	"@typescript-eslint/parser",
-	"@typescript-eslint/eslint-plugin"
-];
+var dependencies$1 = {
+	typescript: false,
+	"typescript-eslint": false,
+	"@typescript-eslint/parser": false,
+	"@typescript-eslint/eslint-plugin": false
+};
 //#endregion
 //#region src/configs/typescript-node/dependencies.ts
-var dependencies$5 = [
-	"typescript",
-	"typescript-eslint",
-	"@typescript-eslint/parser",
-	"@typescript-eslint/eslint-plugin"
-];
-//#endregion
-//#region src/configs/vitest/dependencies.ts
-var dependencies$4 = ["@vitest/eslint-plugin", "globals"];
-//#endregion
-//#region src/configs/vue2/dependencies.ts
-var dependencies$3 = [
-	"eslint-plugin-vue",
-	"eslint-plugin-vue-scoped-css",
-	"vue-eslint-parser"
-];
-//#endregion
-//#region src/configs/vue2-typescript/dependencies.ts
-var dependencies$2 = [
-	"eslint-plugin-vue",
-	"eslint-plugin-vue-scoped-css",
-	"vue-eslint-parser",
-	"typescript",
-	"typescript-eslint",
-	"@typescript-eslint/parser",
-	"@typescript-eslint/eslint-plugin",
-	"@vue/eslint-config-typescript",
-	"@rushstack/eslint-patch"
-];
-//#endregion
-//#region src/configs/vue3/dependencies.ts
-var dependencies$1 = [
-	"eslint-plugin-vue",
-	"eslint-plugin-vue-scoped-css",
-	"vue-eslint-parser"
-];
-//#endregion
-//#region src/configs/vue3-typescript/dependencies.ts
-var dependencies = [
-	"eslint-plugin-vue",
-	"eslint-plugin-vue-scoped-css",
-	"vue-eslint-parser",
-	"typescript",
-	"typescript-eslint",
-	"@typescript-eslint/parser",
-	"@typescript-eslint/eslint-plugin",
-	"@vue/eslint-config-typescript",
-	"@rushstack/eslint-patch"
-];
+var dependencies = {
+	typescript: false,
+	"typescript-eslint": false,
+	"@typescript-eslint/parser": false,
+	"@typescript-eslint/eslint-plugin": false
+};
 //#endregion
 //#region src/cli/migrate/dependencies.ts
 var EXACT_PATTERNS = new Set([
 	"eslint",
-	"prettier",
 	"@useinsider/eslint-config",
 	"globals",
 	"vue-eslint-parser",
@@ -1431,23 +1431,30 @@ var PREFIX_PATTERNS = [
 var SCOPED_ESLINT_PATTERNS = [/^@[^/]+\/eslint-/u, /^@typescript-eslint\//u];
 var SAFELIST = new Set(["typescript", "@types/eslint"]);
 var SCOPE_TO_DEPS = {
-	javascript: dependencies$12,
-	javascriptDom: dependencies$11,
-	javascriptNode: dependencies$10,
-	typescript: dependencies$7,
-	typescriptDom: dependencies$6,
-	typescriptNode: dependencies$5,
-	vue2: dependencies$3,
-	vue3: dependencies$1,
-	vue2Typescript: dependencies$2,
-	vue3Typescript: dependencies,
-	jest: dependencies$9,
-	vitest: dependencies$4,
-	jsdocBasedTs: dependencies$8
+	javascript: dependencies$6,
+	javascriptDom: dependencies$5,
+	javascriptNode: dependencies$4,
+	typescript: dependencies$13,
+	typescriptDom: dependencies$1,
+	typescriptNode: dependencies,
+	vue2: dependencies$11,
+	vue3: dependencies$9,
+	vue2Typescript: dependencies$10,
+	vue3Typescript: dependencies$8,
+	jest: dependencies$14,
+	vitest: dependencies$12,
+	jsdocBasedTs: dependencies$3
 };
+var ALL_PRESET_DEPS = [
+	dependencies$7,
+	dependencies$2,
+	...Object.values(SCOPE_TO_DEPS)
+];
+var PRESET_DEPENDENCY_KEYS = new Set(ALL_PRESET_DEPS.flatMap((record) => Object.keys(record)));
 function isEslintRelatedDependency(name) {
 	if (SAFELIST.has(name)) return false;
 	if (EXACT_PATTERNS.has(name)) return true;
+	if (PRESET_DEPENDENCY_KEYS.has(name)) return true;
 	if (SCOPED_ESLINT_PATTERNS.some((pattern) => pattern.test(name))) return true;
 	return PREFIX_PATTERNS.some((prefix) => name.startsWith(prefix));
 }
@@ -1469,20 +1476,57 @@ function pruneSection(record, removed) {
 	});
 	return sortRecord(kept);
 }
+function parseOverrideKey(key) {
+	if (key.length === 0) return { baseName: key };
+	const searchFrom = key.startsWith("@") ? 1 : 0;
+	const atIndex = key.indexOf("@", searchFrom);
+	if (atIndex === -1) return { baseName: key };
+	return { baseName: key.slice(0, atIndex) };
+}
+function sortOverrides(record) {
+	return Object.keys(record).sort((left, right) => left.localeCompare(right)).reduce((accumulator, key) => {
+		accumulator[key] = record[key];
+		return accumulator;
+	}, {});
+}
+function pruneOverridesSection(record, removed) {
+	if (!record) return record;
+	const kept = {};
+	Object.entries(record).forEach(([key, value]) => {
+		if (!(typeof value === "string")) {
+			kept[key] = value;
+			return;
+		}
+		const { baseName } = parseOverrideKey(key);
+		if (isEslintRelatedDependency(baseName)) {
+			if (!removed.includes(baseName)) removed.push(baseName);
+			return;
+		}
+		kept[key] = value;
+	});
+	return sortOverrides(kept);
+}
 function pruneEslintDependencies(manifest) {
 	const removed = [];
 	const next = { ...manifest };
-	const prunedDeps = pruneSection(manifest.dependencies, removed);
-	const prunedDev = pruneSection(manifest.devDependencies, removed);
-	if (manifest.dependencies) next.dependencies = prunedDeps;
-	if (manifest.devDependencies) next.devDependencies = prunedDev;
+	if (manifest.dependencies) next.dependencies = pruneSection(manifest.dependencies, removed);
+	if (manifest.devDependencies) next.devDependencies = pruneSection(manifest.devDependencies, removed);
+	if (manifest.peerDependencies) next.peerDependencies = pruneSection(manifest.peerDependencies, removed);
+	if (manifest.optionalDependencies) next.optionalDependencies = pruneSection(manifest.optionalDependencies, removed);
+	if (manifest.overrides) next.overrides = pruneOverridesSection(manifest.overrides, removed);
+	if (manifest.pnpm && typeof manifest.pnpm === "object") {
+		const nextPnpm = { ...manifest.pnpm };
+		if (manifest.pnpm.overrides) nextPnpm.overrides = pruneOverridesSection(manifest.pnpm.overrides, removed);
+		next.pnpm = nextPnpm;
+	}
+	if (manifest.resolutions) next.resolutions = pruneSection(manifest.resolutions, removed);
 	return {
 		manifest: next,
 		removed
 	};
 }
 function lookupVersion(manifest, name) {
-	return manifest.dependencies?.[name] ?? manifest.devDependencies?.[name] ?? manifest.optionalDependencies?.[name];
+	return manifest.dependencies?.[name] ?? manifest.devDependencies?.[name] ?? manifest.peerDependencies?.[name] ?? manifest.optionalDependencies?.[name];
 }
 function stripRange(version) {
 	return version.replace(/^(?:\^|~|>=|<=|>|<|=)/u, "");
@@ -1504,10 +1548,10 @@ function buildInstallList(scopes, manifest) {
 	appendSpec(specs, "@useinsider/eslint-config@latest");
 	appendSpec(specs, resolveSpec("eslint", manifest, fallbacks));
 	[...scopes].forEach((scope) => {
-		const list = SCOPE_TO_DEPS[scope];
-		if (!list) return;
-		list.forEach((packageName) => {
-			appendSpec(specs, resolveSpec(packageName, manifest, fallbacks));
+		const record = SCOPE_TO_DEPS[scope];
+		if (!record) return;
+		Object.entries(record).forEach(([packageName, shouldInstall]) => {
+			if (shouldInstall) appendSpec(specs, resolveSpec(packageName, manifest, fallbacks));
 		});
 	});
 	return {