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

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

@@ -1,15 +1,15 @@
 import type { ServerUserConfig, BffUserConfig } from '@modern-js/server-core';
-import type { BuilderPlugin } from '@modern-js/builder-webpack-provider';
-import type { OutputUserConfig, RsOutputUserConfig, SharedOutputConfig } from './output';
-import type { RsSourceUserConfig, SharedSourceConfig, SourceUserConfig } from './source';
+import type { UniBuilderPlugin } from '@modern-js/uni-builder';
+import type { OutputUserConfig } from './output';
+import type { SourceUserConfig } from './source';
 import type { TestingUserConfig } from './testing';
 import type { DevUserConfig } from './dev';
-import type { RsToolsUserConfig, SharedToolsConfig, ToolsUserConfig } from './tools';
-import type { HtmlUserConfig, RsHtmlUserConfig, SharedHtmlConfig } from './html';
-import type { RsSecurityConfig, SecurityUserConfig, SharedSecurityConfig } from './security';
+import type { ToolsUserConfig } from './tools';
+import type { HtmlUserConfig } from './html';
+import type { SecurityUserConfig } from './security';
 import type { DeployUserConfig } from './deploy';
 import type { ExperimentsUserConfig } from './experiments';
-import type { PerformanceUserConfig, RsPerformanceConfig, SharedPerformanceConfig } from './performance';
+import type { PerformanceUserConfig } from './performance';
 export * from './output';
 export interface RuntimeUserConfig {
     [name: string]: any;
@@ -17,10 +17,11 @@ export interface RuntimeUserConfig {
 export interface RuntimeByEntriesUserConfig {
     [name: string]: RuntimeUserConfig;
 }
-export interface SharedUserConfig {
+export interface AppToolsUserConfig {
     server?: ServerUserConfig;
-    source?: SharedSourceConfig;
-    output?: SharedOutputConfig;
+    source?: SourceUserConfig;
+    output?: OutputUserConfig;
+    experiments?: ExperimentsUserConfig;
     /**
      * The configuration of `bff` is provided by `bff` plugin.
      * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
@@ -31,33 +32,16 @@ export interface SharedUserConfig {
     deploy?: DeployUserConfig;
     runtime?: RuntimeUserConfig;
     runtimeByEntries?: RuntimeByEntriesUserConfig;
-    html?: SharedHtmlConfig;
-    tools?: SharedToolsConfig;
-    security?: SharedSecurityConfig;
-    testing?: TestingUserConfig;
-    builderPlugins?: BuilderPlugin[];
-    performance?: SharedPerformanceConfig;
-    devtools?: any;
-}
-export interface AppToolsUserConfig extends SharedUserConfig {
-    source?: SourceUserConfig;
-    output?: OutputUserConfig;
     html?: HtmlUserConfig;
     tools?: ToolsUserConfig;
     security?: SecurityUserConfig;
+    testing?: TestingUserConfig;
+    builderPlugins?: UniBuilderPlugin[];
     performance?: PerformanceUserConfig;
-    experiments?: ExperimentsUserConfig;
-}
-export interface RsAppToolsUserConfig extends SharedUserConfig {
-    source?: RsSourceUserConfig;
-    output?: RsOutputUserConfig;
-    html?: RsHtmlUserConfig;
-    tools?: RsToolsUserConfig;
-    performance?: RsPerformanceConfig;
-    security?: RsSecurityConfig;
+    devtools?: any;
 }
 interface SharedNormalizedConfig<RawConfig> {
     cliOptions?: Record<string, any>;
     _raw: RawConfig;
 }
-export type AppToolsNormalizedConfig<Config = SharedUserConfig> = Required<Config> & SharedNormalizedConfig<Config>;
+export type AppToolsNormalizedConfig<Config = AppToolsUserConfig> = Required<Config> & SharedNormalizedConfig<Config>;

package/dist/types/types/config/output.d.ts

@@ -1,10 +1,7 @@
-import type { SharedOutputConfig as BuilderSharedOutputConfig } from '@modern-js/builder-shared';
+import type { UniBuilderConfig } from '@modern-js/uni-builder';
 import type { SSGConfig } from '@modern-js/types';
-import { WebpackBuilderConfig, RspackBuilderConfig } from '../../builder/shared';
-import { UnwrapBuilderConfig } from '../utils';
-export type BuilderOutputConfig = UnwrapBuilderConfig<WebpackBuilderConfig, 'output'>;
-export type RsBuilderOutputConfig = UnwrapBuilderConfig<RspackBuilderConfig, 'output'>;
-export interface SharedOutputConfig extends BuilderSharedOutputConfig {
+import type { UnwrapBuilderConfig } from '../utils';
+export interface OutputUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, 'output'> {
     /**
      * Enable SSG for self-controlled routing or conventional routing.
      * @default false
@@ -36,8 +33,4 @@ export interface SharedOutputConfig extends BuilderSharedOutputConfig {
      */
     tempDir?: string;
 }
-export interface OutputUserConfig extends BuilderOutputConfig, SharedOutputConfig {
-}
-export interface RsOutputUserConfig extends RsBuilderOutputConfig, SharedOutputConfig {
-}
 export type { SSGRouteOptions, SSGSingleEntryOptions, SSGMultiEntryOptions, SSGConfig, } from '@modern-js/types';

package/dist/types/types/config/performance.d.ts

@@ -1,6 +1,3 @@
-import { UnwrapBuilderConfig } from '../utils';
-import type { WebpackBuilderConfig, RspackBuilderConfig } from '../../builder/shared';
-export type { SharedPerformanceConfig } from '@modern-js/builder-shared';
-export type BuilderPerformanceConfig = UnwrapBuilderConfig<WebpackBuilderConfig, 'performance'>;
-export type RsPerformanceConfig = UnwrapBuilderConfig<RspackBuilderConfig, 'performance'>;
-export type PerformanceUserConfig = BuilderPerformanceConfig;
+import type { UniBuilderConfig } from '@modern-js/uni-builder';
+import type { UnwrapBuilderConfig } from '../utils';
+export type PerformanceUserConfig = UnwrapBuilderConfig<UniBuilderConfig, 'performance'>;

package/dist/types/types/config/security.d.ts

@@ -1,7 +1,2 @@
-import type { SharedSecurityConfig } from '@modern-js/builder-shared';
-import type { WebpackBuilderConfig, RspackBuilderConfig } from '../../builder/shared';
-import { UnwrapBuilderConfig } from '../utils';
-export type BuilderSecurityConfig = UnwrapBuilderConfig<WebpackBuilderConfig, 'security'>;
-export type RsSecurityConfig = UnwrapBuilderConfig<RspackBuilderConfig, 'security'>;
-export type SecurityUserConfig = BuilderSecurityConfig;
-export type { SharedSecurityConfig };
+import type { UniBuilderConfig } from '@modern-js/uni-builder';
+export type SecurityUserConfig = Required<UniBuilderConfig>['security'];

package/dist/types/types/config/source.d.ts

@@ -1,7 +1,4 @@
-import type { SharedSourceConfig as BuilderSharedSourceConfig } from '@modern-js/builder-shared';
-import type { WebpackBuilderConfig, RspackBuilderConfig } from '../../builder/shared';
-export type BuilderSourceConfig = NonNullable<WebpackBuilderConfig['source']>;
-export type RsBuilderSourceConfig = NonNullable<RspackBuilderConfig['source']>;
+import type { UniBuilderConfig } from '@modern-js/uni-builder';
 export type Entry = string | {
     /**
      * The entry file path.
@@ -17,7 +14,7 @@ export type Entry = string | {
     customBootstrap?: string;
 };
 export type Entries = Record<string, Entry>;
-export interface SharedSourceConfig extends BuilderSharedSourceConfig {
+export interface SourceUserConfig extends NonNullable<UniBuilderConfig['source']> {
     /**
      * Used to configure custom page entries.
      */
@@ -58,5 +55,3 @@ export interface SharedSourceConfig extends BuilderSharedSourceConfig {
      */
     designSystem?: Record<string, any>;
 }
-export type SourceUserConfig = BuilderSourceConfig & SharedSourceConfig;
-export type RsSourceUserConfig = RsBuilderSourceConfig & SharedSourceConfig;

package/dist/types/types/config/tools.d.ts

@@ -1,15 +1,10 @@
 import type { JestConfig } from '@modern-js/types';
-import type { PluginSwcOptions } from '@modern-js/builder-plugin-swc';
-import type { PluginEsbuildOptions } from '@modern-js/builder-plugin-esbuild';
-import type { SharedToolsConfig as BuilderSharedToolsConfig } from '@modern-js/builder-shared';
+import type { PluginSwcOptions } from '@rsbuild/plugin-swc';
+import type { PluginEsbuildOptions } from '@rsbuild/plugin-esbuild';
+import type { UniBuilderConfig } from '@modern-js/uni-builder';
 import type { UnwrapBuilderConfig } from '../utils';
-import type { WebpackBuilderConfig, RspackBuilderConfig } from '../../builder/shared';
-export type BuilderToolsConfig = UnwrapBuilderConfig<WebpackBuilderConfig, 'tools'> & {
-    esbuild?: PluginEsbuildOptions;
-};
-export type RsBuilderToolsConfig = UnwrapBuilderConfig<RspackBuilderConfig, 'tools'>;
 export type Tailwindcss = Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
-export interface SharedToolsConfig extends BuilderSharedToolsConfig {
+export interface ToolsUserConfig extends UnwrapBuilderConfig<UniBuilderConfig, 'tools'> {
     /**
      * Used to custom Tailwind CSS configurations.
      * @requires `tailwindcss` plugin.
@@ -31,8 +26,11 @@ export interface SharedToolsConfig extends BuilderSharedToolsConfig {
      * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
      */
     swc?: PluginSwcOptions<'outer'>;
-}
-export interface ToolsUserConfig extends BuilderToolsConfig, SharedToolsConfig {
-}
-export interface RsToolsUserConfig extends SharedToolsConfig, RsBuilderToolsConfig {
+    /**
+     * Used to custom Esbuild configurations.
+     * @requires `esbuild` plugin.
+     * The configuration of `esbuild` is provided by `esbuild` plugin.
+     * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
+     */
+    esbuild?: PluginEsbuildOptions;
 }

package/dist/types/types/hooks.d.ts

@@ -1,9 +1,8 @@
-import type { webpack } from '@modern-js/builder-webpack-provider';
 import type { AsyncWaterfall, AsyncWorkflow, ParallelWorkflow } from '@modern-js/plugin';
 import type { Entrypoint, HtmlPartials, NestedRouteForCli, PageRoute, RouteLegacy, ServerRoute } from '@modern-js/types';
 import type { RegisterBuildPlatformResult, DevToolData } from '@modern-js/core';
-import type { Stats, MultiStats } from '@modern-js/builder-shared';
-import type { Rspack } from '@modern-js/builder-rspack-provider';
+import type { Stats, MultiStats } from '@rsbuild/shared';
+import type { Rspack, webpack } from '@modern-js/uni-builder';
 import { Bundler } from './utils';
 export interface ImportSpecifier {
     local?: string;

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

@@ -1,28 +1,19 @@
 import type { NormalizedConfig, UserConfig } from '@modern-js/core';
-import type { AppToolsUserConfig, AppToolsNormalizedConfig, SharedUserConfig, RsAppToolsUserConfig } from './config';
+import type { AppToolsUserConfig, AppToolsNormalizedConfig } from './config';
 import type { AppToolsHooks } from './hooks';
 import type { AppToolsLegacyUserConfig, AppToolsLegacyNormalizedConfig } from './legacyConfig';
-import { Bundler, FromConfig } from './utils';
+import { Bundler } from './utils';
 export * from './hooks';
 export * from './config';
 export * from './legacyConfig';
-export type { webpack } from '@modern-js/builder-webpack-provider';
-export type { Rspack } from '@modern-js/builder-rspack-provider';
+export type { webpack, Rspack } from '@modern-js/uni-builder';
 export type { Bundler } from './utils';
 export type { ServerUserConfig, ServerNormalizedConfig, BffUserConfig, BffNormalizedConfig, SSR, SSRByEntries, } from '@modern-js/server-core';
 export type { IAppContext, PluginAPI, CliPlugin, NormalizedConfig, UserConfig, } from '@modern-js/core';
 export type AppTools<B extends Bundler = 'webpack'> = {
     hooks: AppToolsHooks<B>;
-    userConfig: FromConfig<B, {
-        rspack: RsAppToolsUserConfig;
-        webpack: AppToolsUserConfig;
-        shared: SharedUserConfig;
-    }>;
-    normalizedConfig: FromConfig<B, {
-        rspack: AppToolsNormalizedConfig<RsAppToolsUserConfig>;
-        webpack: AppToolsNormalizedConfig<AppToolsUserConfig>;
-        shared: AppToolsNormalizedConfig<SharedUserConfig>;
-    }>;
+    userConfig: AppToolsUserConfig;
+    normalizedConfig: AppToolsNormalizedConfig<AppToolsUserConfig>;
 };
 export type LegacyAppTools = {
     hooks: AppToolsHooks;

package/dist/types/types/legacyConfig/output.d.ts

@@ -1,4 +1,4 @@
-import type { MetaOptions } from '@modern-js/builder-shared';
+import type { MetaOptions } from '@rsbuild/shared';
 import type { SSGConfig } from '../config';
 type CrossOrigin = 'anonymous' | 'use-credentials';
 export type OutputLegacyUserConfig = {

package/dist/types/types/legacyConfig/tools.d.ts

@@ -1,6 +1,6 @@
 import type { JestConfig, DevServerOptions } from '@modern-js/types';
-import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
-type BuilderToolsConfig = Required<BuilderConfig>['tools'];
+import type { UniBuilderConfig } from '@modern-js/uni-builder';
+type BuilderToolsConfig = Required<UniBuilderConfig>['tools'];
 export type ToolsLegacyUserConfig = BuilderToolsConfig & {
     esbuild?: Record<string, unknown>;
     devServer?: DevServerOptions;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.45.0",
+  "version": "2.45.1-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,49 +69,39 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
+    "@rsbuild/plugin-esbuild": "0.2.17",
+    "@rsbuild/plugin-node-polyfill": "0.2.17",
+    "@rsbuild/shared": "0.2.17",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/builder": "2.45.0",
-    "@modern-js/builder-webpack-provider": "2.45.0",
-    "@modern-js/core": "2.45.0",
-    "@modern-js/builder-plugin-node-polyfill": "2.45.0",
-    "@modern-js/builder-shared": "2.45.0",
+    "@modern-js/uni-builder": "2.45.0",
     "@modern-js/new-action": "2.45.0",
-    "@modern-js/plugin": "2.45.0",
+    "@modern-js/core": "2.45.0",
     "@modern-js/node-bundle-require": "2.45.0",
     "@modern-js/plugin-data-loader": "2.45.0",
-    "@modern-js/plugin-i18n": "2.45.0",
+    "@modern-js/plugin": "2.45.0",
     "@modern-js/plugin-lint": "2.45.0",
     "@modern-js/prod-server": "2.45.0",
     "@modern-js/server": "2.45.0",
     "@modern-js/server-utils": "2.45.0",
-    "@modern-js/upgrade": "2.45.0",
+    "@modern-js/plugin-i18n": "2.45.0",
     "@modern-js/types": "2.45.0",
     "@modern-js/utils": "2.45.0",
     "@modern-js/server-core": "2.45.0",
-    "@modern-js/builder-plugin-esbuild": "2.45.0"
+    "@modern-js/upgrade": "2.45.0"
   },
   "devDependencies": {
+    "@rsbuild/plugin-swc": "0.2.17",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.89.0",
-    "@modern-js/builder-plugin-swc": "2.45.0",
-    "@modern-js/builder-rspack-provider": "2.45.0",
     "@scripts/build": "2.45.0",
     "@scripts/jest-config": "2.45.0"
   },
-  "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "^2.45.0"
-  },
-  "peerDependenciesMeta": {
-    "@modern-js/builder-rspack-provider": {
-      "optional": true
-    }
-  },
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",