Next.js: Fix react-dom/test-utils aliasing

storybookjs · Sep 5, 2024 · 52c264f · 52c264f
1 parent b00a8ce
commit 52c264f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/code/frameworks/nextjs/src/config/webpack.ts b/code/frameworks/nextjs/src/config/webpack.ts
@@ -33,7 +33,7 @@ export const configureConfig = async ({
     );
   }
   if (tryResolve('next/dist/compiled/react-dom')) {
-    addScopedAlias(baseConfig, 'react-dom$', 'next/dist/compiled/react-dom');
+    addScopedAlias(baseConfig, 'react-dom', 'next/dist/compiled/react-dom');
   }
 
   setupRuntimeConfig(baseConfig, nextConfig);

diff --git a/code/renderers/react/src/act-compat.ts b/code/renderers/react/src/act-compat.ts
@@ -2,14 +2,24 @@
 // https://github.com/testing-library/react-testing-library/blob/3dcd8a9649e25054c0e650d95fca2317b7008576/src/act-compat.js
 import * as React from 'react';
 
-import * as DeprecatedReactTestUtils from 'react-dom/test-utils';
-
 declare const globalThis: {
   IS_REACT_ACT_ENVIRONMENT: boolean;
 };
 
+let reactDomTestUtils;
+
+try {
+  reactDomTestUtils = require('react-dom/test-utils');
+} catch (e) {
+  reactDomTestUtils = () => ({
+    act: async (cb: (() => void) | (() => Promise<void>)) => {
+      await cb();
+    },
+  });
+}
+
 // @ts-expect-error act might not be available in some versions of React
-const reactAct = typeof React.act === 'function' ? React.act : DeprecatedReactTestUtils.act;
+const reactAct = typeof React.act === 'function' ? React.act : reactDomTestUtils.act;
 
 export function setReactActEnvironment(isReactActEnvironment: boolean) {
   globalThis.IS_REACT_ACT_ENVIRONMENT = isReactActEnvironment;