@modern-js/storybook-builder 0.0.0-next-20231127105004 → 0.0.0-next-20231129181734

package/dist/cjs/plugin-storybook.js

@@ -346,16 +346,18 @@ function addonAdapter(api, options) {
       const getOptions = (plugin) => Array.isArray(plugin) ? plugin[1] : null;
       const replaceOrInsert = (plugin, plugins) => {
         const pluginName = getPluginName(plugin);
+        const append = [];
         for (let i = 0; i < plugins.length; i++) {
           if (getPluginName(plugins[i]) === pluginName) {
             if (getOptions(plugin)) {
               import_utils.logger.info(`Detected duplicated babel plugin or presets: ${pluginName}, overrides with the new one`);
               plugins[i] = plugin;
             }
-            return;
+          } else {
+            append.push(plugin);
           }
         }
-        plugins.push(plugin);
+        plugins.push(...append);
       };
       const currentPlugins = config.plugins || [];
       const currentPresets = config.presets || [];
@@ -366,12 +368,18 @@ function addonAdapter(api, options) {
         replaceOrInsert(preset, currentPresets);
       }
       const finalConfig2 = {
+        ...config,
         ...babelOptions,
         plugins: currentPlugins,
         presets: currentPresets
       };
-      if (userConfig) {
-        return (0, import_utils.applyOptionsChain)(finalConfig2, userConfig, utils);
+      if (typeof userConfig === "function") {
+        return userConfig(finalConfig2, utils);
+      } else if (typeof userConfig === "object") {
+        return {
+          ...finalConfig2,
+          ...userConfig
+        };
       } else {
         return finalConfig2;
       }

package/dist/esm/plugin-storybook.js

@@ -365,6 +365,7 @@ function addonAdapter(api, options) {
       const getOptions = (plugin) => Array.isArray(plugin) ? plugin[1] : null;
       const replaceOrInsert = (plugin, plugins) => {
         const pluginName = getPluginName(plugin);
+        const append = [];
         for (let i = 0; i < plugins.length; i++) {
           if (getPluginName(plugins[i]) === pluginName) {
             if (getOptions(plugin)) {
@@ -373,10 +374,11 @@ function addonAdapter(api, options) {
               );
               plugins[i] = plugin;
             }
-            return;
+          } else {
+            append.push(plugin);
           }
         }
-        plugins.push(plugin);
+        plugins.push(...append);
       };
       const currentPlugins = config.plugins || [];
       const currentPresets = config.presets || [];
@@ -387,12 +389,15 @@ function addonAdapter(api, options) {
         replaceOrInsert(preset, currentPresets);
       }
       const finalConfig2 = {
+        ...config,
         ...babelOptions,
         plugins: currentPlugins,
         presets: currentPresets
       };
-      if (userConfig) {
-        return applyOptionsChain(finalConfig2, userConfig, utils);
+      if (typeof userConfig === "function") {
+        return userConfig(finalConfig2, utils);
+      } else if (typeof userConfig === "object") {
+        return { ...finalConfig2, ...userConfig };
       } else {
         return finalConfig2;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/storybook-builder",
-  "version": "0.0.0-next-20231127105004",
+  "version": "0.0.0-next-20231129181734",
   "description": "modern.js support for storybook",
   "repository": {
     "type": "git",
@@ -51,7 +51,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@rspack/dev-client": "0.4.0",
+    "@rspack/dev-client": "0.4.1",
     "@storybook/components": "^7.5.1",
     "@storybook/core-common": "^7.5.1",
     "@storybook/csf-plugin": "^7.5.1",
@@ -71,11 +71,11 @@
     "serve-static": "^1.14.1",
     "tinypool": "^0.8.0",
     "webpack-hot-middleware": "^2.25.4",
-    "@modern-js/builder": "0.0.0-next-20231127105004",
-    "@modern-js/builder-shared": "0.0.0-next-20231127105004",
-    "@modern-js/core": "0.0.0-next-20231127105004",
-    "@modern-js/utils": "0.0.0-next-20231127105004",
-    "@modern-js/runtime": "0.0.0-next-20231127105004"
+    "@modern-js/builder": "0.0.0-next-20231129181734",
+    "@modern-js/builder-shared": "0.0.0-next-20231129181734",
+    "@modern-js/core": "0.0.0-next-20231129181734",
+    "@modern-js/runtime": "0.0.0-next-20231129181734",
+    "@modern-js/utils": "0.0.0-next-20231129181734"
   },
   "devDependencies": {
     "@storybook/types": "^7.5.1",
@@ -83,14 +83,14 @@
     "@types/serve-static": "^1.13.10",
     "@types/webpack-hot-middleware": "^2.25.6",
     "typescript": "^5.2.2",
-    "@modern-js/builder-rspack-provider": "0.0.0-next-20231127105004",
-    "@modern-js/builder-webpack-provider": "0.0.0-next-20231127105004",
-    "@modern-js/core": "0.0.0-next-20231127105004",
-    "@scripts/build": "0.0.0-next-20231127105004"
+    "@modern-js/builder-webpack-provider": "0.0.0-next-20231129181734",
+    "@modern-js/builder-rspack-provider": "0.0.0-next-20231129181734",
+    "@modern-js/core": "0.0.0-next-20231129181734",
+    "@scripts/build": "0.0.0-next-20231129181734"
   },
   "peerDependencies": {
-    "@modern-js/builder-webpack-provider": "0.0.0-next-20231127105004",
-    "@modern-js/builder-rspack-provider": "0.0.0-next-20231127105004"
+    "@modern-js/builder-webpack-provider": "0.0.0-next-20231129181734",
+    "@modern-js/builder-rspack-provider": "0.0.0-next-20231129181734"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-webpack-provider": {