@modern-js/storybook-builder 0.0.0-next-20230920091340 → 0.0.0-next-20231010141253

package/.turbo/turbo-build.log

@@ -2,5 +2,5 @@
 > @modern-js/storybook-builder@2.31.2 build /home/runner/work/modern.js/modern.js/packages/storybook/builder
 > modern-lib build
 
-info    Build succeed in 43.373s
-info    Bundleless generated 51 files, the total size is 81.60 KB
+info    Build succeed in 36.1s
+info    Bundleless generated 51 files, the total size is 83.1 KB

package/CHANGELOG.md

@@ -1,25 +1,29 @@
 # @modern-js/storybook-builder
 
-## 0.0.0-next-20230920091340
+## 0.0.0-next-20231010141253
 
 ### Patch Changes
 
-- 366c3528a: feat: add storybook-framework
+- 251535116: feat: add storybook-framework
   feat: 支持 storybook-framework
-- Updated dependencies [e2def6e3d]
-- Updated dependencies [8ed713c05]
-- Updated dependencies [225f065f4]
-- Updated dependencies [0300daf88]
-- Updated dependencies [f509548a1]
-- Updated dependencies [15b834f65]
-- Updated dependencies [28128ca6e]
-- Updated dependencies [d87a42600]
-- Updated dependencies [4027a6aba]
-- Updated dependencies [3d93e8114]
-  - @modern-js/builder-rspack-provider@0.0.0-next-20230920091340
-  - @modern-js/builder@0.0.0-next-20230920091340
-  - @modern-js/builder-shared@0.0.0-next-20230920091340
-  - @modern-js/utils@0.0.0-next-20230920091340
-  - @modern-js/core@0.0.0-next-20230920091340
-  - @modern-js/builder-webpack-provider@0.0.0-next-20230920091340
-  - @modern-js/runtime@0.0.0-next-20230920091340
+- Updated dependencies [4fbc386a3]
+- Updated dependencies [3448e8208]
+- Updated dependencies [3473beecd]
+- Updated dependencies [b98f8aaf4]
+- Updated dependencies [3921cd46f]
+- Updated dependencies [d90d83a25]
+- Updated dependencies [5c8991041]
+- Updated dependencies [bc25bcbd3]
+- Updated dependencies [c1b0d1805]
+- Updated dependencies [2675812d3]
+- Updated dependencies [9d37401f4]
+- Updated dependencies [eb602d263]
+- Updated dependencies [4e3310bbe]
+- Updated dependencies [5b4bf2188]
+  - @modern-js/core@0.0.0-next-20231010141253
+  - @modern-js/builder@0.0.0-next-20231010141253
+  - @modern-js/utils@0.0.0-next-20231010141253
+  - @modern-js/builder-rspack-provider@0.0.0-next-20231010141253
+  - @modern-js/builder-webpack-provider@0.0.0-next-20231010141253
+  - @modern-js/builder-shared@0.0.0-next-20231010141253
+  - @modern-js/runtime@0.0.0-next-20231010141253

package/dist/cjs/addons/components/modern.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -62,12 +63,14 @@ const resolvePlugins = (runtime) => {
           plugins.push((0, import_model.default)(runtime.state));
         }
       } else if (api === allowedRuntimeAPI.router) {
-        plugins.push(
-          (0, import_router.default)({
-            ...{ serverBase: ["/"] },
-            ...runtime.router
-          })
-        );
+        plugins.push((0, import_router.default)({
+          ...{
+            serverBase: [
+              "/"
+            ]
+          },
+          ...runtime.router
+        }));
       }
     }
   });

package/dist/cjs/addons/constants.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/cjs/addons/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -20,8 +21,8 @@ __export(addons_exports, {
   default: () => addons_default
 });
 module.exports = __toCommonJS(addons_exports);
-var _a;
-if ((_a = module == null ? void 0 : module.hot) == null ? void 0 : _a.decline) {
+var _module_hot;
+if (module === null || module === void 0 ? void 0 : (_module_hot = module.hot) === null || _module_hot === void 0 ? void 0 : _module_hot.decline) {
   module.hot.decline();
 }
 var addons_default = {};

package/dist/cjs/addons/preset/preview.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -21,7 +22,9 @@ __export(preview_exports, {
 });
 module.exports = __toCommonJS(preview_exports);
 var import_withPluginRuntime = require("../withPluginRuntime");
-const decorators = [import_withPluginRuntime.withPluginRuntime];
+const decorators = [
+  import_withPluginRuntime.withPluginRuntime
+];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   decorators

package/dist/cjs/addons/type.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/cjs/addons/withPluginRuntime.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -23,9 +24,7 @@ module.exports = __toCommonJS(withPluginRuntime_exports);
 var import_preview_api = require("@storybook/preview-api");
 var import_modern = require("./components/modern");
 const withPluginRuntime = (storyFn) => {
-  const modernConfigRuntime = (0, import_preview_api.useParameter)(
-    "modernConfigRuntime"
-  );
+  const modernConfigRuntime = (0, import_preview_api.useParameter)("modernConfigRuntime");
   const modernConfigDesignToken = (0, import_preview_api.useParameter)("modernConfigDesignToken");
   return (0, import_modern.WrapProviders)(storyFn, {
     modernConfigRuntime: modernConfigRuntime || {},

package/dist/cjs/build.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -34,7 +35,7 @@ __export(build_exports, {
 });
 module.exports = __toCommonJS(build_exports);
 var import_path = require("path");
-var import_webpack_dev_middleware = __toESM(require("@modern-js/utils/webpack-dev-middleware"));
+var import_webpack_dev_middleware = __toESM(require("@modern-js/builder-shared/webpack-dev-middleware"));
 var import_webpack_hot_middleware = __toESM(require("webpack-hot-middleware"));
 var import_serve_static = __toESM(require("serve-static"));
 var import_utils = require("@modern-js/utils");
@@ -43,14 +44,12 @@ var import_plugin_storybook = require("./plugin-storybook");
 const getConfig = async (options) => {
   const { presets } = options;
   const frameworkOptions = await presets.apply("frameworkOptions");
-  return (frameworkOptions == null ? void 0 : frameworkOptions.options) || {};
+  return (frameworkOptions === null || frameworkOptions === void 0 ? void 0 : frameworkOptions.options) || {};
 };
 const build = async ({ options }) => {
   const config = await getConfig(options);
   const compiler = await (0, import_core.getCompiler)(process.cwd(), config, options);
-  const previewResolvedDir = (0, import_path.dirname)(
-    require.resolve("@storybook/preview/package.json")
-  );
+  const previewResolvedDir = (0, import_path.dirname)(require.resolve("@storybook/preview/package.json"));
   const previewDirOrigin = (0, import_path.join)(previewResolvedDir, "dist");
   const previewDirTarget = (0, import_path.join)(options.outputDir || "", `sb-preview`);
   const previewFiles = import_utils.fs.copy(previewDirOrigin, previewDirTarget, {
@@ -71,22 +70,19 @@ const build = async ({ options }) => {
       }
     });
   });
-  const [stats] = await Promise.all([compilation, previewFiles]);
+  const [stats] = await Promise.all([
+    compilation,
+    previewFiles
+  ]);
   return stats;
 };
-const start = async ({
-  options,
-  router,
-  startTime
-}) => {
-  const previewResolvedDir = (0, import_path.dirname)(
-    require.resolve("@storybook/preview/package.json")
-  );
+const start = async ({ options, router, startTime }) => {
+  const previewResolvedDir = (0, import_path.dirname)(require.resolve("@storybook/preview/package.json"));
   const previewDirOrigin = (0, import_path.join)(previewResolvedDir, "dist");
-  router.use(
-    `/sb-preview`,
-    (0, import_serve_static.default)(previewDirOrigin, { immutable: true, maxAge: "5m" })
-  );
+  router.use(`/sb-preview`, (0, import_serve_static.default)(previewDirOrigin, {
+    immutable: true,
+    maxAge: "5m"
+  }));
   const config = await getConfig(options);
   const compiler = await (0, import_core.getCompiler)(process.cwd(), config, options);
   const middleware = (0, import_webpack_dev_middleware.default)(compiler, {
@@ -95,7 +91,9 @@ const start = async ({
     stats: false
   });
   router.use(middleware);
-  router.use((0, import_webpack_hot_middleware.default)(compiler, { log: false }));
+  router.use((0, import_webpack_hot_middleware.default)(compiler, {
+    log: false
+  }));
   const stats = await new Promise((resolve) => {
     middleware.waitUntilValid((stats2) => {
       resolve(stats2);

package/dist/cjs/core.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -28,10 +29,7 @@ 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_utils.runWithErrorMsg)(
-    () => (0, import_core.loadConfig)(cwd, builderOptions.configPath || (0, import_utils.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 otherBuilderConfig = await presets.apply("modern", loadedConfig) || {};
   const builderConfig = (0, import_builder.mergeBuilderConfig)(otherBuilderConfig, loadedConfig);

package/dist/cjs/docgen/actualNameHandler.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -29,10 +30,7 @@ function actualNameHandler(documentation, path, importer) {
     let currentPath = path;
     while (currentPath.parent) {
       if (import_ast_types.namedTypes.VariableDeclarator.check(currentPath.parent.node)) {
-        documentation.set(
-          "actualName",
-          (0, import_utils.getNameOrValue)(currentPath.parent.get("id"))
-        );
+        documentation.set("actualName", (0, import_utils.getNameOrValue)(currentPath.parent.get("id")));
         return;
       }
       if (import_ast_types.namedTypes.AssignmentExpression.check(currentPath.parent.node)) {

package/dist/cjs/docgen/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -33,10 +34,7 @@ __export(docgen_exports, {
 module.exports = __toCommonJS(docgen_exports);
 var import_utils = require("@modern-js/utils");
 async function applyDocgenWebpack(chain, options) {
-  const typescriptOptions = await options.presets.apply(
-    "typescript",
-    {}
-  );
+  const typescriptOptions = await options.presets.apply("typescript", {});
   const { reactDocgen, reactDocgenTypescriptOptions } = typescriptOptions || {};
   if (typeof reactDocgen !== "string") {
     return;
@@ -64,19 +62,19 @@ async function applyDocgenWebpack(chain, options) {
   }
 }
 async function applyDocgenRspack(config, options) {
-  var _a, _b, _c;
+  var _config, _config_module;
   const typescriptOptions = await options.presets.apply("typescript", {});
   const { reactDocgen } = typescriptOptions || {};
   if (reactDocgen !== "react-docgen") {
     if (reactDocgen !== false && reactDocgen !== void 0) {
-      import_utils.logger.warn(
-        `Rspack currently only support 'typescript.reactDocgen: react-docgen' for auto docs generation, but you specified ${reactDocgen}`
-      );
+      import_utils.logger.warn(`Rspack currently only support 'typescript.reactDocgen: react-docgen' for auto docs generation, but you specified ${reactDocgen}`);
     }
     return;
   }
-  (_a = config.module) != null ? _a : config.module = {};
-  (_c = (_b = config.module).rules) != null ? _c : _b.rules = [];
+  var _module;
+  (_module = (_config = config).module) !== null && _module !== void 0 ? _module : _config.module = {};
+  var _rules;
+  (_rules = (_config_module = config.module).rules) !== null && _rules !== void 0 ? _rules : _config_module.rules = [];
   config.module.rules.push({
     test: /\.(tsx?|jsx?)$/,
     exclude: /node_modules/,

package/dist/cjs/docgen/loader.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;

package/dist/cjs/docgen/process.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -34,21 +35,15 @@ var import_react_docgen = require("react-docgen");
 var import_actualNameHandler = __toESM(require("./actualNameHandler"));
 const defaultHandlers = Object.values(import_react_docgen.handlers).map((handler) => handler);
 const importer = import_react_docgen.importers.makeFsImporter();
-var process_default = ({
-  source,
-  map,
-  filename
-}) => {
+var process_default = ({ source, map, filename }) => {
   try {
-    const results = (0, import_react_docgen.parse)(
-      source,
-      import_react_docgen.resolver.findAllExportedComponentDefinitions,
-      [...defaultHandlers, import_actualNameHandler.default],
-      {
-        filename,
-        importer
-      }
-    );
+    const results = (0, import_react_docgen.parse)(source, import_react_docgen.resolver.findAllExportedComponentDefinitions, [
+      ...defaultHandlers,
+      import_actualNameHandler.default
+    ], {
+      filename,
+      importer
+    });
     const docgen = results.map((result) => {
       const { actualName, ...docgenInfo } = result;
       if (actualName) {
@@ -56,7 +51,10 @@ var process_default = ({
       }
       return "";
     }).filter(Boolean).join(";");
-    return [docgen, map];
+    return [
+      docgen,
+      map
+    ];
   } catch (e) {
     return null;
   }

package/dist/cjs/index.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -28,7 +29,9 @@ module.exports = __toCommonJS(src_exports);
 var import_path = require("path");
 var import_build = require("./build");
 __reExport(src_exports, require("./types"), module.exports);
-const corePresets = [(0, import_path.join)(__dirname, "./preset.js")];
+const corePresets = [
+  (0, import_path.join)(__dirname, "./preset.js")
+];
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   bail,

package/dist/cjs/plugin-storybook.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -47,18 +48,18 @@ const onClose = (f) => {
   closeFn.push(f);
 };
 async function finalize() {
-  await Promise.all([closeFn.map((close) => close())]);
+  await Promise.all([
+    closeFn.map((close) => close())
+  ]);
 }
 const pluginStorybook = (cwd, options) => {
   return {
     name: "builder-plugin-storybook",
-    remove: ["builder-plugin-inline"],
+    remove: [
+      "builder-plugin-inline"
+    ],
     async setup(api) {
-      const matchers = await options.presets.apply(
-        "stories",
-        [],
-        options
-      );
+      const matchers = await options.presets.apply("stories", [], options);
       const storyPatterns = (0, import_core_common.normalizeStories)(matchers, {
         configDir: options.configDir,
         workingDir: options.configDir
@@ -68,21 +69,16 @@ const pluginStorybook = (cwd, options) => {
         return absolutePattern;
       });
       api.modifyBuilderConfig(async (builderConfig) => {
-        await prepareStorybookModules(
-          api.context.cachePath,
-          cwd,
-          options,
-          builderConfig,
-          storyPatterns
-        );
+        await prepareStorybookModules(api.context.cachePath, cwd, options, builderConfig, storyPatterns);
         await applyDefines(builderConfig, options);
         await applyHTML(builderConfig, options);
         await applyReact(builderConfig, options);
         applyExternals(builderConfig);
       });
       const modifyConfig = async (config) => {
-        var _a;
-        (_a = config.resolve) != null ? _a : config.resolve = {};
+        var _config;
+        var _resolve;
+        (_resolve = (_config = config).resolve) !== null && _resolve !== void 0 ? _resolve : _config.resolve = {};
         config.resolve.conditionNames = [
           "require",
           "node",
@@ -107,23 +103,22 @@ const pluginStorybook = (cwd, options) => {
   };
 };
 async function applyCsfPlugin(config, options) {
-  var _a, _b, _c;
+  var _addons_find;
+  var _config;
   const { presets } = options;
   const addons = await presets.apply("addons", []);
-  const {
-    options: { bundler }
-  } = await presets.apply("frameworkOptions");
-  const docsOptions = (
-    // @ts-expect-error - not sure what type to use here
-    (_b = (_a = addons.find((a) => [a, a.name].includes("@storybook/addon-docs"))) == null ? void 0 : _a.options) != null ? _b : {}
-  );
-  (_c = config.plugins) != null ? _c : config.plugins = [];
-  config.plugins.push(
-    bundler === "rspack" ? import_csf_plugin.unplugin.rspack(docsOptions) : import_csf_plugin.unplugin.webpack(docsOptions)
-  );
+  const { options: { bundler } } = await presets.apply("frameworkOptions");
+  var _addons_find_options;
+  const docsOptions = (_addons_find_options = (_addons_find = addons.find((a) => [
+    a,
+    a.name
+  ].includes("@storybook/addon-docs"))) === null || _addons_find === void 0 ? void 0 : _addons_find.options) !== null && _addons_find_options !== void 0 ? _addons_find_options : {};
+  var _plugins;
+  (_plugins = (_config = config).plugins) !== null && _plugins !== void 0 ? _plugins : _config.plugins = [];
+  config.plugins.push(bundler === "rspack" ? import_csf_plugin.unplugin.rspack(docsOptions) : import_csf_plugin.unplugin.webpack(docsOptions));
 }
 async function prepareStorybookModules(tempDir, cwd, options, builderConfig, storyPatterns) {
-  var _a;
+  var _builderConfig;
   const mappings = await createStorybookModules(cwd, options, storyPatterns);
   const componentsPath = (0, import_utils2.maybeGetAbsolutePath)(`@storybook/components`);
   const routerPath = (0, import_utils2.maybeGetAbsolutePath)(`@storybook/router`);
@@ -132,11 +127,16 @@ async function prepareStorybookModules(tempDir, cwd, options, builderConfig, sto
     ...componentsPath ? {
       [`@storybook/components`]: componentsPath
     } : {},
-    ...routerPath ? { [`@storybook/router`]: routerPath } : {},
-    ...themingPath ? { [`@storybook/theming`]: themingPath } : {}
+    ...routerPath ? {
+      [`@storybook/router`]: routerPath
+    } : {},
+    ...themingPath ? {
+      [`@storybook/theming`]: themingPath
+    } : {}
   };
   const [mappingsAlias, write] = await (0, import_utils2.virtualModule)(tempDir, cwd, mappings);
-  (_a = builderConfig.source) != null ? _a : builderConfig.source = {};
+  var _source;
+  (_source = (_builderConfig = builderConfig).source) !== null && _source !== void 0 ? _source : _builderConfig.source = {};
   builderConfig.source.alias = {
     ...builderConfig.source.alias,
     ...storybookPaths,
@@ -150,10 +150,11 @@ async function prepareStorybookModules(tempDir, cwd, options, builderConfig, sto
   }
 }
 async function applyDefines(builderConfig, options) {
-  var _a;
+  var _builderConfig;
   const { presets } = options;
   const envs = await presets.apply("env");
-  (_a = builderConfig.source) != null ? _a : builderConfig.source = {};
+  var _source;
+  (_source = (_builderConfig = builderConfig).source) !== null && _source !== void 0 ? _source : _builderConfig.source = {};
   builderConfig.source.define = {
     ...builderConfig.source.define,
     ...(0, import_core_common.stringifyProcessEnvs)(envs),
@@ -162,24 +163,9 @@ async function applyDefines(builderConfig, options) {
   };
 }
 async function applyHTML(builderConfig, options) {
-  var _a;
-  const {
-    presets,
-    packageJson,
-    configType,
-    features,
-    previewUrl,
-    serverChannelUrl
-  } = options;
-  const [
-    coreOptions,
-    frameworkOptions,
-    logLevel,
-    headHtmlSnippet,
-    bodyHtmlSnippet,
-    template,
-    docsOptions
-  ] = await Promise.all([
+  var _builderConfig;
+  const { presets, packageJson, configType, features, previewUrl, serverChannelUrl } = options;
+  const [coreOptions, frameworkOptions, logLevel, headHtmlSnippet, bodyHtmlSnippet, template, docsOptions] = await Promise.all([
     presets.apply("core"),
     presets.apply("frameworkOptions"),
     presets.apply("logLevel", void 0),
@@ -188,16 +174,14 @@ async function applyHTML(builderConfig, options) {
     presets.apply("previewMainTemplate"),
     presets.apply("docs")
   ]);
-  (_a = builderConfig.tools) != null ? _a : builderConfig.tools = {};
+  var _tools;
+  (_tools = (_builderConfig = builderConfig).tools) !== null && _tools !== void 0 ? _tools : _builderConfig.tools = {};
   builderConfig.tools.htmlPlugin = {
     ...builderConfig.tools.htmlPlugin,
     template,
     filename: "iframe.html",
     templateParameters: {
-      ...builderConfig.tools.htmlPlugin ? (
-        // @ts-expect-error
-        builderConfig.tools.htmlPlugin.templateParameters || {}
-      ) : {},
+      ...builderConfig.tools.htmlPlugin ? builderConfig.tools.htmlPlugin.templateParameters || {} : {},
       version: packageJson.version || "",
       globals: {
         CONFIG_TYPE: configType,
@@ -216,65 +200,63 @@ async function applyHTML(builderConfig, options) {
   };
 }
 async function applyMdxLoader(config, options) {
-  var _a, _b, _c, _d, _e, _f;
+  var _mdxPluginOptions_mdxCompileOptions, _options_features;
+  var _config, _config_module;
   const { presets, mdxPluginOptions } = options;
   const remarkExternalLinks = await Promise.resolve().then(() => __toESM(require("remark-external-links")));
   const remarkSlug = await Promise.resolve().then(() => __toESM(require("remark-slug")));
+  var _mdxPluginOptions_mdxCompileOptions_remarkPlugins;
   const mdxLoaderOptions = await presets.apply("mdxLoaderOptions", {
     skipCsf: true,
     mdxCompileOptions: {
       providerImportSource: "@storybook/addon-docs/mdx-react-shim",
-      ...mdxPluginOptions == null ? void 0 : mdxPluginOptions.mdxCompileOptions,
+      ...mdxPluginOptions === null || mdxPluginOptions === void 0 ? void 0 : mdxPluginOptions.mdxCompileOptions,
       remarkPlugins: [
         remarkSlug,
         remarkExternalLinks,
-        ...(_b = (_a = mdxPluginOptions == null ? void 0 : mdxPluginOptions.mdxCompileOptions) == null ? void 0 : _a.remarkPlugins) != null ? _b : []
+        ...(_mdxPluginOptions_mdxCompileOptions_remarkPlugins = mdxPluginOptions === null || mdxPluginOptions === void 0 ? void 0 : (_mdxPluginOptions_mdxCompileOptions = mdxPluginOptions.mdxCompileOptions) === null || _mdxPluginOptions_mdxCompileOptions === void 0 ? void 0 : _mdxPluginOptions_mdxCompileOptions.remarkPlugins) !== null && _mdxPluginOptions_mdxCompileOptions_remarkPlugins !== void 0 ? _mdxPluginOptions_mdxCompileOptions_remarkPlugins : []
       ]
     }
   });
-  const mdxLoader = ((_c = options.features) == null ? void 0 : _c.legacyMdx1) ? require.resolve("@storybook/mdx1-csf/loader") : require.resolve("@storybook/mdx2-csf/loader");
-  (_d = config.module) != null ? _d : config.module = {};
-  (_f = (_e = config.module).rules) != null ? _f : _e.rules = [];
-  config.module.rules.push(
-    {
-      test: /(stories|story)\.mdx$/,
-      use: [
-        {
-          loader: mdxLoader,
-          options: {
-            ...mdxLoaderOptions,
-            skipCsf: false
-          }
+  const mdxLoader = ((_options_features = options.features) === null || _options_features === void 0 ? void 0 : _options_features.legacyMdx1) ? require.resolve("@storybook/mdx1-csf/loader") : require.resolve("@storybook/mdx2-csf/loader");
+  var _module;
+  (_module = (_config = config).module) !== null && _module !== void 0 ? _module : _config.module = {};
+  var _rules;
+  (_rules = (_config_module = config.module).rules) !== null && _rules !== void 0 ? _rules : _config_module.rules = [];
+  config.module.rules.push({
+    test: /(stories|story)\.mdx$/,
+    use: [
+      {
+        loader: mdxLoader,
+        options: {
+          ...mdxLoaderOptions,
+          skipCsf: false
         }
-      ]
-    },
-    {
-      test: /\.mdx$/,
-      exclude: /(stories|story)\.mdx$/,
-      use: [
-        {
-          loader: mdxLoader,
-          options: mdxLoaderOptions
-        }
-      ]
-    }
-  );
-}
-function applyExternals(builderConfig) {
-  var _a;
-  const config = (0, import_builder_shared.mergeBuilderConfig)(
-    {
-      output: {
-        ...builderConfig.output,
-        externals: (_a = builderConfig.output) == null ? void 0 : _a.externals
       }
-    },
-    {
-      output: {
-        externals: import_globals.globals
+    ]
+  }, {
+    test: /\.mdx$/,
+    exclude: /(stories|story)\.mdx$/,
+    use: [
+      {
+        loader: mdxLoader,
+        options: mdxLoaderOptions
       }
+    ]
+  });
+}
+function applyExternals(builderConfig) {
+  var _builderConfig_output;
+  const config = (0, import_builder_shared.mergeBuilderConfig)({
+    output: {
+      ...builderConfig.output,
+      externals: (_builderConfig_output = builderConfig.output) === null || _builderConfig_output === void 0 ? void 0 : _builderConfig_output.externals
+    }
+  }, {
+    output: {
+      externals: import_globals.globals
     }
-  );
+  });
   builderConfig.output = config.output;
 }
 function getStoriesEntryPath(cwd) {
@@ -290,11 +272,7 @@ async function createStorybookModules(cwd, options, storyPatterns) {
   virtualModuleMappings[getStoriesEntryPath(cwd)] = storiesEntry;
   const configEntryPath = getStoriesConfigPath(cwd);
   const previewAnnotations = [
-    ...(await presets.apply(
-      "previewAnnotations",
-      [],
-      options
-    )).map((entry) => {
+    ...(await presets.apply("previewAnnotations", [], options)).map((entry) => {
       if (typeof entry === "object") {
         return entry.absolute;
       }
@@ -302,62 +280,55 @@ async function createStorybookModules(cwd, options, storyPatterns) {
     }),
     (0, import_core_common.loadPreviewOrConfigFile)(options)
   ].filter(Boolean);
-  virtualModuleMappings[configEntryPath] = (0, import_core_common.handlebars)(
-    await (0, import_core_common.readTemplate)(
-      require.resolve("@modern-js/storybook-builder/templates/virtualModuleModernEntry.js.handlebars")
-    ),
-    {
-      storiesFilename: STORIES_FILENAME,
-      previewAnnotations
-    }
-  ).replace(/\\/g, "\\\\");
+  virtualModuleMappings[configEntryPath] = (0, import_core_common.handlebars)(await (0, import_core_common.readTemplate)(require.resolve("@modern-js/storybook-builder/templates/virtualModuleModernEntry.js.handlebars")), {
+    storiesFilename: STORIES_FILENAME,
+    previewAnnotations
+  }).replace(/\\/g, "\\\\");
   return virtualModuleMappings;
 }
 async function createStoriesEntry(cwd, storyPatterns) {
-  const stories = (await Promise.all(
-    storyPatterns.map((pattern) => {
-      return (0, import_utils.globby)((0, import_utils.slash)(pattern), { followSymbolicLinks: true });
-    })
-  )).reduce((carry, stories2) => carry.concat(stories2), []);
+  const stories = (await Promise.all(storyPatterns.map((pattern) => {
+    return (0, import_utils.globby)((0, import_utils.slash)(pattern), {
+      followSymbolicLinks: true
+    });
+  }))).reduce((carry, stories2) => carry.concat(stories2), []);
   return await (0, import_utils2.toImportFn)(cwd, stories);
 }
 async function applyReact(config, options) {
-  var _a, _b, _c;
   let version = "18.0.0";
   try {
     ({ version } = await Promise.resolve().then(() => __toESM(require("react-dom/package.json"))));
   } catch (_) {
   }
-  const { legacyRootApi } = await options.presets.apply(
-    "frameworkOptions"
-  ) || {};
+  const { legacyRootApi } = await options.presets.apply("frameworkOptions") || {};
   const isReact18 = version.startsWith("18") || version.startsWith("0.0.0");
-  const useReact17 = legacyRootApi != null ? legacyRootApi : !isReact18;
+  const useReact17 = legacyRootApi !== null && legacyRootApi !== void 0 ? legacyRootApi : !isReact18;
   if (!useReact17) {
-    (_a = config.source) != null ? _a : config.source = {};
-    (_c = (_b = config.source).alias) != null ? _c : _b.alias = {};
+    var _config, _config_source;
+    var _source;
+    (_source = (_config = config).source) !== null && _source !== void 0 ? _source : _config.source = {};
+    var _alias;
+    (_alias = (_config_source = config.source).alias) !== null && _alias !== void 0 ? _alias : _config_source.alias = {};
     config.source.alias["@storybook/react-dom-shim"] = "@storybook/react-dom-shim/dist/react-18";
   }
 }
 async function watchStories(patterns, cwd, writeModule) {
-  const watcher = (0, import_utils.watch)(
-    cwd,
-    async ({ changeType, changedFilePath }) => {
-      if (changeType !== "add" && changeType !== "unlink") {
-        return;
-      }
-      if (patterns.some((entry) => (0, import_minimatch.minimatch)(changedFilePath, entry))) {
-        const stories = (await Promise.all(
-          patterns.map((pattern) => {
-            return (0, import_utils.globby)((0, import_utils.slash)(pattern), { followSymbolicLinks: true });
-          })
-        )).reduce((carry, stories2) => carry.concat(stories2), []);
-        const newStories = await (0, import_utils2.toImportFn)(cwd, stories);
-        writeModule(getStoriesEntryPath(cwd), newStories);
-      }
-    },
-    [/node_modules/]
-  );
+  const watcher = (0, import_utils.watch)(cwd, async ({ changeType, changedFilePath }) => {
+    if (changeType !== "add" && changeType !== "unlink") {
+      return;
+    }
+    if (patterns.some((entry) => (0, import_minimatch.minimatch)(changedFilePath, entry))) {
+      const stories = (await Promise.all(patterns.map((pattern) => {
+        return (0, import_utils.globby)((0, import_utils.slash)(pattern), {
+          followSymbolicLinks: true
+        });
+      }))).reduce((carry, stories2) => carry.concat(stories2), []);
+      const newStories = await (0, import_utils2.toImportFn)(cwd, stories);
+      writeModule(getStoriesEntryPath(cwd), newStories);
+    }
+  }, [
+    /node_modules/
+  ]);
   return watcher;
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/preset.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -45,25 +46,23 @@ const entries = async (_, options) => {
   const result = [];
   const { bundler } = await (0, import_build.getConfig)(options);
   if (options.configType === "DEVELOPMENT") {
-    result.push(
-      ...[
-        `${require.resolve("webpack-hot-middleware/client")}?reload=true&quiet=false&noInfo=${options.quiet}`,
-        bundler === "rspack" ? require.resolve("@rspack/dev-client/react-refresh-entry") : null
-      ].filter(Boolean)
-    );
+    result.push(...[
+      `${require.resolve("webpack-hot-middleware/client")}?reload=true&quiet=false&noInfo=${options.quiet}`,
+      bundler === "rspack" ? require.resolve("@rspack/dev-client/react-refresh-entry") : null
+    ].filter(Boolean));
   }
   result.push(getStoriesConfigPath(process.cwd()));
   return result;
 };
 const modern = (builderConfig, options) => {
-  var _a;
+  var _builderConfig_output;
   return {
     ...builderConfig,
     output: {
       ...builderConfig.output,
       disableInlineRuntimeChunk: true,
       distPath: {
-        ...(_a = builderConfig.output) == null ? void 0 : _a.distPath,
+        ...(_builderConfig_output = builderConfig.output) === null || _builderConfig_output === void 0 ? void 0 : _builderConfig_output.distPath,
         root: options.outputDir
       }
     }

package/dist/cjs/types.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;

package/dist/cjs/utils.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -48,8 +49,8 @@ const VIRTUAL_MODULE_BASE = ".MODERN_STORYBOOK";
 const STORIES_FILENAME = "storybook-stories.js";
 const STORYBOOK_CONFIG_ENTRY = "storybook-config-entry.js";
 const requireResolve = (importer, path2) => {
-  const require2 = (0, import_node_module.createRequire)(importer);
-  require2.resolve(path2);
+  const require1 = (0, import_node_module.createRequire)(importer);
+  require1.resolve(path2);
 };
 async function getProvider(bundler, builderConfig) {
   try {
@@ -65,23 +66,19 @@ async function getProvider(bundler, builderConfig) {
       });
     }
   } catch (e) {
-    import_utils.logger.error(
-      `Cannot find provider, you need to install @modern-js/builder-${bundler}-provider first`
-    );
+    import_utils.logger.error(`Cannot find provider, you need to install @modern-js/builder-${bundler}-provider first`);
   }
 }
 async function virtualModule(tempDir, cwd, virtualModuleMap) {
   import_utils.fs.ensureDirSync(tempDir);
   const alias = {};
-  await Promise.all(
-    Reflect.ownKeys(virtualModuleMap).map((k) => {
-      const virtualPath = k;
-      const relativePath = import_path.default.relative(cwd, virtualPath);
-      const realPath = import_path.default.join(tempDir, relativePath);
-      alias[virtualPath] = realPath;
-      return import_utils.fs.writeFile(realPath, virtualModuleMap[virtualPath]);
-    })
-  );
+  await Promise.all(Reflect.ownKeys(virtualModuleMap).map((k) => {
+    const virtualPath = k;
+    const relativePath = import_path.default.relative(cwd, virtualPath);
+    const realPath = import_path.default.join(tempDir, relativePath);
+    alias[virtualPath] = realPath;
+    return import_utils.fs.writeFile(realPath, virtualModuleMap[virtualPath]);
+  }));
   return [
     alias,
     (virtualPath, content) => {
@@ -95,10 +92,14 @@ async function toImportFn(cwd, stories) {
   const objectEntries = stories.map((file) => {
     const ext = import_path.default.extname(file);
     const relativePath = import_path.default.relative(cwd, file);
-    if (![".js", ".jsx", ".ts", ".tsx", ".mdx"].includes(ext)) {
-      import_utils.logger.warn(
-        `Cannot process ${ext} file with storyStoreV7: ${relativePath}`
-      );
+    if (![
+      ".js",
+      ".jsx",
+      ".ts",
+      ".tsx",
+      ".mdx"
+    ].includes(ext)) {
+      import_utils.logger.warn(`Cannot process ${ext} file with storyStoreV7: ${relativePath}`);
     }
     return `  '${toImportPath(relativePath)}': async () => import('${file}')`;
   });

package/dist/esm/build.js

@@ -1,5 +1,5 @@
 import { dirname, join, parse } from "path";
-import webpackDevMiddleware from "@modern-js/utils/webpack-dev-middleware";
+import webpackDevMiddleware from "@modern-js/builder-shared/webpack-dev-middleware";
 import webpackHotMiddleware from "webpack-hot-middleware";
 import serveStatic from "serve-static";
 import { fs } from "@modern-js/utils";

package/dist/types/core.d.ts

@@ -1,4 +1,4 @@
 import type { Options } from '@storybook/types';
-import type { Compiler } from '@modern-js/utils/webpack-dev-middleware';
+import type { Compiler } from '@modern-js/builder-shared/webpack-dev-middleware';
 import type { BuilderOptions } from './types';
 export declare function getCompiler(cwd: string, builderOptions: BuilderOptions, options: Options): Promise<Compiler>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/storybook-builder",
-  "version": "0.0.0-next-20230920091340",
+  "version": "0.0.0-next-20231010141253",
   "description": "modern.js support for storybook",
   "repository": {
     "type": "git",
@@ -35,17 +35,17 @@
   "license": "MIT",
   "dependencies": {
     "@rspack/dev-client": "0.3.2",
-    "@storybook/components": "^7.4.0",
-    "@storybook/core-common": "^7.4.0",
-    "@storybook/csf-plugin": "^7.4.0",
+    "@storybook/components": "^7.4.6",
+    "@storybook/core-common": "^7.4.6",
+    "@storybook/csf-plugin": "^7.4.6",
     "@storybook/global": "^5.0.0",
     "@storybook/mdx1-csf": "^1.0.0",
     "@storybook/mdx2-csf": "^1.1.0",
-    "@storybook/preview": "^7.4.0",
-    "@storybook/preview-api": "^7.4.0",
+    "@storybook/preview": "^7.4.6",
+    "@storybook/preview-api": "^7.4.6",
     "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0",
-    "@storybook/router": "^7.4.0",
-    "@storybook/theming": "^7.4.0",
+    "@storybook/router": "^7.4.6",
+    "@storybook/theming": "^7.4.6",
     "ast-types": "^0.14.2",
     "minimatch": "^9.0.3",
     "react-docgen": "6.0.0-alpha.3",
@@ -54,26 +54,26 @@
     "serve-static": "^1.14.1",
     "tinypool": "^0.8.0",
     "webpack-hot-middleware": "^2.25.4",
-    "@modern-js/builder": "0.0.0-next-20230920091340",
-    "@modern-js/builder-shared": "0.0.0-next-20230920091340",
-    "@modern-js/core": "0.0.0-next-20230920091340",
-    "@modern-js/runtime": "0.0.0-next-20230920091340",
-    "@modern-js/utils": "0.0.0-next-20230920091340"
+    "@modern-js/builder": "0.0.0-next-20231010141253",
+    "@modern-js/builder-shared": "0.0.0-next-20231010141253",
+    "@modern-js/core": "0.0.0-next-20231010141253",
+    "@modern-js/runtime": "0.0.0-next-20231010141253",
+    "@modern-js/utils": "0.0.0-next-20231010141253"
   },
   "devDependencies": {
-    "@storybook/types": "^7.4.0",
+    "@storybook/types": "^7.4.6",
     "@types/babel__core": "^7.20.1",
     "@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-20230920091340",
-    "@modern-js/builder-webpack-provider": "0.0.0-next-20230920091340",
-    "@modern-js/core": "0.0.0-next-20230920091340",
-    "@scripts/build": "0.0.0-next-20230920091340"
+    "@modern-js/builder-rspack-provider": "0.0.0-next-20231010141253",
+    "@modern-js/builder-webpack-provider": "0.0.0-next-20231010141253",
+    "@modern-js/core": "0.0.0-next-20231010141253",
+    "@scripts/build": "0.0.0-next-20231010141253"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "0.0.0-next-20230920091340",
-    "@modern-js/builder-webpack-provider": "0.0.0-next-20230920091340"
+    "@modern-js/builder-rspack-provider": "0.0.0-next-20231010141253",
+    "@modern-js/builder-webpack-provider": "0.0.0-next-20231010141253"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {

package/src/build.ts

@@ -1,5 +1,5 @@
 import { dirname, join, parse } from 'path';
-import webpackDevMiddleware from '@modern-js/utils/webpack-dev-middleware';
+import webpackDevMiddleware from '@modern-js/builder-shared/webpack-dev-middleware';
 import webpackHotMiddleware from 'webpack-hot-middleware';
 import serveStatic from 'serve-static';
 import type { Builder as RawStorybookBuilder, Stats } from '@storybook/types';

package/src/core.ts

@@ -1,7 +1,7 @@
 import { createBuilder, mergeBuilderConfig } from '@modern-js/builder';
 import { loadConfig } from '@modern-js/core';
 import type { Options } from '@storybook/types';
-import type { Compiler } from '@modern-js/utils/webpack-dev-middleware';
+import type { Compiler } from '@modern-js/builder-shared/webpack-dev-middleware';
 import type { BuilderConfig, BuilderOptions } from './types';
 import { getConfigFileName, getProvider, runWithErrorMsg } from './utils';
 import { pluginStorybook } from './plugin-storybook';