Fix some things

Author: puehringer

config/storybook.main.template.js

@@ -1,3 +1,5 @@
+const { resolve } = require('path');
+
 /**
  * @type {import('storybook-react-rsbuild').StorybookConfig}
  */
@@ -7,33 +9,14 @@ module.exports = {
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-interactions',
-    {
-      name: '@storybook/addon-styling-webpack',
-      options: {
-        // This is our best guess to replicate the style config we are using in the rspack.config.js
-        scssBuildRule: {
-          test: /\.scss$/,
-          use: [
-            'style-loader',
-            {
-              loader: 'css-loader',
-              options: { importLoaders: 1 },
-            },
-            'resolve-url-loader',
-            {
-              loader: 'sass-loader',
-              options: {
-                sourceMap: true,
-              },
-            },
-          ],
-        },
-      },
-    },
-    'storybook-addon-swc',
   ],
   framework: {
     name: 'storybook-react-rsbuild',
+    options: {
+      builder: {
+        rsbuildConfigPath: resolve(__dirname, './storybook.rsbuild.config.ts'),
+      },
+    },
   },
   rsbuildFinal: async (config) => {
     const reactDocgenLoaderRule = config.tools.rspack[1].module.rules[0];

config/storybook.rsbuild.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from '@rsbuild/core';
+import { pluginReact } from '@rsbuild/plugin-react';
+import { pluginSass } from '@rsbuild/plugin-sass';
+
+// This is the rsbuild configuration used by storybook, it is not the same as the rspack config!
+export default defineConfig({
+  plugins: [pluginReact(), pluginSass()],
+});

package.json

@@ -39,6 +39,9 @@
     "@rspack/core": "~1.1.1",
     "@rspack/plugin-minify": "~0.7.5",
     "@rspack/plugin-react-refresh": "~1.0.0",
+    "@rsbuild/core": "^1.1.10",
+    "@rsbuild/plugin-react": "^1.1.0",
+    "@rsbuild/plugin-sass": "^1.1.2",
     "@swc/core": "~1.9.2",
     "@swc/helpers": "~0.5.15",
     "@swc/jest": "~0.2.37",

tests_fixtures/standalone_template/.storybook/preview.jsx

@@ -4,7 +4,6 @@ import '../workspace.scss';
  * @type {import('@storybook/react').Parameters}
  */
 export const parameters = {
-  actions: { argTypesRegex: '^on[A-Z].*' },
   layout: 'fullscreen',
   controls: {
     matchers: {

tests_fixtures/standalone_template/package.json

@@ -57,21 +57,18 @@
     "visyn_scripts": "portal:../../"
   },
   "devDependencies": {
-    "@rsbuild/core": "^1.1.1",
-    "@rsbuild/plugin-react": "^1.0.7",
-    "@storybook/addon-actions": "^8.4.2",
-    "@storybook/addon-essentials": "^8.4.2",
-    "@storybook/addon-interactions": "^8.4.2",
-    "@storybook/addon-links": "^8.4.2",
-    "@storybook/addon-styling-webpack": "^1.0.1",
-    "@storybook/cli": "^8.4.2",
-    "@storybook/react": "^8.4.2",
-    "@storybook/react-webpack5": "^8.4.2",
-    "@storybook/testing-library": "0.2.2",
+    "@storybook/addon-actions": "^8.4.7",
+    "@storybook/addon-essentials": "^8.4.7",
+    "@storybook/addon-interactions": "^8.4.7",
+    "@storybook/addon-links": "^8.4.7",
+    "@storybook/blocks": "8.4.7",
+    "@storybook/cli": "^8.4.7",
+    "@storybook/react": "^8.4.7",
+    "@storybook/react-webpack5": "^8.4.7",
     "@types/react": "18.3.12",
     "@types/react-dom": "^18.3.1",
-    "storybook": "^8.4.2",
-    "storybook-react-rsbuild": "^0.1.4"
+    "storybook": "^8.4.7",
+    "storybook-react-rsbuild": "^0.1.6"
   },
   "resolutions": {
     "visyn_scripts": "portal:../../"