@modern-js/uni-builder 0.0.0-nightly-20240708170628 → 0.0.0-nightly-20240710063815

package/dist/index.d.ts

@@ -4,10 +4,10 @@ import type { CreateUniBuilderOptions } from './types';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 export { HtmlWebpackPlugin };
 export type { CreateUniBuilderOptions, UniBuilderInstance, UniBuilderWebpackInstance, };
-export type { CopyPluginOptions, NormalizedConfig, RspackConfig, CacheGroup, } from '@rsbuild/shared';
-export type { UniBuilderConfig, UniBuilderPlugin } from './types';
+export type { CacheGroup } from '@rsbuild/shared';
+export type { UniBuilderConfig, UniBuilderPlugin, BundlerType, MetaOptions, Stats, MultiStats, RspackConfig, } from './types';
 export type { StartDevServerOptions } from './shared/devServer';
 export declare function createUniBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderInstance>;
-export { logger, type ConfigChain, type RsbuildPlugin, type ChainIdentifier, type RspackChain, type Rspack, type RsbuildContext, type RsbuildConfig, } from '@rsbuild/core';
+export { logger, type ConfigChain, type RsbuildPlugin, type ChainIdentifier, type RspackChain, type Rspack, type RsbuildContext, type RsbuildConfig, type RsbuildTarget, type NormalizedConfig, } from '@rsbuild/core';
 export type { webpack, WebpackConfig } from '@rsbuild/webpack';
-export { RUNTIME_CHUNK_NAME } from './shared/utils';
+export { RUNTIME_CHUNK_NAME, isHtmlDisabled, castArray } from './shared/utils';

package/dist/index.js

@@ -30,7 +30,9 @@ var src_exports = {};
 __export(src_exports, {
   HtmlWebpackPlugin: () => import_html_webpack_plugin.default,
   RUNTIME_CHUNK_NAME: () => import_utils.RUNTIME_CHUNK_NAME,
+  castArray: () => import_utils.castArray,
   createUniBuilder: () => createUniBuilder,
+  isHtmlDisabled: () => import_utils.isHtmlDisabled,
   logger: () => import_core.logger
 });
 module.exports = __toCommonJS(src_exports);
@@ -46,6 +48,8 @@ async function createUniBuilder(options) {
 0 && (module.exports = {
   HtmlWebpackPlugin,
   RUNTIME_CHUNK_NAME,
+  castArray,
   createUniBuilder,
+  isHtmlDisabled,
   logger
 });

package/dist/rspack/plugins/babel-post.d.ts

@@ -1,4 +1,4 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
+import { type RsbuildPlugin } from '@rsbuild/core';
 /**
  * should not set babel-loader when babel config not modified
  */

package/dist/shared/devServer.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
-import { StartDevServerOptions as RsbuildStartDevServerOptions, DevConfig, ServerConfig } from '@rsbuild/shared';
-import { type RsbuildInstance } from '@rsbuild/core';
+import { type RsbuildInstance, type DevConfig, type ServerConfig, type Rspack } from '@rsbuild/core';
 import type { ModernDevServerOptions } from '@modern-js/server';
 import type { Server } from 'node:http';
 import { type ApplyPlugins } from '@modern-js/prod-server';
@@ -12,7 +11,9 @@ export declare const transformToRsbuildServerOptions: (dev: NonNullable<UniBuild
     dev: DevConfig;
     server: ServerConfig;
 };
-export type StartDevServerOptions = RsbuildStartDevServerOptions & {
+export type StartDevServerOptions = {
+    compiler?: Rspack.Compiler | Rspack.MultiCompiler;
+    getPortSilently?: boolean;
     apiOnly?: boolean;
     serverOptions?: ServerOptions;
     applyPlugins?: ApplyPlugins;

package/dist/shared/devServer.js

@@ -32,7 +32,7 @@ __export(devServer_exports, {
   transformToRsbuildServerOptions: () => transformToRsbuildServerOptions
 });
 module.exports = __toCommonJS(devServer_exports);
-var import_shared = require("@rsbuild/shared");
+var import_ts_deepmerge = require("ts-deepmerge");
 var import_utils = require("@modern-js/utils");
 var import_core = require("@rsbuild/core");
 var import_prod_server = require("@modern-js/prod-server");
@@ -73,7 +73,7 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
       overlay: false,
       ...devConfig.client || {}
     }
-  }, devServer, {}, import_shared.deepmerge);
+  }, devServer, {}, import_ts_deepmerge.merge);
   const rsbuildDev = {
     ...devConfig,
     writeToDisk: (_newDevServerConfig_devMiddleware = newDevServerConfig.devMiddleware) === null || _newDevServerConfig_devMiddleware === void 0 ? void 0 : _newDevServerConfig_devMiddleware.writeToDisk,
@@ -95,7 +95,7 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
   } else if (newDevServerConfig.setupMiddlewares) {
     rsbuildDev.setupMiddlewares = newDevServerConfig.setupMiddlewares;
   }
-  const server = (0, import_shared.isProd)() ? {
+  const server = (0, import_utils.isProd)() ? {
     publicDir: false,
     htmlFallback: false,
     printUrls: false
@@ -118,7 +118,7 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
 };
 const getDevServerOptions = async ({ builderConfig, serverOptions }) => {
   const defaultConfig = getServerOptions(builderConfig);
-  const config = serverOptions.config ? (0, import_shared.deepmerge)(defaultConfig, serverOptions.config) : defaultConfig;
+  const config = serverOptions.config ? (0, import_ts_deepmerge.merge)(defaultConfig, serverOptions.config) : defaultConfig;
   return {
     config
   };

package/dist/shared/getCssSupport.js

@@ -31,7 +31,7 @@ __export(getCssSupport_exports, {
   getCssSupport: () => getCssSupport
 });
 module.exports = __toCommonJS(getCssSupport_exports);
-var import_browserslist = __toESM(require("@rsbuild/shared/browserslist"));
+var import_browserslist = __toESM(require("browserslist"));
 const CSS_FEATURES_BROWSER = {
   customProperties: {
     and_chr: "49",

package/dist/shared/manifest.d.ts

@@ -1,4 +1,4 @@
-import type { Rspack } from '@rsbuild/shared';
+import type { Rspack } from '@rsbuild/core';
 export declare const generateManifest: (seed: Record<string, any>, files: Array<{
     chunk?: Rspack.Chunk;
     name: string;

package/dist/shared/parseCommonConfig.js

@@ -32,8 +32,8 @@ __export(parseCommonConfig_exports, {
   parseCommonConfig: () => parseCommonConfig
 });
 module.exports = __toCommonJS(parseCommonConfig_exports);
-var import_shared = require("@rsbuild/shared");
 var import_core = require("@rsbuild/core");
+var import_utils = require("@modern-js/utils");
 var import_plugin_toml = require("@rsbuild/plugin-toml");
 var import_plugin_yaml = require("@rsbuild/plugin-yaml");
 var import_plugin_react = require("@rsbuild/plugin-react");
@@ -50,11 +50,11 @@ var import_arco = require("./plugins/arco");
 var import_plugin_sass = require("@rsbuild/plugin-sass");
 var import_plugin_less = require("@rsbuild/plugin-less");
 var import_devServer = require("./devServer");
-var import_utils = require("./utils");
+var import_utils2 = require("./utils");
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
 const isLooseCssModules = (path) => {
-  if (import_shared.NODE_MODULES_REGEX.test(path)) {
+  if (import_utils2.NODE_MODULES_REGEX.test(path)) {
     return CSS_MODULES_REGEX.test(path);
   }
   return !GLOBAL_CSS_REGEX.test(path);
@@ -67,38 +67,6 @@ function removeUndefinedKey(obj) {
   });
   return obj;
 }
-const DEFAULT_WEB_BROWSERSLIST = [
-  "> 0.01%",
-  "not dead",
-  "not op_mini all"
-];
-const DEFAULT_BROWSERSLIST = {
-  web: DEFAULT_WEB_BROWSERSLIST,
-  node: [
-    "node >= 14"
-  ],
-  "web-worker": DEFAULT_WEB_BROWSERSLIST,
-  "service-worker": DEFAULT_WEB_BROWSERSLIST
-};
-async function getBrowserslistWithDefault(path, config, target) {
-  const { overrideBrowserslist: overrides = {} } = (config === null || config === void 0 ? void 0 : config.output) || {};
-  if (target === "web" || target === "web-worker") {
-    if (Array.isArray(overrides)) {
-      return overrides;
-    }
-    if (overrides[target]) {
-      return overrides[target];
-    }
-    const browserslistrc = await (0, import_shared.getBrowserslist)(path);
-    if (browserslistrc) {
-      return browserslistrc;
-    }
-  }
-  if (!Array.isArray(overrides) && overrides[target]) {
-    return overrides[target];
-  }
-  return DEFAULT_BROWSERSLIST[target];
-}
 const isUseCssSourceMap = (disableSourceMap = {}) => {
   if (typeof disableSourceMap === "boolean") {
     return !disableSourceMap;
@@ -175,7 +143,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   output.targets = targets;
   const overrideBrowserslist = {};
   for (const target2 of targets) {
-    overrideBrowserslist[target2] = await getBrowserslistWithDefault(cwd, uniBuilderConfig, target2);
+    overrideBrowserslist[target2] = await (0, import_utils2.getBrowserslistWithDefault)(cwd, uniBuilderConfig, target2);
   }
   output.overrideBrowserslist = overrideBrowserslist;
   if (enableInlineStyles) {
@@ -216,10 +184,10 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   if (tagsByEntries) {
     extraConfig.html.tags = [
       (tags2, utils) => {
-        const entryTags = (0, import_utils.castArray)(tagsByEntries[utils.entryName]);
+        const entryTags = (0, import_utils2.castArray)(tagsByEntries[utils.entryName]);
         const handlers = [];
         for (const tag of entryTags) {
-          if ((0, import_shared.isFunction)(tag)) {
+          if ((0, import_utils.isFunction)(tag)) {
             handlers.push(tag);
           } else {
             tags2.push(tag);

package/dist/shared/plugins/antd.d.ts

@@ -1,2 +1,2 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
+import { type RsbuildPlugin } from '@rsbuild/core';
 export declare const pluginAntd: () => RsbuildPlugin;

package/dist/shared/plugins/arco.d.ts

@@ -1,2 +1,2 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
+import { type RsbuildPlugin } from '@rsbuild/core';
 export declare const pluginArco: () => RsbuildPlugin;

package/dist/shared/plugins/devtools.d.ts

@@ -1,4 +1,4 @@
-import { RsbuildPlugin } from '@rsbuild/shared';
+import type { RsbuildPlugin } from '@rsbuild/core';
 import { DisableSourceMapOption } from '../../types';
 export declare const pluginDevtool: (options: {
     disableSourceMap?: DisableSourceMapOption;

package/dist/shared/plugins/emitRouteFile.d.ts

@@ -1,4 +1,4 @@
-import { type RsbuildPlugin } from '@rsbuild/shared';
+import { type RsbuildPlugin } from '@rsbuild/core';
 export declare function isFileExists(file: string): Promise<boolean>;
 /**
  * generate a basic route.json for modern.js server

package/dist/shared/plugins/emitRouteFile.js

@@ -32,17 +32,17 @@ __export(emitRouteFile_exports, {
   pluginEmitRouteFile: () => pluginEmitRouteFile
 });
 module.exports = __toCommonJS(emitRouteFile_exports);
-var import_path = require("path");
-var import_shared = require("@rsbuild/shared");
+var import_node_path = require("node:path");
+var import_node_fs = __toESM(require("node:fs"));
 async function isFileExists(file) {
-  return import_shared.fse.promises.access(file, import_shared.fse.constants.F_OK).then(() => true).catch(() => false);
+  return import_node_fs.default.promises.access(file, import_node_fs.default.constants.F_OK).then(() => true).catch(() => false);
 }
 const pluginEmitRouteFile = () => ({
   name: "uni-builder:emit-route-file",
   setup(api) {
     api.onBeforeStartDevServer(async () => {
-      const { fs, ROUTE_SPEC_FILE } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
-      const routeFilePath = (0, import_path.join)(api.context.distPath, ROUTE_SPEC_FILE);
+      const { fs: fs2, ROUTE_SPEC_FILE } = await Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+      const routeFilePath = (0, import_node_path.join)(api.context.distPath, ROUTE_SPEC_FILE);
       const htmlPaths = api.getHTMLPaths();
       const routesInfo = Object.entries(htmlPaths).map(([entryName, filename], index) => ({
         urlPath: index === 0 ? "/" : `/${entryName}`,
@@ -51,7 +51,7 @@ const pluginEmitRouteFile = () => ({
         isSPA: true
       }));
       if (!await isFileExists(routeFilePath) && routesInfo.length) {
-        await fs.outputFile(routeFilePath, JSON.stringify({
+        await fs2.outputFile(routeFilePath, JSON.stringify({
           routes: routesInfo
         }, null, 2));
       }

package/dist/shared/plugins/extensionPrefix.d.ts

@@ -1,3 +1,2 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
-import type { RsbuildTarget } from '@rsbuild/shared';
+import type { RsbuildPlugin, RsbuildTarget } from '@rsbuild/core';
 export declare const pluginExtensionPrefix: (prefixInfo: string | Partial<Record<RsbuildTarget, string>>) => RsbuildPlugin;

package/dist/shared/plugins/frameworkConfig.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,18 +17,26 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var frameworkConfig_exports = {};
 __export(frameworkConfig_exports, {
   pluginFrameworkConfig: () => pluginFrameworkConfig
 });
 module.exports = __toCommonJS(frameworkConfig_exports);
-var import_shared = require("@rsbuild/shared");
+var import_node_fs = __toESM(require("node:fs"));
 const pluginFrameworkConfig = (configPath) => ({
   name: "uni-builder:framework-config",
   setup(api) {
     api.modifyBundlerChain((chain) => {
-      if (!import_shared.fse.existsSync(configPath)) {
+      if (!import_node_fs.default.existsSync(configPath)) {
         return;
       }
       const cache = chain.get("cache");

package/dist/shared/plugins/mainFields.d.ts

@@ -1,4 +1,3 @@
-import type { RsbuildPlugin } from '@rsbuild/core';
+import type { RsbuildPlugin, RsbuildTarget } from '@rsbuild/core';
 import type { MainFields } from '../../types';
-import type { RsbuildTarget } from '@rsbuild/shared';
 export declare const pluginMainFields: (resolveMainFields: MainFields | Partial<Record<RsbuildTarget, MainFields>>) => RsbuildPlugin;

package/dist/shared/plugins/postcssLegacy.js

@@ -21,7 +21,7 @@ __export(postcssLegacy_exports, {
   pluginPostcssLegacy: () => pluginPostcssLegacy
 });
 module.exports = __toCommonJS(postcssLegacy_exports);
-var import_shared = require("@rsbuild/shared");
+var import_utils = require("@modern-js/utils");
 var import_getCssSupport = require("../getCssSupport");
 const pluginPostcssLegacy = (webBrowserslist) => ({
   name: "uni-builder:postcss-plugins",
@@ -30,7 +30,7 @@ const pluginPostcssLegacy = (webBrowserslist) => ({
       var _config_output;
       const cssSupport = (0, import_getCssSupport.getCssSupport)(webBrowserslist);
       const enableExtractCSS = !((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.injectStyles);
-      const enableCssMinify = !enableExtractCSS && import_shared.isProd;
+      const enableCssMinify = !enableExtractCSS && import_utils.isProd;
       const plugins = [
         require("postcss-flexbugs-fixes"),
         !cssSupport.customProperties && require("postcss-custom-properties"),

package/dist/shared/utils.d.ts

@@ -1,7 +1,24 @@
-import type { RsbuildTarget, NormalizedConfig } from '@rsbuild/core';
+import type { RsbuildTarget, RspackChain, RsbuildContext, NormalizedConfig } from '@rsbuild/core';
+import { OverrideBrowserslist } from '@rsbuild/shared';
 export declare const RUNTIME_CHUNK_NAME = "builder-runtime";
 export declare const JS_REGEX: RegExp;
 export declare const TS_REGEX: RegExp;
+export declare const SCRIPT_REGEX: RegExp;
+export declare const NODE_MODULES_REGEX: RegExp;
 export declare function isServerTarget(target: RsbuildTarget[]): boolean;
 export declare const castArray: <T>(arr?: T | T[] | undefined) => T[];
+export declare function applyScriptCondition({ rule, chain, config, context, includes, excludes, }: {
+    rule: RspackChain.Rule;
+    chain: RspackChain;
+    config: NormalizedConfig;
+    context: RsbuildContext;
+    includes: (string | RegExp)[];
+    excludes: (string | RegExp)[];
+}): void;
+export declare const isHtmlDisabled: (config: NormalizedConfig, target: RsbuildTarget) => boolean;
 export declare const getHash: (config: NormalizedConfig) => string;
+export declare function getBrowserslistWithDefault(path: string, config: {
+    output?: {
+        overrideBrowserslist?: OverrideBrowserslist;
+    };
+}, target: RsbuildTarget): Promise<string[]>;

package/dist/shared/utils.js

@@ -19,16 +19,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   JS_REGEX: () => JS_REGEX,
+  NODE_MODULES_REGEX: () => NODE_MODULES_REGEX,
   RUNTIME_CHUNK_NAME: () => RUNTIME_CHUNK_NAME,
+  SCRIPT_REGEX: () => SCRIPT_REGEX,
   TS_REGEX: () => TS_REGEX,
+  applyScriptCondition: () => applyScriptCondition,
   castArray: () => castArray,
+  getBrowserslistWithDefault: () => getBrowserslistWithDefault,
   getHash: () => getHash,
+  isHtmlDisabled: () => isHtmlDisabled,
   isServerTarget: () => isServerTarget
 });
 module.exports = __toCommonJS(utils_exports);
+var import_shared = require("@rsbuild/shared");
 const RUNTIME_CHUNK_NAME = "builder-runtime";
 const JS_REGEX = /\.(?:js|mjs|cjs|jsx)$/;
 const TS_REGEX = /\.(?:ts|mts|cts|tsx)$/;
+const SCRIPT_REGEX = /\.(?:js|jsx|mjs|cjs|ts|tsx|mts|cts)$/;
+const NODE_MODULES_REGEX = /[\\/]node_modules[\\/]/;
 function isServerTarget(target) {
   return (Array.isArray(target) ? target : [
     target
@@ -45,6 +53,43 @@ const castArray = (arr) => {
     arr
   ];
 };
+function applyScriptCondition({ rule, chain, config, context, includes, excludes }) {
+  rule.include.add({
+    and: [
+      context.rootPath,
+      {
+        not: NODE_MODULES_REGEX
+      }
+    ]
+  });
+  rule.include.add(/\.(?:ts|tsx|jsx|mts|cts)$/);
+  const target = castArray(chain.get("target"));
+  const legacyTarget = [
+    "es5",
+    "es6",
+    "es2015",
+    "es2016"
+  ];
+  if (legacyTarget.some((item) => target.includes(item))) {
+    rule.include.add(/[\\/]@rsbuild[\\/]core[\\/]dist[\\/]/);
+  }
+  for (const condition of [
+    ...includes,
+    ...config.source.include || []
+  ]) {
+    rule.include.add(condition);
+  }
+  for (const condition of [
+    ...excludes,
+    ...config.source.exclude || []
+  ]) {
+    rule.exclude.add(condition);
+  }
+}
+const isHtmlDisabled = (config, target) => {
+  const { htmlPlugin } = config.tools;
+  return htmlPlugin === false || Array.isArray(htmlPlugin) && htmlPlugin.includes(false) || target !== "web";
+};
 const getHash = (config) => {
   const { filenameHash } = config.output;
   if (typeof filenameHash === "string") {
@@ -52,12 +97,49 @@ const getHash = (config) => {
   }
   return filenameHash ? ".[contenthash:8]" : "";
 };
+const DEFAULT_WEB_BROWSERSLIST = [
+  "> 0.01%",
+  "not dead",
+  "not op_mini all"
+];
+const DEFAULT_BROWSERSLIST = {
+  web: DEFAULT_WEB_BROWSERSLIST,
+  node: [
+    "node >= 14"
+  ],
+  "web-worker": DEFAULT_WEB_BROWSERSLIST,
+  "service-worker": DEFAULT_WEB_BROWSERSLIST
+};
+async function getBrowserslistWithDefault(path, config, target) {
+  const { overrideBrowserslist: overrides = {} } = (config === null || config === void 0 ? void 0 : config.output) || {};
+  if (target === "web" || target === "web-worker") {
+    if (Array.isArray(overrides)) {
+      return overrides;
+    }
+    if (overrides[target]) {
+      return overrides[target];
+    }
+    const browserslistrc = await (0, import_shared.getBrowserslist)(path);
+    if (browserslistrc) {
+      return browserslistrc;
+    }
+  }
+  if (!Array.isArray(overrides) && overrides[target]) {
+    return overrides[target];
+  }
+  return DEFAULT_BROWSERSLIST[target];
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   JS_REGEX,
+  NODE_MODULES_REGEX,
   RUNTIME_CHUNK_NAME,
+  SCRIPT_REGEX,
   TS_REGEX,
+  applyScriptCondition,
   castArray,
+  getBrowserslistWithDefault,
   getHash,
+  isHtmlDisabled,
   isServerTarget
 });

package/dist/types.d.ts

@@ -1,5 +1,5 @@
-import type { NodeEnv, MetaOptions, RequestHandler, HtmlTagDescriptor } from '@rsbuild/shared';
-import type { ConfigChainWithContext, ConfigChain, DevConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, ServerConfig, RsbuildPluginAPI, SourceConfig, OutputConfig } from '@rsbuild/core';
+import type { NodeEnv, RequestHandler, HtmlTagDescriptor } from '@rsbuild/shared';
+import type { ConfigChainWithContext, ConfigChain, DevConfig, RsbuildConfig, RsbuildTarget, Polyfill, ScriptInject, ServerConfig, RsbuildPluginAPI, SourceConfig, OutputConfig, Rspack } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
 import type { PluginRemOptions } from '@rsbuild/plugin-rem';
@@ -17,6 +17,25 @@ import type { StartDevServerOptions, UniBuilderStartServerResult } from './share
 import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
 import type TerserPlugin from 'terser-webpack-plugin';
 type ArrayOrNot<T> = T | T[];
+export type Stats = Omit<Rspack.Stats, '#private' | 'hash'>;
+export type RspackConfig = Rspack.Configuration;
+export type MultiStats = Omit<Rspack.MultiStats, '#private' | 'hash' | 'stats'> & {
+    stats: Stats[];
+};
+/**
+ * custom properties
+ * e.g. { name: 'viewport' content: 'width=500, initial-scale=1' }
+ * */
+type MetaAttrs = {
+    [attrName: string]: string | boolean;
+};
+export type MetaOptions = {
+    /**
+     * name content pair
+     * e.g. { viewport: 'width=device-width, initial-scale=1, shrink-to-fit=no' }`
+     * */
+    [name: string]: string | false | MetaAttrs;
+};
 export type CreateBuilderCommonOptions = {
     entry?: SourceConfig['entry'];
     frameworkConfigPath?: string;
@@ -24,8 +43,9 @@ export type CreateBuilderCommonOptions = {
     /** The root path of current project. */
     cwd: string;
 };
+export type BundlerType = 'rspack' | 'webpack';
 export type CreateUniBuilderOptions = {
-    bundlerType: 'rspack' | 'webpack';
+    bundlerType: BundlerType;
     config: UniBuilderConfig;
 } & Partial<CreateBuilderCommonOptions>;
 export type GlobalVars = Record<string, any>;

package/dist/webpack/ModuleScopePlugin.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var ModuleScopePlugin_exports = {};
 __export(ModuleScopePlugin_exports, {
@@ -22,7 +32,7 @@ __export(ModuleScopePlugin_exports, {
 });
 module.exports = __toCommonJS(ModuleScopePlugin_exports);
 var import_path = require("path");
-var import_shared = require("@rsbuild/shared");
+var import_picocolors = __toESM(require("picocolors"));
 var import_utils = require("@modern-js/utils");
 class ModuleScopePlugin {
   apply(resolver) {
@@ -56,12 +66,12 @@ class ModuleScopePlugin {
         const requestRelative = (0, import_path.relative)(allowedDir, requestFullPath);
         return requestRelative.startsWith("../") || requestRelative.startsWith("..\\");
       })) {
-        let message = `You attempted to import ${import_shared.color.bold(request.__innerRequest_request)} which is not allowed. `;
+        let message = `You attempted to import ${import_picocolors.default.bold(request.__innerRequest_request)} which is not allowed. `;
         if (allowedDirs.length) {
-          message += `Allowed dirs: ${import_shared.color.bold(relativeAllowedDirs.join(","))}. `;
+          message += `Allowed dirs: ${import_picocolors.default.bold(relativeAllowedDirs.join(","))}. `;
         }
         if (allowedPatterns.length) {
-          message += `Allowed patterns: ${import_shared.color.bold(allowedPatterns.map((p) => p.toString()).join(","))}. `;
+          message += `Allowed patterns: ${import_picocolors.default.bold(allowedPatterns.map((p) => p.toString()).join(","))}. `;
         }
         message += `Please check the source.moduleScopes configuration.`;
         const scopeError = new Error(message);

package/dist/webpack/plugins/babel.js

@@ -36,8 +36,8 @@ var import_cloneDeep = __toESM(require("lodash/cloneDeep"));
 var import_web = require("@rsbuild/babel-preset/web");
 var import_node = require("@rsbuild/babel-preset/node");
 var import_utils = require("@modern-js/utils");
-var import_shared = require("@rsbuild/shared");
 var import_plugin_babel = require("@rsbuild/plugin-babel");
+var import_utils2 = require("../../shared/utils");
 const getPresetReact = (rootPath, isProd) => {
   const isNewJsx = (0, import_utils.isBeyondReact17)(rootPath);
   const presetReactOptions = {
@@ -65,7 +65,7 @@ const pluginBabel = (options, extraOptions) => ({
       order: "pre",
       handler: async (chain, { CHAIN_ID, target, isProd, isServer, isServiceWorker }) => {
         const config = api.getNormalizedConfig();
-        const browserslist = await (0, import_shared.getBrowserslistWithDefault)(api.context.rootPath, config, target);
+        const browserslist = await (0, import_utils2.getBrowserslistWithDefault)(api.context.rootPath, config, target);
         const getBabelOptions = (config2) => {
           var _baseBabelConfig_presets;
           const includes2 = [];
@@ -138,7 +138,7 @@ const pluginBabel = (options, extraOptions) => ({
         };
         const { babelOptions, includes, excludes } = getBabelOptions(config);
         const rule = chain.module.rule(CHAIN_ID.RULE.JS);
-        (0, import_shared.applyScriptCondition)({
+        (0, import_utils2.applyScriptCondition)({
           chain,
           rule,
           config,
@@ -146,7 +146,7 @@ const pluginBabel = (options, extraOptions) => ({
           includes,
           excludes
         });
-        rule.test(import_shared.SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options(babelOptions);
+        rule.test(import_utils2.SCRIPT_REGEX).use(CHAIN_ID.USE.BABEL).loader(require.resolve("babel-loader")).options(babelOptions);
         chain.module.rule(CHAIN_ID.RULE.JS_DATA_URI).mimetype({
           or: [
             "text/javascript",

package/dist/webpack/plugins/tsLoader.d.ts

@@ -1,8 +1,9 @@
-import { type FileFilterUtil } from '@rsbuild/shared';
 import { type ConfigChainWithContext } from '@rsbuild/core';
 import { PluginBabelOptions } from '@rsbuild/plugin-babel';
 import type { RsbuildPlugin } from '@rsbuild/core';
 import type { Options as RawTSLoaderOptions } from 'ts-loader';
+type OneOrMany<T> = T | T[];
+type FileFilterUtil = (items: OneOrMany<string | RegExp>) => void;
 export type TSLoaderOptions = Partial<RawTSLoaderOptions>;
 export type PluginTsLoaderOptions = ConfigChainWithContext<TSLoaderOptions, {
     /**
@@ -17,3 +18,4 @@ export type PluginTsLoaderOptions = ConfigChainWithContext<TSLoaderOptions, {
     addExcludes: FileFilterUtil;
 }>;
 export declare const pluginTsLoader: (options?: PluginTsLoaderOptions, babelOptions?: PluginBabelOptions['babelLoaderOptions']) => RsbuildPlugin;
+export {};

package/dist/webpack/plugins/tsLoader.js

@@ -31,7 +31,6 @@ __export(tsLoader_exports, {
   pluginTsLoader: () => pluginTsLoader
 });
 module.exports = __toCommonJS(tsLoader_exports);
-var import_shared = require("@rsbuild/shared");
 var import_utils = require("@modern-js/utils");
 var import_plugin_babel = require("@rsbuild/plugin-babel");
 var import_web = require("@rsbuild/babel-preset/web");
@@ -50,7 +49,7 @@ const pluginTsLoader = (options, babelOptions) => {
           var _baseBabelConfig_presets;
           const config = api.getNormalizedConfig();
           const { rootPath } = api.context;
-          const browserslist = await (0, import_shared.getBrowserslistWithDefault)(rootPath, config, target);
+          const browserslist = await (0, import_utils2.getBrowserslistWithDefault)(rootPath, config, target);
           const baseBabelConfig = (0, import_web.getBabelConfigForWeb)({
             presetEnv: {
               targets: browserslist,
@@ -85,7 +84,7 @@ const pluginTsLoader = (options, babelOptions) => {
             tsLoaderUtils
           );
           const rule = chain.module.rule(CHAIN_ID.RULE.TS);
-          (0, import_shared.applyScriptCondition)({
+          (0, import_utils2.applyScriptCondition)({
             chain,
             rule,
             config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "0.0.0-nightly-20240708170628",
+  "version": "0.0.0-nightly-20240710063815",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -51,6 +51,7 @@
     "babel-plugin-import": "1.13.5",
     "babel-plugin-styled-components": "1.13.3",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
+    "browserslist": "4.23.1",
     "cssnano": "6.0.1",
     "glob": "^9.3.5",
     "html-webpack-plugin": "5.5.3",
@@ -63,15 +64,17 @@
     "postcss-media-minmax": "5.0.0",
     "postcss-nesting": "12.0.1",
     "postcss-page-break": "3.0.4",
+    "picocolors": "^1.0.1",
     "react-refresh": "^0.14.0",
     "rspack-manifest-plugin": "5.0.0",
     "terser-webpack-plugin": "5.3.10",
+    "ts-deepmerge": "7.0.0",
     "ts-loader": "9.4.4",
     "webpack": "^5.92.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "0.0.0-nightly-20240708170628",
-    "@modern-js/server": "0.0.0-nightly-20240708170628",
-    "@modern-js/prod-server": "0.0.0-nightly-20240708170628"
+    "@modern-js/server": "0.0.0-nightly-20240710063815",
+    "@modern-js/utils": "0.0.0-nightly-20240710063815",
+    "@modern-js/prod-server": "0.0.0-nightly-20240710063815"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.7.10",
@@ -79,8 +82,8 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/build": "0.0.0-nightly-20240708170628",
-    "@scripts/vitest-config": "0.0.0-nightly-20240708170628"
+    "@scripts/vitest-config": "0.0.0-nightly-20240710063815",
+    "@scripts/build": "0.0.0-nightly-20240710063815"
   },
   "publishConfig": {
     "access": "public",