@modern-js/uni-builder 0.0.0-nightly-20231219170633 → 2.43.0

package/dist/rspack/index.d.ts

@@ -1,8 +1,8 @@
 import type { RsbuildConfig, RsbuildPlugin, RsbuildInstance } from '@rsbuild/core';
 import type { RsbuildProvider, StartServerResult } from '@rsbuild/shared';
-import type { UniBuilderRspackConfig, CreateRspackBuilderOptions, CreateBuilderCommonOptions } from '../types';
+import type { BuilderConfig, CreateUniBuilderOptions, CreateBuilderCommonOptions } from '../types';
 import type { StartDevServerOptions } from '../shared/devServer';
-export declare function parseConfig(uniBuilderConfig: UniBuilderRspackConfig, options: CreateBuilderCommonOptions): Promise<{
+export declare function parseConfig(uniBuilderConfig: BuilderConfig, options: CreateBuilderCommonOptions): Promise<{
     rsbuildConfig: RsbuildConfig;
     rsbuildPlugins: RsbuildPlugin[];
 }>;
@@ -14,5 +14,5 @@ type UniBuilderInstance = Omit<RsbuildInstance<RsbuildProvider>, 'startDevServer
      */
     startDevServer: (options: StartDevServerOptions) => Promise<StartServerResult>;
 };
-export declare function createRspackBuilder(options: CreateRspackBuilderOptions): Promise<UniBuilderInstance>;
+export declare function createRspackBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderInstance>;
 export {};

package/dist/shared/parseCommonConfig.d.ts

@@ -1,8 +1,8 @@
 import { type RsbuildPlugin, type RsbuildConfig } from '@rsbuild/core';
-import type { CreateBuilderCommonOptions, UniBuilderRspackConfig, UniBuilderWebpackConfig } from '../types';
+import type { CreateBuilderCommonOptions, BuilderConfig } from '../types';
 /** Determine if a file path is a CSS module when disableCssModuleExtension is enabled. */
 export declare const isLooseCssModules: (path: string) => boolean;
-export declare function parseCommonConfig<B = 'rspack' | 'webpack'>(uniBuilderConfig: B extends 'rspack' ? UniBuilderRspackConfig : UniBuilderWebpackConfig, options: CreateBuilderCommonOptions): Promise<{
+export declare function parseCommonConfig(uniBuilderConfig: BuilderConfig, options: CreateBuilderCommonOptions): Promise<{
     rsbuildConfig: RsbuildConfig;
     rsbuildPlugins: RsbuildPlugin[];
 }>;

package/dist/types.d.ts

@@ -16,17 +16,12 @@ export type CreateBuilderCommonOptions = {
     frameworkConfigPath?: string;
     target?: RsbuildTarget | RsbuildTarget[];
     /** The root path of current project. */
-    cwd?: string;
+    cwd: string;
 };
-export type CreateWebpackBuilderOptions = {
-    bundlerType: 'webpack';
-    config: UniBuilderWebpackConfig;
-} & CreateBuilderCommonOptions;
-export type CreateRspackBuilderOptions = {
-    bundlerType: 'rspack';
-    config: UniBuilderRspackConfig;
-} & CreateBuilderCommonOptions;
-export type CreateUniBuilderOptions = CreateWebpackBuilderOptions | CreateRspackBuilderOptions;
+export type CreateUniBuilderOptions = {
+    bundlerType: 'rspack' | 'webpack';
+    config: BuilderConfig;
+} & Partial<CreateBuilderCommonOptions>;
 export type GlobalVars = Record<string, any>;
 export type ChainedGlobalVars = ChainedConfigWithUtils<GlobalVars, {
     env: NodeEnv;
@@ -79,6 +74,13 @@ export type UniBuilderExtraConfig = {
          * Note that `Object.assign` is a shallow copy and will completely overwrite the built-in `presets` or `plugins` array, please use it with caution.
          */
         babel?: PluginBabelOptions['babelLoaderOptions'];
+        /**
+         * Modify the options of [ts-loader](https://github.com/TypeStrong/ts-loader).
+         * When `tools.tsLoader` is not undefined, Rsbuild will use ts-loader instead of babel-loader to compile TypeScript code.
+         *
+         * Tips: this configuration is not yet supported in rspack
+         */
+        tsLoader?: PluginTsLoaderOptions;
     };
     dev?: {
         /**
@@ -205,12 +207,23 @@ export type UniBuilderExtraConfig = {
         templateParametersByEntries?: Record<string, Record<string, unknown>>;
     };
     security?: {
+        /**
+         * Adding an integrity attribute (`integrity`) to sub-resources introduced by HTML allows the browser to
+         * verify the integrity of the introduced resource, thus preventing tampering with the downloaded resource.
+         *
+         * Tips: this configuration is not yet supported in rspack
+         */
+        sri?: SriOptions | boolean;
         /**
          * Analyze the build artifacts to identify advanced syntax that is incompatible with the current browser scope.
          */
         checkSyntax?: boolean | PluginCheckSyntaxOptions;
     };
     experiments?: {
+        /**
+         * Tips: this configuration is not yet supported in rspack
+         */
+        lazyCompilation?: LazyCompilationOptions;
         /**
          * Enable the ability for source code building
          */
@@ -222,24 +235,4 @@ export type SriOptions = {
     enabled?: 'auto' | true | false;
     hashLoading?: 'eager' | 'lazy';
 };
-export type UniBuilderWebpackConfig = RsbuildConfig & UniBuilderExtraConfig & {
-    security?: {
-        /**
-         * Adding an integrity attribute (`integrity`) to sub-resources introduced by HTML allows the browser to
-         * verify the integrity of the introduced resource, thus preventing tampering with the downloaded resource.
-         */
-        sri?: SriOptions | boolean;
-    };
-    experiments?: {
-        lazyCompilation?: LazyCompilationOptions;
-    };
-    tools?: {
-        /**
-         * Modify the options of [ts-loader](https://github.com/TypeStrong/ts-loader).
-         * When `tools.tsLoader` is not undefined, Rsbuild will use ts-loader instead of babel-loader to compile TypeScript code.
-         */
-        tsLoader?: PluginTsLoaderOptions;
-    };
-};
-export type UniBuilderRspackConfig = RsbuildConfig & UniBuilderExtraConfig;
-export type BuilderConfig<B = 'rspack'> = B extends 'rspack' ? UniBuilderRspackConfig : UniBuilderWebpackConfig;
+export type BuilderConfig = RsbuildConfig & UniBuilderExtraConfig;

package/dist/webpack/index.d.ts

@@ -1,13 +1,13 @@
 import { type RsbuildConfig, type RsbuildPlugin, type RsbuildInstance } from '@rsbuild/core';
 import type { StartServerResult } from '@rsbuild/shared';
-import type { UniBuilderWebpackConfig, CreateWebpackBuilderOptions, CreateBuilderCommonOptions } from '../types';
+import type { BuilderConfig, CreateUniBuilderOptions, CreateBuilderCommonOptions } from '../types';
 import type { StartDevServerOptions } from '../shared/devServer';
-export declare function parseConfig(uniBuilderConfig: UniBuilderWebpackConfig, options: CreateBuilderCommonOptions): Promise<{
+export declare function parseConfig(uniBuilderConfig: BuilderConfig, options: CreateBuilderCommonOptions): Promise<{
     rsbuildConfig: RsbuildConfig;
     rsbuildPlugins: RsbuildPlugin[];
 }>;
 type UniBuilderWebpackInstance = Omit<RsbuildInstance, 'startDevServer'> & {
     startDevServer: (options: StartDevServerOptions) => Promise<StartServerResult>;
 };
-export declare function createWebpackBuilder(options: CreateWebpackBuilderOptions): Promise<UniBuilderWebpackInstance>;
+export declare function createWebpackBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderWebpackInstance>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "0.0.0-nightly-20231219170633",
+  "version": "2.43.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -25,21 +25,21 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.23.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.2.4",
-    "@rsbuild/core": "0.2.4",
-    "@rsbuild/plugin-assets-retry": "0.2.4",
-    "@rsbuild/plugin-babel": "0.2.4",
-    "@rsbuild/plugin-check-syntax": "0.2.4",
-    "@rsbuild/plugin-css-minimizer": "0.2.4",
-    "@rsbuild/plugin-pug": "0.2.4",
-    "@rsbuild/plugin-react": "0.2.4",
-    "@rsbuild/plugin-rem": "0.2.4",
-    "@rsbuild/plugin-source-build": "0.2.4",
-    "@rsbuild/plugin-styled-components": "0.2.4",
-    "@rsbuild/plugin-svgr": "0.2.4",
-    "@rsbuild/plugin-type-check": "0.2.4",
-    "@rsbuild/shared": "0.2.4",
-    "@rsbuild/webpack": "0.2.4",
+    "@rsbuild/babel-preset": "0.2.7",
+    "@rsbuild/core": "0.2.7",
+    "@rsbuild/plugin-assets-retry": "0.2.7",
+    "@rsbuild/plugin-babel": "0.2.7",
+    "@rsbuild/plugin-check-syntax": "0.2.7",
+    "@rsbuild/plugin-css-minimizer": "0.2.7",
+    "@rsbuild/plugin-pug": "0.2.7",
+    "@rsbuild/plugin-react": "0.2.7",
+    "@rsbuild/plugin-rem": "0.2.7",
+    "@rsbuild/plugin-source-build": "0.2.7",
+    "@rsbuild/plugin-styled-components": "0.2.7",
+    "@rsbuild/plugin-svgr": "0.2.7",
+    "@rsbuild/plugin-type-check": "0.2.7",
+    "@rsbuild/shared": "0.2.7",
+    "@rsbuild/webpack": "0.2.7",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -60,18 +60,18 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/server": "0.0.0-nightly-20231219170633",
-    "@modern-js/utils": "0.0.0-nightly-20231219170633",
-    "@modern-js/prod-server": "0.0.0-nightly-20231219170633"
+    "@modern-js/server": "2.43.0",
+    "@modern-js/utils": "2.43.0",
+    "@modern-js/prod-server": "2.43.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.2.4",
+    "@rsbuild/plugin-swc": "0.2.7",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/vitest-config": "0.0.0-nightly-20231219170633",
-    "@scripts/build": "0.0.0-nightly-20231219170633"
+    "@scripts/vitest-config": "2.43.0",
+    "@scripts/build": "2.43.0"
   },
   "publishConfig": {
     "access": "public",