@modern-js/uni-builder 2.47.1 → 2.48.1

package/dist/rspack/plugins/babel-post.js

@@ -39,7 +39,7 @@ const pluginBabelPost = () => ({
     api.modifyBundlerChain({
       handler: async (chain, { CHAIN_ID }) => {
         if (chain.module.rules.get(CHAIN_ID.RULE.JS)) {
-          const babelLoaderOptions = chain.module.rule(CHAIN_ID.RULE.JS).use(CHAIN_ID.USE.BABEL).get("options");
+          const { cacheIdentifier, ...babelLoaderOptions } = chain.module.rule(CHAIN_ID.RULE.JS).use(CHAIN_ID.USE.BABEL).get("options");
           const config = api.getNormalizedConfig();
           if (babelLoaderOptions && (0, import_isEqual.default)((0, import_plugin_babel.getDefaultBabelOptions)(config, api.context), babelLoaderOptions)) {
             chain.module.rule(CHAIN_ID.RULE.JS).uses.delete(CHAIN_ID.USE.BABEL);

package/dist/shared/parseCommonConfig.js

@@ -193,7 +193,10 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     extraConfig.html.template = ({ entryName }) => templateByEntries[entryName];
   }
   if (templateParametersByEntries) {
-    extraConfig.html.templateParameters = (_, { entryName }) => templateParametersByEntries[entryName];
+    extraConfig.html.templateParameters = (defaultValue, { entryName }) => ({
+      ...defaultValue,
+      ...templateParametersByEntries[entryName] || {}
+    });
   }
   var _tools;
   (_tools = (_extraConfig1 = extraConfig).tools) !== null && _tools !== void 0 ? _tools : _extraConfig1.tools = {};

package/dist/shared/plugins/fallback.js

@@ -52,7 +52,7 @@ const resourceRuleFallback = (rules = []) => {
       import_shared.TS_REGEX,
       // exclude `html` and `json`, they get processed by webpack internal loaders.
       import_shared.HTML_REGEX,
-      import_shared.JSON_REGEX
+      /\.json$/
     ],
     type: "asset/resource"
   };

package/dist/shared/plugins/postcssLegacy.js

@@ -50,13 +50,17 @@ const pluginPostcssLegacy = (webBrowserslist) => ({
           ]
         }) : false
       ].filter(Boolean);
-      return mergeRsbuildConfig(config, {
-        tools: {
-          postcss: (opts) => {
-            opts.postcssOptions.plugins.push(...plugins);
+      return mergeRsbuildConfig(
+        {
+          tools: {
+            postcss: (opts) => {
+              opts.postcssOptions.plugins.push(...plugins);
+            }
           }
-        }
-      });
+        },
+        // user config has higher priority than builtin config
+        config
+      );
     });
   }
 });

package/dist/shared/plugins/splitChunk.js

@@ -61,8 +61,8 @@ const pluginSplitChunks = () => ({
         // rspack chunks type mismatch with webpack
         // @ts-expect-error
         cacheGroups: {
-          ...currentConfig.cacheGroups,
-          ...(0, import_shared.createCacheGroups)(groups)
+          ...(0, import_shared.createCacheGroups)(groups),
+          ...currentConfig.cacheGroups
         }
       });
     });

package/dist/webpack/ModuleScopePlugin.js

@@ -21,7 +21,6 @@ __export(ModuleScopePlugin_exports, {
   ModuleScopePlugin: () => ModuleScopePlugin
 });
 module.exports = __toCommonJS(ModuleScopePlugin_exports);
-var import_define_property = require("@swc/helpers/_/_define_property");
 var import_path = require("path");
 var import_shared = require("@rsbuild/shared");
 class ModuleScopePlugin {
@@ -78,12 +77,6 @@ class ModuleScopePlugin {
     });
   }
   constructor({ scopes, allowedFiles = [] }) {
-    (0, import_define_property._)(this, "scopes", void 0);
-    (0, import_define_property._)(this, "allowedFiles", void 0);
-    (0, import_define_property._)(this, "allowedDirs", void 0);
-    (0, import_define_property._)(this, "allowedPatterns", void 0);
-    (0, import_define_property._)(this, "relativeAllowedDirs", void 0);
-    (0, import_define_property._)(this, "cache", void 0);
     this.scopes = scopes;
     this.allowedFiles = new Set(allowedFiles);
     this.allowedDirs = scopes.filter(import_shared.isString);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.47.1",
+  "version": "2.48.1",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,23 +26,23 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.23.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/babel-preset": "0.4.6",
-    "@rsbuild/core": "0.4.6",
-    "@rsbuild/plugin-assets-retry": "0.4.6",
-    "@rsbuild/plugin-babel": "0.4.6",
-    "@rsbuild/plugin-check-syntax": "0.4.6",
-    "@rsbuild/plugin-css-minimizer": "0.4.6",
-    "@rsbuild/plugin-pug": "0.4.6",
-    "@rsbuild/plugin-react": "0.4.6",
-    "@rsbuild/plugin-rem": "0.4.6",
-    "@rsbuild/plugin-source-build": "0.4.6",
-    "@rsbuild/plugin-styled-components": "0.4.6",
-    "@rsbuild/plugin-svgr": "0.4.6",
-    "@rsbuild/plugin-type-check": "0.4.6",
-    "@rsbuild/plugin-toml": "0.4.6",
-    "@rsbuild/plugin-yaml": "0.4.6",
-    "@rsbuild/shared": "0.4.6",
-    "@rsbuild/webpack": "0.4.6",
+    "@rsbuild/babel-preset": "0.4.15",
+    "@rsbuild/core": "0.4.15",
+    "@rsbuild/plugin-assets-retry": "0.4.15",
+    "@rsbuild/plugin-babel": "0.4.15",
+    "@rsbuild/plugin-check-syntax": "0.4.15",
+    "@rsbuild/plugin-css-minimizer": "0.4.15",
+    "@rsbuild/plugin-pug": "0.4.15",
+    "@rsbuild/plugin-react": "0.4.15",
+    "@rsbuild/plugin-rem": "0.4.15",
+    "@rsbuild/plugin-source-build": "0.4.15",
+    "@rsbuild/plugin-styled-components": "0.4.15",
+    "@rsbuild/plugin-svgr": "0.4.15",
+    "@rsbuild/plugin-type-check": "0.4.15",
+    "@rsbuild/plugin-toml": "0.4.15",
+    "@rsbuild/plugin-yaml": "0.4.15",
+    "@rsbuild/shared": "0.4.15",
+    "@rsbuild/webpack": "0.4.15",
     "@swc/helpers": "0.5.3",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
@@ -52,6 +52,7 @@
     "glob": "^9.3.5",
     "html-webpack-plugin": "5.5.3",
     "lodash": "^4.17.21",
+    "postcss": "^8.4.35",
     "postcss-custom-properties": "13.1.5",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
@@ -65,18 +66,18 @@
     "webpack": "^5.89.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.47.1",
-    "@modern-js/server": "2.47.1",
-    "@modern-js/prod-server": "2.47.1"
+    "@modern-js/utils": "2.48.1",
+    "@modern-js/server": "2.48.1"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.4.6",
+    "@rsbuild/plugin-swc": "0.4.15",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.3.0",
-    "@scripts/build": "2.47.1",
-    "@scripts/vitest-config": "2.47.1"
+    "@modern-js/prod-server": "2.48.1",
+    "@scripts/build": "2.48.1",
+    "@scripts/vitest-config": "2.48.1"
   },
   "publishConfig": {
     "access": "public",