Merge remote-tracking branch 'origin/next' into preview-web-dep-6.5

storybookjs · Aug 30, 2022 · 691bfa1 · 691bfa1
2 parents 64a729c + c4bc348
commit 691bfa1
Show file tree

Hide file tree

Showing 5 changed files with 1,870 additions and 1,844 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -51,7 +51,7 @@ executors:
         default: 'medium'
     working_directory: /tmp/storybook
     docker:
-      - image: mcr.microsoft.com/playwright:v1.24.0-focal
+      - image: mcr.microsoft.com/playwright:v1.25.1-focal
         environment:
           NODE_OPTIONS: --max_old_space_size=3076
     resource_class: <<parameters.class>>
@@ -317,7 +317,7 @@ jobs:
           name: Run @storybook/bench on repro
           command: |
             cd ./cra-bench
-            npx @storybook/bench@1.0.0--canary.11.52d1ee7.1 'echo noop' --label cra
+            npx -p @storybook/bench@1.0.0--canary.12.f21510e.0 sb-bench 'echo noop' --label cra
   e2e-tests-pnp:
     executor:
       class: medium

diff --git a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -191,6 +191,10 @@ export default async (
       {
         message: /export '\S+' was not found in 'global'/,
       },
+      {
+        message:
+          /require function is used in a way in which dependencies cannot be statically extracted/,
+      },
     ],
     plugins: [
       Object.keys(virtualModuleMapping).length > 0

diff --git a/code/lib/theming/scripts/fix-theme-type-export.ts b/code/lib/theming/scripts/fix-theme-type-export.ts
@@ -3,7 +3,7 @@ import { readFile, writeFile } from 'fs-extra';
 import { dedent } from 'ts-dedent';
 import { join } from 'path';
 
-const run = async () => {
+async function editIndexTypeDefinitionsFile() {
   const target = join(process.cwd(), 'dist', 'index.d.ts');
   const contents = await readFile(target, 'utf8');
 
@@ -20,6 +20,20 @@ const run = async () => {
   `;
 
   await writeFile(target, newContents);
+}
+
+async function editIndexESMFile() {
+  const target = join(process.cwd(), 'dist', 'index.mjs');
+  const contents = await readFile(target, 'utf8');
+
+  const newContents = contents.replace(/\.useInsertionEffect/g, `['useInsertion'+'Effect']`);
+
+  await writeFile(target, newContents);
+}
+
+const run = async () => {
+  await editIndexTypeDefinitionsFile();
+  await editIndexESMFile();
 };
 
 run().catch((e) => {