Merge branch 'next' of github.com:storybookjs/storybook into jeppe/re…

…act-prerelease-sandboxes
storybookjs · Apr 26, 2024 · 5731002 · 5731002
2 parents 9f7ca74 + 34f0c20
commit 5731002
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/code/e2e-tests/addon-docs.spec.ts b/code/e2e-tests/addon-docs.spec.ts
@@ -67,7 +67,7 @@ test.describe('addon-docs', () => {
         await new Promise(resolve => resolve('Play function'));
       }
     }`;
-    await expect(sourceCode.textContent()).resolves.toContain(expectedSource);
+    await expect(sourceCode).toHaveText(expectedSource);
   });
 
   test('should render errors', async ({ page }) => {

diff --git a/code/e2e-tests/framework-svelte.spec.ts b/code/e2e-tests/framework-svelte.spec.ts
@@ -41,7 +41,7 @@ test.describe('Svelte', () => {
     await showCodeButton.click();
     const sourceCode = root.locator('pre.prismjs');
     const expectedSource = '<ButtonJavaScript primary/>';
-    await expect(sourceCode.textContent()).resolves.toContain(expectedSource);
+    await expect(sourceCode).toHaveText(expectedSource);
   });
 
   test('Decorators runs only once', async ({ page }) => {

diff --git a/code/lib/react-dom-shim/src/preset.ts b/code/lib/react-dom-shim/src/preset.ts
@@ -6,7 +6,7 @@ import { readFile } from 'fs/promises';
  * Get react-dom version from the resolvedReact preset, which points to either
  * a root react-dom dependency or the react-dom dependency shipped with addon-docs
  */
-const getIsReactVersion18 = async (options: Options) => {
+const getIsReactVersion18or19 = async (options: Options) => {
   const { legacyRootApi } =
     (await options.presets.apply<{ legacyRootApi?: boolean } | null>('frameworkOptions')) || {};
 
@@ -24,11 +24,11 @@ const getIsReactVersion18 = async (options: Options) => {
   }
 
   const { version } = JSON.parse(await readFile(join(reactDom, 'package.json'), 'utf-8'));
-  return version.startsWith('18') || version.startsWith('0.0.0');
+  return version.startsWith('18') || version.startsWith('19') || version.startsWith('0.0.0');
 };
 
 export const webpackFinal = async (config: any, options: Options) => {
-  const isReactVersion18 = await getIsReactVersion18(options);
+  const isReactVersion18 = await getIsReactVersion18or19(options);
   if (isReactVersion18) {
     return config;
   }
@@ -46,7 +46,7 @@ export const webpackFinal = async (config: any, options: Options) => {
 };
 
 export const viteFinal = async (config: any, options: Options) => {
-  const isReactVersion18 = await getIsReactVersion18(options);
+  const isReactVersion18 = await getIsReactVersion18or19(options);
   if (isReactVersion18) {
     return config;
   }