npm - @modern-js/app-tools - Versions diffs - 2.44.0 → 2.45.1-alpha.0 - Mend

@modern-js/app-tools 2.44.0 → 2.45.1-alpha.0

Files changed (82) hide show

package/dist/cjs/analyze/nestedRoutes.js CHANGED Viewed

@@ -143,7 +143,7 @@ const walk = async (dirname, rootDir, alias, entryName, isMainEntry, oldVersion)
   const items = await import_utils.fs.readdir(dirname);
   for (const item of items) {
     const itemPath = path.join(dirname, item);
-    const itemPathWithAlias = (0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name);
+    const itemPathWithAlias = getPathWithoutExt((0, import_utils2.replaceWithAlias)(alias.basename, itemPath, alias.name));
     const extname = path.extname(item);
     const itemWithoutExt = item.slice(0, -extname.length);
     const isDirectory2 = (await import_utils.fs.stat(itemPath)).isDirectory();

package/dist/cjs/analyze/templates.js CHANGED Viewed

@@ -91,8 +91,6 @@ const html = (partials) => `
 <!DOCTYPE html>
 <html>
 <head>
-  <%= meta %>
-  <title><%= title %></title>
   ${partials.top.join("\n")}
@@ -275,13 +273,12 @@ const fileSystemRoutes = async ({ routes, ssrMode, nestedRoutesEntry, entryName,
             lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
             component = `lazy(${lazyImport})`;
           }
+        } else if (ssrMode === "string") {
+          components.push(route._component);
+          component = `component_${components.length - 1}`;
         } else {
           lazyImport = `() => import(/* webpackMode: "eager" */  '${route._component}').then(routeModule => handleRouteModule(routeModule, "${route.id}")).catch(handleRouteModuleError) `;
-          if (ssrMode === "string") {
-            component = `loadable(${lazyImport})`;
-          } else {
-            component = `lazy(${lazyImport})`;
-          }
+          component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {

package/dist/cjs/builder/builder-rspack/index.js CHANGED Viewed

@@ -21,11 +21,10 @@ __export(builder_rspack_exports, {
   createRspackBuilderForModern: () => createRspackBuilderForModern
 });
 module.exports = __toCommonJS(builder_rspack_exports);
-var import_builder_rspack_provider = require("@modern-js/builder-rspack-provider");
 var import_generator = require("../generator");
 var import_adapterCopy = require("./adapterCopy");
 async function createRspackBuilderForModern(options) {
-  const builder = await (0, import_generator.generateBuilder)(options, import_builder_rspack_provider.builderRspackProvider);
+  const builder = await (0, import_generator.generateBuilder)(options, "rspack");
   builder.addPlugins([
     (0, import_adapterCopy.builderPluginAdpaterCopy)(options)
   ]);

package/dist/cjs/builder/builder-webpack/createCopyPattern.js CHANGED Viewed

@@ -51,6 +51,8 @@ function createPublicPattern(appContext, config, chain) {
 function createUploadPattern(appContext, config) {
   const { uploadDir } = (0, import_shared.createCopyInfo)(appContext, config);
   return {
+    // rspack copy info structure is inconsistent with webpack, it only used in webpack mode
+    // @ts-expect-error
     info,
     from: "**/*",
     to: "upload",

package/dist/cjs/builder/builder-webpack/index.js CHANGED Viewed

@@ -31,17 +31,16 @@ __export(builder_webpack_exports, {
   createWebpackBuilderForModern: () => createWebpackBuilderForModern
 });
 module.exports = __toCommonJS(builder_webpack_exports);
-var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
 var import_generator = require("../generator");
 var import_adapterModern = require("./adapterModern");
 async function createWebpackBuilderForModern(options) {
-  const builder = await (0, import_generator.generateBuilder)(options, import_builder_webpack_provider.builderWebpackProvider);
+  const builder = await (0, import_generator.generateBuilder)(options, "webpack");
   const { normalizedConfig } = options;
   if (normalizedConfig.tools.esbuild) {
     const { esbuild: esbuildOptions } = normalizedConfig.tools;
-    const { builderPluginEsbuild } = await Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-esbuild")));
+    const { pluginEsbuild } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-esbuild")));
     builder.addPlugins([
-      builderPluginEsbuild(esbuildOptions)
+      pluginEsbuild(esbuildOptions)
     ]);
   }
   builder.addPlugins([

package/dist/cjs/builder/generator/createBuilderOptions.js CHANGED Viewed

@@ -40,9 +40,8 @@ function createBuilderOptions(target, appContext) {
   return {
     cwd: appContext.appDirectory,
     target,
-    configPath: appContext.configFile || void 0,
-    entry: entries,
-    framework: appContext.metaName
+    frameworkConfigPath: appContext.configFile || void 0,
+    entry: entries
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/builder/generator/createBuilderProviderConfig.js CHANGED Viewed

@@ -47,6 +47,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
   }
   const config = {
     ...resolveConfig,
+    plugins: [],
     dev: {
       ...resolveConfig.dev,
       port: appContext.port

package/dist/cjs/builder/generator/index.js CHANGED Viewed

@@ -31,19 +31,20 @@ __export(generator_exports, {
   generateBuilder: () => generateBuilder
 });
 module.exports = __toCommonJS(generator_exports);
-var import_builder = require("@modern-js/builder");
+var import_uni_builder = require("@modern-js/uni-builder");
 var import_createBuilderProviderConfig = require("./createBuilderProviderConfig");
 var import_getBuilderTargets = require("./getBuilderTargets");
 var import_createBuilderOptions = require("./createBuilderOptions");
-async function generateBuilder(options, generateProvider) {
+async function generateBuilder(options, bundlerType) {
   const { normalizedConfig, appContext } = options;
   const builderConfig = (0, import_createBuilderProviderConfig.createBuilderProviderConfig)(normalizedConfig, appContext);
-  const provider = generateProvider({
-    builderConfig
-  });
   const target = (0, import_getBuilderTargets.getBuilderTargets)(normalizedConfig);
   const builderOptions = (0, import_createBuilderOptions.createBuilderOptions)(target, appContext);
-  const builder = await (0, import_builder.createBuilder)(provider, builderOptions);
+  const builder = await (0, import_uni_builder.createUniBuilder)({
+    ...builderOptions,
+    bundlerType,
+    config: builderConfig
+  });
   await applyBuilderPlugins(builder, options);
   return builder;
 }
@@ -56,9 +57,9 @@ async function applyBuilderPlugins(builder, options) {
   ]);
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {
-    const { builderPluginNodePolyfill } = await Promise.resolve().then(() => __toESM(require("@modern-js/builder-plugin-node-polyfill")));
+    const { pluginNodePolyfill } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-node-polyfill")));
     builder.addPlugins([
-      builderPluginNodePolyfill()
+      pluginNodePolyfill()
     ]);
   }
 }

package/dist/cjs/builder/index.js CHANGED Viewed

@@ -31,18 +31,10 @@ __export(builder_exports, {
   createBuilderGenerator: () => createBuilderGenerator
 });
 module.exports = __toCommonJS(builder_exports);
-var import_utils = require("@modern-js/utils");
 async function createBuilderGenerator(bundler) {
   if (bundler === "rspack") {
-    try {
-      const { createRspackBuilderForModern } = await Promise.resolve().then(() => __toESM(require("./builder-rspack")));
-      const { getRspackVersion } = await Promise.resolve().then(() => __toESM(require("@modern-js/builder-rspack-provider")));
-      const version = await getRspackVersion();
-      import_utils.logger.info(`Using Rspack v${version}`);
-      return createRspackBuilderForModern;
-    } catch (_) {
-      throw new Error("Failed to use Rspack, please check if you have `@modern-js/builder-rspack-provider` installed");
-    }
+    const { createRspackBuilderForModern } = await Promise.resolve().then(() => __toESM(require("./builder-rspack")));
+    return createRspackBuilderForModern;
   }
   const { createWebpackBuilderForModern } = await Promise.resolve().then(() => __toESM(require("./builder-webpack")));
   return createWebpackBuilderForModern;

package/dist/cjs/builder/shared/builderPlugins/adapterBasic.js CHANGED Viewed

@@ -42,15 +42,13 @@ const builderPluginAdapterBasic = () => ({
         chain.name("service-worker");
       } else if (target === "web-worker") {
         chain.name("worker");
-      } else if (target === "modern-web") {
-        chain.name("modern");
       } else {
         chain.name("client");
       }
       if (target === "node" || target === "service-worker") {
         applyNodeCompat(target, chain);
       }
-      if (target === "web" || target === "modern-web") {
+      if (target === "web") {
         const bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
         chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
         chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));

package/dist/cjs/builder/shared/builderPlugins/adapterHtml.js CHANGED Viewed

@@ -21,7 +21,7 @@ __export(adapterHtml_exports, {
   builderPluginAdapterHtml: () => builderPluginAdapterHtml
 });
 module.exports = __toCommonJS(adapterHtml_exports);
-var import_builder_shared = require("@modern-js/builder-shared");
+var import_shared = require("@rsbuild/shared");
 var import_utils = require("@modern-js/utils");
 var import_lodash = require("@modern-js/utils/lodash");
 var import_bundlerPlugins = require("../bundlerPlugins");
@@ -30,7 +30,7 @@ const builderPluginAdapterHtml = (options) => ({
   setup(api) {
     api.modifyBundlerChain(async (chain, { CHAIN_ID, target, HtmlPlugin: HtmlBundlerPlugin }) => {
       const builderConfig = api.getNormalizedConfig();
-      if (!(0, import_builder_shared.isHtmlDisabled)(builderConfig, target)) {
+      if (!(0, import_shared.isHtmlDisabled)(builderConfig, target)) {
         applyBottomHtmlPlugin({
           api,
           options,
@@ -51,7 +51,7 @@ async function injectAssetPrefix({ chain }) {
   const assetPrefix = (0, import_utils.removeTailSlash)(chain.output.get("publicPath") || "");
   const code = `window.__assetPrefix__ = '${assetPrefix}';`;
   entryNames.forEach((entryName) => {
-    entries[entryName].prepend((0, import_builder_shared.createVirtualModule)(code));
+    entries[entryName].prepend((0, import_shared.createVirtualModule)(code));
   });
 }
 function applyBottomHtmlPlugin({ api, chain, options, CHAIN_ID, HtmlBundlerPlugin }) {

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js CHANGED Viewed

@@ -32,7 +32,7 @@ __export(adapterSSR_exports, {
 });
 module.exports = __toCommonJS(adapterSSR_exports);
 var path = __toESM(require("path"));
-var import_builder_shared = require("@modern-js/builder-shared");
+var import_shared = require("@rsbuild/shared");
 var import_utils = require("@modern-js/utils");
 var import_bundlerPlugins = require("../bundlerPlugins");
 var import_utils2 = require("../../../analyze/utils");
@@ -40,9 +40,9 @@ const builderPluginAdapterSSR = (options) => ({
   name: "builder-plugin-adapter-modern-ssr",
   setup(api) {
     const { normalizedConfig } = options;
-    api.modifyBuilderConfig((config) => {
+    api.modifyRsbuildConfig((config) => {
       if (isStreamingSSR(normalizedConfig)) {
-        return (0, import_builder_shared.mergeBuilderConfig)(config, {
+        return (0, import_shared.mergeRsbuildConfig)(config, {
           html: {
             inject: "body"
           }
@@ -68,7 +68,7 @@ const builderPluginAdapterSSR = (options) => ({
           appNormalizedConfig: normalizedConfig2
         });
       }
-      if (!(0, import_builder_shared.isHtmlDisabled)(builderConfig, target)) {
+      if (!(0, import_shared.isHtmlDisabled)(builderConfig, target)) {
         applyAsyncChunkHtmlPlugin({
           chain,
           modernConfig: options.normalizedConfig,

package/dist/cjs/commands/dev.js CHANGED Viewed

@@ -92,7 +92,6 @@ const dev = async (api, options, devServerOptions = {}) => {
     });
   } else {
     const { server } = await appContext.builder.startDevServer({
-      printURLs: false,
       serverOptions
     });
     (0, import_createServer.setServer)(server);

package/dist/cjs/config/default.js CHANGED Viewed

@@ -22,25 +22,29 @@ __export(default_exports, {
   createLegacyDefaultConfig: () => createLegacyDefaultConfig
 });
 module.exports = __toCommonJS(default_exports);
-var import_builder_webpack_provider = require("@modern-js/builder-webpack-provider");
 var import_utils = require("@modern-js/utils");
 var import_env = require("../utils/env");
-function createDefaultConfig(appContext, bundler) {
-  const defaultBuilderConfig = (0, import_builder_webpack_provider.createDefaultConfig)();
+function createDefaultConfig(appContext) {
   const dev = {
-    ...defaultBuilderConfig.dev,
     // `dev.port` should not have a default value
     // because we will use `server.port` by default
     port: void 0
   };
   const output = {
-    ...defaultBuilderConfig.output,
+    distPath: {
+      root: "dist",
+      html: "html",
+      js: "static/js",
+      css: "static/css",
+      server: "bundles",
+      worker: "worker"
+    },
+    cleanDistPath: true,
     disableNodePolyfill: true,
     enableInlineRouteManifests: true,
     disableInlineRouteManifests: false
   };
   const source = {
-    ...defaultBuilderConfig.source,
     entries: void 0,
     mainEntryName: import_utils.MAIN_ENTRY_NAME,
     enableAsyncEntry: false,
@@ -56,8 +60,8 @@ function createDefaultConfig(appContext, bundler) {
     }
   };
   const html = {
-    ...defaultBuilderConfig.html,
     title: "",
+    mountId: "root",
     meta: {
       charset: {
         charset: "utf-8"
@@ -82,7 +86,7 @@ function createDefaultConfig(appContext, bundler) {
     baseUrl: "/",
     port: 8080
   };
-  const defaultTsCheckerConfig = {
+  const tools = {
     tsChecker: {
       issue: {
         include: [
@@ -93,10 +97,6 @@ function createDefaultConfig(appContext, bundler) {
       }
     }
   };
-  const tools = bundler === "webpack" ? {
-    ...defaultBuilderConfig.tools,
-    ...defaultTsCheckerConfig
-  } : defaultTsCheckerConfig;
   return {
     source,
     output,

package/dist/cjs/initialize/index.js CHANGED Viewed

@@ -41,7 +41,7 @@ var initialize_default = ({ bundler }) => ({
         ...appContext,
         bundlerType: bundler
       });
-      return (0, import_config.checkIsLegacyConfig)(userConfig) ? (0, import_config.createLegacyDefaultConfig)(appContext) : (0, import_config.createDefaultConfig)(appContext, bundler);
+      return (0, import_config.checkIsLegacyConfig)(userConfig) ? (0, import_config.createLegacyDefaultConfig)(appContext) : (0, import_config.createDefaultConfig)(appContext);
     };
     return {
       config,

package/dist/esm/analyze/nestedRoutes.js CHANGED Viewed

@@ -150,7 +150,7 @@ var walk = function() {
             ];
           item = _step.value;
           itemPath = path.join(dirname, item);
-          itemPathWithAlias = replaceWithAlias(alias.basename, itemPath, alias.name);
+          itemPathWithAlias = getPathWithoutExt(replaceWithAlias(alias.basename, itemPath, alias.name));
           extname = path.extname(item);
           itemWithoutExt = item.slice(0, -extname.length);
           return [

package/dist/esm/analyze/templates.js CHANGED Viewed

@@ -21,7 +21,7 @@ var renderFunction = function(param) {
   }).join("\n"), "\n    ]\n  })(").concat(fileSystemRoutes2 ? "" : "App", ")\n\n\n  if(!AppWrapper.init && typeof appInit !== 'undefined') {\n    AppWrapper.init = appInit;\n  }\n\n\n  if (IS_BROWSER) {\n    ").concat(customBootstrap ? "customBootstrap(AppWrapper, () => ".concat(bootstrap, ");") : "".concat(bootstrap, ";"), "\n  }\n\n  return AppWrapper\n");
 };
 var html = function(partials) {
-  return "\n<!DOCTYPE html>\n<html>\n<head>\n  <%= meta %>\n  <title><%= title %></title>\n\n  ".concat(partials.top.join("\n"), "\n\n  ").concat(partials.head.join("\n"), '\n\n</head>\n\n<body>\n  <div id="<%= mountId %>"><!--<?- html ?>--></div>\n  ').concat(partials.body.join("\n"), "\n  <!--<?- chunksMap.js ?>-->\n  <!--<?- SSRDataScript ?>-->\n  <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
+  return "\n<!DOCTYPE html>\n<html>\n<head>\n\n  ".concat(partials.top.join("\n"), "\n\n  ").concat(partials.head.join("\n"), '\n\n</head>\n\n<body>\n  <div id="<%= mountId %>"><!--<?- html ?>--></div>\n  ').concat(partials.body.join("\n"), "\n  <!--<?- chunksMap.js ?>-->\n  <!--<?- SSRDataScript ?>-->\n  <!--<?- bottomTemplate ?>-->\n</body>\n\n</html>\n");
 };
 var routesForServer = function(param) {
   var routes = param.routes;
@@ -220,13 +220,12 @@ var fileSystemRoutes = function() {
                     lazyImport = '() => import(/* webpackChunkName: "'.concat(route2.id, `" */  '`).concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
                     component2 = "lazy(".concat(lazyImport, ")");
                   }
+                } else if (ssrMode === "string") {
+                  components.push(route2._component);
+                  component2 = "component_".concat(components.length - 1);
                 } else {
                   lazyImport = `() => import(/* webpackMode: "eager" */  '`.concat(route2._component, `').then(routeModule => handleRouteModule(routeModule, "`).concat(route2.id, '")).catch(handleRouteModuleError) ');
-                  if (ssrMode === "string") {
-                    component2 = "loadable(".concat(lazyImport, ")");
-                  } else {
-                    component2 = "lazy(".concat(lazyImport, ")");
-                  }
+                  component2 = "lazy(".concat(lazyImport, ")");
                 }
               }
             } else if (route2._component) {

package/dist/esm/builder/builder-rspack/index.js CHANGED Viewed

@@ -1,6 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { builderRspackProvider } from "@modern-js/builder-rspack-provider";
 import { generateBuilder } from "../generator";
 import { builderPluginAdpaterCopy } from "./adapterCopy";
 function createRspackBuilderForModern(options) {
@@ -14,7 +13,7 @@ function _createRspackBuilderForModern() {
         case 0:
           return [
             4,
-            generateBuilder(options, builderRspackProvider)
+            generateBuilder(options, "rspack")
           ];
         case 1:
           builder = _state.sent();

package/dist/esm/builder/builder-webpack/createCopyPattern.js CHANGED Viewed

@@ -29,6 +29,8 @@ function createPublicPattern(appContext, config, chain) {
 function createUploadPattern(appContext, config) {
   var uploadDir = createCopyInfo(appContext, config).uploadDir;
   return {
+    // rspack copy info structure is inconsistent with webpack, it only used in webpack mode
+    // @ts-expect-error
     info,
     from: "**/*",
     to: "upload",

package/dist/esm/builder/builder-webpack/index.js CHANGED Viewed

@@ -1,6 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { builderWebpackProvider } from "@modern-js/builder-webpack-provider";
 import { generateBuilder } from "../generator";
 import { builderPluginAdapterModern } from "./adapterModern";
 function createWebpackBuilderForModern(options) {
@@ -8,13 +7,13 @@ function createWebpackBuilderForModern(options) {
 }
 function _createWebpackBuilderForModern() {
   _createWebpackBuilderForModern = _async_to_generator(function(options) {
-    var builder, normalizedConfig, _normalizedConfig_tools, esbuildOptions, builderPluginEsbuild;
+    var builder, normalizedConfig, _normalizedConfig_tools, esbuildOptions, pluginEsbuild;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           return [
             4,
-            generateBuilder(options, builderWebpackProvider)
+            generateBuilder(options, "webpack")
           ];
         case 1:
           builder = _state.sent();
@@ -27,12 +26,12 @@ function _createWebpackBuilderForModern() {
           _normalizedConfig_tools = normalizedConfig.tools, esbuildOptions = _normalizedConfig_tools.esbuild;
           return [
             4,
-            import("@modern-js/builder-plugin-esbuild")
+            import("@rsbuild/plugin-esbuild")
           ];
         case 2:
-          builderPluginEsbuild = _state.sent().builderPluginEsbuild;
+          pluginEsbuild = _state.sent().pluginEsbuild;
           builder.addPlugins([
-            builderPluginEsbuild(esbuildOptions)
+            pluginEsbuild(esbuildOptions)
           ]);
           _state.label = 3;
         case 3:

package/dist/esm/builder/generator/createBuilderOptions.js CHANGED Viewed

@@ -34,9 +34,8 @@ function createBuilderOptions(target, appContext) {
   return {
     cwd: appContext.appDirectory,
     target,
-    configPath: appContext.configFile || void 0,
-    entry: entries,
-    framework: appContext.metaName
+    frameworkConfigPath: appContext.configFile || void 0,
+    entry: entries
   };
 }
 export {

package/dist/esm/builder/generator/createBuilderProviderConfig.js CHANGED Viewed

@@ -19,6 +19,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
     htmlConfig.templateByEntries = _object_spread({}, appContext.htmlTemplates, htmlConfig.templateByEntries);
   }
   var config = _object_spread_props(_object_spread({}, resolveConfig), {
+    plugins: [],
     dev: _object_spread_props(_object_spread({}, resolveConfig.dev), {
       port: appContext.port
     }),

package/dist/esm/builder/generator/index.js CHANGED Viewed

@@ -1,28 +1,30 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createBuilder } from "@modern-js/builder";
+import { createUniBuilder } from "@modern-js/uni-builder";
 import { createBuilderProviderConfig } from "./createBuilderProviderConfig";
 import { getBuilderTargets } from "./getBuilderTargets";
 import { createBuilderOptions } from "./createBuilderOptions";
-function generateBuilder(options, generateProvider) {
+function generateBuilder(options, bundlerType) {
   return _generateBuilder.apply(this, arguments);
 }
 function _generateBuilder() {
-  _generateBuilder = _async_to_generator(function(options, generateProvider) {
-    var normalizedConfig, appContext, builderConfig, provider, target, builderOptions, builder;
+  _generateBuilder = _async_to_generator(function(options, bundlerType) {
+    var normalizedConfig, appContext, builderConfig, target, builderOptions, builder;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           normalizedConfig = options.normalizedConfig, appContext = options.appContext;
           builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
-          provider = generateProvider({
-            builderConfig
-          });
           target = getBuilderTargets(normalizedConfig);
           builderOptions = createBuilderOptions(target, appContext);
           return [
             4,
-            createBuilder(provider, builderOptions)
+            createUniBuilder(_object_spread_props(_object_spread({}, builderOptions), {
+              bundlerType,
+              config: builderConfig
+            }))
           ];
         case 1:
           builder = _state.sent();
@@ -46,7 +48,7 @@ function applyBuilderPlugins(builder, options) {
 }
 function _applyBuilderPlugins() {
   _applyBuilderPlugins = _async_to_generator(function(builder, options) {
-    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, builderPluginNodePolyfill;
+    var _ref, builderPluginAdapterBasic, builderPluginAdapterHtml, builderPluginAdapterSSR, normalizedConfig, pluginNodePolyfill;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -69,12 +71,12 @@ function _applyBuilderPlugins() {
             ];
           return [
             4,
-            import("@modern-js/builder-plugin-node-polyfill")
+            import("@rsbuild/plugin-node-polyfill")
           ];
         case 2:
-          builderPluginNodePolyfill = _state.sent().builderPluginNodePolyfill;
+          pluginNodePolyfill = _state.sent().pluginNodePolyfill;
           builder.addPlugins([
-            builderPluginNodePolyfill()
+            pluginNodePolyfill()
           ]);
           _state.label = 3;
         case 3:

package/dist/esm/builder/index.js CHANGED Viewed

@@ -1,60 +1,35 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { logger } from "@modern-js/utils";
 function createBuilderGenerator(bundler) {
   return _createBuilderGenerator.apply(this, arguments);
 }
 function _createBuilderGenerator() {
   _createBuilderGenerator = _async_to_generator(function(bundler) {
-    var createRspackBuilderForModern, getRspackVersion, version, _, createWebpackBuilderForModern;
+    var createRspackBuilderForModern, createWebpackBuilderForModern;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           if (!(bundler === "rspack"))
             return [
               3,
-              6
+              2
             ];
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            5,
-            ,
-            6
-          ]);
           return [
             4,
             import("./builder-rspack")
           ];
-        case 2:
+        case 1:
           createRspackBuilderForModern = _state.sent().createRspackBuilderForModern;
-          return [
-            4,
-            import("@modern-js/builder-rspack-provider")
-          ];
-        case 3:
-          getRspackVersion = _state.sent().getRspackVersion;
-          return [
-            4,
-            getRspackVersion()
-          ];
-        case 4:
-          version = _state.sent();
-          logger.info("Using Rspack v".concat(version));
           return [
             2,
             createRspackBuilderForModern
           ];
-        case 5:
-          _ = _state.sent();
-          throw new Error("Failed to use Rspack, please check if you have `@modern-js/builder-rspack-provider` installed");
-        case 6:
+        case 2:
           return [
             4,
             import("./builder-webpack")
           ];
-        case 7:
+        case 3:
           createWebpackBuilderForModern = _state.sent().createWebpackBuilderForModern;
           return [
             2,

package/dist/esm/builder/shared/builderPlugins/adapterBasic.js CHANGED Viewed

@@ -11,15 +11,13 @@ var builderPluginAdapterBasic = function() {
           chain.name("service-worker");
         } else if (target === "web-worker") {
           chain.name("worker");
-        } else if (target === "modern-web") {
-          chain.name("modern");
         } else {
           chain.name("client");
         }
         if (target === "node" || target === "service-worker") {
           applyNodeCompat(target, chain);
         }
-        if (target === "web" || target === "modern-web") {
+        if (target === "web") {
           var bareServerModuleReg = /\.(server|node)\.[tj]sx?$/;
           chain.module.rule(CHAIN_ID.RULE.JS).exclude.add(bareServerModuleReg);
           chain.module.rule("bare-server-module").test(bareServerModuleReg).use("server-module-loader").loader(require.resolve("../loaders/serverModuleLoader"));

package/dist/esm/builder/shared/builderPlugins/adapterHtml.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { isHtmlDisabled, createVirtualModule } from "@modern-js/builder-shared";
+import { isHtmlDisabled, createVirtualModule } from "@rsbuild/shared";
 import { MAIN_ENTRY_NAME, getEntryOptions, removeTailSlash } from "@modern-js/utils";
 import { template as lodashTemplate } from "@modern-js/utils/lodash";
 import { BottomTemplatePlugin } from "../bundlerPlugins";

package/dist/esm/builder/shared/builderPlugins/adapterSSR.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
-import { isHtmlDisabled, mergeBuilderConfig } from "@modern-js/builder-shared";
+import { isHtmlDisabled, mergeRsbuildConfig } from "@rsbuild/shared";
 import { isSSR, fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
 import { getServerCombinedModueFile } from "../../../analyze/utils";
@@ -10,9 +10,9 @@ var builderPluginAdapterSSR = function(options) {
     name: "builder-plugin-adapter-modern-ssr",
     setup: function setup(api) {
       var normalizedConfig = options.normalizedConfig;
-      api.modifyBuilderConfig(function(config) {
+      api.modifyRsbuildConfig(function(config) {
         if (isStreamingSSR(normalizedConfig)) {
-          return mergeBuilderConfig(config, {
+          return mergeRsbuildConfig(config, {
             html: {
               inject: "body"
             }

package/dist/esm/commands/dev.js CHANGED Viewed

@@ -119,7 +119,6 @@ var dev = function() {
           return [
             4,
             appContext.builder.startDevServer({
-              printURLs: false,
               serverOptions
             })
           ];