Fix a problem with using XO with Prettier

sindresorhus · sindresorhus · commit fa34c748ca0e · 2021-04-21T01:45:03.000+07:00
Fixes #533
diff --git a/lib/options-manager.js b/lib/options-manager.js
@@ -395,10 +395,6 @@ const buildPrettierConfig = (options, prettierConfig) => config => {
 				config.baseConfig.extends = config.baseConfig.extends.concat(prettierConfig);
 			}
 		}
-
-		if (options.ts) {
-			config.baseConfig.extends = config.baseConfig.extends.concat('prettier/@typescript-eslint');
-		}
 	}
 
 	return config;
diff --git a/test/options-manager.js b/test/options-manager.js
@@ -110,9 +110,8 @@ test('buildConfig: prettier: true, typescript file', t => {
 	}]);
 
 	// eslint-prettier-config must always be last
-	t.is(config.baseConfig.extends[config.baseConfig.extends.length - 1], 'prettier/@typescript-eslint');
-	t.is(config.baseConfig.extends[config.baseConfig.extends.length - 2], 'prettier');
-	t.is(config.baseConfig.extends[config.baseConfig.extends.length - 3], 'xo-typescript');
+	t.is(config.baseConfig.extends[config.baseConfig.extends.length - 1], 'prettier');
+	t.is(config.baseConfig.extends[config.baseConfig.extends.length - 2], 'xo-typescript');
 
 	// Indent rule is not enabled
 	t.is(config.rules.indent, undefined);

Original file line number	Diff line number	Diff line change
`@@ -395,10 +395,6 @@ const buildPrettierConfig = (options, prettierConfig) => config => {`
`395`	`395`	`config.baseConfig.extends = config.baseConfig.extends.concat(prettierConfig);`
`396`	`396`	`}`
`397`	`397`	`}`
`398`		`-`
`399`		`- if (options.ts) {`
`400`		`- config.baseConfig.extends = config.baseConfig.extends.concat('prettier/@typescript-eslint');`
`401`		`- }`
`402`	`398`	`}`
`403`	`399`
`404`	`400`	`return config;`