fix: update resolveConfig to work with Prettier 3

The `sync` function is gone and only async version exists.
prettier · Oct 27, 2023 · b53b2b4 · b53b2b4
1 parent da73add
commit b53b2b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 32 deletions.
diff --git a/src/__mocks__/prettier.js b/src/__mocks__/prettier.js
@@ -7,9 +7,7 @@ const mockFormatSpy = jest.fn(mockFormat);
 
 Object.assign(prettier, {
   format: mockFormatSpy,
-  resolveConfig: {
-    sync: jest.fn(prettier.resolveConfig.sync)
-  }
+  resolveConfig: jest.fn()
 });
 
 function mockFormat(...args) {

diff --git a/src/__tests__/index.js b/src/__tests__/index.js
@@ -235,7 +235,7 @@ beforeEach(() => {
   eslintMock.mock.lintText.mockClear();
   eslintMock.mock.calculateConfigForFile.mockClear();
   prettierMock.format.mockClear();
-  prettierMock.resolveConfig.sync.mockClear();
+  prettierMock.resolveConfig.mockClear();
   fsMock.readFileSync.mockClear();
   loglevelMock.mock.clearAll();
   global.__PRETTIER_ESLINT_TEST_STATE__ = {};
@@ -376,33 +376,15 @@ test('logs error if it cannot read the file from the filePath', async () => {
   fsMock.readFileSync = originalMock;
 });
 
-test('calls prettier.resolveConfig.sync with the file path', async () => {
+test('calls prettier.resolveConfig with the file path', async () => {
   const filePath = require.resolve('../../tests/fixtures/paths/foo.js');
   await format({
     filePath,
     text: defaultInputText(),
     eslintConfig: getESLintConfigWithDefaultRules()
   });
-  expect(prettierMock.resolveConfig.sync).toHaveBeenCalledTimes(1);
-  expect(prettierMock.resolveConfig.sync).toHaveBeenCalledWith(filePath);
-});
-
-test('does not raise an error if prettier.resolveConfig.sync is not defined', () => {
-  const filePath = require.resolve('../../tests/fixtures/paths/foo.js');
-  const originalPrettierMockResolveConfigSync = prettierMock.resolveConfig.sync;
-  prettierMock.resolveConfig.sync = undefined;
-
-  function callingFormat() {
-    return format({
-      filePath,
-      text: defaultInputText(),
-      eslintConfig: getESLintConfigWithDefaultRules()
-    });
-  }
-
-  expect(callingFormat).not.toThrowError();
-
-  prettierMock.resolveConfig.sync = originalPrettierMockResolveConfigSync;
+  expect(prettierMock.resolveConfig).toHaveBeenCalledTimes(1);
+  expect(prettierMock.resolveConfig).toHaveBeenCalledWith(filePath);
 });
 
 test('does not raise an error if prettier.resolveConfig is not defined', async () => {

diff --git a/src/index.js b/src/index.js
@@ -65,7 +65,7 @@ async function format(options) {
     // Let prettier infer the parser using the filepath, if present. Otherwise
     // assume the file is JS and default to the babel parser.
     filePath ? { filepath: filePath } : { parser: 'babel' },
-    getPrettierConfig(filePath, prettierPath),
+    await getPrettierConfig(filePath, prettierPath) || {},
     options.prettierOptions
   );
 
@@ -298,12 +298,8 @@ async function getESLintConfig(filePath, eslintPath, eslintOptions) {
 
 function getPrettierConfig(filePath, prettierPath) {
   const prettier = requireModule(prettierPath, 'prettier');
-  return (
-    (prettier.resolveConfig &&
-      prettier.resolveConfig.sync &&
-      prettier.resolveConfig.sync(filePath)) ||
-    {}
-  );
+
+  return prettier.resolveConfig && prettier.resolveConfig(filePath);
 }
 
 function getModulePath(filePath = __filename, moduleName) {