fix

jestjs · SimenB · Sep 25, 2023 · Sep 24, 2023 · Sep 24, 2023 · Sep 24, 2023
commit a1ce469e519fafcb94d54187e5c3e75ed1d0c4f2
diff --git a/constraints.pro b/constraints.pro
@@ -22,7 +22,9 @@ gen_enforced_dependency(WorkspaceCwd, DependencyIdent, DependencyRange2, Depende
     % @types/node in the root need to stay on ~14.14.45
     '@types/node',
     % upgrading the entire repository is a breaking change
-    'glob'
+    'glob',
+    % repository and snapshot
+    'prettier'
   ]).
 
 % Enforces that a dependency doesn't appear in both `dependencies` and `devDependencies`

diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json
@@ -35,7 +35,7 @@
     "jest-message-util": "workspace:*",
     "jest-util": "workspace:*",
     "natural-compare": "^1.4.0",
-    "pretty-format": "workspace:^",
+    "pretty-format": "workspace:*",
     "semver": "^7.5.3",
     "synckit": "^0.8.5"
   },

diff --git a/packages/jest-snapshot/src/utils.ts b/packages/jest-snapshot/src/utils.ts
@@ -426,7 +426,7 @@ export const processInlineSnapshotsWithBabel = (
 
 export const processPrettierAst = (
   ast: File,
-  options: Record<string, any>,
+  options: Record<string, any> | null,
   snapshotMatcherNames: Array<string>,
   keepNode?: boolean,
 ): void => {
@@ -463,16 +463,16 @@ export const processPrettierAst = (
         ? parent.loc.start.column
         : callee.loc.start.column;
 
-    const useSpaces = !options.useTabs;
+    const useSpaces = !options?.useTabs;
     snapshot = indent(
       snapshot,
       Math.ceil(
         useSpaces
-          ? startColumn / (options.tabWidth ?? 1)
+          ? startColumn / (options?.tabWidth ?? 1)
           : // Each tab is 2 characters.
             startColumn / 2,
       ),
-      useSpaces ? ' '.repeat(options.tabWidth ?? 1) : '\t',
+      useSpaces ? ' '.repeat(options?.tabWidth ?? 1) : '\t',
     );
 
     if (keepNode) {

diff --git a/packages/jest-snapshot/src/worker.ts b/packages/jest-snapshot/src/worker.ts
@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 import {runAsWorker} from 'synckit';
 import {processPrettierAst} from './utils';
 
@@ -38,7 +45,7 @@ runAsWorker(
       originalText: sourceFileWithSnapshots,
       parser: inferredParser,
     });
-    processPrettierAst(ast, config!, snapshotMatcherNames, true);
+    processPrettierAst(ast, config, snapshotMatcherNames, true);
     // Snapshots have now been inserted. Run prettier to make sure that the code is
     // formatted, except snapshot indentation. Snapshots cannot be formatted until
     // after the initial format because we don't know where the call expression

diff --git a/yarn.lock b/yarn.lock
@@ -13094,7 +13094,7 @@ __metadata:
     natural-compare: ^1.4.0
     prettier: ^3.0.3
     prettier-v2: "npm:prettier@^2.1.5"
-    pretty-format: "workspace:^"
+    pretty-format: "workspace:*"
     semver: ^7.5.3
     synckit: ^0.8.5
     tsd-lite: ^0.8.0
@@ -17346,7 +17346,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@workspace:*, pretty-format@workspace:^, pretty-format@workspace:packages/pretty-format":
+"pretty-format@workspace:*, pretty-format@workspace:packages/pretty-format":
   version: 0.0.0-use.local
   resolution: "pretty-format@workspace:packages/pretty-format"
   dependencies: