Skip to content

Commit df56739

Browse files
Fix merger/ruleMerger imports
1 parent 01df1eb commit df56739

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

src/converters/lintConfigs/rules/convertRules.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ConversionError } from "../../../errors/conversionError";
22
import { convertRules } from "./convertRules";
3-
import { RuleMerger } from "./merger";
3+
import { RuleMerger } from "./ruleMerger";
44
import { RuleConverter, ConversionResult } from "./ruleConverter";
55
import { TSLintRuleOptions, TSLintRuleSeverity } from "./types";
66

src/converters/lintConfigs/rules/convertRules.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { TSLintConfigurationRules } from "../../../input/findTSLintConfiguration
44
import { convertRule } from "./convertRule";
55
import { convertTSLintRuleSeverity } from "./formats/convertTSLintRuleSeverity";
66
import { formatRawTslintRule } from "./formats/formatRawTslintRule";
7-
import { RuleMerger } from "./merger";
7+
import { RuleMerger } from "./ruleMerger";
88
import { RuleConverter } from "./ruleConverter";
99
import { TSLintRuleOptions, ESLintRuleOptions } from "./types";
1010

src/converters/lintConfigs/rules/ruleMergers/ban-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RuleMerger } from "../merger";
1+
import { RuleMerger } from "../ruleMerger";
22

33
export const mergeBanTypes: RuleMerger = (existingOptions, newOptions) => {
44
if (existingOptions === undefined && newOptions === undefined) {

src/converters/lintConfigs/rules/ruleMergers/consistent-type-assertions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RuleMerger } from "../merger";
1+
import { RuleMerger } from "../ruleMerger";
22

33
export const mergeConsistentTypeAssertions: RuleMerger = (existingOptions, newOptions) => {
44
return [existingOptions?.[0] ?? newOptions?.[0]].filter(Boolean);

src/converters/lintConfigs/rules/ruleMergers/indent.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RuleMerger } from "../merger";
1+
import { RuleMerger } from "../ruleMerger";
22

33
const ESLINT_INDENT_DEFAULT = 4;
44

src/converters/lintConfigs/rules/ruleMergers/member-delimiter-style.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RuleMerger } from "../merger";
1+
import { RuleMerger } from "../ruleMerger";
22

33
export const mergeNoMemberDelimiterStyle: RuleMerger = (existingOptions, newOptions) => {
44
if (existingOptions === undefined && newOptions === undefined) {

src/converters/lintConfigs/rules/ruleMergers/naming-convention.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RuleMerger } from "../merger";
1+
import { RuleMerger } from "../ruleMerger";
22

33
export const mergeNamingConvention: RuleMerger = (existingOptions, newOptions) => {
44
if (existingOptions === undefined && newOptions === undefined) {

src/converters/lintConfigs/rules/ruleMergers/no-caller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RuleMerger } from "../merger";
1+
import { RuleMerger } from "../ruleMerger";
22

33
export const mergeNoCaller: RuleMerger = () => {
44
// no-caller rule does not accept any options

src/converters/lintConfigs/rules/ruleMergers/no-eval.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RuleMerger } from "../merger";
1+
import { RuleMerger } from "../ruleMerger";
22

33
export const mergeNoEval: RuleMerger = (existingOptions, newOptions) => {
44
if (existingOptions === undefined && newOptions === undefined) {

src/converters/lintConfigs/rules/ruleMergers/no-unnecessary-type-assertion.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RuleMerger } from "../merger";
1+
import { RuleMerger } from "../ruleMerger";
22

33
export const mergeNoUnnecessaryTypeAssertion: RuleMerger = (existingOptions, newOptions) => {
44
if (existingOptions === undefined && newOptions === undefined) {

0 commit comments

Comments
 (0)