Fix a problem with using XO with Prettier

Fixes #533
xojs · Apr 20, 2021 · fa34c74 · fa34c74
1 parent fd8828d
commit fa34c74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
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);