@modern-js/app-tools 2.45.0 → 2.45.1-alpha.1

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

@@ -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

@@ -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

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

package/dist/esm/config/default.js

@@ -1,23 +1,28 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
 import { MAIN_ENTRY_NAME } from "@modern-js/utils";
 import { getAutoInjectEnv } from "../utils/env";
-function createDefaultConfig(appContext, bundler) {
-  var defaultBuilderConfig = createDefaultBuilderConfig();
-  var dev = _object_spread_props(_object_spread({}, defaultBuilderConfig.dev), {
+function createDefaultConfig(appContext) {
+  var dev = {
     // `dev.port` should not have a default value
     // because we will use `server.port` by default
     port: void 0
-  });
-  var output = _object_spread_props(_object_spread({}, defaultBuilderConfig.output), {
+  };
+  var output = {
+    distPath: {
+      root: "dist",
+      html: "html",
+      js: "static/js",
+      css: "static/css",
+      server: "bundles",
+      worker: "worker"
+    },
+    cleanDistPath: true,
     disableNodePolyfill: true,
     enableInlineRouteManifests: true,
     disableInlineRouteManifests: false
-  });
+  };
   var _obj;
-  var source = _object_spread_props(_object_spread({}, defaultBuilderConfig.source), {
+  var source = {
     entries: void 0,
     mainEntryName: MAIN_ENTRY_NAME,
     enableAsyncEntry: false,
@@ -26,9 +31,10 @@ function createDefaultConfig(appContext, bundler) {
     configDir: "./config",
     globalVars: getAutoInjectEnv(appContext),
     alias: (_obj = {}, _define_property(_obj, appContext.internalDirAlias, appContext.internalDirectory), _define_property(_obj, appContext.internalSrcAlias, appContext.srcDirectory), _define_property(_obj, "@", appContext.srcDirectory), _define_property(_obj, "@shared", appContext.sharedDirectory), _obj)
-  });
-  var html = _object_spread_props(_object_spread({}, defaultBuilderConfig.html), {
+  };
+  var html = {
     title: "",
+    mountId: "root",
     meta: {
       charset: {
         charset: "utf-8"
@@ -44,7 +50,7 @@ function createDefaultConfig(appContext, bundler) {
       "wap-font-scale": "no",
       "format-detection": "telephone=no"
     }
-  });
+  };
   var server = {
     routes: void 0,
     publicRoutes: void 0,
@@ -53,7 +59,7 @@ function createDefaultConfig(appContext, bundler) {
     baseUrl: "/",
     port: 8080
   };
-  var defaultTsCheckerConfig = {
+  var tools = {
     tsChecker: {
       issue: {
         include: [
@@ -64,7 +70,6 @@ function createDefaultConfig(appContext, bundler) {
       }
     }
   };
-  var tools = bundler === "webpack" ? _object_spread({}, defaultBuilderConfig.tools, defaultTsCheckerConfig) : defaultTsCheckerConfig;
   return {
     source,
     output,

package/dist/esm/initialize/index.js

@@ -23,7 +23,7 @@ function initialize_default(param) {
         api.setAppContext(_object_spread_props(_object_spread({}, appContext), {
           bundlerType: bundler
         }));
-        return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext, bundler);
+        return checkIsLegacyConfig(userConfig) ? createLegacyDefaultConfig(appContext) : createDefaultConfig(appContext);
       };
       return {
         config,

package/dist/esm-node/analyze/generateCode.js

@@ -146,6 +146,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           internalDirAlias
         })
       });
+      console.log("222222222", imports);
       importsStatemets.set(entryName, imports);
       const entryFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_FILE_NAME}`);
       entrypoint.internalEntry = entryFile;

package/dist/esm-node/analyze/index.js

@@ -11,6 +11,10 @@ import { checkIsBuildCommands, isPageComponentFile, parseModule, replaceWithAlia
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 import { generateIndexCode } from "./generateCode";
 const debug = createDebugger("plugin-analyze");
+const getPathWithoutExt = (filename) => {
+  const extname = path.extname(filename);
+  return filename.slice(0, -extname.length);
+};
 var analyze_default = ({ bundler }) => ({
   name: "@modern-js/plugin-analyze",
   setup: (api) => {
@@ -183,7 +187,7 @@ var analyze_default = ({ bundler }) => ({
               filename: rootLayoutFile
             });
             const hasAppConfig = moduleExports.some((e) => e.n === APP_CONFIG_NAME);
-            const generateLayoutPath = replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias);
+            const generateLayoutPath = getPathWithoutExt(replaceWithAlias(srcDirectory, rootLayoutFile, internalSrcAlias));
             if (hasAppConfig) {
               imports.push({
                 value: generateLayoutPath,

package/dist/esm-node/analyze/nestedRoutes.js

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

package/dist/esm-node/analyze/templates.js

@@ -53,8 +53,6 @@ const html = (partials) => `
 <!DOCTYPE html>
 <html>
 <head>
-  <%= meta %>
-  <title><%= title %></title>
 
   ${partials.top.join("\n")}
 

package/dist/esm-node/analyze/utils.js

@@ -89,6 +89,7 @@ const getDefaultImports = ({ entrypoint, srcDirectory, appDirectory, internalSrc
       value: normalizeToPosixPath(entry.replace(srcDirectory, internalSrcAlias))
     });
   }
+  console.log("iiiiiiiiiii", imports);
   return imports;
 };
 const isPageComponentFile = (filePath) => {

package/dist/esm-node/builder/builder-rspack/index.js

@@ -1,8 +1,7 @@
-import { builderRspackProvider } from "@modern-js/builder-rspack-provider";
 import { generateBuilder } from "../generator";
 import { builderPluginAdpaterCopy } from "./adapterCopy";
 async function createRspackBuilderForModern(options) {
-  const builder = await generateBuilder(options, builderRspackProvider);
+  const builder = await generateBuilder(options, "rspack");
   builder.addPlugins([
     builderPluginAdpaterCopy(options)
   ]);

package/dist/esm-node/builder/builder-webpack/createCopyPattern.js

@@ -27,6 +27,8 @@ function createPublicPattern(appContext, config, chain) {
 function createUploadPattern(appContext, config) {
   const { uploadDir } = 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/esm-node/builder/builder-webpack/index.js

@@ -1,14 +1,13 @@
-import { builderWebpackProvider } from "@modern-js/builder-webpack-provider";
 import { generateBuilder } from "../generator";
 import { builderPluginAdapterModern } from "./adapterModern";
 async function createWebpackBuilderForModern(options) {
-  const builder = await generateBuilder(options, builderWebpackProvider);
+  const builder = await generateBuilder(options, "webpack");
   const { normalizedConfig } = options;
   if (normalizedConfig.tools.esbuild) {
     const { esbuild: esbuildOptions } = normalizedConfig.tools;
-    const { builderPluginEsbuild } = await import("@modern-js/builder-plugin-esbuild");
+    const { pluginEsbuild } = await import("@rsbuild/plugin-esbuild");
     builder.addPlugins([
-      builderPluginEsbuild(esbuildOptions)
+      pluginEsbuild(esbuildOptions)
     ]);
   }
   builder.addPlugins([

package/dist/esm-node/builder/generator/createBuilderOptions.js

@@ -17,9 +17,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-node/builder/generator/createBuilderProviderConfig.js

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

package/dist/esm-node/builder/generator/index.js

@@ -1,16 +1,17 @@
-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";
-async function generateBuilder(options, generateProvider) {
+async function generateBuilder(options, bundlerType) {
   const { normalizedConfig, appContext } = options;
   const builderConfig = createBuilderProviderConfig(normalizedConfig, appContext);
-  const provider = generateProvider({
-    builderConfig
-  });
   const target = getBuilderTargets(normalizedConfig);
   const builderOptions = createBuilderOptions(target, appContext);
-  const builder = await createBuilder(provider, builderOptions);
+  const builder = await createUniBuilder({
+    ...builderOptions,
+    bundlerType,
+    config: builderConfig
+  });
   await applyBuilderPlugins(builder, options);
   return builder;
 }
@@ -23,9 +24,9 @@ async function applyBuilderPlugins(builder, options) {
   ]);
   const { normalizedConfig } = options;
   if (!normalizedConfig.output.disableNodePolyfill) {
-    const { builderPluginNodePolyfill } = await import("@modern-js/builder-plugin-node-polyfill");
+    const { pluginNodePolyfill } = await import("@rsbuild/plugin-node-polyfill");
     builder.addPlugins([
-      builderPluginNodePolyfill()
+      pluginNodePolyfill()
     ]);
   }
 }

package/dist/esm-node/builder/index.js

@@ -1,15 +1,7 @@
-import { logger } from "@modern-js/utils";
 async function createBuilderGenerator(bundler) {
   if (bundler === "rspack") {
-    try {
-      const { createRspackBuilderForModern } = await import("./builder-rspack");
-      const { getRspackVersion } = await import("@modern-js/builder-rspack-provider");
-      const version = await getRspackVersion();
-      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 import("./builder-rspack");
+    return createRspackBuilderForModern;
   }
   const { createWebpackBuilderForModern } = await import("./builder-webpack");
   return createWebpackBuilderForModern;

package/dist/esm-node/builder/shared/builderPlugins/adapterBasic.js

@@ -9,15 +9,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/esm-node/builder/shared/builderPlugins/adapterHtml.js

@@ -1,4 +1,4 @@
-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-node/builder/shared/builderPlugins/adapterSSR.js

@@ -1,5 +1,5 @@
 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";
@@ -7,9 +7,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 mergeBuilderConfig(config, {
+        return mergeRsbuildConfig(config, {
           html: {
             inject: "body"
           }

package/dist/esm-node/commands/dev.js

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

package/dist/esm-node/config/default.js

@@ -1,22 +1,26 @@
-import { createDefaultConfig as createDefaultBuilderConfig } from "@modern-js/builder-webpack-provider";
 import { MAIN_ENTRY_NAME } from "@modern-js/utils";
 import { getAutoInjectEnv } from "../utils/env";
-function createDefaultConfig(appContext, bundler) {
-  const defaultBuilderConfig = createDefaultBuilderConfig();
+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: MAIN_ENTRY_NAME,
     enableAsyncEntry: false,
@@ -32,8 +36,8 @@ function createDefaultConfig(appContext, bundler) {
     }
   };
   const html = {
-    ...defaultBuilderConfig.html,
     title: "",
+    mountId: "root",
     meta: {
       charset: {
         charset: "utf-8"
@@ -58,7 +62,7 @@ function createDefaultConfig(appContext, bundler) {
     baseUrl: "/",
     port: 8080
   };
-  const defaultTsCheckerConfig = {
+  const tools = {
     tsChecker: {
       issue: {
         include: [
@@ -69,10 +73,6 @@ function createDefaultConfig(appContext, bundler) {
       }
     }
   };
-  const tools = bundler === "webpack" ? {
-    ...defaultBuilderConfig.tools,
-    ...defaultTsCheckerConfig
-  } : defaultTsCheckerConfig;
   return {
     source,
     output,

package/dist/esm-node/initialize/index.js

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

package/dist/types/analyze/generateCode.d.ts

@@ -1,6 +1,6 @@
 import { IAppContext, PluginAPI } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
-import { BundlerConfig } from '@modern-js/builder-shared';
+import { RspackConfig, WebpackConfig } from '@rsbuild/shared';
 import { AppNormalizedConfig, AppTools, ImportStatement } from '../types';
 export declare const createImportStatements: (statements: ImportStatement[]) => string;
 export declare const generateCode: (appContext: IAppContext, config: AppNormalizedConfig<'shared'>, entrypoints: Entrypoint[], api: PluginAPI<AppTools<'shared'>>) => Promise<{
@@ -12,5 +12,5 @@ export declare const generateIndexCode: ({ appContext, api, entrypoints, config,
     entrypoints: Entrypoint[];
     config: AppNormalizedConfig<'shared'>;
     importsStatemets: Map<string, ImportStatement[]>;
-    bundlerConfigs?: BundlerConfig[] | undefined;
+    bundlerConfigs?: RspackConfig[] | WebpackConfig[] | undefined;
 }) => Promise<void>;

package/dist/types/builder/builder-rspack/adapterCopy.d.ts

@@ -1,4 +1,3 @@
-import { BuilderPlugin } from '@modern-js/builder-shared';
-import { BuilderPluginAPI } from '@modern-js/builder-rspack-provider';
+import { RsbuildPlugin } from '@modern-js/uni-builder';
 import { BuilderOptions } from '../shared';
-export declare const builderPluginAdpaterCopy: (options: BuilderOptions<'rspack'>) => BuilderPlugin<BuilderPluginAPI>;
+export declare const builderPluginAdpaterCopy: (options: BuilderOptions<'rspack'>) => RsbuildPlugin;

package/dist/types/builder/builder-rspack/index.d.ts

@@ -1,2 +1,2 @@
 import { BuilderOptions } from '../shared';
-export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<import("@modern-js/builder-shared").BuilderInstance<import("@modern-js/builder-shared").BuilderProvider>>;
+export declare function createRspackBuilderForModern(options: BuilderOptions<'rspack'>): Promise<import("@modern-js/uni-builder").UniBuilderInstance>;

package/dist/types/builder/builder-webpack/adapterModern.d.ts

@@ -1,7 +1,6 @@
-import { BuilderPlugin } from '@modern-js/builder-shared';
-import type { BuilderPluginAPI } from '@modern-js/builder-webpack-provider';
+import { RsbuildPlugin } from '@modern-js/uni-builder';
 import { BuilderOptions } from '../shared';
 /**
  * Provides default configuration consistent with modern.js v1
  */
-export declare const builderPluginAdapterModern: (options: BuilderOptions<'webpack'>) => BuilderPlugin<BuilderPluginAPI>;
+export declare const builderPluginAdapterModern: (options: BuilderOptions<'webpack'>) => RsbuildPlugin;

package/dist/types/builder/builder-webpack/createCopyPattern.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { WebpackChain } from '@modern-js/builder-webpack-provider';
+import { CopyPluginOptions, WebpackChain } from '@modern-js/uni-builder';
 import type { AppNormalizedConfig, Bundler, IAppContext } from '../../types';
 export declare function createPublicPattern(appContext: IAppContext, config: AppNormalizedConfig, chain: WebpackChain): {
     info: (file: {
@@ -13,14 +13,4 @@ export declare function createPublicPattern(appContext: IAppContext, config: App
     noErrorOnMissing: boolean;
     transform: (content: Buffer, absoluteFrom: string) => string | Buffer;
 };
-export declare function createUploadPattern<B extends Bundler>(appContext: IAppContext, config: AppNormalizedConfig<B>): {
-    info: (file: {
-        sourceFilename: string;
-    }) => {
-        minimized: boolean;
-    };
-    from: string;
-    to: string;
-    context: string;
-    noErrorOnMissing: boolean;
-};
+export declare function createUploadPattern<B extends Bundler>(appContext: IAppContext, config: AppNormalizedConfig<B>): CopyPluginOptions['patterns']['0'];

package/dist/types/builder/builder-webpack/index.d.ts

@@ -1,4 +1,2 @@
-import { BuilderInstance } from '@modern-js/builder';
-import { BuilderWebpackProvider } from '@modern-js/builder-webpack-provider';
 import { BuilderOptions } from '../shared';
-export declare function createWebpackBuilderForModern(options: BuilderOptions<'webpack'>): Promise<BuilderInstance<BuilderWebpackProvider>>;
+export declare function createWebpackBuilderForModern(options: BuilderOptions<'webpack'>): Promise<import("@modern-js/uni-builder").UniBuilderInstance>;

package/dist/types/builder/generator/createBuilderOptions.d.ts

@@ -1,3 +1,4 @@
-import type { BuilderTarget, CreateBuilderOptions } from '@modern-js/builder-shared';
+import type { CreateUniBuilderOptions } from '@modern-js/uni-builder';
+import type { RsbuildTarget } from '@rsbuild/shared';
 import type { IAppContext } from '@modern-js/core';
-export declare function createBuilderOptions(target: BuilderTarget | BuilderTarget[], appContext: IAppContext): CreateBuilderOptions;
+export declare function createBuilderOptions(target: RsbuildTarget | RsbuildTarget[], appContext: IAppContext): Omit<CreateUniBuilderOptions, 'bundlerType' | 'config'>;

package/dist/types/builder/generator/createBuilderProviderConfig.d.ts

@@ -1,2 +1,2 @@
 import type { Bundler, IAppContext, AppNormalizedConfig } from '../../types';
-export declare function createBuilderProviderConfig<B extends Bundler>(resolveConfig: AppNormalizedConfig<B>, appContext: IAppContext): AppNormalizedConfig<B>;
+export declare function createBuilderProviderConfig<B extends Bundler>(resolveConfig: AppNormalizedConfig<B>, appContext: IAppContext): Omit<AppNormalizedConfig<B>, 'plugins'>;

package/dist/types/builder/generator/getBuilderTargets.d.ts

@@ -1,3 +1,3 @@
-import type { BuilderTarget } from '@modern-js/builder-shared';
+import type { RsbuildTarget } from '@rsbuild/shared';
 import type { AppNormalizedConfig } from '../../types';
-export declare function getBuilderTargets(normalizedConfig: AppNormalizedConfig<'shared'>): BuilderTarget[];
+export declare function getBuilderTargets(normalizedConfig: AppNormalizedConfig<'shared'>): RsbuildTarget[];

package/dist/types/builder/generator/index.d.ts

@@ -1,12 +1,10 @@
-import type { BuilderProvider, BuilderInstance } from '@modern-js/builder-shared';
+import { UniBuilderInstance } from '@modern-js/uni-builder';
+import { BundlerType } from '@rsbuild/shared';
 import { BuilderOptions } from '../shared';
 import { Bundler } from '../../types';
-export type GenerateProvider = (c: {
-    builderConfig: any;
-}) => BuilderProvider;
 /**
  * @param options BuilderOptions
- * @param generateProvider GenerateProvider
+ * @param bundlerType BundlerType
  * @returns BuilderInstance
  */
-export declare function generateBuilder<B extends Bundler>(options: BuilderOptions<B>, generateProvider: GenerateProvider): Promise<BuilderInstance<BuilderProvider>>;
+export declare function generateBuilder<B extends Bundler>(options: BuilderOptions<B>, bundlerType: BundlerType): Promise<UniBuilderInstance>;

package/dist/types/builder/index.d.ts

@@ -1 +1 @@
-export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack").createRspackBuilderForModern | typeof import("./builder-webpack").createWebpackBuilderForModern>;
+export declare function createBuilderGenerator(bundler: 'webpack' | 'rspack'): Promise<typeof import("./builder-rspack").createRspackBuilderForModern>;

package/dist/types/builder/shared/builderPlugins/adapterBasic.d.ts

@@ -1,3 +1,2 @@
-import { BuilderPlugin } from '@modern-js/builder-shared';
-import type { BuilderPluginAPI } from '../types';
-export declare const builderPluginAdapterBasic: () => BuilderPlugin<BuilderPluginAPI>;
+import { RsbuildPlugin } from '@rsbuild/shared';
+export declare const builderPluginAdapterBasic: () => RsbuildPlugin;

package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts

@@ -1,4 +1,4 @@
-import { BuilderPlugin } from '@modern-js/builder-shared';
+import { RsbuildPlugin } from '@rsbuild/shared';
 import { Bundler } from '../../../types';
-import type { BuilderOptions, BuilderPluginAPI } from '../types';
-export declare const builderPluginAdapterHtml: <B extends Bundler>(options: BuilderOptions<B>) => BuilderPlugin<BuilderPluginAPI>;
+import type { BuilderOptions } from '../types';
+export declare const builderPluginAdapterHtml: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

package/dist/types/builder/shared/builderPlugins/adapterSSR.d.ts

@@ -1,4 +1,4 @@
-import { BuilderPlugin } from '@modern-js/builder-shared';
+import { RsbuildPlugin } from '@rsbuild/shared';
 import type { Bundler } from '../../../types';
-import type { BuilderOptions, BuilderPluginAPI } from '../types';
-export declare const builderPluginAdapterSSR: <B extends Bundler>(options: BuilderOptions<B>) => BuilderPlugin<BuilderPluginAPI>;
+import type { BuilderOptions } from '../types';
+export declare const builderPluginAdapterSSR: <B extends Bundler>(options: BuilderOptions<B>) => RsbuildPlugin;

package/dist/types/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.d.ts

@@ -1,6 +1,4 @@
-import type { webpack } from '@modern-js/builder-webpack-provider';
-import type { Rspack } from '@modern-js/builder-rspack-provider';
-import type HtmlWebpackPlugin from '@modern-js/builder-webpack-provider/html-webpack-plugin';
+import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
 export declare class HtmlAsyncChunkPlugin {
     name: string;
     htmlWebpackPlugin: typeof HtmlWebpackPlugin;

package/dist/types/builder/shared/bundlerPlugins/HtmlBottomTemplate.d.ts

@@ -1,6 +1,4 @@
-import type { webpack } from '@modern-js/builder-webpack-provider';
-import type { Rspack } from '@modern-js/builder-rspack-provider';
-import type HtmlWebpackPlugin from '@modern-js/builder-webpack-provider/html-webpack-plugin';
+import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
 export declare class BottomTemplatePlugin {
     htmlWebpackPlugin: typeof HtmlWebpackPlugin;
     bottomTemplateReg: RegExp;

package/dist/types/builder/shared/bundlerPlugins/RouterPlugin.d.ts

@@ -1,7 +1,5 @@
-import type { webpack } from '@modern-js/builder-webpack-provider';
-import type { Rspack } from '@modern-js/builder-rspack-provider';
-import type HtmlWebpackPlugin from '@modern-js/builder-webpack-provider/html-webpack-plugin';
-import type { ScriptLoading } from '@modern-js/builder-shared';
+import type { Rspack, webpack, HtmlWebpackPlugin } from '@modern-js/uni-builder';
+import type { ScriptLoading } from '@rsbuild/shared';
 export interface RouteAssets {
     [routeId: string]: {
         chunkIds?: (string | number)[];
@@ -12,7 +10,7 @@ export interface RouteAssets {
 type Compiler = webpack.Compiler | Rspack.Compiler;
 type Options = {
     HtmlBundlerPlugin: typeof HtmlWebpackPlugin;
-    staticJsDir: string;
+    staticJsDir?: string;
     enableInlineRouteManifests: boolean;
     disableFilenameHash?: boolean;
     scriptLoading?: ScriptLoading;

package/dist/types/builder/shared/loaders/serverModuleLoader.d.ts

@@ -1,4 +1,3 @@
-import type { webpack } from '@modern-js/builder-webpack-provider';
-import type { Rspack } from '@modern-js/builder-rspack-provider';
+import type { webpack, Rspack } from '@modern-js/uni-builder';
 declare function loader(this: webpack.LoaderContext<void> | Rspack.LoaderContext): string;
 export default loader;