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

package/dist/cjs/plugin-storybook.js

@@ -89,7 +89,6 @@ 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);
@@ -331,68 +330,6 @@ 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/plugin-storybook.js

@@ -1,11 +1,5 @@
 import { isAbsolute, join, resolve } from "path";
-import {
-  slash,
-  watch,
-  globby,
-  applyOptionsChain,
-  logger
-} from "@modern-js/utils";
+import { slash, watch, globby, applyOptionsChain } from "@modern-js/utils";
 import {
   mergeBuilderConfig
 } from "@modern-js/builder-shared";
@@ -79,7 +73,6 @@ 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);
@@ -353,68 +346,6 @@ 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-20231114141546",
+  "version": "0.0.0-next-20231115182236",
   "description": "modern.js support for storybook",
   "repository": {
     "type": "git",
@@ -17,19 +17,19 @@
   ],
   "exports": {
     ".": {
-      "jsnext:source": "./src/index.ts",
       "types": "./dist/types/index.d.ts",
+      "jsnext:source": "./src/index.ts",
       "default": "./dist/cjs/index.js"
     },
     "./preset": "./dist/esm/preset.js",
     "./addons": {
-      "jsnext:source": "./src/addons/preset/preview.ts",
       "types": "./dist/types/addons/preset/preview.d.ts",
+      "jsnext:source": "./src/addons/preset/preview.ts",
       "default": "./dist/esm/addons/preset/preview.js"
     },
     "./types": {
-      "jsnext:source": "./src/types.ts",
       "types": "./dist/types/types.d.ts",
+      "jsnext:source": "./src/types.ts",
       "default": "./dist/cjs/types.js"
     },
     "./templates/preview.ejs": "./templates/preview.ejs",
@@ -71,11 +71,11 @@
     "serve-static": "^1.14.1",
     "tinypool": "^0.8.0",
     "webpack-hot-middleware": "^2.25.4",
-    "@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"
+    "@modern-js/builder": "0.0.0-next-20231115182236",
+    "@modern-js/builder-shared": "0.0.0-next-20231115182236",
+    "@modern-js/core": "0.0.0-next-20231115182236",
+    "@modern-js/runtime": "0.0.0-next-20231115182236",
+    "@modern-js/utils": "0.0.0-next-20231115182236"
   },
   "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-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"
+    "@modern-js/builder-rspack-provider": "0.0.0-next-20231115182236",
+    "@modern-js/builder-webpack-provider": "0.0.0-next-20231115182236",
+    "@modern-js/core": "0.0.0-next-20231115182236",
+    "@scripts/build": "0.0.0-next-20231115182236"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/templates/virtualModuleModernEntry.js.handlebars

@@ -27,13 +27,13 @@ window.__STORYBOOK_CLIENT_API__ = new ClientApi({ storyStore: preview.storyStore
 
 preview.initialize({ importFn, getProjectAnnotations });
 
-if (import.meta.webpackHot) {
-  import.meta.webpackHot.accept('./{{storiesFilename}}', () => {
+if (module.hot) {
+  module.hot.accept('./{{storiesFilename}}', () => {
     // importFn has changed so we need to patch the new one in
     preview.onStoriesChanged({ importFn });
   });
 
-  import.meta.webpackHot.accept([
+  module.hot.accept([
     {{#each previewAnnotations}}'{{this}}',
     {{/each}}
   ], () => {