@modern-js/uni-builder 2.67.11 → 2.68.0

package/dist/shared/devServer.js

@@ -25,14 +25,21 @@ var import_utils = require("@modern-js/utils");
 var import_ts_deepmerge = require("ts-deepmerge");
 const transformDevSetupMiddlewares = (seuptMiddlewares) => {
   if (seuptMiddlewares) {
-    const newSetupMiddlewares = seuptMiddlewares.map((handler) => (_, server) => {
+    const newSetupMiddlewares = Array.isArray(seuptMiddlewares) ? seuptMiddlewares.map((handler) => (_, server) => {
       handler({
         unshift() {
         },
         push() {
         }
       }, server);
-    });
+    }) : (_, server) => {
+      seuptMiddlewares({
+        unshift() {
+        },
+        push() {
+        }
+      }, server);
+    };
     return newSetupMiddlewares;
   }
   return void 0;
@@ -83,7 +90,8 @@ const transformToRsbuildServerOptions = (dev, devServer) => {
     proxy: newDevServerConfig.proxy,
     port,
     host,
-    https: https ? https : void 0
+    https: https ? https : void 0,
+    middlewareMode: true
   };
   if (!(0, import_utils.isProd)() && startUrl) {
     server.open = beforeStartUrl ? {

package/dist/shared/parseCommonConfig.js

@@ -80,7 +80,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_output, _uniBuilderConfig_tools;
   var _rsbuildConfig_tools, _output, _output_distPath, _output1, _extraConfig, _html, _extraConfig1;
   const frameworkConfigPath = options === null || options === void 0 ? void 0 : options.frameworkConfigPath;
-  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, enableAssetManifest, disableSourceMap, sourceMap, convertToRem, disableMinimize, polyfill, dataUriLimit = 1e4, distPath = {}, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, outputStructure, appIcon, tags, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, transformImport, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {} } = uniBuilderConfig;
+  const { plugins: [...plugins] = [], performance: { ...performanceConfig } = {}, output: { disableFilenameHash, enableLatestDecorators, cssModuleLocalIdentName, enableInlineScripts, disableCssExtract, enableInlineStyles, enableCssModuleTSDeclaration, disableCssModuleExtension, disableTsChecker, disableSvgr, svgDefaultExport, assetsRetry, enableAssetFallback, enableAssetManifest, disableSourceMap, sourceMap, convertToRem, disableMinimize, polyfill, dataUriLimit = 1e4, distPath = {}, ...outputConfig } = {}, html: { disableHtmlFolder, metaByEntries, titleByEntries, faviconByEntries, injectByEntries, templateByEntries, templateParametersByEntries, tagsByEntries, outputStructure, appIcon, tags, ...htmlConfig } = {}, source: { alias, globalVars, resolveMainFields, resolveExtensionPrefix, transformImport, ...sourceConfig } = {}, dev, security: { checkSyntax, sri, ...securityConfig } = {}, tools: { devServer, tsChecker, minifyCss, less, sass, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {}, resolve = {} } = uniBuilderConfig;
   const rsbuildConfig = {
     plugins,
     output: {
@@ -89,6 +89,7 @@ async function parseCommonConfig(uniBuilderConfig, options) {
       sourceMap,
       ...outputConfig
     },
+    resolve,
     source: {
       alias,
       ...sourceConfig
@@ -99,6 +100,10 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     security: securityConfig,
     environments
   };
+  if (typeof alias === "object" && Object.keys(alias).length === 0) {
+    var _rsbuildConfig_source;
+    (_rsbuildConfig_source = rsbuildConfig.source) === null || _rsbuildConfig_source === void 0 ? true : delete _rsbuildConfig_source.alias;
+  }
   rsbuildConfig.tools.htmlPlugin = htmlPlugin;
   var _lightningcssLoader;
   (_lightningcssLoader = (_rsbuildConfig_tools = rsbuildConfig.tools).lightningcssLoader) !== null && _lightningcssLoader !== void 0 ? _lightningcssLoader : _rsbuildConfig_tools.lightningcssLoader = false;

package/dist/shared/rsc/common.js

@@ -50,11 +50,15 @@ const sharedData = {
   }
 };
 function setBuildInfo(mod, property) {
-  mod.buildInfo = mod.buildInfo || {};
+  if (!mod.buildInfo) {
+    mod.buildInfo = {};
+  }
   Object.assign(mod.buildInfo, property);
 }
 function setRscBuildInfo(mod, property) {
-  mod.buildInfo = mod.buildInfo || {};
+  if (!mod.buildInfo) {
+    mod.buildInfo = {};
+  }
   const rscBuildInfo = mod.buildInfo[MODERN_RSC_INFO] || {};
   Object.assign(rscBuildInfo, property);
   setBuildInfo(mod, {

package/dist/shared/rsc/plugins/rsbuild-rsc-plugin.js

@@ -90,11 +90,11 @@ const rsbuildRscPlugin = ({ appDir, isRspack = true, rscClientRuntimePath, rscSe
             const jsLoaderOptions = originalJsRule.use(JSRule).get("options");
             const jsLoaderPath = originalJsRule.use(JSRule).get("loader");
             originalJsRule.uses.delete(JSRule);
-            chain.module.rule(CHAIN_ID.RULE.JS).oneOf("rsc-server").issuerLayer(import_common.webpackRscLayerName).use("rsc-server-loader").loader(require.resolve("../rsc-server-loader")).options({
+            chain.module.rule(CHAIN_ID.RULE.JS).oneOf("rsc-server").issuerLayer(import_common.webpackRscLayerName).exclude.add(/universal[/\\]async_storage/).end().use("rsc-server-loader").loader(require.resolve("../rsc-server-loader")).options({
               entryPath2Name,
               appDir,
               runtimePath: rscServerRuntimePath
-            }).end().use(JSRule).loader(jsLoaderPath).options(jsLoaderOptions).end().end().oneOf("rsc-ssr").use("rsc-ssr-loader").loader(require.resolve("../rsc-ssr-loader")).options({
+            }).end().use(JSRule).loader(jsLoaderPath).options(jsLoaderOptions).end().end().oneOf("rsc-ssr").exclude.add(/universal[/\\]async_storage/).end().use("rsc-ssr-loader").loader(require.resolve("../rsc-ssr-loader")).options({
               entryPath2Name
             }).end().use(JSRule).loader(jsLoaderPath).options(jsLoaderOptions).end().end();
           }

package/dist/types.d.ts

@@ -384,6 +384,7 @@ export type UniBuilderConfig = {
     performance?: RsbuildConfig['performance'];
     security?: Omit<SecurityConfig, 'sri'>;
     tools?: Omit<ToolsConfig, 'htmlPlugin'>;
+    resolve?: RsbuildConfig['resolve'];
     source?: Omit<SourceConfig, 'alias' | 'transformImport'>;
     plugins?: RsbuildPlugins;
     environments?: {

package/dist/webpack/index.js

@@ -39,6 +39,7 @@ var import_postcss = require("../shared/plugins/postcss");
 var import_rsbuild_rsc_plugin = require("../shared/rsc/plugins/rsbuild-rsc-plugin");
 var import_utils = require("../shared/utils");
 var import_babel = require("./plugins/babel");
+var import_include = require("./plugins/include");
 var import_moduleScopes = require("./plugins/moduleScopes");
 var import_react = require("./plugins/react");
 async function parseConfig(uniBuilderConfig, options) {
@@ -137,6 +138,7 @@ async function parseConfig(uniBuilderConfig, options) {
     rsbuildPlugins.push(pluginStyledComponents(options2));
   }
   rsbuildPlugins.push((0, import_moduleScopes.pluginModuleScopes)((_uniBuilderConfig_source = uniBuilderConfig.source) === null || _uniBuilderConfig_source === void 0 ? void 0 : _uniBuilderConfig_source.moduleScopes));
+  rsbuildPlugins.push((0, import_include.pluginInclude)());
   return {
     rsbuildConfig,
     rsbuildPlugins

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

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

package/dist/webpack/plugins/include.js

@@ -0,0 +1,46 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var include_exports = {};
+__export(include_exports, {
+  pluginInclude: () => pluginInclude
+});
+module.exports = __toCommonJS(include_exports);
+const pluginInclude = () => ({
+  name: "uni-builder:babel-include",
+  setup(api) {
+    api.modifyWebpackChain((chain, { CHAIN_ID }) => {
+      const includes = chain.module.rule(CHAIN_ID.RULE.JS).include.values();
+      includes.forEach((include) => {
+        if (typeof include === "object" && !Array.isArray(include) && !(include instanceof RegExp) && include.not && include.not.toString() === /[\\/]node_modules[\\/]/.toString()) {
+          include.and = [
+            api.context.rootPath || process.cwd(),
+            {
+              not: include.not
+            }
+          ];
+          delete include.not;
+        }
+      });
+    });
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  pluginInclude
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.67.11",
+  "version": "2.68.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.26.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.16",
-    "@rsbuild/core": "1.3.22",
+    "@rsbuild/core": "1.4.3",
     "@rsbuild/plugin-assets-retry": "1.3.0",
     "@rsbuild/plugin-babel": "1.0.5",
     "@rsbuild/plugin-check-syntax": "1.3.0",
@@ -41,7 +41,7 @@
     "@rsbuild/plugin-rem": "1.0.2",
     "@rsbuild/plugin-sass": "1.3.2",
     "@rsbuild/plugin-source-build": "1.0.2",
-    "@rsbuild/plugin-styled-components": "1.3.0",
+    "@rsbuild/plugin-styled-components": "1.4.0",
     "@rsbuild/plugin-svgr": "1.2.0",
     "@rsbuild/plugin-toml": "1.1.0",
     "@rsbuild/plugin-type-check": "1.2.3",
@@ -80,9 +80,9 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.99.8",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/babel-preset": "2.67.11",
-    "@modern-js/flight-server-transform-plugin": "2.67.11",
-    "@modern-js/utils": "2.67.11"
+    "@modern-js/babel-preset": "2.68.0",
+    "@modern-js/flight-server-transform-plugin": "2.68.0",
+    "@modern-js/utils": "2.68.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.1.1",
@@ -93,7 +93,7 @@
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@modern-js/types": "2.67.11",
+    "@modern-js/types": "2.68.0",
     "@scripts/build": "2.66.0",
     "@scripts/vitest-config": "2.66.0"
   },