feat!: compact with storybook 8.2.0

rspack-contrib · Jul 12, 2024 · 38f1eed · 38f1eed
1 parent e476659
commit 38f1eed
Show file tree

Hide file tree

Showing 19 changed files with 510 additions and 1,975 deletions.
diff --git a/packages/builder-rsbuild/package.json b/packages/builder-rsbuild/package.json
@@ -61,17 +61,8 @@
   },
   "dependencies": {
     "@rsbuild/plugin-type-check": "1.0.0-alpha.9",
-    "@storybook/addon-docs": "^8.0.10",
-    "@storybook/channels": "^8.0.10",
-    "@storybook/client-logger": "^8.0.10",
-    "@storybook/core-common": "^8.0.10",
-    "@storybook/core-events": "^8.0.10",
-    "@storybook/core-webpack": "^8.0.10",
-    "@storybook/node-logger": "^8.0.10",
-    "@storybook/preview": "^8.0.10",
-    "@storybook/preview-api": "^8.0.10",
-    "@storybook/react-dom-shim": "^8.0.10",
-    "@storybook/types": "^8.0.10",
+    "@storybook/addon-docs": "^8.2.1",
+    "@storybook/core-webpack": "^8.2.1",
     "browser-assert": "^1.2.1",
     "case-sensitive-paths-webpack-plugin": "^2.4.0",
     "cjs-module-lexer": "^1.2.3",
@@ -99,10 +90,12 @@
     "add": "^2.0.6",
     "pretty-hrtime": "^1.0.3",
     "slash": "^5.0.0",
+    "storybook": "8.2.1",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
-    "@rsbuild/core": ">= 1.0.0-alpha.9"
+    "@rsbuild/core": ">= 1.0.0-alpha.9",
+    "storybook": "^8.2.1"
   },
   "peerDependenciesMeta": {
     "typescript": {

diff --git a/packages/builder-rsbuild/src/index.ts b/packages/builder-rsbuild/src/index.ts
@@ -1,13 +1,14 @@
 import * as rsbuildReal from '@rsbuild/core'
-import type { Options } from '@storybook/types'
-import { dirname, join, parse } from 'path'
+import type { Options } from 'storybook/internal/types'
+import { join, parse } from 'path'
 import express from 'express'
 import fs from 'fs-extra'
-import { WebpackInvocationError } from '@storybook/core-events/server-errors'
+import { WebpackInvocationError } from 'storybook/internal/server-errors'
 import type { RsbuildBuilder } from './types'
 import rsbuildConfig, {
   type RsbuildBuilderOptions,
 } from './preview/iframe-rsbuild.config'
+import { corePath } from 'storybook/core-path'
 
 import prettyTime from 'pretty-hrtime'
 
@@ -28,9 +29,6 @@ export const printDuration = (startTime: [number, number]) =>
     .replace(' s', ' seconds')
     .replace(' m', ' minutes')
 
-const getAbsolutePath = <I extends string>(input: I): I =>
-  dirname(require.resolve(join(input, 'package.json'))) as any
-
 type BuilderStartOptions = Parameters<RsbuildBuilder['start']>['0']
 
 export const executor = {
@@ -119,8 +117,8 @@ export const start: RsbuildBuilder['start'] = async ({
     })
   }
 
-  const previewResolvedDir = getAbsolutePath('@storybook/preview')
-  const previewDirOrigin = join(previewResolvedDir, 'dist')
+  const previewResolvedDir = join(corePath, 'dist/preview')
+  const previewDirOrigin = previewResolvedDir
 
   router.use(
     `/sb-preview`,
@@ -150,8 +148,8 @@ export const build: ({
     rsbuildConfig: config,
   })
 
-  const previewResolvedDir = getAbsolutePath('@storybook/preview')
-  const previewDirOrigin = join(previewResolvedDir, 'dist')
+  const previewResolvedDir = join(corePath, 'dist/preview')
+  const previewDirOrigin = previewResolvedDir
   const previewDirTarget = join(options.outputDir || '', `sb-preview`)
   let stats: Stats
 

diff --git a/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts b/packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts
@@ -1,15 +1,15 @@
 import { dirname, join, resolve } from 'path'
 // @ts-expect-error (I removed this on purpose, because it's incorrect)
 import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin'
-import type { Options } from '@storybook/types'
+import type { Options } from 'storybook/internal/types'
 import type { BuilderOptions } from '../types'
-import { globalsNameReferenceMap } from '@storybook/preview/globals'
+import { globalsNameReferenceMap } from 'storybook/internal/preview/globals'
 import {
   stringifyProcessEnvs,
   normalizeStories,
   getBuilderOptions,
   isPreservingSymlinks,
-} from '@storybook/core-common'
+} from 'storybook/internal/common'
 import { dedent } from 'ts-dedent'
 import { getVirtualModules } from './virtual-module-mapping'
 import { loadConfig, mergeRsbuildConfig } from '@rsbuild/core'

diff --git a/packages/builder-rsbuild/src/preview/virtual-module-mapping.ts b/packages/builder-rsbuild/src/preview/virtual-module-mapping.ts
@@ -4,14 +4,14 @@ import type {
   NormalizedStoriesSpecifier,
   Options,
   PreviewAnnotation,
-} from '@storybook/types'
+} from 'storybook/internal/types'
 import { join, resolve } from 'path'
 import {
   handlebars,
   loadPreviewOrConfigFile,
   normalizeStories,
   readTemplate,
-} from '@storybook/core-common'
+} from 'storybook/internal/common'
 import slash from 'slash'
 import { webpackIncludeRegexp } from '@storybook/core-webpack'
 import { dedent } from 'ts-dedent'

diff --git a/packages/builder-rsbuild/src/types.ts b/packages/builder-rsbuild/src/types.ts
@@ -5,7 +5,7 @@ import type {
   Options,
   TypescriptOptions as TypeScriptOptionsBase,
   BuilderResult as BuilderResultBase,
-} from '@storybook/types'
+} from 'storybook/internal/types'
 import type { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check'
 
 // Storybook's Stats are optional Webpack related property

diff --git a/packages/builder-rsbuild/templates/virtualModuleModernEntry.js.handlebars b/packages/builder-rsbuild/templates/virtualModuleModernEntry.js.handlebars
@@ -1,7 +1,7 @@
 import { global } from '@storybook/global';
 
-import { ClientApi, PreviewWeb, addons, composeConfigs } from '@storybook/preview-api';
-import { createBrowserChannel } from '@storybook/channels';
+import { ClientApi, PreviewWeb, addons, composeConfigs } from 'storybook/internal/preview-api';
+import { createBrowserChannel } from 'storybook/internal/channels';
 
 import { importFn } from './{{storiesFilename}}';
 

diff --git a/packages/react-rsbuild/package.json b/packages/react-rsbuild/package.json
@@ -53,9 +53,7 @@
     "prep": "node --loader ../../scripts/node_modules/esbuild-register/loader.js -r ../../scripts/node_modules/esbuild-register/register.js ../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/docs-tools": "^8.0.10",
-    "@storybook/node-logger": "^8.0.10",
-    "@storybook/react": "^8.0.10",
+    "@storybook/react": "^8.2.1",
     "@storybook/react-docgen-typescript-plugin": "^1.0.1",
     "@types/node": "^18.0.0",
     "find-up": "^5.0.0",
@@ -67,15 +65,17 @@
   },
   "devDependencies": {
     "@rsbuild/core": "1.0.0-alpha.9",
-    "@storybook/types": "^8.0.10",
+    "@storybook/types": "^8.2.1",
     "@types/resolve": "^1.20.6",
     "add": "^2.0.6",
+    "storybook": "^8.2.1",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
     "@rsbuild/core": ">= 1.0.0-alpha.9",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+    "storybook": "^8.2.1",
     "typescript": ">= 4.2.x"
   },
   "peerDependenciesMeta": {

diff --git a/packages/react-rsbuild/src/loaders/react-docgen-loader.ts b/packages/react-rsbuild/src/loaders/react-docgen-loader.ts
@@ -17,7 +17,7 @@ import type {
   babelTypes as t,
   Documentation,
 } from 'react-docgen'
-import { logger } from '@storybook/node-logger'
+import { logger } from 'storybook/internal/node-logger'
 
 import {
   RESOLVE_EXTENSIONS,

diff --git a/packages/react-rsbuild/src/preset.ts b/packages/react-rsbuild/src/preset.ts
@@ -1,5 +1,5 @@
 import { dirname, join } from 'path'
-import type { PresetProperty } from '@storybook/types'
+import type { PresetProperty } from 'storybook/internal/types'
 import { rsbuildFinalDocs } from './react-docs'
 import type { StorybookConfig } from './types'
 

diff --git a/packages/react-rsbuild/src/react-docs.ts b/packages/react-rsbuild/src/react-docs.ts
@@ -1,4 +1,4 @@
-import { hasDocsOrControls } from '@storybook/docs-tools'
+import { hasDocsOrControls } from 'storybook/internal/docs-tools'
 import { mergeRsbuildConfig } from '@rsbuild/core'
 
 import type { RsbuildConfig } from '@rsbuild/core'

diff --git a/packages/react-rsbuild/src/types.ts b/packages/react-rsbuild/src/types.ts
@@ -6,7 +6,7 @@ import type {
 import type {
   StorybookConfig as StorybookConfigBase,
   TypescriptOptions as TypescriptOptionsBase,
-} from '@storybook/types'
+} from 'storybook/internal/types'
 import type { PluginOptions as ReactDocgenTypescriptOptions } from '@storybook/react-docgen-typescript-plugin'
 
 type FrameworkName = 'storybook-react-rsbuild'

diff --git a/packages/vue3-rsbuild/package.json b/packages/vue3-rsbuild/package.json
@@ -49,19 +49,19 @@
     "prep": "node --loader ../../scripts/node_modules/esbuild-register/loader.js -r ../../scripts/node_modules/esbuild-register/register.js ../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@storybook/docs-tools": "^8.0.10",
-    "@storybook/types": "^8.0.10",
-    "@storybook/vue3": "^8.0.10",
+    "@storybook/vue3": "^8.2.1",
     "storybook-builder-rsbuild": "workspace:*",
     "vue-docgen-loader": "^1.5.1"
   },
   "devDependencies": {
     "@rsbuild/core": "1.0.0-alpha.9",
     "@types/node": "^18.0.0",
+    "storybook": "^8.2.1",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
-    "@rsbuild/core": ">= 1.0.0-alpha.9"
+    "@rsbuild/core": ">= 1.0.0-alpha.9",
+    "storybook": "^8.2.1"
   },
   "peerDependenciesMeta": {
     "typescript": {

diff --git a/packages/vue3-rsbuild/src/framework-preset-vue3-docs.ts b/packages/vue3-rsbuild/src/framework-preset-vue3-docs.ts
@@ -1,5 +1,5 @@
 import type { StorybookConfig } from './types'
-import { hasDocsOrControls } from '@storybook/docs-tools'
+import { hasDocsOrControls } from 'storybook/internal/docs-tools'
 import { mergeRsbuildConfig } from '@rsbuild/core'
 
 export const rsbuildFinal: StorybookConfig['rsbuildFinal'] = (

diff --git a/packages/vue3-rsbuild/src/preset.ts b/packages/vue3-rsbuild/src/preset.ts
@@ -1,4 +1,4 @@
-import type { PresetProperty } from '@storybook/types'
+import type { PresetProperty } from 'storybook/internal/types'
 import { dirname, join } from 'path'
 
 export { rsbuildFinal } from './framework-preset-vue3-docs'

diff --git a/packages/vue3-rsbuild/src/types.ts b/packages/vue3-rsbuild/src/types.ts
@@ -1,7 +1,7 @@
 import type {
   StorybookConfig as StorybookConfigBase,
   TypescriptOptions as TypescriptOptionsBaseAndVue,
-} from '@storybook/types'
+} from 'storybook/internal/types'
 import type {
   StorybookConfigRsbuild,
   TypescriptOptions as TypescriptOptionsBuilder,