@modern-js/uni-builder 2.57.0 → 2.58.0

package/dist/shared/parseCommonConfig.js

@@ -42,7 +42,7 @@ var import_runtimeChunk = require("./plugins/runtimeChunk");
 var import_frameworkConfig = require("./plugins/frameworkConfig");
 var import_splitChunk = require("./plugins/splitChunk");
 var import_plugin_css_minimizer = require("@rsbuild/plugin-css-minimizer");
-var import_postcssLegacy = require("./plugins/postcssLegacy");
+var import_postcss = require("./plugins/postcss");
 var import_devtools = require("./plugins/devtools");
 var import_emitRouteFile = require("./plugins/emitRouteFile");
 var import_antd = require("./plugins/antd");
@@ -80,9 +80,9 @@ const isUseCssSourceMap = (disableSourceMap = {}) => {
 };
 async function parseCommonConfig(uniBuilderConfig, options) {
   var _uniBuilderConfig_output, _uniBuilderConfig_tools;
-  var _output_distPath, _output, _extraConfig, _html, _extraConfig1;
+  var _rsbuildConfig_tools, _output_distPath, _output, _extraConfig, _html, _extraConfig1;
   const { frameworkConfigPath } = options;
-  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, distPath = {}, ...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, htmlPlugin, ...toolsConfig } = {}, environments = {} } = 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, distPath = {}, ...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, htmlPlugin, autoprefixer, ...toolsConfig } = {}, environments = {} } = uniBuilderConfig;
   const rsbuildConfig = {
     plugins,
     output: {
@@ -101,6 +101,8 @@ async function parseCommonConfig(uniBuilderConfig, options) {
     environments
   };
   rsbuildConfig.tools.htmlPlugin = htmlPlugin;
+  var _lightningcssLoader;
+  (_lightningcssLoader = (_rsbuildConfig_tools = rsbuildConfig.tools).lightningcssLoader) !== null && _lightningcssLoader !== void 0 ? _lightningcssLoader : _rsbuildConfig_tools.lightningcssLoader = false;
   const { html = {}, output = {}, source = {} } = rsbuildConfig;
   if (enableLatestDecorators) {
     source.decorators = {
@@ -299,7 +301,9 @@ async function parseCommonConfig(uniBuilderConfig, options) {
   rsbuildPlugins.push((0, import_plugin_css_minimizer.pluginCssMinimizer)({
     pluginOptions: minifyCss
   }));
-  rsbuildPlugins.push((0, import_postcssLegacy.pluginPostcssLegacy)());
+  rsbuildPlugins.push((0, import_postcss.pluginPostcss)({
+    autoprefixer
+  }));
   if (enableAssetManifest) {
     const { pluginManifest } = await Promise.resolve().then(() => __toESM(require("./plugins/manifest")));
     rsbuildPlugins.push(pluginManifest());

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

@@ -0,0 +1,5 @@
+import type { RsbuildPlugin } from '@rsbuild/core';
+import type { ToolsAutoprefixerConfig } from '../../types';
+export declare const pluginPostcss: ({ autoprefixer, }: {
+    autoprefixer?: ToolsAutoprefixerConfig | undefined;
+}) => RsbuildPlugin;

package/dist/shared/plugins/{postcssLegacy.js → postcss.js}

@@ -16,24 +16,28 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var postcssLegacy_exports = {};
-__export(postcssLegacy_exports, {
-  pluginPostcssLegacy: () => pluginPostcssLegacy
+var postcss_exports = {};
+__export(postcss_exports, {
+  pluginPostcss: () => pluginPostcss
 });
-module.exports = __toCommonJS(postcssLegacy_exports);
+module.exports = __toCommonJS(postcss_exports);
 var import_utils = require("@modern-js/utils");
 var import_getCssSupport = require("../getCssSupport");
-const pluginPostcssLegacy = () => ({
+const pluginPostcss = ({ autoprefixer }) => ({
   name: "uni-builder:postcss-plugins",
+  pre: [
+    "uni-builder:environment-defaults-plugin"
+  ],
   setup(api) {
     api.modifyEnvironmentConfig((config, { mergeEnvironmentConfig }) => {
       var _config_output;
       if (config.output.target !== "web") {
-        return;
+        return config;
       }
       const cssSupport = (0, import_getCssSupport.getCssSupport)(config.output.overrideBrowserslist);
       const enableExtractCSS = !((_config_output = config.output) === null || _config_output === void 0 ? void 0 : _config_output.injectStyles);
       const enableCssMinify = !enableExtractCSS && import_utils.isProd;
+      const enableAutoprefixer = config.tools.lightningcssLoader === false;
       const plugins = [
         require("postcss-flexbugs-fixes"),
         !cssSupport.customProperties && require("postcss-custom-properties"),
@@ -52,13 +56,20 @@ const pluginPostcssLegacy = () => ({
               mergeLonghand: false
             }
           ]
-        }) : false
+        }) : false,
+        // The last insert autoprefixer
+        enableAutoprefixer && require("autoprefixer")((0, import_utils.applyOptionsChain)({
+          flexbox: "no-2009",
+          overrideBrowserslist: config.output.overrideBrowserslist
+        }, autoprefixer))
       ].filter(Boolean);
       return mergeEnvironmentConfig(
         {
           tools: {
-            postcss: (opts) => {
-              opts.postcssOptions.plugins.push(...plugins);
+            postcss: {
+              postcssOptions: {
+                plugins
+              }
             }
           }
         },
@@ -70,5 +81,5 @@ const pluginPostcssLegacy = () => ({
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  pluginPostcssLegacy
+  pluginPostcss
 });

package/dist/types.d.ts

@@ -15,6 +15,7 @@ import type { AliasOption } from '@modern-js/utils';
 import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
 import type TerserPlugin from 'terser-webpack-plugin';
 import type { Options as HTMLPluginOptions } from 'html-webpack-plugin';
+import type { Options as AutoprefixerOptions } from 'autoprefixer';
 type ArrayOrNot<T> = T | T[];
 export type Stats = Omit<Rspack.Stats, '#private' | 'hash' | 'startTime' | 'endTime'>;
 export type RspackConfig = Rspack.Configuration;
@@ -78,8 +79,13 @@ export type ToolsDevServerConfig = ConfigChain<{
 }>;
 export type TerserPluginOptions = TerserPlugin.BasePluginOptions & TerserPlugin.DefinedDefaultMinimizerAndOptions<TerserPlugin.TerserOptions>;
 export type ToolsTerserConfig = ConfigChain<TerserPluginOptions>;
+export type ToolsAutoprefixerConfig = ConfigChain<AutoprefixerOptions>;
 export type UniBuilderExtraConfig = {
     tools?: {
+        /**
+         * Modify the config of [autoprefixer](https://github.com/postcss/autoprefixer)
+         */
+        autoprefixer?: ToolsAutoprefixerConfig;
         htmlPlugin?: boolean | ConfigChainWithContext<HTMLPluginOptions, {
             entryName: string;
             entryValue: (string | string[] | Rspack.EntryDescription)[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modern-js/uni-builder",
-  "version": "2.57.0",
+  "version": "2.58.0",
   "description": "Unified builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,25 +26,26 @@
     "@babel/preset-react": "^7.22.15",
     "@babel/types": "^7.24.7",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@rsbuild/core": "1.0.1-beta.3",
-    "@rsbuild/plugin-sass": "1.0.1-beta.3",
-    "@rsbuild/plugin-less": "1.0.1-beta.3",
-    "@rsbuild/plugin-assets-retry": "1.0.1-beta.3",
-    "@rsbuild/plugin-babel": "1.0.1-beta.3",
-    "@rsbuild/plugin-check-syntax": "1.0.1-beta.3",
+    "@rsbuild/core": "1.0.1-beta.9",
+    "@rsbuild/plugin-sass": "1.0.1-beta.9",
+    "@rsbuild/plugin-less": "1.0.1-beta.9",
+    "@rsbuild/plugin-assets-retry": "1.0.1-beta.9",
+    "@rsbuild/plugin-babel": "1.0.1-beta.9",
+    "@rsbuild/plugin-check-syntax": "1.0.1-beta.9",
     "@rsbuild/plugin-css-minimizer": "1.0.1",
     "@rsbuild/plugin-pug": "1.0.1",
-    "@rsbuild/plugin-react": "1.0.1-beta.3",
-    "@rsbuild/plugin-rem": "1.0.1-beta.3",
-    "@rsbuild/plugin-source-build": "1.0.1-beta.3",
-    "@rsbuild/plugin-styled-components": "1.0.1-beta.3",
-    "@rsbuild/plugin-svgr": "1.0.1-beta.3",
-    "@rsbuild/plugin-type-check": "1.0.1-beta.3",
+    "@rsbuild/plugin-react": "1.0.1-beta.9",
+    "@rsbuild/plugin-rem": "1.0.1-beta.9",
+    "@rsbuild/plugin-source-build": "1.0.1-beta.9",
+    "@rsbuild/plugin-styled-components": "1.0.1-beta.9",
+    "@rsbuild/plugin-svgr": "1.0.1-beta.9",
+    "@rsbuild/plugin-type-check": "1.0.1-beta.9",
     "@rsbuild/plugin-typed-css-modules": "1.0.1",
     "@rsbuild/plugin-toml": "1.0.0",
     "@rsbuild/plugin-yaml": "1.0.1",
-    "@rsbuild/webpack": "1.0.1-beta.3",
+    "@rsbuild/webpack": "1.0.1-beta.9",
     "@swc/helpers": "0.5.3",
+    "autoprefixer": "10.4.19",
     "babel-loader": "9.1.3",
     "babel-plugin-import": "1.13.5",
     "babel-plugin-styled-components": "1.13.3",
@@ -71,19 +72,19 @@
     "ts-loader": "9.4.4",
     "webpack": "^5.93.0",
     "webpack-subresource-integrity": "5.1.0",
-    "@modern-js/utils": "2.57.0",
-    "@modern-js/babel-preset": "2.57.0"
+    "@modern-js/utils": "2.58.0",
+    "@modern-js/babel-preset": "2.58.0"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "1.0.1-beta.3",
+    "@rsbuild/plugin-swc": "1.0.1-beta.9",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/lodash": "^4.14.202",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "terser": "^5.31.1",
     "typescript": "^5.3.0",
-    "@scripts/vitest-config": "2.57.0",
-    "@scripts/build": "2.57.0"
+    "@scripts/build": "2.58.0",
+    "@scripts/vitest-config": "2.58.0"
   },
   "publishConfig": {
     "access": "public",

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

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