--wip-- [skip ci]

jestjs · Jul 25, 2023 · 536a80a · 536a80a
1 parent c5fa881
commit 536a80a
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 1,488 deletions.
diff --git a/.yarn/patches/prettier-npm-3.0.0-7ffbcce680.patch b/.yarn/patches/prettier-npm-3.0.0-7ffbcce680.patch
diff --git a/e2e/__tests__/crawlSymlinks.test.ts b/e2e/__tests__/crawlSymlinks.test.ts
@@ -75,8 +75,6 @@ test('Should throw if watchman used with haste.enableSymlinks', () => {
   expect(stderr).toMatchInlineSnapshot(`
     "Validation Error:
 
-    haste.enableSymlinks is incompatible with watchman
-
     Either set haste.enableSymlinks to false or do not use watchman"
   `);
   expect(exitCode).toBe(1);

diff --git a/jest.config.mjs b/jest.config.mjs
@@ -8,10 +8,6 @@
 import {createRequire} from 'module';
 const require = createRequire(import.meta.url);
 
-const jestSnapshotIndex = require.resolve('jest-snapshot');
-const requireFromSnapshot = createRequire(jestSnapshotIndex);
-const prettierPath = requireFromSnapshot.resolve('prettier');
-
 /** @type {import('jest').Config} */
 export default {
   collectCoverageFrom: [
@@ -35,7 +31,6 @@ export default {
     'website/.*',
     'e2e/runtime-internal-module-registry/__mocks__',
   ],
-  prettierPath,
   projects: ['<rootDir>', '<rootDir>/examples/*/'],
   snapshotFormat: {
     printBasicPrototype: true,

diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "node-notifier": "^10.0.0",
     "p-limit": "^3.1.0",
     "pkg-dir": "^5.0.0",
-    "prettier": "patch:prettier@npm:^3.0.0#./.yarn/patches/prettier-npm-3.0.0-7ffbcce680.patch",
+    "prettier": "^3.0.0",
     "promise": "^8.0.2",
     "read-pkg": "^5.2.0",
     "resolve": "^1.20.0",

diff --git a/packages/babel-plugin-jest-hoist/package.json b/packages/babel-plugin-jest-hoist/package.json
@@ -31,9 +31,8 @@
     "@babel/preset-typescript": "^7.0.0",
     "@types/babel__template": "^7.0.2",
     "@types/node": "*",
-    "@types/prettier": "^2.1.5",
     "babel-plugin-tester": "^11.0.2",
-    "prettier": "^2.1.1"
+    "prettier": "^3.0.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json
@@ -25,6 +25,7 @@
     "@jest/expect-utils": "workspace:^",
     "@jest/transform": "workspace:^",
     "@jest/types": "workspace:^",
+    "@prettier/sync": "^0.3.0",
     "babel-preset-current-node-syntax": "^1.0.0",
     "chalk": "^4.0.0",
     "expect": "workspace:^",
@@ -46,11 +47,10 @@
     "@types/babel__core": "^7.1.14",
     "@types/graceful-fs": "^4.1.3",
     "@types/natural-compare": "^1.4.0",
-    "@types/prettier": "^2.1.5",
     "@types/semver": "^7.1.0",
     "ansi-regex": "^5.0.1",
     "ansi-styles": "^5.0.0",
-    "prettier": "^2.1.1",
+    "prettier": "^3.0.0",
     "tsd-lite": "^0.7.0"
   },
   "engines": {

diff --git a/packages/jest-snapshot/src/InlineSnapshots.ts b/packages/jest-snapshot/src/InlineSnapshots.ts
@@ -14,6 +14,7 @@ import type {
   Program,
   TraversalAncestors,
 } from '@babel/types';
+import {createSynchronizedPrettier} from '@prettier/sync';
 import * as fs from 'graceful-fs';
 import type {
   CustomParser as PrettierCustomParser,
@@ -60,6 +61,10 @@ export function saveInlineSnapshots(
     try {
       // @ts-expect-error requireOutside Babel transform
       prettier = requireOutside(prettierPath) as Prettier;
+
+      if (semver.gte(prettier.version, '3.0.0')) {
+        prettier = createSynchronizedPrettier({prettierEntry: prettierPath});
+      }
     } catch {
       // Continue even if prettier is not installed.
     }
@@ -292,7 +297,7 @@ const runPrettier = (
   // Resolve project configuration.
   // For older versions of Prettier, do not load configuration.
   const config = prettier.resolveConfig
-    ? prettier.resolveConfig.sync(sourceFilePath, {editorconfig: true})
+    ? prettier.resolveConfig(sourceFilePath, {editorconfig: true})
     : null;
 
   // Prioritize parser found in the project config.
@@ -302,7 +307,7 @@ const runPrettier = (
   const inferredParser: PrettierParserName | null | undefined =
     (config && typeof config.parser === 'string' && config.parser) ||
     (prettier.getFileInfo
-      ? prettier.getFileInfo.sync(sourceFilePath).inferredParser
+      ? prettier.getFileInfo(sourceFilePath).inferredParser
       : simpleDetectParser(sourceFilePath));
 
   if (!inferredParser) {

diff --git a/yarn.lock b/yarn.lock
@@ -2913,7 +2913,7 @@ __metadata:
     node-notifier: ^10.0.0
     p-limit: ^3.1.0
     pkg-dir: ^5.0.0
-    prettier: "patch:prettier@npm:^3.0.0#./.yarn/patches/prettier-npm-3.0.0-7ffbcce680.patch"
+    prettier: ^3.0.0
     promise: ^8.0.2
     read-pkg: ^5.2.0
     resolve: ^1.20.0
@@ -3824,6 +3824,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@prettier/sync@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@prettier/sync@npm:0.3.0"
+  peerDependencies:
+    prettier: ^3.0.0
+  checksum: a663ceca292629c66c2c983662293b047b48435942c25b7ea76f0eab899e434f2bc17ae3dce56ee66b29929f7853118073f716fd4c7dabc3cccf78458a168dd4
+  languageName: node
+  linkType: hard
+
 "@react-native-community/cli-clean@npm:^10.1.1":
   version: 10.1.1
   resolution: "@react-native-community/cli-clean@npm:10.1.1"
@@ -4981,13 +4990,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prettier@npm:^2.1.5":
-  version: 2.7.3
-  resolution: "@types/prettier@npm:2.7.3"
-  checksum: 705384209cea6d1433ff6c187c80dcc0b95d99d5c5ce21a46a9a58060c527973506822e428789d842761e0280d25e3359300f017fbe77b9755bc772ab3dc2f83
-  languageName: node
-  linkType: hard
-
 "@types/prompts@npm:^2.0.1":
   version: 2.4.4
   resolution: "@types/prompts@npm:2.4.4"
@@ -6366,9 +6368,8 @@ __metadata:
     "@types/babel__template": ^7.0.2
     "@types/babel__traverse": ^7.0.6
     "@types/node": "*"
-    "@types/prettier": ^2.1.5
     babel-plugin-tester: ^11.0.2
-    prettier: ^2.1.1
+    prettier: ^3.0.0
   languageName: unknown
   linkType: soft
 
@@ -13104,11 +13105,11 @@ __metadata:
     "@jest/test-utils": "workspace:^"
     "@jest/transform": "workspace:^"
     "@jest/types": "workspace:^"
+    "@prettier/sync": ^0.3.0
     "@tsd/typescript": ^5.0.4
     "@types/babel__core": ^7.1.14
     "@types/graceful-fs": ^4.1.3
     "@types/natural-compare": ^1.4.0
-    "@types/prettier": ^2.1.5
     "@types/semver": ^7.1.0
     ansi-regex: ^5.0.1
     ansi-styles: ^5.0.0
@@ -13122,7 +13123,7 @@ __metadata:
     jest-message-util: "workspace:^"
     jest-util: "workspace:^"
     natural-compare: ^1.4.0
-    prettier: ^2.1.1
+    prettier: ^3.0.0
     pretty-format: "workspace:^"
     semver: ^7.5.3
     tsd-lite: ^0.7.0
@@ -16995,7 +16996,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.1.1, prettier@npm:^2.8.3":
+"prettier@npm:^2.8.3":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
   bin:
@@ -17013,15 +17014,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@patch:prettier@npm:^3.0.0#./.yarn/patches/prettier-npm-3.0.0-7ffbcce680.patch::locator=%40jest%2Fmonorepo%40workspace%3A.":
-  version: 3.0.0
-  resolution: "prettier@patch:prettier@npm%3A3.0.0#./.yarn/patches/prettier-npm-3.0.0-7ffbcce680.patch::version=3.0.0&hash=fad750&locator=%40jest%2Fmonorepo%40workspace%3A."
-  bin:
-    prettier: bin/prettier.cjs
-  checksum: a13645a0b420fe8824ef521ea9ca55bc394e0c90654a101450fbe95053c9addc5f6b89c03d3fd3f7da0c1ba578556536a9a880061f1d1923a17b91cdb3b4bb52
-  languageName: node
-  linkType: hard
-
 "pretty-bytes@npm:^5.3.0":
   version: 5.6.0
   resolution: "pretty-bytes@npm:5.6.0"