Merge branch 'next' into release-8-0

storybookjs · Nov 3, 2023 · f105fbb · f105fbb
2 parents c711543 + cc6d582
commit f105fbb
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -507,7 +507,7 @@ workflows:
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 9
+          parallelism: 11
           requires:
             - build-sandboxes
       - e2e-production:
@@ -563,7 +563,7 @@ workflows:
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 16
+          parallelism: 18
           requires:
             - build-sandboxes
       - e2e-production:
@@ -620,7 +620,7 @@ workflows:
           requires:
             - create-sandboxes
       - chromatic-sandboxes:
-          parallelism: 31
+          parallelism: 33
           requires:
             - build-sandboxes
       - e2e-production:

diff --git a/code/.eslintrc.js b/code/.eslintrc.js
@@ -69,6 +69,13 @@ module.exports = {
         '@typescript-eslint/ban-types': 'warn', // should become error, in the future
       },
     },
+    {
+      // this package depends on a lot of peerDependencies we don't want to specify, because npm would install them
+      files: ['**/builder-vite/**/*.html'],
+      rules: {
+        '@typescript-eslint/no-unused-expressions': 'off', // should become error, in the future
+      },
+    },
     {
       // these packages use pre-bundling, dependencies will be bundled, and will be in devDepenencies
       files: [

diff --git a/code/builders/builder-vite/input/iframe.html b/code/builders/builder-vite/input/iframe.html
@@ -22,6 +22,8 @@
     window.STORIES = '[STORIES HERE]';
     window.DOCS_OPTIONS = '[DOCS_OPTIONS HERE]';
 
+    ('OTHER_GLOBLALS HERE');
+
     // We do this so that "module && module.hot" etc. in Storybook source code
     // doesn't fail (it will simply be disabled)
     window.module = undefined;

diff --git a/code/builders/builder-vite/src/transform-iframe-html.ts b/code/builders/builder-vite/src/transform-iframe-html.ts
@@ -5,6 +5,7 @@ export type PreviewHtml = string | undefined;
 
 export async function transformIframeHtml(html: string, options: Options) {
   const { configType, features, presets } = options;
+  const build = await presets.apply('build');
   const frameworkOptions = await presets.apply<Record<string, any> | null>('frameworkOptions');
   const headHtmlSnippet = await presets.apply<PreviewHtml>('previewHead');
   const bodyHtmlSnippet = await presets.apply<PreviewHtml>('previewBody');
@@ -20,10 +21,20 @@ export async function transformIframeHtml(html: string, options: Options) {
     importPathMatcher: specifier.importPathMatcher.source,
   }));
 
+  const otherGlobals = {
+    ...(build?.test?.emptyBlocks ? { __STORYBOOK_BLOCKS_EMPTY_MODULE__: {} } : {}),
+  };
+
   return html
     .replace('[CONFIG_TYPE HERE]', configType || '')
     .replace('[LOGLEVEL HERE]', logLevel || '')
     .replace(`'[FRAMEWORK_OPTIONS HERE]'`, JSON.stringify(frameworkOptions))
+    .replace(
+      `('OTHER_GLOBLALS HERE');`,
+      Object.entries(otherGlobals)
+        .map(([k, v]) => `window["${k}"] = ${JSON.stringify(v)};`)
+        .join('')
+    )
     .replace(
       `'[CHANNEL_OPTIONS HERE]'`,
       JSON.stringify(coreOptions && coreOptions.channelOptions ? coreOptions.channelOptions : {})

diff --git a/code/builders/builder-vite/src/vite-config.ts b/code/builders/builder-vite/src/vite-config.ts
@@ -81,6 +81,11 @@ export async function commonConfig(
 
 export async function pluginConfig(options: Options) {
   const frameworkName = await getFrameworkName(options);
+  const build = await options.presets.apply('build');
+
+  if (build?.test?.emptyBlocks) {
+    globals['@storybook/blocks'] = '__STORYBOOK_BLOCKS_EMPTY_MODULE__';
+  }
 
   const plugins = [
     codeGeneratorPlugin(options),

diff --git a/code/builders/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/builders/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -88,6 +88,7 @@ export default async (
     entries,
     nonNormalizedStories,
     modulesCount = 1000,
+    build,
   ] = await Promise.all([
     presets.apply<CoreConfig>('core'),
     presets.apply('frameworkOptions'),
@@ -100,6 +101,7 @@ export default async (
     presets.apply<string[]>('entries', []),
     presets.apply('stories', []),
     options.cache?.get('modulesCount').catch(() => {}),
+    options.presets.apply('build'),
   ]);
 
   const stories = normalizeStories(nonNormalizedStories, {
@@ -215,6 +217,10 @@ export default async (
     `);
   }
 
+  if (build?.test?.emptyBlocks) {
+    globals['@storybook/blocks'] = '__STORYBOOK_BLOCKS_EMPTY_MODULE__';
+  }
+
   return {
     name: 'preview',
     mode: isProd ? 'production' : 'development',
@@ -267,6 +273,7 @@ export default async (
               importPathMatcher: specifier.importPathMatcher.source,
             })),
             DOCS_OPTIONS: docsOptions,
+            ...(build?.test?.emptyBlocks ? { __STORYBOOK_BLOCKS_EMPTY_MODULE__: {} } : {}),
           },
           headHtmlSnippet,
           bodyHtmlSnippet,

diff --git a/code/frameworks/nextjs/src/preset.ts b/code/frameworks/nextjs/src/preset.ts
@@ -20,7 +20,6 @@ import { configureAliasing } from './dependency-map';
 
 export const addons: PresetProperty<'addons', StorybookConfig> = [
   dirname(require.resolve(join('@storybook/preset-react-webpack', 'package.json'))),
-  dirname(require.resolve(join('@storybook/builder-webpack5', 'package.json'))),
 ];
 
 const defaultFrameworkOptions: FrameworkOptions = {};

diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts
@@ -540,7 +540,7 @@ const benchTemplates = {
       skipTemplateStories: true,
       testBuild: true,
     },
-    skipTasks: ['e2e-tests-dev', 'test-runner', 'test-runner-dev', 'e2e-tests', 'chromatic'],
+    skipTasks: ['e2e-tests-dev', 'test-runner', 'test-runner-dev', 'e2e-tests'],
   },
   'bench/react-webpack-18-ts-test-build': {
     ...baseTemplates['react-webpack/18-ts'],
@@ -550,7 +550,7 @@ const benchTemplates = {
       skipTemplateStories: true,
       testBuild: true,
     },
-    skipTasks: ['e2e-tests-dev', 'test-runner', 'test-runner-dev', 'e2e-tests', 'chromatic'],
+    skipTasks: ['e2e-tests-dev', 'test-runner', 'test-runner-dev', 'e2e-tests'],
   },
 } satisfies Record<string, Template & { isInternal: true }>;
 

diff --git a/code/lib/core-server/src/presets/common-preset.ts b/code/lib/core-server/src/presets/common-preset.ts
@@ -185,6 +185,10 @@ export const previewAnnotations = async (base: any, options: Options) => {
   return [...config, ...base];
 };
 
+const testBuildFeatures = (value: boolean) => ({
+  emptyBlocks: value,
+});
+
 export const features = async (
   existing: StorybookConfig['features']
 ): Promise<StorybookConfig['features']> => ({
@@ -196,6 +200,16 @@ export const features = async (
   legacyDecoratorFileOrder: false,
 });
 
+export const build = async (value: StorybookConfig['build'], options: Options) => {
+  return {
+    ...value,
+    test: {
+      ...testBuildFeatures(!!options.test),
+      ...value?.test,
+    },
+  };
+};
+
 export const csfIndexer: Indexer = {
   test: /(stories|story)\.(m?js|ts)x?$/,
   createIndex: async (fileName, options) => (await readCsf(fileName, options)).parse().indexInputs,

diff --git a/code/lib/preview/src/globals/types.ts b/code/lib/preview/src/globals/types.ts
@@ -1,8 +1,11 @@
 // Here we map the name of a module to their NAME in the global scope.
-export const globals = {
+// eslint-disable-next-line @typescript-eslint/naming-convention,no-underscore-dangle
+const _globals = {
   '@storybook/global': '__STORYBOOK_MODULE_GLOBAL__',
   '@storybook/channels': '__STORYBOOK_MODULE_CHANNELS__',
   '@storybook/client-logger': '__STORYBOOK_MODULE_CLIENT_LOGGER__',
   '@storybook/core-events': '__STORYBOOK_MODULE_CORE_EVENTS__',
   '@storybook/preview-api': '__STORYBOOK_MODULE_PREVIEW_API__',
 };
+
+export const globals: typeof _globals & Record<string, string> = _globals;
diff --git a/code/lib/types/src/modules/core-common.ts b/code/lib/types/src/modules/core-common.ts
@@ -76,6 +76,7 @@ export interface Presets {
   apply(extension: 'managerEntries', config: [], args?: any): Promise<string[]>;
   apply(extension: 'refs', config?: [], args?: any): Promise<unknown>;
   apply(extension: 'core', config?: {}, args?: any): Promise<CoreConfig>;
+  apply(extension: 'build', config?: {}, args?: any): Promise<StorybookConfig['build']>;
   apply<T>(extension: string, config?: T, args?: unknown): Promise<T>;
 }
 
@@ -156,6 +157,7 @@ export interface CLIOptions {
   quiet?: boolean;
   versionUpdates?: boolean;
   docs?: boolean;
+  test?: boolean;
   debugWebpack?: boolean;
   webpackStatsJson?: string | boolean;
   outputDir?: string;
@@ -312,6 +314,15 @@ export interface StorybookConfig {
     legacyDecoratorFileOrder?: boolean;
   };
 
+  build?: {
+    test?: {
+      /**
+       * Globalize @storybook/blocks
+       */
+      emptyBlocks?: boolean;
+    };
+  };
+
   /**
    * Tells Storybook where to find stories.
    *