Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xojs/xo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.32.1
Choose a base ref
...
head repository: xojs/xo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.33.0
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Aug 10, 2020

  1. Respect Prettier’s use of .editorconfig (#493)

    @andersk
    andersk authored Aug 10, 2020
    Copy the full SHA
    f45ab80 View commit details

  2. Update dependencies

    @sindresorhus
    sindresorhus committed Aug 10, 2020
    Copy the full SHA
    53fcb1a View commit details

  3. 0.33.0

    @sindresorhus
    sindresorhus committed Aug 10, 2020
    Copy the full SHA
    27549c2 View commit details
Showing with 20 additions and 21 deletions.
  1. +3 −4 lib/options-manager.js
  2. +16 −16 package.json
  3. +1 −1 test/options-manager.js
7 changes: 3 additions & 4 deletions lib/options-manager.js
View file
Original file line number Diff line number Diff line change
@@ -99,7 +99,7 @@ const mergeWithFileConfig = options => {
({options} = applyOverrides(options.filename, options));
}

const prettierOptions = options.prettier ? prettier.resolveConfig.sync(searchPath) || {} : {};
const prettierOptions = options.prettier ? prettier.resolveConfig.sync(searchPath, {editorconfig: true}) || {} : {};

if (options.filename && isTypescript(options.filename)) {
const tsConfigExplorer = cosmiconfigSync([], {searchPlaces: ['tsconfig.json'], loaders: {'.json': (_, content) => JSON5.parse(content)}});
@@ -133,8 +133,7 @@ const mergeWithFileConfigs = async (files, options, configFiles) => {
const {hash, options: optionsWithOverrides} = applyOverrides(file, fileOptions);
fileOptions = optionsWithOverrides;

const prettierConfigPath = fileOptions.prettier ? await prettier.resolveConfigFile(file) : undefined;
const prettierOptions = prettierConfigPath ? await prettier.resolveConfig(file, {config: prettierConfigPath}) : {};
const prettierOptions = fileOptions.prettier ? await prettier.resolveConfig(file, {editorconfig: true}) || {} : {};

let tsConfigPath;
if (isTypescript(file)) {
@@ -147,7 +146,7 @@ const mergeWithFileConfigs = async (files, options, configFiles) => {
fileOptions.ts = true;
}

const cacheKey = stringify({xoConfigPath, enginesConfigPath, prettierConfigPath, hash, tsConfigPath: fileOptions.tsConfigPath, ts: fileOptions.ts});
const cacheKey = stringify({xoConfigPath, enginesConfigPath, prettierOptions, hash, tsConfigPath: fileOptions.tsConfigPath, ts: fileOptions.ts});
const cachedGroup = configs.get(cacheKey);

configs.set(cacheKey, {
32 changes: 16 additions & 16 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "xo",
"version": "0.32.1",
"version": "0.33.0",
"description": "JavaScript/TypeScript linter with great defaults",
"license": "MIT",
"repository": "xojs/xo",
@@ -51,25 +51,25 @@
"typescript"
],
"dependencies": {
"@typescript-eslint/eslint-plugin": "^3.1.0",
"@typescript-eslint/parser": "^3.1.0",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"arrify": "^2.0.1",
"cosmiconfig": "^6.0.0",
"cosmiconfig": "^7.0.0",
"debug": "^4.1.1",
"eslint": "^7.1.0",
"eslint": "^7.6.0",
"eslint-config-prettier": "^6.11.0",
"eslint-config-xo": "^0.30.0",
"eslint-config-xo-typescript": "^0.31.0",
"eslint-formatter-pretty": "^3.0.1",
"eslint-config-xo": "^0.32.1",
"eslint-config-xo-typescript": "^0.32.0",
"eslint-formatter-pretty": "^4.0.0",
"eslint-import-resolver-webpack": "^0.12.1",
"eslint-plugin-ava": "^10.3.0",
"eslint-plugin-ava": "^10.5.0",
"eslint-plugin-eslint-comments": "^3.2.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-no-use-extend-native": "^0.5.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-unicorn": "^20.1.0",
"eslint-plugin-unicorn": "^21.0.0",
"find-cache-dir": "^3.3.1",
"find-up": "^4.1.0",
"fs-extra": "^9.0.0",
@@ -80,7 +80,7 @@
"is-path-inside": "^3.0.2",
"json-stable-stringify-without-jsonify": "^1.0.1",
"json5": "^2.1.3",
"lodash": "^4.17.15",
"lodash": "^4.17.19",
"meow": "^7.0.1",
"micromatch": "^4.0.2",
"open-editor": "^2.0.1",
@@ -92,22 +92,22 @@
"semver": "^7.3.2",
"slash": "^3.0.0",
"to-absolute-glob": "^2.0.2",
"typescript": "^3.3.1",
"typescript": "^3.9.7",
"update-notifier": "^4.1.0"
},
"devDependencies": {
"ava": "^3.9.0",
"coveralls": "^3.1.0",
"eslint-config-xo-react": "^0.23.0",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^4.0.4",
"eslint-plugin-react": "^7.20.5",
"eslint-plugin-react-hooks": "^4.0.8",
"esm": "^3.2.25",
"execa": "^4.0.2",
"execa": "^4.0.3",
"nyc": "^15.1.0",
"pify": "^5.0.0",
"proxyquire": "^2.1.3",
"temp-write": "^4.0.0",
"webpack": "^4.43.0"
"webpack": "^4.44.1"
},
"eslintConfig": {
"extends": "eslint-config-xo"
2 changes: 1 addition & 1 deletion test/options-manager.js
View file
Original file line number Diff line number Diff line change
@@ -638,7 +638,7 @@ test('mergeWithFileConfigs: nested configs with prettier', async t => {
extensions: DEFAULT_EXTENSION,
ignores: DEFAULT_IGNORES
},
prettierOptions: {semi: false}
prettierOptions: {endOfLine: 'lf', semi: false, useTabs: true}
}
]);
});