@modern-js/uni-builder 2.50.0 → 2.51.0

package/dist/rspack/index.js

@@ -36,8 +36,11 @@ var import_core = require("@rsbuild/core");
 var import_parseCommonConfig = require("../shared/parseCommonConfig");
 var import_compatLegacyPlugin = require("../shared/compatLegacyPlugin");
 async function parseConfig(uniBuilderConfig, options) {
-  var _uniBuilderConfig_tools, _uniBuilderConfig_tools1;
+  var _uniBuilderConfig_experiments, _uniBuilderConfig_tools, _uniBuilderConfig_tools1;
   const { rsbuildConfig, rsbuildPlugins } = await (0, import_parseCommonConfig.parseCommonConfig)(uniBuilderConfig, options);
+  if ((_uniBuilderConfig_experiments = uniBuilderConfig.experiments) === null || _uniBuilderConfig_experiments === void 0 ? void 0 : _uniBuilderConfig_experiments.lazyCompilation) {
+    rsbuildConfig.dev.lazyCompilation = uniBuilderConfig.experiments.lazyCompilation;
+  }
   if ((_uniBuilderConfig_tools = uniBuilderConfig.tools) === null || _uniBuilderConfig_tools === void 0 ? void 0 : _uniBuilderConfig_tools.babel) {
     var _uniBuilderConfig_tools2;
     const { pluginBabel } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-babel")));

package/dist/shared/devServer.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
-import { StartDevServerOptions as RsbuildStartDevServerOptions, StartServerResult, RsbuildInstance, DevConfig, ServerConfig } from '@rsbuild/shared';
+import { StartDevServerOptions as RsbuildStartDevServerOptions, DevConfig, ServerConfig } from '@rsbuild/shared';
+import { RsbuildInstance } from '@rsbuild/core';
 import type { ModernDevServerOptions } from '@modern-js/server';
 import type { Server } from 'node:http';
 import { type InitProdMiddlewares } from '@modern-js/prod-server';
@@ -16,8 +17,9 @@ export type StartDevServerOptions = RsbuildStartDevServerOptions & {
     serverOptions?: ServerOptions;
     initProdMiddlewares?: InitProdMiddlewares;
 };
-export type UniBuilderStartServerResult = Omit<StartServerResult, 'server'> & {
+export type UniBuilderStartServerResult = {
     server: Server;
+    port: number;
 };
 export declare function startDevServer(rsbuild: RsbuildInstance, options: StartDevServerOptions | undefined, builderConfig: UniBuilderConfig): Promise<UniBuilderStartServerResult>;
 export {};

package/dist/shared/devServer.js

@@ -162,12 +162,6 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
     },
     config
   }, options.initProdMiddlewares);
-  const protocol = https ? "https" : "http";
-  const urls = (0, import_shared.getAddressUrls)({
-    protocol,
-    port,
-    host
-  });
   (0, import_shared.debug)("listen dev server");
   return new Promise((resolve) => {
     server.listen({
@@ -181,7 +175,6 @@ async function startDevServer(rsbuild, options = {}, builderConfig) {
       await rsbuildServer.afterListen();
       resolve({
         port,
-        urls: urls.map((item) => item.url),
         server
       });
     });

package/dist/shared/parseCommonConfig.js

@@ -47,11 +47,14 @@ var import_devtools = require("./plugins/devtools");
 var import_emitRouteFile = require("./plugins/emitRouteFile");
 var import_antd = require("./plugins/antd");
 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");
+const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
 const isLooseCssModules = (path) => {
   if (import_shared.NODE_MODULES_REGEX.test(path)) {
-    return import_shared.CSS_MODULES_REGEX.test(path);
+    return CSS_MODULES_REGEX.test(path);
   }
   return !GLOBAL_CSS_REGEX.test(path);
 };
@@ -108,11 +111,12 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_output, _uniBuilderConfig_tools;
   var _output, _output_distPath, _output_distPath1, _output1, _extraConfig, _html, _extraConfig1;
   const { cwd, frameworkConfigPath, entry, target } = options;
-  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, enableAssetManifest, disableSourceMap, convertToRem, disableMinimize, polyfill, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, tags, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, ...toolsConfig } = {} } = uniBuilderConfig;
+  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, enableAssetManifest, disableSourceMap, convertToRem, disableMinimize, polyfill, dataUriLimit = 1e4, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, tags, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, ...toolsConfig } = {} } = uniBuilderConfig;
   const rsbuildConfig = {
     plugins,
     output: {
       polyfill: polyfill === "ua" ? "off" : polyfill,
+      dataUriLimit,
       ...outputConfig
     },
     source: {
@@ -260,7 +264,13 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     (0, import_plugin_toml.pluginToml)(),
     (0, import_plugin_yaml.pluginYaml)(),
     (0, import_antd.pluginAntd)(),
-    (0, import_arco.pluginArco)()
+    (0, import_arco.pluginArco)(),
+    (0, import_plugin_sass.pluginSass)({
+      sassLoaderOptions: sass
+    }),
+    (0, import_plugin_less.pluginLess)({
+      lessLoaderOptions: less
+    })
   ];
   if (checkSyntax) {
     const { pluginCheckSyntax } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-check-syntax")));
@@ -284,6 +294,10 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     const { pluginRem } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-rem")));
     rsbuildPlugins.push(pluginRem(typeof convertToRem === "boolean" ? {} : convertToRem));
   }
+  if (enableCssModuleTSDeclaration) {
+    const { pluginTypedCSSModules } = await Promise.resolve().then(() => __toESM(require("@rsbuild/plugin-typed-css-modules")));
+    rsbuildPlugins.push(pluginTypedCSSModules());
+  }
   rsbuildPlugins.push((0, import_runtimeChunk.pluginRuntimeChunk)((_uniBuilderConfig_output = uniBuilderConfig.output) === null || _uniBuilderConfig_output === void 0 ? void 0 : _uniBuilderConfig_output.disableInlineRuntimeChunk));
   const { sourceBuild } = uniBuilderConfig.experiments || {};
   if (sourceBuild) {

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

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

package/dist/shared/plugins/emitRouteFile.js

@@ -28,11 +28,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var emitRouteFile_exports = {};
 __export(emitRouteFile_exports, {
+  isFileExists: () => isFileExists,
   pluginEmitRouteFile: () => pluginEmitRouteFile
 });
 module.exports = __toCommonJS(emitRouteFile_exports);
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
+async function isFileExists(file) {
+  return import_shared.fse.promises.access(file, import_shared.fse.constants.F_OK).then(() => true).catch(() => false);
+}
 const pluginEmitRouteFile = () => ({
   name: "uni-builder:emit-route-file",
   setup(api) {
@@ -46,7 +50,7 @@ const pluginEmitRouteFile = () => ({
         entryPath: filename,
         isSPA: true
       }));
-      if (!await (0, import_shared.isFileExists)(routeFilePath) && routesInfo.length) {
+      if (!await isFileExists(routeFilePath) && routesInfo.length) {
         await fs.outputFile(routeFilePath, JSON.stringify({
           routes: routesInfo
         }, null, 2));
@@ -56,5 +60,6 @@ const pluginEmitRouteFile = () => ({
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  isFileExists,
   pluginEmitRouteFile
 });

package/dist/shared/plugins/fallback.js

@@ -23,6 +23,7 @@ __export(fallback_exports, {
 module.exports = __toCommonJS(fallback_exports);
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
+const HTML_REGEX = /\.html$/;
 const resourceRuleFallback = (rules = []) => {
   const innerRules = [];
   const outerRules = [];
@@ -51,7 +52,7 @@ const resourceRuleFallback = (rules = []) => {
       import_shared.JS_REGEX,
       import_shared.TS_REGEX,
       // exclude `html` and `json`, they get processed by webpack internal loaders.
-      import_shared.HTML_REGEX,
+      HTML_REGEX,
       /\.json$/
     ],
     type: "asset/resource"

package/dist/shared/plugins/postcssLegacy.js

@@ -27,8 +27,9 @@ const pluginPostcssLegacy = (webBrowserslist) => ({
   name: "uni-builder:postcss-plugins",
   setup(api) {
     api.modifyRsbuildConfig((config, { mergeRsbuildConfig }) => {
+      var _config_output;
       const cssSupport = (0, import_getCssSupport.getCssSupport)(webBrowserslist);
-      const enableExtractCSS = (0, import_shared.isUseCssExtract)(config, "web");
+      const enableExtractCSS = !((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.injectStyles);
       const enableCssMinify = !enableExtractCSS && import_shared.isProd;
       const plugins = [
         require("postcss-flexbugs-fixes"),

package/dist/types.d.ts

@@ -2,7 +2,6 @@ import type { NodeEnv, MetaOptions, ServerConfig, ScriptInject, RsbuildTarget, C
 import type { RsbuildConfig } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginStyledComponentsOptions } from '@rsbuild/plugin-styled-components';
-import type { LazyCompilationOptions } from './webpack/plugins/lazyCompilation';
 import type { PluginRemOptions } from '@rsbuild/plugin-rem';
 import type { PluginTsLoaderOptions } from './webpack/plugins/tsLoader';
 import type { SvgDefaultExport } from '@rsbuild/plugin-svgr';
@@ -11,6 +10,8 @@ import type { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
 import type { PluginCheckSyntaxOptions } from '@rsbuild/plugin-check-syntax';
 import type { PluginPugOptions } from '@rsbuild/plugin-pug';
 import type { PluginBabelOptions } from '@rsbuild/plugin-babel';
+import type { PluginSassOptions } from '@rsbuild/plugin-sass';
+import type { PluginLessOptions } from '@rsbuild/plugin-less';
 import type { AliasOption } from '@modern-js/utils';
 import type { StartDevServerOptions, UniBuilderStartServerResult } from './shared/devServer';
 import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
@@ -94,6 +95,14 @@ export type UniBuilderExtraConfig = {
          * @requires webpack
          */
         terser?: ToolsTerserConfig;
+        /**
+         * Modify the config of [less-loader](https://github.com/webpack-contrib/less-loader).
+         */
+        less?: PluginLessOptions['lessLoaderOptions'];
+        /**
+         * Modify the config of [sass-loader](https://github.com/webpack-contrib/sass-loader).
+         */
+        sass?: PluginSassOptions['sassLoaderOptions'];
     };
     dev?: {
         /**
@@ -139,6 +148,10 @@ export type UniBuilderExtraConfig = {
          * @deprecated use `output.filenameHash` instead
          */
         disableFilenameHash?: boolean;
+        /**
+         * Whether to generate a TypeScript declaration file for CSS Modules.
+         */
+        enableCssModuleTSDeclaration?: boolean;
         /**
          * @deprecated use `source.decorators` instead
          */
@@ -260,10 +273,7 @@ export type UniBuilderExtraConfig = {
         checkSyntax?: boolean | PluginCheckSyntaxOptions;
     };
     experiments?: {
-        /**
-         * Tips: this configuration is not yet supported in rspack
-         */
-        lazyCompilation?: LazyCompilationOptions;
+        lazyCompilation?: DevConfig['lazyCompilation'];
         /**
          * Enable the ability for source code building
          */

package/dist/webpack/index.d.ts

@@ -1,9 +1,8 @@
 import { type RsbuildConfig, type RsbuildPlugin, type RsbuildInstance } from '@rsbuild/core';
-import type { RsbuildProvider } from '@rsbuild/shared';
 import type { UniBuilderConfig, CreateUniBuilderOptions, CreateBuilderCommonOptions, OverridesUniBuilderInstance } from '../types';
 export declare function parseConfig(uniBuilderConfig: UniBuilderConfig, options: CreateBuilderCommonOptions): Promise<{
     rsbuildConfig: RsbuildConfig;
     rsbuildPlugins: RsbuildPlugin[];
 }>;
-export type UniBuilderWebpackInstance = Omit<RsbuildInstance<RsbuildProvider<'webpack'>>, keyof OverridesUniBuilderInstance> & OverridesUniBuilderInstance;
+export type UniBuilderWebpackInstance = Omit<RsbuildInstance, keyof OverridesUniBuilderInstance> & OverridesUniBuilderInstance;
 export declare function createWebpackBuilder(options: CreateUniBuilderOptions): Promise<UniBuilderWebpackInstance>;

package/dist/webpack/index.js

@@ -85,7 +85,7 @@ async function createWebpackBuilder(options) {
     cwd
   });
   const { webpackProvider } = await Promise.resolve().then(() => __toESM(require("@rsbuild/webpack")));
-  const { setHTMLPlugin } = await Promise.resolve().then(() => __toESM(require("@rsbuild/core/internal")));
+  const { __internalHelper: { setHTMLPlugin } } = await Promise.resolve().then(() => __toESM(require("@rsbuild/core")));
   const { default: HtmlWebpackPlugin } = await Promise.resolve().then(() => __toESM(require("html-webpack-plugin")));
   setHTMLPlugin(HtmlWebpackPlugin);
   rsbuildConfig.provider = webpackProvider;

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

@@ -1,6 +1,5 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-export type LazyCompilationOptions = boolean | {
-    entries?: boolean;
-    imports?: boolean;
-};
+import type { DevConfig } from '@rsbuild/shared';
+type LazyCompilationOptions = DevConfig['lazyCompilation'];
 export declare const pluginLazyCompilation: (options: LazyCompilationOptions) => RsbuildPlugin;
+export {};

package/dist/webpack/plugins/minimize.js

@@ -91,7 +91,11 @@ const pluginMinimize = (userTerserConfig) => ({
   setup(api) {
     api.modifyBundlerChain(async (chain, { isProd }) => {
       const config = api.getNormalizedConfig();
-      if ((0, import_shared.parseMinifyOptions)(config, isProd).minifyJs) {
+      const { minify } = config.output;
+      if (minify === false || !isProd) {
+        return;
+      }
+      if (minify === true || (minify === null || minify === void 0 ? void 0 : minify.js) !== false) {
         await applyJSMinimizer(chain, config, userTerserConfig);
       }
     });

package/dist/webpack/plugins/moduleScopes.js

@@ -34,7 +34,7 @@ __export(moduleScopes_exports, {
 });
 module.exports = __toCommonJS(moduleScopes_exports);
 var import_path = __toESM(require("path"));
-var import_shared = require("@rsbuild/shared");
+const ensureAbsolutePath = (base, filePath) => import_path.default.isAbsolute(filePath) ? filePath : import_path.default.resolve(base, filePath);
 const isPrimitiveScope = (items) => items.every((item) => typeof item === "string" || Object.prototype.toString.call(item) === "[object RegExp]");
 const applyScopeChain = (defaults, options) => {
   if (Array.isArray(options)) {
@@ -57,7 +57,7 @@ const pluginModuleScopes = (moduleScopes) => ({
       const rootPackageJson = import_path.default.resolve(api.context.rootPath, "./package.json");
       const formattedScopes = scopes.map((scope) => {
         if (typeof scope === "string") {
-          return (0, import_shared.ensureAbsolutePath)(api.context.rootPath, scope);
+          return ensureAbsolutePath(api.context.rootPath, scope);
         }
         return scope;
       });

package/dist/webpack/plugins/styledComponents.js

@@ -33,6 +33,16 @@ __export(styledComponents_exports, {
 module.exports = __toCommonJS(styledComponents_exports);
 var import_core = require("@rsbuild/core");
 var import_shared = require("@rsbuild/shared");
+const getDefaultStyledComponentsConfig = (isProd, ssr) => {
+  return {
+    ssr,
+    // "pure" is used to improve dead code elimination in production.
+    // we don't need to enable it in development because it will slow down the build process.
+    pure: isProd,
+    displayName: true,
+    transpileTemplateLiterals: true
+  };
+};
 const pluginStyledComponents = (userConfig = {}) => ({
   name: "uni-builder:styled-components",
   pre: [
@@ -43,7 +53,7 @@ const pluginStyledComponents = (userConfig = {}) => ({
     api.modifyBundlerChain(async (chain, { CHAIN_ID, isProd }) => {
       const isSSR = (0, import_shared.isServerTarget)(api.context.targets);
       const styledComponentsOptions = (0, import_shared.mergeChainedOptions)({
-        defaults: (0, import_shared.getDefaultStyledComponentsConfig)(isProd, isSSR),
+        defaults: getDefaultStyledComponentsConfig(isProd, isSSR),
         options: userConfig
       });
       if (!styledComponentsOptions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.50.0",
+  "version": "2.51.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,23 +26,26 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.23.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.6.15",
-    "@rsbuild/core": "0.6.15",
-    "@rsbuild/plugin-assets-retry": "0.6.15",
-    "@rsbuild/plugin-babel": "0.6.15",
-    "@rsbuild/plugin-check-syntax": "0.6.15",
-    "@rsbuild/plugin-css-minimizer": "0.6.15",
-    "@rsbuild/plugin-pug": "0.6.15",
-    "@rsbuild/plugin-react": "0.6.15",
-    "@rsbuild/plugin-rem": "0.6.15",
-    "@rsbuild/plugin-source-build": "0.6.15",
-    "@rsbuild/plugin-styled-components": "0.6.15",
-    "@rsbuild/plugin-svgr": "0.6.15",
-    "@rsbuild/plugin-type-check": "0.6.15",
-    "@rsbuild/plugin-toml": "0.6.15",
-    "@rsbuild/plugin-yaml": "0.6.15",
-    "@rsbuild/shared": "0.6.15",
-    "@rsbuild/webpack": "0.6.15",
+    "@rsbuild/babel-preset": "0.7.1",
+    "@rsbuild/core": "0.7.1",
+    "@rsbuild/plugin-sass": "0.7.1",
+    "@rsbuild/plugin-less": "0.7.1",
+    "@rsbuild/plugin-assets-retry": "0.7.1",
+    "@rsbuild/plugin-babel": "0.7.1",
+    "@rsbuild/plugin-check-syntax": "0.7.1",
+    "@rsbuild/plugin-css-minimizer": "0.7.1",
+    "@rsbuild/plugin-pug": "0.7.1",
+    "@rsbuild/plugin-react": "0.7.1",
+    "@rsbuild/plugin-rem": "0.7.1",
+    "@rsbuild/plugin-source-build": "0.7.1",
+    "@rsbuild/plugin-styled-components": "0.7.1",
+    "@rsbuild/plugin-svgr": "0.7.1",
+    "@rsbuild/plugin-type-check": "0.7.1",
+    "@rsbuild/plugin-typed-css-modules": "0.7.1",
+    "@rsbuild/plugin-toml": "0.7.1",
+    "@rsbuild/plugin-yaml": "0.7.1",
+    "@rsbuild/shared": "0.7.1",
+    "@rsbuild/webpack": "0.7.1",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -66,18 +69,18 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.91.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/server": "2.50.0",
-    "@modern-js/prod-server": "2.50.0",
-    "@modern-js/utils": "2.50.0"
+    "@modern-js/prod-server": "2.51.0",
+    "@modern-js/utils": "2.51.0",
+    "@modern-js/server": "2.51.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.6.15",
+    "@rsbuild/plugin-swc": "0.7.1",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/build": "2.50.0",
-    "@scripts/vitest-config": "2.50.0"
+    "@scripts/build": "2.51.0",
+    "@scripts/vitest-config": "2.51.0"
   },
   "publishConfig": {
     "access": "public",