Skip to content

Commit 968fd82

Browse files
loicplairegregberge
authored andcommitted
feat: add .editorconfig support (#129)
1 parent 261594a commit 968fd82

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

packages/core/src/plugins/prettier.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ import merge from 'lodash/merge'
44
export default async (code, config = {}, state = {}) => {
55
if (!config.prettier) return code
66
const filePath = state.filePath || process.cwd()
7-
const prettierRcConfig = await prettier.resolveConfig(filePath)
7+
const prettierRcConfig = await prettier.resolveConfig(filePath, {
8+
editorconfig: true,
9+
})
810
return prettier.format(
911
code,
1012
merge({ parser: 'babylon' }, prettierRcConfig, config.prettierConfig || {}),

packages/core/src/plugins/prettier.test.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,18 @@ describe('prettier', () => {
2222
)
2323
expect(result).toBe('const foo = <div />;\n')
2424
})
25+
26+
it('should resolve the prettier config with the editorconfig option', async () => {
27+
jest.resetModules()
28+
jest.doMock('prettier')
29+
/* eslint-disable global-require */
30+
const prettierPlugin = require('./prettier').default
31+
const { resolveConfig } = require('prettier')
32+
/* eslint-enable global-require */
33+
34+
await prettierPlugin(`const foo = <div></div>`, { prettier: true })
35+
expect(resolveConfig).toHaveBeenCalledWith(expect.any(String), {
36+
editorconfig: true,
37+
})
38+
})
2539
})

0 commit comments

Comments
 (0)