@oxlint/migrate 1.46.0 → 1.48.0

package/dist/bin/oxlint-migrate.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as preFixForJsPlugins, f as nurseryRules, p as rules_exports, u as isOffValue } from "../settings-C8UlaScv.mjs";
+import { a as preFixForJsPlugins, f as nurseryRules, p as rules_exports, u as isOffValue } from "../settings-DozKYNAk.mjs";
 import main from "../src/index.mjs";
 import { program } from "commander";
 import { existsSync, readFileSync, renameSync, writeFileSync } from "node:fs";
@@ -33,7 +33,7 @@ const loadESLintConfig = async (filePath) => {
 
 //#endregion
 //#region package.json
-var version = "1.46.0";
+var version = "1.48.0";
 
 //#endregion
 //#region src/walker/comments/replaceRuleDirectiveComment.ts

package/dist/{settings-C8UlaScv.mjs → settings-DozKYNAk.mjs}

@@ -425,6 +425,7 @@ const styleRules = [
 	"@typescript-eslint/adjacent-overload-signatures",
 	"@typescript-eslint/array-type",
 	"@typescript-eslint/ban-tslint-comment",
+	"@typescript-eslint/class-literal-property-style",
 	"@typescript-eslint/consistent-generic-constructors",
 	"@typescript-eslint/consistent-indexed-object-style",
 	"@typescript-eslint/consistent-type-assertions",
@@ -432,10 +433,12 @@ const styleRules = [
 	"@typescript-eslint/consistent-type-imports",
 	"@typescript-eslint/no-empty-interface",
 	"@typescript-eslint/no-inferrable-types",
+	"@typescript-eslint/parameter-properties",
 	"@typescript-eslint/prefer-for-of",
 	"@typescript-eslint/prefer-function-type",
 	"@typescript-eslint/prefer-reduce-type-parameter",
 	"@typescript-eslint/prefer-return-this-type",
+	"@typescript-eslint/unified-signatures",
 	"unicorn/catch-error-name",
 	"unicorn/consistent-date-clone",
 	"unicorn/consistent-existence-index-check",
@@ -548,7 +551,9 @@ const suspiciousRules = [
 	"no-extend-native",
 	"no-extra-bind",
 	"no-new",
+	"no-shadow",
 	"no-unexpected-multiline",
+	"no-unmodified-loop-condition",
 	"no-unneeded-ternary",
 	"no-useless-concat",
 	"no-useless-constructor",
@@ -588,6 +593,7 @@ const suspiciousRules = [
 	"unicorn/require-post-message-target-origin",
 	"vue/no-required-prop-with-default",
 	"vue/require-default-export",
+	"@typescript-eslint/no-shadow",
 	"@typescript-eslint/no-useless-constructor",
 	"import-x/no-absolute-path",
 	"import-x/no-empty-named-blocks",
@@ -649,11 +655,13 @@ const restrictionRules = [
 	"@typescript-eslint/no-empty-object-type",
 	"@typescript-eslint/no-explicit-any",
 	"@typescript-eslint/no-import-type-side-effects",
+	"@typescript-eslint/no-invalid-void-type",
 	"@typescript-eslint/no-namespace",
 	"@typescript-eslint/no-non-null-asserted-nullish-coalescing",
 	"@typescript-eslint/no-non-null-assertion",
 	"@typescript-eslint/no-require-imports",
 	"@typescript-eslint/no-restricted-types",
+	"@typescript-eslint/no-use-before-define",
 	"@typescript-eslint/no-var-requires",
 	"@typescript-eslint/non-nullable-type-assertion-style",
 	"@typescript-eslint/prefer-literal-enum-member",
@@ -791,6 +799,7 @@ const correctnessRules = [
 	"jsx-a11y/no-distracting-elements",
 	"jsx-a11y/no-noninteractive-tabindex",
 	"jsx-a11y/no-redundant-roles",
+	"jsx-a11y/no-static-element-interactions",
 	"jsx-a11y/prefer-tag-over-role",
 	"jsx-a11y/role-has-required-aria-props",
 	"jsx-a11y/role-supports-aria-props",
@@ -911,9 +920,9 @@ const nurseryRules = [
 	"no-unreachable",
 	"import/export",
 	"import/named",
-	"jsx-a11y/no-static-element-interactions",
 	"promise/no-return-in-finally",
 	"react/require-render-return",
+	"@typescript-eslint/no-unnecessary-condition",
 	"@typescript-eslint/prefer-optional-chain",
 	"import-x/export",
 	"import-x/named"
@@ -921,6 +930,7 @@ const nurseryRules = [
 const perfRules = [
 	"no-await-in-loop",
 	"no-useless-call",
+	"react/jsx-no-constructed-context-values",
 	"react/no-array-index-key",
 	"react-perf/jsx-no-jsx-as-prop",
 	"react-perf/jsx-no-new-array-as-prop",
@@ -946,6 +956,7 @@ const typeAwareRules = [
 	"@typescript-eslint/no-mixed-enums",
 	"@typescript-eslint/no-redundant-type-constituents",
 	"@typescript-eslint/no-unnecessary-boolean-literal-compare",
+	"@typescript-eslint/no-unnecessary-condition",
 	"@typescript-eslint/no-unnecessary-template-expression",
 	"@typescript-eslint/no-unnecessary-type-arguments",
 	"@typescript-eslint/no-unnecessary-type-assertion",
@@ -1103,6 +1114,11 @@ const normalizeSeverityValue = (value) => {
 		return "off";
 	}
 };
+const removePreviousOverrideRule = (rule, eslintConfig, overrides) => {
+	if (eslintConfig.files === void 0 && overrides) {
+		for (const override of overrides) if (override.rules?.[rule]) delete override.rules[rule];
+	}
+};
 /**
 * Merges a new rule configuration with an existing one, preserving options when
 * the new config only specifies a severity level.
@@ -1128,11 +1144,12 @@ const mergeRuleConfig = (existingConfig, newConfig) => {
 	if (Array.isArray(newConfig) && newConfig.length === 1 && existingIsArray && existingConfig.length > 1) return [newConfig[0], ...existingConfig.slice(1)];
 	return newConfig;
 };
-const transformRuleEntry = (eslintConfig, targetConfig, baseConfig, options) => {
+const transformRuleEntry = (eslintConfig, targetConfig, baseConfig, options, overrides) => {
 	if (eslintConfig.rules === void 0) return;
 	if (targetConfig.rules === void 0) targetConfig.rules = {};
 	for (const [rule, config] of Object.entries(eslintConfig.rules)) {
 		const normalizedConfig = normalizeSeverityValue(config);
+		if (!options?.merge) removePreviousOverrideRule(rule, eslintConfig, overrides);
 		if (allRules.includes(rule)) {
 			if (!options?.withNursery && nurseryRules.includes(rule)) {
 				options?.reporter?.markSkipped(rule, "nursery");

package/dist/src/index.mjs

@@ -1,4 +1,4 @@
-import { c as cleanUpOxlintConfig, d as transformRuleEntry, h as transformEnvAndGlobals, i as fixForJsPlugins, l as detectNeededRulesPlugins, m as detectEnvironmentByGlobals, n as warnSettingsInOverride, o as detectSameOverride, r as processConfigFiles, s as transformIgnorePatterns, t as transformSettings } from "../settings-C8UlaScv.mjs";
+import { c as cleanUpOxlintConfig, d as transformRuleEntry, h as transformEnvAndGlobals, i as fixForJsPlugins, l as detectNeededRulesPlugins, m as detectEnvironmentByGlobals, n as warnSettingsInOverride, o as detectSameOverride, r as processConfigFiles, s as transformIgnorePatterns, t as transformSettings } from "../settings-DozKYNAk.mjs";
 
 //#region src/index.ts
 const buildConfig = (configs, oxlintConfig, options) => {
@@ -34,7 +34,7 @@ const buildConfig = (configs, oxlintConfig, options) => {
 			if (push) overrides.push(result);
 		}
 		transformIgnorePatterns(config, targetConfig, options);
-		transformRuleEntry(config, targetConfig, config.files !== void 0 ? oxlintConfig : void 0, options);
+		transformRuleEntry(config, targetConfig, config.files !== void 0 ? oxlintConfig : void 0, options, config.files === void 0 ? overrides : void 0);
 		transformEnvAndGlobals(config, targetConfig, options);
 		if (config.files === void 0) transformSettings(config, oxlintConfig, options);
 		else warnSettingsInOverride(config, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxlint/migrate",
-  "version": "1.46.0",
+  "version": "1.48.0",
   "description": "Generates a `.oxlintrc.json` from a existing eslint flat config",
   "keywords": [
     "eslint",
@@ -76,7 +76,7 @@
     "lint-staged": "^16.1.2",
     "next": "^16.0.0",
     "oxfmt": "^0.28.0",
-    "oxlint": "^1.46.0",
+    "oxlint": "^1.48.0",
     "oxlint-tsgolint": "^0.11.3",
     "tsdown": "^0.20.0",
     "typescript-eslint": "^8.35.0",