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

package/dist/cjs/core.js

@@ -23,18 +23,16 @@ __export(core_exports, {
 module.exports = __toCommonJS(core_exports);
 var import_builder = require("@modern-js/builder");
 var import_core = require("@modern-js/core");
-var import_utils = require("@modern-js/utils");
-var import_utils2 = require("./utils");
+var import_utils = require("./utils");
 var import_plugin_storybook = require("./plugin-storybook");
 async function getCompiler(cwd, builderOptions, options) {
   const bundler = builderOptions.bundler || "webpack";
   const { presets } = options;
   const entries = await presets.apply("entries", []);
-  const res = await (0, import_utils2.runWithErrorMsg)(() => (0, import_core.loadConfig)(cwd, builderOptions.configPath || (0, import_utils2.getConfigFileName)()), "Failed to load config");
+  const res = await (0, import_utils.runWithErrorMsg)(() => (0, import_core.loadConfig)(cwd, builderOptions.configPath || (0, import_utils.getConfigFileName)()), "Failed to load config");
   const loadedConfig = res ? res.config : {};
   const finalConfig = await presets.apply("modern", loadedConfig) || loadedConfig;
-  await addonAdapter(finalConfig, options);
-  const provider = await (0, import_utils2.getProvider)(bundler, finalConfig);
+  const provider = await (0, import_utils.getProvider)(bundler, finalConfig);
   if (!provider) {
     throw new Error(`@modern-js/builder-${bundler}-provider not found `);
   }
@@ -52,58 +50,6 @@ async function getCompiler(cwd, builderOptions, options) {
   ]);
   return builder.createCompiler();
 }
-async function addonAdapter(finalConfig, options) {
-  var _finalConfig, _finalConfig1;
-  const { presets } = options;
-  const babelOptions = await presets.apply("babel", {}, {
-    ...options
-  });
-  var _tools;
-  (_tools = (_finalConfig = finalConfig).tools) !== null && _tools !== void 0 ? _tools : _finalConfig.tools = {};
-  finalConfig.tools.babel = (config) => {
-    const getPluginName = (plugin) => Array.isArray(plugin) ? plugin[0] : plugin;
-    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, overrides with the new one");
-            plugins[i] = plugin;
-          }
-        } else {
-          append.push(plugin);
-        }
-      }
-      plugins.push(...append);
-    };
-    const currentPlugins = config.plugins || [];
-    for (const plugin of babelOptions.plugins || []) {
-      replaceOrInsert(plugin, currentPlugins);
-    }
-    return {
-      ...config,
-      ...babelOptions,
-      plugins: currentPlugins,
-      presets: config.presets,
-      overrides: [
-        ...config.overrides || [],
-        ...babelOptions.overrides || []
-      ]
-    };
-  };
-  var _tools1;
-  (_tools1 = (_finalConfig1 = finalConfig).tools) !== null && _tools1 !== void 0 ? _tools1 : _finalConfig1.tools = {};
-  finalConfig.tools.webpack = (0, import_utils.applyOptionsChain)(
-    // @ts-expect-error tools.webpack not present in rspack config, but it's OK, we only
-    finalConfig.tools.webpack,
-    async (defaultConfig) => {
-      const finalDefaultConfig = await presets.apply("webpackFinal", defaultConfig, options);
-      return finalDefaultConfig;
-    }
-  );
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getCompiler

package/dist/cjs/plugin-storybook.js

@@ -89,6 +89,7 @@ const pluginStorybook = (cwd, options) => {
         await applyCsfPlugin(config, options);
       };
       if ("modifyWebpackConfig" in api) {
+        addonAdapter(api, options);
         api.modifyWebpackConfig(modifyConfig);
         api.modifyWebpackChain(async (chain) => {
           await (0, import_docgen.applyDocgenWebpack)(chain, options);
@@ -330,6 +331,68 @@ async function watchStories(patterns, cwd, writeModule) {
   ]);
   return watcher;
 }
+async function addonAdapter(api, options) {
+  const { presets } = options;
+  api.modifyBuilderConfig(async (finalConfig) => {
+    var _finalConfig;
+    const babelOptions = await presets.apply("babel", {}, {
+      ...options
+    });
+    var _tools;
+    (_tools = (_finalConfig = finalConfig).tools) !== null && _tools !== void 0 ? _tools : _finalConfig.tools = {};
+    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) => {
+        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;
+            }
+          } else {
+            append.push(plugin);
+          }
+        }
+        plugins.push(...append);
+      };
+      const currentPlugins = config.plugins || [];
+      const currentPresets = config.presets || [];
+      for (const plugin of babelOptions.plugins || []) {
+        replaceOrInsert(plugin, currentPlugins);
+      }
+      for (const preset of babelOptions.presets || []) {
+        replaceOrInsert(preset, currentPresets);
+      }
+      const finalConfig2 = {
+        ...config,
+        ...babelOptions,
+        plugins: currentPlugins,
+        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;
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   finalize,

package/dist/esm/core.js

@@ -1,6 +1,5 @@
 import { createBuilder } from "@modern-js/builder";
 import { loadConfig } from "@modern-js/core";
-import { applyOptionsChain, logger } from "@modern-js/utils";
 import { getConfigFileName, getProvider, runWithErrorMsg } from "./utils";
 import { pluginStorybook } from "./plugin-storybook";
 async function getCompiler(cwd, builderOptions, options) {
@@ -13,7 +12,6 @@ async function getCompiler(cwd, builderOptions, options) {
   );
   const loadedConfig = res ? res.config : {};
   const finalConfig = await presets.apply("modern", loadedConfig) || loadedConfig;
-  await addonAdapter(finalConfig, options);
   const provider = await getProvider(bundler, finalConfig);
   if (!provider) {
     throw new Error(`@modern-js/builder-${bundler}-provider not found `);
@@ -32,60 +30,6 @@ async function getCompiler(cwd, builderOptions, options) {
   ]);
   return builder.createCompiler();
 }
-async function addonAdapter(finalConfig, options) {
-  var _a, _b;
-  const { presets } = options;
-  const babelOptions = await presets.apply("babel", {}, { ...options });
-  (_a = finalConfig.tools) != null ? _a : finalConfig.tools = {};
-  finalConfig.tools.babel = (config) => {
-    const getPluginName = (plugin) => Array.isArray(plugin) ? plugin[0] : plugin;
-    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)) {
-            logger.info(
-              "Detected duplicated babel plugin, overrides with the new one"
-            );
-            plugins[i] = plugin;
-          }
-        } else {
-          append.push(plugin);
-        }
-      }
-      plugins.push(...append);
-    };
-    const currentPlugins = config.plugins || [];
-    for (const plugin of babelOptions.plugins || []) {
-      replaceOrInsert(plugin, currentPlugins);
-    }
-    return {
-      ...config,
-      ...babelOptions,
-      plugins: currentPlugins,
-      presets: config.presets,
-      overrides: [
-        ...config.overrides || [],
-        ...babelOptions.overrides || []
-      ]
-    };
-  };
-  (_b = finalConfig.tools) != null ? _b : finalConfig.tools = {};
-  finalConfig.tools.webpack = applyOptionsChain(
-    // @ts-expect-error tools.webpack not present in rspack config, but it's OK, we only
-    finalConfig.tools.webpack,
-    async (defaultConfig) => {
-      const finalDefaultConfig = await presets.apply(
-        "webpackFinal",
-        defaultConfig,
-        options
-      );
-      return finalDefaultConfig;
-    }
-  );
-}
 export {
   getCompiler
 };

package/dist/esm/plugin-storybook.js

@@ -1,5 +1,11 @@
 import { isAbsolute, join, resolve } from "path";
-import { slash, watch, globby, applyOptionsChain } from "@modern-js/utils";
+import {
+  slash,
+  watch,
+  globby,
+  applyOptionsChain,
+  logger
+} from "@modern-js/utils";
 import {
   mergeBuilderConfig
 } from "@modern-js/builder-shared";
@@ -73,6 +79,7 @@ const pluginStorybook = (cwd, options) => {
         await applyCsfPlugin(config, options);
       };
       if ("modifyWebpackConfig" in api) {
+        addonAdapter(api, options);
         api.modifyWebpackConfig(modifyConfig);
         api.modifyWebpackChain(async (chain) => {
           await applyDocgenWebpack(chain, options);
@@ -346,6 +353,68 @@ async function watchStories(patterns, cwd, writeModule) {
   );
   return watcher;
 }
+async function addonAdapter(api, options) {
+  const { presets } = options;
+  api.modifyBuilderConfig(async (finalConfig) => {
+    var _a;
+    const babelOptions = await presets.apply("babel", {}, { ...options });
+    (_a = finalConfig.tools) != null ? _a : finalConfig.tools = {};
+    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) => {
+        const pluginName = getPluginName(plugin);
+        const append = [];
+        for (let i = 0; i < plugins.length; i++) {
+          if (getPluginName(plugins[i]) === pluginName) {
+            if (getOptions(plugin)) {
+              logger.info(
+                `Detected duplicated babel plugin or presets: ${pluginName}, overrides with the new one`
+              );
+              plugins[i] = plugin;
+            }
+          } else {
+            append.push(plugin);
+          }
+        }
+        plugins.push(...append);
+      };
+      const currentPlugins = config.plugins || [];
+      const currentPresets = config.presets || [];
+      for (const plugin of babelOptions.plugins || []) {
+        replaceOrInsert(plugin, currentPlugins);
+      }
+      for (const preset of babelOptions.presets || []) {
+        replaceOrInsert(preset, currentPresets);
+      }
+      const finalConfig2 = {
+        ...config,
+        ...babelOptions,
+        plugins: currentPlugins,
+        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;
+  });
+}
 export {
   finalize,
   pluginStorybook

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/storybook-builder",
-  "version": "0.0.0-next-20231114083144",
+  "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-20231114083144",
-    "@modern-js/core": "0.0.0-next-20231114083144",
-    "@modern-js/builder-shared": "0.0.0-next-20231114083144",
-    "@modern-js/runtime": "0.0.0-next-20231114083144",
-    "@modern-js/utils": "0.0.0-next-20231114083144"
+    "@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/core": "0.0.0-next-20231114083144",
-    "@modern-js/builder-webpack-provider": "0.0.0-next-20231114083144",
-    "@scripts/build": "0.0.0-next-20231114083144",
-    "@modern-js/builder-rspack-provider": "0.0.0-next-20231114083144"
+    "@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/",