Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rspack-contrib/storybook-rsbuild
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: rspack-contrib/storybook-rsbuild
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
  • 11 commits
  • 21 files changed
  • 3 contributors

Commits on Feb 27, 2025

  1. Copy the full SHA
    e617e9c View commit details

Commits on Mar 4, 2025

  1. Copy the full SHA
    5599ed4 View commit details
  2. chore(deps): pin dependencies

    renovate[bot] authored and fi3ework committed Mar 4, 2025
    Copy the full SHA
    cf158d2 View commit details
  3. Update rspack.mdx

    pre1ude authored and fi3ework committed Mar 4, 2025
    Copy the full SHA
    ab655fa View commit details

Commits on Mar 7, 2025

  1. Copy the full SHA
    c8fec05 View commit details

Commits on Mar 12, 2025

  1. Copy the full SHA
    11f78ea View commit details

Commits on Mar 24, 2025

  1. Copy the full SHA
    5d3af9f View commit details
  2. Copy the full SHA
    9cb7c0b View commit details
  3. v1.0.1

    fi3ework committed Mar 24, 2025
    Copy the full SHA
    74c8240 View commit details

Commits on Mar 25, 2025

  1. chore(deps): update storybook

    renovate[bot] authored and fi3ework committed Mar 25, 2025
    Copy the full SHA
    b8f98c7 View commit details
  2. chore(deps): update rsbuild

    renovate[bot] authored and fi3ework committed Mar 25, 2025
    Copy the full SHA
    b584b13 View commit details
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -27,11 +27,11 @@
"check-dependency-version-consistency": "^4.1.1",
"cross-env": "^7.0.3",
"nano-staged": "^0.8.0",
"nx": "^20.4.4",
"nx": "^20.4.6",
"simple-git-hooks": "^2.11.1",
"sort-package-json": "^2.12.0",
"ts-dedent": "^2.2.0",
"tsx": "^4.19.2",
"tsx": "^4.19.3",
"typescript": "^5.7.3",
"vitest": "^2.1.9"
},
6 changes: 3 additions & 3 deletions packages/addon-rslib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-addon-rslib",
"version": "1.0.0",
"version": "1.0.1",
"description": "Storybook addon for loading configuration of Rslib",
"keywords": ["storybook", "storybook-addons", "rsbuild", "rspack", "rslib"],
"homepage": "https://storybook-rsbuild.netlify.app",
@@ -33,10 +33,10 @@
"prepare": "pnpm run build"
},
"devDependencies": {
"@rsbuild/core": "^1.1.13",
"@rsbuild/core": "^1.2.19",
"@rslib/core": "^0.4.1",
"@types/node": "^18.0.0",
"storybook": "8.5.8",
"storybook": "8.6.9",
"storybook-builder-rsbuild": "workspace:*",
"typescript": "^5.7.3"
},
6 changes: 3 additions & 3 deletions packages/builder-rsbuild/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-builder-rsbuild",
"version": "1.0.0",
"version": "1.0.1",
"description": "Rsbuild builder for Storybook",
"keywords": ["storybook", "rsbuild", "rspack"],
"homepage": "https://storybook-rsbuild.netlify.app",
@@ -80,14 +80,14 @@
"util-deprecate": "^1.0.2"
},
"devDependencies": {
"@rsbuild/core": "^1.1.13",
"@rsbuild/core": "^1.2.19",
"@types/find-cache-dir": "^5.0.2",
"@types/fs-extra": "^11.0.4",
"@types/node": "^18.0.0",
"@types/pretty-hrtime": "^1.0.3",
"pretty-hrtime": "^1.0.3",
"slash": "^5.1.0",
"storybook": "8.5.8",
"storybook": "8.6.9",
"typescript": "^5.7.3"
},
"peerDependencies": {
6 changes: 4 additions & 2 deletions packages/builder-rsbuild/src/index.ts
Original file line number Diff line number Diff line change
@@ -61,10 +61,12 @@ const rsbuild = async (_: unknown, options: RsbuildBuilderOptions) => {
await presets.apply<StorybookConfigRaw['addons']>('webpackAddons')
const resolvedWebpackAddons = (webpackAddons ?? [])
.map((preset: Preset) => {
const options = isObject(preset) ? preset.options || undefined : undefined
const addonOptions = isObject(preset)
? preset.options || undefined
: undefined
const name = isObject(preset) ? preset.name : preset
// Taken fromm https://github.com/storybookjs/storybook/blob/f3b15ce1f28daac195e7698c075be7790f8172f1/code/core/src/common/presets.ts#L198.
return resolveAddonName(options.configDir, name, options)
return resolveAddonName(options.configDir, name, addonOptions)
})
.filter(nonNullables)
const { apply } = await getPresets(resolvedWebpackAddons, options)
25 changes: 16 additions & 9 deletions packages/builder-rsbuild/src/preview/iframe-rsbuild.config.ts
Original file line number Diff line number Diff line change
@@ -29,6 +29,16 @@ const maybeGetAbsolutePath = <I extends string>(input: I): I | false => {
}
}

const builtInResolveExtensions = [
'.mjs',
'.js',
'.jsx',
'.ts',
'.tsx',
'.json',
'.cjs',
]

const managerAPIPath = maybeGetAbsolutePath('@storybook/manager-api')
const componentsPath = maybeGetAbsolutePath('@storybook/components')
const globalPath = maybeGetAbsolutePath('@storybook/global')
@@ -289,15 +299,12 @@ export default async (

config.resolve ??= {}
config.resolve.symlinks = !isPreservingSymlinks()
config.resolve.extensions = [
'.mjs',
'.js',
'.jsx',
'.ts',
'.tsx',
'.json',
'.cjs',
]
config.resolve.extensions = Array.from(
new Set([
...(config.resolve.extensions ?? []),
...builtInResolveExtensions,
]),
)

config.watchOptions = {
ignored: /node_modules/,
8 changes: 4 additions & 4 deletions packages/framework-html/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-html-rsbuild",
"version": "1.0.0",
"version": "1.0.1",
"description": "Storybook for HTML and Rsbuild: View HTML snippets in isolation with Hot Reloading.",
"keywords": ["storybook", "rsbuild", "rspack", "vanilla", "html"],
"homepage": "https://storybook-rsbuild.netlify.app",
@@ -47,10 +47,10 @@
"tsconfig-paths": "^4.2.0"
},
"devDependencies": {
"@rsbuild/core": "^1.1.13",
"@storybook/types": "8.5.8",
"@rsbuild/core": "^1.2.19",
"@storybook/types": "8.6.9",
"@types/resolve": "^1.20.6",
"storybook": "8.5.8",
"storybook": "8.6.9",
"typescript": "^5.7.3"
},
"peerDependencies": {
10 changes: 5 additions & 5 deletions packages/framework-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-react-rsbuild",
"version": "1.0.0",
"version": "1.0.1",
"description": "Storybook for React and Rsbuild: Develop React components in isolation with Hot Reloading.",
"keywords": ["storybook", "rsbuild", "rspack", "react"],
"homepage": "https://storybook-rsbuild.netlify.app",
@@ -58,13 +58,13 @@
"tsconfig-paths": "^4.2.0"
},
"devDependencies": {
"@rsbuild/core": "^1.1.13",
"@storybook/types": "8.5.8",
"@types/react": "^18.3.18",
"@rsbuild/core": "^1.2.19",
"@storybook/types": "8.6.9",
"@types/react": "^18.3.19",
"@types/resolve": "^1.20.6",
"react": "18.3.1",
"react-dom": "18.3.1",
"storybook": "8.5.8",
"storybook": "8.6.9",
"typescript": "^5.7.3"
},
"peerDependencies": {
6 changes: 3 additions & 3 deletions packages/framework-vue3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-vue3-rsbuild",
"version": "1.0.0",
"version": "1.0.1",
"description": "Storybook for Vue3 and Rsbuild: Develop React Component in isolation with Hot Reloading.",
"keywords": ["storybook", "rsbuild", "rspack", "vue3"],
"homepage": "https://storybook-rsbuild.netlify.app",
@@ -46,9 +46,9 @@
"vue-docgen-loader": "^1.5.1"
},
"devDependencies": {
"@rsbuild/core": "^1.1.13",
"@rsbuild/core": "^1.2.19",
"@types/node": "^18.0.0",
"storybook": "8.5.8",
"storybook": "8.6.9",
"typescript": "^5.7.3",
"vue": "^3.5.13"
},
6 changes: 3 additions & 3 deletions packages/framework-web-components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-web-components-rsbuild",
"version": "1.0.0",
"version": "1.0.1",
"description": "Storybook for web component and Rsbuild: Develop React Component in isolation with Hot Reloading.",
"keywords": [
"storybook",
@@ -53,10 +53,10 @@
"storybook-builder-rsbuild": "workspace:*"
},
"devDependencies": {
"@rsbuild/core": "^1.1.13",
"@rsbuild/core": "^1.2.19",
"@types/node": "^18.0.0",
"lit": "^3.2.1",
"storybook": "8.5.8",
"storybook": "8.6.9",
"typescript": "^5.7.3"
},
"peerDependencies": {
Loading