@bleedingdev/modern-js-builder 3.2.0-ultramodern.120 → 3.2.0-ultramodern.122

package/dist/cjs/plugins/postcss.js

@@ -40,6 +40,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    loadPostcssPlugin: ()=>loadPostcssPlugin,
     pluginPostcss: ()=>pluginPostcss
 });
 const external_node_module_namespaceObject = require("node:module");
@@ -51,14 +52,6 @@ const core_namespaceObject = require("@rsbuild/core");
 const getCssSupport_js_namespaceObject = require("../shared/getCssSupport.js");
 const builderRequire = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__);
 const createRootRequire = (rootPath)=>(0, external_node_module_namespaceObject.createRequire)((0, external_node_url_namespaceObject.pathToFileURL)(external_node_path_default().join(rootPath, 'package.json')).href);
-const loadByResolver = (resolveWith, name)=>{
-    try {
-        return resolveWith(name);
-    } catch (error) {
-        const resolved = resolveWith.resolve(name);
-        return resolveWith(resolved);
-    }
-};
 const loadPostcssPlugin = (name, appRootPath)=>{
     const resolvers = [
         builderRequire,
@@ -67,34 +60,13 @@ const loadPostcssPlugin = (name, appRootPath)=>{
     ];
     let firstError = null;
     for (const resolveWith of resolvers)try {
-        return loadByResolver(resolveWith, name);
+        return resolveWith(name);
     } catch (error) {
         firstError ??= error;
     }
     throw firstError;
 };
 const importPostcssPlugin = (name, appRootPath)=>Promise.resolve(loadPostcssPlugin(name, appRootPath));
-const clonePostCSSConfig = (config)=>({
-        ...config,
-        plugins: config.plugins ? [
-            ...config.plugins
-        ] : void 0
-    });
-const postcssLoadConfig = builderRequire('postcss-load-config');
-const userPostcssrcCache = new Map();
-const loadUserPostcssrc = async (root)=>{
-    const cached = userPostcssrcCache.get(root);
-    if (cached) return clonePostCSSConfig(await cached);
-    const promise = postcssLoadConfig({}, root).catch((err)=>{
-        if (err?.message?.includes('No PostCSS Config found')) return {};
-        throw err;
-    });
-    userPostcssrcCache.set(root, promise);
-    return promise.then((config)=>{
-        userPostcssrcCache.set(root, config);
-        return clonePostCSSConfig(config);
-    });
-};
 const pluginPostcss = (options = {})=>({
         name: 'builder:postcss-plugins',
         pre: [
@@ -130,7 +102,6 @@ const pluginPostcss = (options = {})=>({
                             overrideBrowserslist: config.output.overrideBrowserslist
                         }, autoprefixer)))
                 ]).then((results)=>results.filter(Boolean));
-                const userOptions = await loadUserPostcssrc(api.context.rootPath);
                 return mergeEnvironmentConfig({
                     tools: {
                         postcss: (opts)=>{
@@ -138,27 +109,19 @@ const pluginPostcss = (options = {})=>({
                                 core_namespaceObject.logger.warn('unexpected function type postcssOptions, the default postcss plugins will not be applied.');
                                 return opts;
                             }
-                            const existingOptions = opts.postcssOptions ?? {};
-                            const mergedOptions = {
-                                ...userOptions,
-                                ...existingOptions
-                            };
-                            const userPlugins = userOptions.plugins ?? [];
-                            const existingPlugins = existingOptions.plugins ?? [];
-                            mergedOptions.plugins = [
-                                ...userPlugins,
-                                ...existingPlugins,
-                                ...plugins
-                            ];
-                            opts.postcssOptions = mergedOptions;
+                            opts.postcssOptions ??= {};
+                            opts.postcssOptions.plugins ??= [];
+                            opts.postcssOptions.plugins.push(...plugins);
                         }
                     }
                 }, config);
             });
         }
     });
+exports.loadPostcssPlugin = __webpack_exports__.loadPostcssPlugin;
 exports.pluginPostcss = __webpack_exports__.pluginPostcss;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
+    "loadPostcssPlugin",
     "pluginPostcss"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];
 Object.defineProperty(exports, '__esModule', {

package/dist/cjs/rsdoctorConfig.js

@@ -0,0 +1,18 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ("u" > typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+for(var __rspack_i in __webpack_exports__)exports[__rspack_i] = __webpack_exports__[__rspack_i];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/dist/esm/plugins/postcss.mjs

@@ -6,14 +6,6 @@ import { logger } from "@rsbuild/core";
 import { getCssSupport } from "../shared/getCssSupport.mjs";
 const builderRequire = createRequire(import.meta.url);
 const createRootRequire = (rootPath)=>createRequire(pathToFileURL(node_path.join(rootPath, 'package.json')).href);
-const loadByResolver = (resolveWith, name)=>{
-    try {
-        return resolveWith(name);
-    } catch (error) {
-        const resolved = resolveWith.resolve(name);
-        return resolveWith(resolved);
-    }
-};
 const loadPostcssPlugin = (name, appRootPath)=>{
     const resolvers = [
         builderRequire,
@@ -22,34 +14,13 @@ const loadPostcssPlugin = (name, appRootPath)=>{
     ];
     let firstError = null;
     for (const resolveWith of resolvers)try {
-        return loadByResolver(resolveWith, name);
+        return resolveWith(name);
     } catch (error) {
         firstError ??= error;
     }
     throw firstError;
 };
 const importPostcssPlugin = (name, appRootPath)=>Promise.resolve(loadPostcssPlugin(name, appRootPath));
-const clonePostCSSConfig = (config)=>({
-        ...config,
-        plugins: config.plugins ? [
-            ...config.plugins
-        ] : void 0
-    });
-const postcssLoadConfig = builderRequire('postcss-load-config');
-const userPostcssrcCache = new Map();
-const loadUserPostcssrc = async (root)=>{
-    const cached = userPostcssrcCache.get(root);
-    if (cached) return clonePostCSSConfig(await cached);
-    const promise = postcssLoadConfig({}, root).catch((err)=>{
-        if (err?.message?.includes('No PostCSS Config found')) return {};
-        throw err;
-    });
-    userPostcssrcCache.set(root, promise);
-    return promise.then((config)=>{
-        userPostcssrcCache.set(root, config);
-        return clonePostCSSConfig(config);
-    });
-};
 const pluginPostcss = (options = {})=>({
         name: 'builder:postcss-plugins',
         pre: [
@@ -85,7 +56,6 @@ const pluginPostcss = (options = {})=>({
                             overrideBrowserslist: config.output.overrideBrowserslist
                         }, autoprefixer)))
                 ]).then((results)=>results.filter(Boolean));
-                const userOptions = await loadUserPostcssrc(api.context.rootPath);
                 return mergeEnvironmentConfig({
                     tools: {
                         postcss: (opts)=>{
@@ -93,23 +63,13 @@ const pluginPostcss = (options = {})=>({
                                 logger.warn('unexpected function type postcssOptions, the default postcss plugins will not be applied.');
                                 return opts;
                             }
-                            const existingOptions = opts.postcssOptions ?? {};
-                            const mergedOptions = {
-                                ...userOptions,
-                                ...existingOptions
-                            };
-                            const userPlugins = userOptions.plugins ?? [];
-                            const existingPlugins = existingOptions.plugins ?? [];
-                            mergedOptions.plugins = [
-                                ...userPlugins,
-                                ...existingPlugins,
-                                ...plugins
-                            ];
-                            opts.postcssOptions = mergedOptions;
+                            opts.postcssOptions ??= {};
+                            opts.postcssOptions.plugins ??= [];
+                            opts.postcssOptions.plugins.push(...plugins);
                         }
                     }
                 }, config);
             });
         }
     });
-export { pluginPostcss };
+export { loadPostcssPlugin, pluginPostcss };

package/dist/esm-node/plugins/postcss.mjs

@@ -7,14 +7,6 @@ import { logger } from "@rsbuild/core";
 import { getCssSupport } from "../shared/getCssSupport.mjs";
 const builderRequire = createRequire(import.meta.url);
 const createRootRequire = (rootPath)=>createRequire(pathToFileURL(node_path.join(rootPath, 'package.json')).href);
-const loadByResolver = (resolveWith, name)=>{
-    try {
-        return resolveWith(name);
-    } catch (error) {
-        const resolved = resolveWith.resolve(name);
-        return resolveWith(resolved);
-    }
-};
 const loadPostcssPlugin = (name, appRootPath)=>{
     const resolvers = [
         builderRequire,
@@ -23,34 +15,13 @@ const loadPostcssPlugin = (name, appRootPath)=>{
     ];
     let firstError = null;
     for (const resolveWith of resolvers)try {
-        return loadByResolver(resolveWith, name);
+        return resolveWith(name);
     } catch (error) {
         firstError ??= error;
     }
     throw firstError;
 };
 const importPostcssPlugin = (name, appRootPath)=>Promise.resolve(loadPostcssPlugin(name, appRootPath));
-const clonePostCSSConfig = (config)=>({
-        ...config,
-        plugins: config.plugins ? [
-            ...config.plugins
-        ] : void 0
-    });
-const postcssLoadConfig = builderRequire('postcss-load-config');
-const userPostcssrcCache = new Map();
-const loadUserPostcssrc = async (root)=>{
-    const cached = userPostcssrcCache.get(root);
-    if (cached) return clonePostCSSConfig(await cached);
-    const promise = postcssLoadConfig({}, root).catch((err)=>{
-        if (err?.message?.includes('No PostCSS Config found')) return {};
-        throw err;
-    });
-    userPostcssrcCache.set(root, promise);
-    return promise.then((config)=>{
-        userPostcssrcCache.set(root, config);
-        return clonePostCSSConfig(config);
-    });
-};
 const pluginPostcss = (options = {})=>({
         name: 'builder:postcss-plugins',
         pre: [
@@ -86,7 +57,6 @@ const pluginPostcss = (options = {})=>({
                             overrideBrowserslist: config.output.overrideBrowserslist
                         }, autoprefixer)))
                 ]).then((results)=>results.filter(Boolean));
-                const userOptions = await loadUserPostcssrc(api.context.rootPath);
                 return mergeEnvironmentConfig({
                     tools: {
                         postcss: (opts)=>{
@@ -94,23 +64,13 @@ const pluginPostcss = (options = {})=>({
                                 logger.warn('unexpected function type postcssOptions, the default postcss plugins will not be applied.');
                                 return opts;
                             }
-                            const existingOptions = opts.postcssOptions ?? {};
-                            const mergedOptions = {
-                                ...userOptions,
-                                ...existingOptions
-                            };
-                            const userPlugins = userOptions.plugins ?? [];
-                            const existingPlugins = existingOptions.plugins ?? [];
-                            mergedOptions.plugins = [
-                                ...userPlugins,
-                                ...existingPlugins,
-                                ...plugins
-                            ];
-                            opts.postcssOptions = mergedOptions;
+                            opts.postcssOptions ??= {};
+                            opts.postcssOptions.plugins ??= [];
+                            opts.postcssOptions.plugins.push(...plugins);
                         }
                     }
                 }, config);
             });
         }
     });
-export { pluginPostcss };
+export { loadPostcssPlugin, pluginPostcss };

package/dist/esm-node/rsdoctorConfig.mjs

@@ -0,0 +1 @@
+import "node:module";

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

@@ -1,5 +1,6 @@
 import { type RsbuildPlugin } from '@rsbuild/core';
 import type { ToolsAutoprefixerConfig } from '../types';
+export declare const loadPostcssPlugin: (name: string, appRootPath: string) => any;
 export interface PluginPostcssOptions {
     autoprefixer?: ToolsAutoprefixerConfig;
 }

package/dist/types/plugins/rsdoctor.d.ts

@@ -1,3 +1,3 @@
 import type { RsbuildPlugin } from '@rsbuild/core';
-import type { RsdoctorUserConfig } from '../types';
+import type { RsdoctorUserConfig } from '../rsdoctorConfig';
 export declare const pluginRsdoctor: (config: RsdoctorUserConfig | undefined) => RsbuildPlugin | null;

package/dist/types/rsdoctorConfig.d.ts

@@ -0,0 +1,12 @@
+export type RsdoctorUserConfig = boolean | {
+    /**
+     * Force enable / disable Rsdoctor.
+     * When `performance.rsdoctor` is not configured, Rsdoctor is disabled.
+     */
+    enabled?: boolean;
+    /**
+     * Disable Rsdoctor client server and ensure build process exits after report generation.
+     * @default true
+     */
+    disableClientServer?: boolean;
+};

package/dist/types/shared/parseCommonConfig.d.ts

@@ -1,5 +1,6 @@
 import { type RsbuildConfig, type RsbuildPlugin } from '@rsbuild/core';
-import type { BuilderConfig, CreateBuilderCommonOptions, RsdoctorUserConfig } from '../types';
+import type { RsdoctorUserConfig } from '../rsdoctorConfig';
+import type { BuilderConfig, CreateBuilderCommonOptions } from '../types';
 /** Determine if a file path is a CSS module when disableCssModuleExtension is enabled. */
 export declare const isLooseCssModules: (path: string) => boolean;
 export declare function parseCommonConfig(builderConfig: BuilderConfig, options?: CreateBuilderCommonOptions): Promise<{

package/dist/types/types.d.ts

@@ -10,6 +10,8 @@ import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
 import type { SvgDefaultExport } from '@rsbuild/plugin-svgr';
 import type { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
 import type { Options as AutoprefixerOptions } from 'autoprefixer';
+import type { RsdoctorUserConfig } from './rsdoctorConfig';
+export type { RsdoctorUserConfig } from './rsdoctorConfig';
 export type CacheGroup = Rspack.OptimizationSplitChunksCacheGroup;
 export type Stats = Omit<Rspack.Stats, '#private' | 'hash' | 'startTime' | 'endTime'>;
 export type RspackConfig = Rspack.Configuration;
@@ -79,18 +81,6 @@ export type ToolsDevServerConfig = ConfigChain<{
     watch?: boolean;
 }>;
 export type ToolsAutoprefixerConfig = ConfigChain<AutoprefixerOptions>;
-export type RsdoctorUserConfig = boolean | {
-    /**
-     * Force enable / disable Rsdoctor.
-     * By default, Modern.js enables Rsdoctor in production builds.
-     */
-    enabled?: boolean;
-    /**
-     * Disable Rsdoctor client server and ensure build process exits after report generation.
-     * @default true
-     */
-    disableClientServer?: boolean;
-};
 export type BuilderExtraConfig = {
     tools?: {
         /**
@@ -284,4 +274,3 @@ export type BuilderConfig = {
         [key: string]: EnvironmentConfig;
     };
 } & BuilderExtraConfig;
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bleedingdev/modern-js-builder",
-  "version": "3.2.0-ultramodern.120",
+  "version": "3.2.0-ultramodern.122",
   "description": "A builder for Modern.js",
   "repository": {
     "type": "git",
@@ -53,14 +53,13 @@
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
     "postcss-initial": "4.0.1",
-    "postcss-load-config": "6.0.1",
     "postcss-media-minmax": "5.0.0",
     "postcss-nesting": "14.0.0",
     "postcss-page-break": "3.0.4",
     "rsbuild-plugin-rsc": "0.1.0",
     "rspack-manifest-plugin": "5.2.2",
     "ts-deepmerge": "8.0.0",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.120"
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.2.0-ultramodern.122"
   },
   "devDependencies": {
     "@rslib/core": "0.22.0",
@@ -68,7 +67,7 @@
     "@types/lodash": "^4.17.24",
     "react": "^19.2.7",
     "terser": "^5.48.0",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.120",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.2.0-ultramodern.122",
     "@scripts/rstest-config": "2.66.0"
   },
   "publishConfig": {