@modern-js/storybook-builder 0.0.0-nightly-20231128170637 → 0.0.0-nightly-20231130170642

package/dist/cjs/plugin-storybook.js

@@ -224,6 +224,12 @@ async function applyMdxLoader(config, options) {
   var _rules;
   (_rules = (_config_module = config.module).rules) !== null && _rules !== void 0 ? _rules : _config_module.rules = [];
   config.module.rules.push({
+    resourceQuery: /raw/,
+    type: "asset/source"
+  }, {
+    test: /\.md$/,
+    type: "asset/source"
+  }, {
     test: /(stories|story)\.mdx$/,
     use: [
       {
@@ -346,18 +352,16 @@ 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;
             }
-          } else {
-            append.push(plugin);
+            return;
           }
         }
-        plugins.push(...append);
+        plugins.push(plugin);
       };
       const currentPlugins = config.plugins || [];
       const currentPresets = config.presets || [];
@@ -368,18 +372,12 @@ function addonAdapter(api, options) {
         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
-        };
+      if (userConfig) {
+        return (0, import_utils.applyOptionsChain)(finalConfig2, userConfig, utils);
       } else {
         return finalConfig2;
       }

package/dist/esm/plugin-storybook.js

@@ -225,6 +225,14 @@ async function applyMdxLoader(config, options) {
   (_d = config.module) != null ? _d : config.module = {};
   (_f = (_e = config.module).rules) != null ? _f : _e.rules = [];
   config.module.rules.push(
+    {
+      resourceQuery: /raw/,
+      type: "asset/source"
+    },
+    {
+      test: /\.md$/,
+      type: "asset/source"
+    },
     {
       test: /(stories|story)\.mdx$/,
       use: [
@@ -365,7 +373,6 @@ 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)) {
@@ -374,11 +381,10 @@ function addonAdapter(api, options) {
               );
               plugins[i] = plugin;
             }
-          } else {
-            append.push(plugin);
+            return;
           }
         }
-        plugins.push(...append);
+        plugins.push(plugin);
       };
       const currentPlugins = config.plugins || [];
       const currentPresets = config.presets || [];
@@ -389,15 +395,12 @@ function addonAdapter(api, options) {
         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 };
+      if (userConfig) {
+        return applyOptionsChain(finalConfig2, userConfig, utils);
       } else {
         return finalConfig2;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/storybook-builder",
-  "version": "0.0.0-nightly-20231128170637",
+  "version": "0.0.0-nightly-20231130170642",
   "description": "modern.js support for storybook",
   "repository": {
     "type": "git",
@@ -51,7 +51,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@rspack/dev-client": "0.4.0-canary-a9e7d87-20231127152134",
+    "@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-nightly-20231128170637",
-    "@modern-js/builder-shared": "0.0.0-nightly-20231128170637",
-    "@modern-js/runtime": "0.0.0-nightly-20231128170637",
-    "@modern-js/utils": "0.0.0-nightly-20231128170637",
-    "@modern-js/core": "0.0.0-nightly-20231128170637"
+    "@modern-js/builder": "0.0.0-nightly-20231130170642",
+    "@modern-js/core": "0.0.0-nightly-20231130170642",
+    "@modern-js/runtime": "0.0.0-nightly-20231130170642",
+    "@modern-js/builder-shared": "0.0.0-nightly-20231130170642",
+    "@modern-js/utils": "0.0.0-nightly-20231130170642"
   },
   "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-nightly-20231128170637",
-    "@modern-js/builder-webpack-provider": "0.0.0-nightly-20231128170637",
-    "@modern-js/core": "0.0.0-nightly-20231128170637",
-    "@scripts/build": "0.0.0-nightly-20231128170637"
+    "@modern-js/core": "0.0.0-nightly-20231130170642",
+    "@modern-js/builder-webpack-provider": "0.0.0-nightly-20231130170642",
+    "@modern-js/builder-rspack-provider": "0.0.0-nightly-20231130170642",
+    "@scripts/build": "0.0.0-nightly-20231130170642"
   },
   "peerDependencies": {
-    "@modern-js/builder-webpack-provider": "0.0.0-nightly-20231128170637",
-    "@modern-js/builder-rspack-provider": "0.0.0-nightly-20231128170637"
+    "@modern-js/builder-webpack-provider": "0.0.0-nightly-20231130170642",
+    "@modern-js/builder-rspack-provider": "0.0.0-nightly-20231130170642"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-webpack-provider": {