Merge branch 'next' into norbert/remove-handlebars

2025-04-08 11:11:53 +08:00 · 2024-09-26 12:50:14 +02:00 · 2024-09-26 12:50:14 +02:00 · b85c1e2aa0
commit b85c1e2aa0
parent 6ae8da121a 71f2da582d
24 changed files with 29 additions and 53 deletions
--- a/code/.storybook/main.ts
+++ b/code/.storybook/main.ts
@ -85,7 +85,6 @@ const config: StorybookConfig = {
    // },
  ],
  addons: [
-    '@storybook/addon-links',
    '@storybook/addon-themes',
    '@storybook/addon-essentials',
    '@storybook/addon-interactions',
--- a/code/addons/links/package.json
+++ b/code/addons/links/package.json
@ -3,8 +3,7 @@
  "version": "8.4.0-alpha.1",
  "description": "Link stories together to build demos and prototypes with your UI components",
  "keywords": [
-    "addon",
-    "storybook",
+    "storybook-addons",
    "organize"
  ],
  "homepage": "https://github.com/storybookjs/storybook/tree/next/code/addons/links",
--- a/code/core/scripts/prep.ts
+++ b/code/core/scripts/prep.ts
@ -191,6 +191,14 @@ async function run() {
                '@storybook/core': join(cwd, 'src'),
                react: dirname(require.resolve('react/package.json')),
                'react-dom': dirname(require.resolve('react-dom/package.json')),
+                'react-dom/client': join(
+                  dirname(require.resolve('react-dom/package.json')),
+                  'client'
+                ),
+              },
+              define: {
+                // This should set react in prod mode for the manager
+                'process.env.NODE_ENV': JSON.stringify('production'),
              },
              external: [],
            })
--- a/code/core/src/common/js-package-manager/JsPackageManager.ts
+++ b/code/core/src/common/js-package-manager/JsPackageManager.ts
@ -60,7 +60,7 @@ export abstract class JsPackageManager {
  /** Get the INSTALLED version of a package from the package.json file */
  async getPackageVersion(packageName: string, basePath = this.cwd): Promise<string | null> {
    const packageJSON = await this.getPackageJSON(packageName, basePath);
-    return packageJSON ? packageJSON.version ?? null : null;
+    return packageJSON ? (packageJSON.version ?? null) : null;
  }

  constructor(options?: JsPackageManagerOptions) {
--- a/code/core/src/core-server/for-testing/main.ts
+++ b/code/core/src/core-server/for-testing/main.ts
@ -20,7 +20,6 @@ const config: StorybookConfig = {
    '@storybook/addon-essentials',
    '@storybook/addon-interactions',
    '@storybook/addon-storysource',
-    '@storybook/addon-links',
    '@storybook/addon-jest',
    '@storybook/addon-a11y',
  ],
--- a/code/core/src/preview-api/modules/store/csf/portable-stories.ts
+++ b/code/core/src/preview-api/modules/store/csf/portable-stories.ts
@ -126,7 +126,7 @@ export function composeStory<TRenderer extends Renderer = Renderer, TArgs extend
    composeConfigs([
      defaultConfig && Object.keys(defaultConfig).length > 0
        ? defaultConfig
-        : globalThis.defaultProjectAnnotations ?? {},
+        : (globalThis.defaultProjectAnnotations ?? {}),
      globalThis.globalProjectAnnotations ?? {},
      projectAnnotations ?? {},
    ])
--- a/code/e2e-tests/util.ts
+++ b/code/e2e-tests/util.ts
@ -49,7 +49,7 @@ export class SbPage {

    await this.page.waitForURL((url) =>
      url.search.includes(
-        `path=/${viewMode ?? name === 'docs' ? 'docs' : 'story'}/${titleId}--${storyId}`
+        `path=/${(viewMode ?? name === 'docs') ? 'docs' : 'story'}/${titleId}--${storyId}`
      )
    );

--- a/code/frameworks/angular/src/server/angular-cli-webpack.js
+++ b/code/frameworks/angular/src/server/angular-cli-webpack.js
@ -68,7 +68,7 @@ exports.getWebpackConfig = async (baseConfig, { builderOptions, builderContext }
      outputPath:
        typeof builderOptions.outputPath === 'string'
          ? builderOptions.outputPath
-          : builderOptions.outputPath?.base ?? 'noop-out',
+          : (builderOptions.outputPath?.base ?? 'noop-out'),

      // Fixed options
      optimization: false,
--- a/code/frameworks/vue3-vite/src/preset.ts
+++ b/code/frameworks/vue3-vite/src/preset.ts
@ -22,7 +22,7 @@ export const viteFinal: StorybookConfig['viteFinal'] = async (config, options) =

  const framework = await options.presets.apply('framework');
  const frameworkOptions: FrameworkOptions =
-    typeof framework === 'string' ? {} : framework.options ?? {};
+    typeof framework === 'string' ? {} : (framework.options ?? {});

  const docgen = resolveDocgenOptions(frameworkOptions.docgen);

--- a/code/lib/cli-storybook/src/automigrate/fixes/test/main-config-without-wrappers.js
+++ b/code/lib/cli-storybook/src/automigrate/fixes/test/main-config-without-wrappers.js
@ -1,10 +1,6 @@
 const config = {
  stories: ['../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: [
-    '@storybook/addon-links',
-    '@storybook/addon-essentials',
-    '@storybook/addon-interactions',
-  ],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-interactions'],
  framework: {
    name: '@storybook/angular',
    options: {},
--- a/code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.ts
+++ b/code/lib/cli-storybook/src/automigrate/helpers/mainConfigFile.ts
@ -94,7 +94,9 @@ export const getBuilderPackageName = (mainConfig?: StorybookConfigRaw) => {
 export const getFrameworkOptions = (
  mainConfig?: StorybookConfigRaw
 ): Record<string, any> | null => {
-  return typeof mainConfig?.framework === 'string' ? null : mainConfig?.framework?.options ?? null;
+  return typeof mainConfig?.framework === 'string'
+    ? null
+    : (mainConfig?.framework?.options ?? null);
 };

 /**
--- a/code/lib/cli-storybook/src/automigrate/helpers/new-frameworks-utils.ts
+++ b/code/lib/cli-storybook/src/automigrate/helpers/new-frameworks-utils.ts
@ -77,14 +77,14 @@ export const detectBuilderInfo = async ({
  const builderPackageName = getBuilderPackageName(mainConfig);
  const frameworkPackageName = getFrameworkPackageName(mainConfig) as string;

-  let builderOptions = typeof builder !== 'string' ? builder?.options ?? {} : {};
+  let builderOptions = typeof builder !== 'string' ? (builder?.options ?? {}) : {};

  if (builderPackageName) {
    builderOrFrameworkName = builderPackageName;
  } else if (framework) {
    if (Object.keys(frameworkPackages).includes(frameworkPackageName)) {
      builderOrFrameworkName = frameworkPackageName;
-      builderOptions = typeof framework === 'object' ? framework.options?.builder ?? {} : {};
+      builderOptions = typeof framework === 'object' ? (framework.options?.builder ?? {}) : {};
    }
  }

--- a/code/lib/cli-storybook/src/automigrate/index.ts
+++ b/code/lib/cli-storybook/src/automigrate/index.ts
@ -275,7 +275,7 @@ export async function runFixes({

    if (result) {
      const promptType: Prompt =
-        typeof f.promptType === 'function' ? await f.promptType(result) : f.promptType ?? 'auto';
+        typeof f.promptType === 'function' ? await f.promptType(result) : (f.promptType ?? 'auto');

      logger.info(`\n🔎 found a '${chalk.cyan(f.id)}' migration:`);
      const message = f.prompt(result);
--- a/code/lib/codemod/src/transforms/tests/mdx-to-csf.test.ts
+++ b/code/lib/codemod/src/transforms/tests/mdx-to-csf.test.ts
@ -7,7 +7,7 @@ import { dedent } from 'ts-dedent';
 import jscodeshift, { nameToValidExport } from '../mdx-to-csf';

 expect.addSnapshotSerializer({
-  print: (val: any) => (typeof val === 'string' ? val : JSON.stringify(val, null, 2) ?? ''),
+  print: (val: any) => (typeof val === 'string' ? val : (JSON.stringify(val, null, 2) ?? '')),
  test: () => true,
 });

--- a/code/lib/create-storybook/src/generators/baseGenerator.ts
+++ b/code/lib/create-storybook/src/generators/baseGenerator.ts
@ -228,11 +228,7 @@ export async function baseGenerator(
        })
      : extraAddonPackages;

-  extraAddonsToInstall.push(
-    '@storybook/addon-links',
-    '@storybook/addon-essentials',
-    '@chromatic-com/storybook@^1'
-  );
+  extraAddonsToInstall.push('@storybook/addon-essentials', '@chromatic-com/storybook@^1');

  // added to main.js
  const addons = [
--- a/code/lib/create-storybook/src/generators/configure.test.ts
+++ b/code/lib/create-storybook/src/generators/configure.test.ts
@ -81,7 +81,6 @@ describe('configureMain', () => {
      language: SupportedLanguage.JAVASCRIPT,
      prefixes: [],
      addons: [
-        "%%path.dirname(require.resolve(path.join('@storybook/addon-links', 'package.json')))%%",
        "%%path.dirname(require.resolve(path.join('@storybook/addon-essentials', 'package.json')))%%",
        "%%path.dirname(require.resolve(path.join('@storybook/preset-create-react-app', 'package.json')))%%",
        "%%path.dirname(require.resolve(path.join('@storybook/addon-interactions', 'package.json')))%%",
@ -103,7 +102,6 @@ describe('configureMain', () => {
      const config = {
        stories: ['../stories/**/*.mdx', '../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
        addons: [
-          path.dirname(require.resolve(path.join('@storybook/addon-links', 'package.json'))),
          path.dirname(require.resolve(path.join('@storybook/addon-essentials', 'package.json'))),
          path.dirname(require.resolve(path.join('@storybook/preset-create-react-app', 'package.json'))),
          path.dirname(require.resolve(path.join('@storybook/addon-interactions', 'package.json'))),
--- a/code/renderers/vue3/src/docs/extractArgTypes.ts
+++ b/code/renderers/vue3/src/docs/extractArgTypes.ts
@ -129,7 +129,7 @@ export const extractFromVueDocgenApi = (
    }
  }

-  const required = 'required' in docgenInfo ? docgenInfo.required ?? false : false;
+  const required = 'required' in docgenInfo ? (docgenInfo.required ?? false) : false;

  return {
    name: docgenInfo.name,
--- a/docs/_snippets/main-config-test-disable-disableaddons.md
+++ b/docs/_snippets/main-config-test-disable-disableaddons.md
@ -3,12 +3,7 @@ export default {
  // Replace your-framework with the framework you are using (e.g., react-webpack5, vue3-vite)
  framework: '@storybook/your-framework',
  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: [
-    '@storybook/addon-links',
-    '@storybook/addon-essentials',
-    '@storybook/addon-interactions',
-    '@storybook/addon-a11y',
-  ],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-interactions', '@storybook/addon-a11y'],
  build: {
    test: {
      disabledAddons: ['@storybook/addon-a11y'],
@ -24,12 +19,7 @@ import type { StorybookConfig } from '@storybook/your-framework';
 const config: StorybookConfig = {
  framework: '@storybook/your-framework',
  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: [
-    '@storybook/addon-links',
-    '@storybook/addon-essentials',
-    '@storybook/addon-interactions',
-    '@storybook/addon-a11y',
-  ],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-interactions', '@storybook/addon-a11y'],
  build: {
    test: {
      disabledAddons: ['@storybook/addon-a11y'],
@ -39,4 +29,3 @@ const config: StorybookConfig = {

 export default config;
 ```
-
--- a/docs/_snippets/storybook-coverage-addon-optimized-config.md
+++ b/docs/_snippets/storybook-coverage-addon-optimized-config.md
@ -4,7 +4,6 @@ export default {
  framework: '@storybook/your-framework',
  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
  addons: [
-    '@storybook/addon-links',
    '@storybook/addon-essentials',
    '@storybook/addon-interactions',
    '@storybook/addon-coverage',
@ -25,7 +24,6 @@ const config: StorybookConfig = {
  framework: '@storybook/your-framework',
  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
  addons: [
-    '@storybook/addon-links',
    '@storybook/addon-essentials',
    '@storybook/addon-interactions',
    '@storybook/addon-coverage',
@ -39,4 +37,3 @@ const config: StorybookConfig = {

 export default config;
 ```
-
--- a/docs/_snippets/storybook-vite-builder-aliasing.md
+++ b/docs/_snippets/storybook-vite-builder-aliasing.md
@ -1,7 +1,7 @@
 ```js filename=".storybook/main.js|ts" renderer="common" language="js"
 export default {
  stories: ['../src/**/*.mdx', '../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: ['@storybook/addon-links', '@storybook/addon-essentials'],
+  addons: ['@storybook/addon-essentials'],
  core: {
    builder: '@storybook/builder-vite',
  },
@ -18,4 +18,3 @@ export default {
  },
 };
 ```
-
--- a/docs/_snippets/storybook-vite-builder-react-docgen.md
+++ b/docs/_snippets/storybook-vite-builder-react-docgen.md
@ -1,7 +1,7 @@
 ```js filename=".storybook/main.js|ts" renderer="common" language="js"
 export default {
  stories: ['../src/**/*.mdx', '../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: ['@storybook/addon-links', '@storybook/addon-essentials'],
+  addons: ['@storybook/addon-essentials'],
  core: {
    builder: '@storybook/builder-vite',
  },
@ -12,4 +12,3 @@ export default {
  },
 };
 ```
-
--- a/docs/_snippets/storybook-vite-builder-register.md
+++ b/docs/_snippets/storybook-vite-builder-register.md
@ -1,10 +1,9 @@
 ```js filename=".storybook/main.js|ts" renderer="common" language="js"
 export default {
  stories: ['../src/**/*.mdx', '../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-  addons: ['@storybook/addon-links', '@storybook/addon-essentials'],
+  addons: ['@storybook/addon-essentials'],
  core: {
    builder: '@storybook/builder-vite', // 👈 The builder enabled here.
  },
 };
 ```
-
--- a/docs/api/cli-options.mdx
+++ b/docs/api/cli-options.mdx
@ -274,7 +274,6 @@ Storybook Environment Info:
  npmPackages:
    @storybook/addon-essentials: ^7.6.6 => 7.6.6
    @storybook/addon-interactions: ^7.6.6 => 7.6.6
-    @storybook/addon-links: ^7.6.6 => 7.6.6
    @storybook/addon-onboarding: ^1.0.10 => 1.0.10
    @storybook/blocks: ^7.6.6 => 7.6.6
    @storybook/preset-create-react-app: ^7.6.6 => 7.6.6
--- a/docs/configure/telemetry.mdx
+++ b/docs/configure/telemetry.mdx
@ -127,9 +127,6 @@ Will generate the following output:
      }
    },
    "addons": {
-      "@storybook/addon-links": {
-        "version": "7.1.0"
-      },
      "@storybook/addon-essentials": {
        "version": "7.1.0"
      },