@modern-js/storybook-builder 0.0.0-next-20231114124526 → 0.0.0-next-20231114141546

package/dist/cjs/plugin-storybook.js

@@ -334,15 +334,14 @@ async function watchStories(patterns, cwd, writeModule) {
 async function addonAdapter(api, options) {
   const { presets } = options;
   api.modifyBuilderConfig(async (finalConfig) => {
-    var _finalConfig, _finalConfig_tools;
+    var _finalConfig;
     const babelOptions = await presets.apply("babel", {}, {
       ...options
     });
     var _tools;
     (_tools = (_finalConfig = finalConfig).tools) !== null && _tools !== void 0 ? _tools : _finalConfig.tools = {};
-    var _babel;
-    (_babel = (_finalConfig_tools = finalConfig.tools).babel) !== null && _babel !== void 0 ? _babel : _finalConfig_tools.babel = {};
-    finalConfig.tools.babel = (config) => {
+    const userConfig = finalConfig.tools.babel;
+    finalConfig.tools.babel = (config, utils) => {
       const getPluginName = (plugin) => Array.isArray(plugin) ? plugin[0] : plugin;
       const getOptions = (plugin) => Array.isArray(plugin) ? plugin[1] : null;
       const replaceOrInsert = (plugin, plugins) => {
@@ -351,7 +350,7 @@ async function addonAdapter(api, options) {
         for (let i = 0; i < plugins.length; i++) {
           if (getPluginName(plugins[i]) === pluginName) {
             if (getOptions(plugin)) {
-              import_utils.logger.info("Detected duplicated babel plugin, overrides with the new one");
+              import_utils.logger.info(`Detected duplicated babel plugin or presets: ${pluginName}, overrides with the new one`);
               plugins[i] = plugin;
             }
           } else {
@@ -361,21 +360,34 @@ async function addonAdapter(api, options) {
         plugins.push(...append);
       };
       const currentPlugins = config.plugins || [];
+      const currentPresets = config.presets || [];
       for (const plugin of babelOptions.plugins || []) {
         replaceOrInsert(plugin, currentPlugins);
       }
-      return {
+      for (const preset of babelOptions.presets || []) {
+        replaceOrInsert(preset, currentPresets);
+      }
+      const finalConfig2 = {
         ...config,
         ...babelOptions,
         plugins: currentPlugins,
-        presets: config.presets,
-        overrides: [
-          ...config.overrides || [],
-          ...babelOptions.overrides || []
-        ]
+        presets: currentPresets
       };
+      if (typeof userConfig === "function") {
+        return userConfig(finalConfig2, utils);
+      } else if (typeof userConfig === "object") {
+        return {
+          ...finalConfig2,
+          ...userConfig
+        };
+      } else {
+        return finalConfig2;
+      }
     };
   });
+  api.modifyBundlerChain((chain, { CHAIN_ID }) => {
+    chain.module.rule(CHAIN_ID.RULE.JS);
+  });
   api.modifyWebpackConfig(async (config) => {
     const finalDefaultConfig = await presets.apply("webpackFinal", config, options);
     return finalDefaultConfig;

package/dist/esm/plugin-storybook.js

@@ -356,11 +356,11 @@ async function watchStories(patterns, cwd, writeModule) {
 async function addonAdapter(api, options) {
   const { presets } = options;
   api.modifyBuilderConfig(async (finalConfig) => {
-    var _a, _b, _c;
+    var _a;
     const babelOptions = await presets.apply("babel", {}, { ...options });
     (_a = finalConfig.tools) != null ? _a : finalConfig.tools = {};
-    (_c = (_b = finalConfig.tools).babel) != null ? _c : _b.babel = {};
-    finalConfig.tools.babel = (config) => {
+    const userConfig = finalConfig.tools.babel;
+    finalConfig.tools.babel = (config, utils) => {
       const getPluginName = (plugin) => Array.isArray(plugin) ? plugin[0] : plugin;
       const getOptions = (plugin) => Array.isArray(plugin) ? plugin[1] : null;
       const replaceOrInsert = (plugin, plugins) => {
@@ -370,7 +370,7 @@ async function addonAdapter(api, options) {
           if (getPluginName(plugins[i]) === pluginName) {
             if (getOptions(plugin)) {
               logger.info(
-                "Detected duplicated babel plugin, overrides with the new one"
+                `Detected duplicated babel plugin or presets: ${pluginName}, overrides with the new one`
               );
               plugins[i] = plugin;
             }
@@ -381,21 +381,31 @@ async function addonAdapter(api, options) {
         plugins.push(...append);
       };
       const currentPlugins = config.plugins || [];
+      const currentPresets = config.presets || [];
       for (const plugin of babelOptions.plugins || []) {
         replaceOrInsert(plugin, currentPlugins);
       }
-      return {
+      for (const preset of babelOptions.presets || []) {
+        replaceOrInsert(preset, currentPresets);
+      }
+      const finalConfig2 = {
         ...config,
         ...babelOptions,
         plugins: currentPlugins,
-        presets: config.presets,
-        overrides: [
-          ...config.overrides || [],
-          ...babelOptions.overrides || []
-        ]
+        presets: currentPresets
       };
+      if (typeof userConfig === "function") {
+        return userConfig(finalConfig2, utils);
+      } else if (typeof userConfig === "object") {
+        return { ...finalConfig2, ...userConfig };
+      } else {
+        return finalConfig2;
+      }
     };
   });
+  api.modifyBundlerChain((chain, { CHAIN_ID }) => {
+    chain.module.rule(CHAIN_ID.RULE.JS);
+  });
   api.modifyWebpackConfig(async (config) => {
     const finalDefaultConfig = await presets.apply(
       "webpackFinal",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/storybook-builder",
-  "version": "0.0.0-next-20231114124526",
+  "version": "0.0.0-next-20231114141546",
   "description": "modern.js support for storybook",
   "repository": {
     "type": "git",
@@ -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-20231114124526",
-    "@modern-js/builder-shared": "0.0.0-next-20231114124526",
-    "@modern-js/runtime": "0.0.0-next-20231114124526",
-    "@modern-js/core": "0.0.0-next-20231114124526",
-    "@modern-js/utils": "0.0.0-next-20231114124526"
+    "@modern-js/builder-shared": "0.0.0-next-20231114141546",
+    "@modern-js/builder": "0.0.0-next-20231114141546",
+    "@modern-js/runtime": "0.0.0-next-20231114141546",
+    "@modern-js/utils": "0.0.0-next-20231114141546",
+    "@modern-js/core": "0.0.0-next-20231114141546"
   },
   "devDependencies": {
     "@storybook/types": "^7.5.1",
@@ -83,10 +83,10 @@
     "@types/serve-static": "^1.13.10",
     "@types/webpack-hot-middleware": "^2.25.6",
     "typescript": "^5.2.2",
-    "@modern-js/builder-webpack-provider": "0.0.0-next-20231114124526",
-    "@modern-js/builder-rspack-provider": "0.0.0-next-20231114124526",
-    "@scripts/build": "0.0.0-next-20231114124526",
-    "@modern-js/core": "0.0.0-next-20231114124526"
+    "@modern-js/builder-webpack-provider": "0.0.0-next-20231114141546",
+    "@modern-js/builder-rspack-provider": "0.0.0-next-20231114141546",
+    "@modern-js/core": "0.0.0-next-20231114141546",
+    "@scripts/build": "0.0.0-next-20231114141546"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",