@bleedingdev/modern-js-builder 3.9.0-ultramodern.9 → 3.9.3-ultramodern.2

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

@@ -8,7 +8,10 @@ import type { RsbuildPlugin } from '@rsbuild/core';
  * 4. Adding entry name virtual module for client-side entries
  * 5. Adding 'use server-entry' directive to route components
  */
-export declare function pluginRscConfig(): RsbuildPlugin;
+export declare function pluginRscConfig(environments?: {
+    server?: string;
+    client?: string;
+}, rscLayerMatchers?: RegExp[]): RsbuildPlugin;
 /**
  * Get RSC plugins based on configuration
  * @param enableRsc - Whether RSC is enabled

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

@@ -0,0 +1,32 @@
+import type { PluginLessOptions } from '@rsbuild/plugin-less';
+import type { PluginSassOptions } from '../sass/index.js';
+import type { PluginSvgrOptions, SvgDefaultExport } from '@rsbuild/plugin-svgr';
+import type { BuilderConfig } from '../types.js';
+type BuilderToolsConfig = NonNullable<BuilderConfig['tools']>;
+/** Reset the warn-once state. Only meant for unit tests. */
+export declare const resetPluginOptionsWarnings: () => void;
+/**
+ * `tools.less` accepts either the full options of `@rsbuild/plugin-less`
+ * or, for backward compatibility, the less-loader options directly
+ * (object, function or array form). The legacy form is wrapped into
+ * `lessLoaderOptions` so the generated bundler config stays unchanged.
+ */
+export declare const normalizeLessOptions: (less: BuilderToolsConfig['less']) => PluginLessOptions;
+/**
+ * Same as {@link normalizeLessOptions} for `tools.sass`.
+ */
+export declare const normalizeSassOptions: (sass: BuilderToolsConfig['sass']) => PluginSassOptions;
+/**
+ * Resolve the options passed to `@rsbuild/plugin-svgr`, or `false` when the
+ * plugin should not be registered.
+ *
+ * `tools.svgr` takes precedence over the deprecated `output.disableSvgr` and
+ * `output.svgDefaultExport`; the two legacy options keep working when
+ * `tools.svgr` is not set.
+ */
+export declare const resolveSvgrOptions: ({ svgr, disableSvgr, svgDefaultExport, }: {
+    svgr: BuilderToolsConfig['svgr'];
+    disableSvgr?: boolean;
+    svgDefaultExport?: SvgDefaultExport;
+}) => PluginSvgrOptions | false;
+export {};

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

@@ -18,10 +18,8 @@ export type TsCheckerOptions = Parameters<TsCheckerFn>[0];
  */
 export declare const refreshTsgoCheckerConfig: (checkerConfigFile: string) => string | undefined;
 /**
- * Type checking runs on TypeScript Go (`tsgo`) by default. The checker
- * prefers the project's stable TypeScript 7 package, then falls back to
- * `@typescript/native-preview` for projects still on the preview lane.
- * Set `tools.tsChecker.typescript.tsgo: false` to use the classic checker.
+ * Type checking uses the canonical stable TypeScript 7.0.2 package by default,
+ * supplied by the project or the builder's declared production dependency.
  */
 export declare const withTsgoDefaults: (userOptions: TsCheckerChain | undefined, rootPath: string) => TsCheckerChain;
 export {};

package/dist/types/types.d.ts

@@ -1,16 +1,20 @@
-import type { AliasOption } from '@modern-js/utils';
+import type { AliasOption } from '@modern-js/utils/alias';
 import type { ConfigChain, ConfigChainWithContext, DevConfig, DistPathConfig, EnvironmentConfig, HtmlConfig, OutputConfig, Polyfill, RsbuildConfig, RsbuildPluginAPI, RsbuildPlugins, RsbuildTarget, Rspack, SecurityConfig, ServerConfig, SourceConfig, ToolsConfig } from '@rsbuild/core';
 import type { PluginAssetsRetryOptions } from '@rsbuild/plugin-assets-retry';
 import type { PluginCheckSyntaxOptions } from '@rsbuild/plugin-check-syntax';
 import type { PluginCssMinimizerOptions } from './css-minimizer/index.js';
 import type { PluginLessOptions } from '@rsbuild/plugin-less';
-import type { PluginReactOptions } from '@rsbuild/plugin-react';
 import type { PluginRemOptions } from '@rsbuild/plugin-rem';
 import type { PluginSassOptions } from './sass/index.js';
 import type { PluginSourceBuildOptions } from '@rsbuild/plugin-source-build';
-type SvgDefaultExport = 'component' | 'url';
 import type { PluginTypeCheckerOptions } from '@rsbuild/plugin-type-check';
 import type { Options as AutoprefixerOptions } from 'autoprefixer';
+/** Renderer-owned SVG compiler options, registered by the selected React owner. */
+export interface BuilderSvgOptions {
+}
+type RegisteredSvgOptions = BuilderSvgOptions extends {
+    options: infer Options;
+} ? Options : never;
 export type CacheGroup = Rspack.OptimizationSplitChunksCacheGroup;
 export type Stats = Omit<Rspack.Stats, '#private' | 'hash' | 'startTime' | 'endTime'>;
 export type RspackConfig = Rspack.Configuration;
@@ -105,13 +109,29 @@ export type BuilderExtraConfig = {
          */
         minifyCss?: PluginCssMinimizerOptions['pluginOptions'];
         /**
-         * Modify the config of [less-loader](https://github.com/webpack-contrib/less-loader).
+         * Modify the options of [@rsbuild/plugin-less](https://rsbuild.rs/plugins/list/plugin-less),
+         * such as `lessLoaderOptions`, `include`, `exclude` and `parallel`.
+         *
+         * Passing the [less-loader](https://github.com/webpack-contrib/less-loader)
+         * options directly is still supported for backward compatibility, but is
+         * deprecated: move them under `lessLoaderOptions`.
          */
-        less?: PluginLessOptions['lessLoaderOptions'];
+        less?: PluginLessOptions['lessLoaderOptions'] | PluginLessOptions;
         /**
-         * Modify the config of [sass-loader](https://github.com/webpack-contrib/sass-loader).
+         * Modify the options of [@rsbuild/plugin-sass](https://rsbuild.rs/plugins/list/plugin-sass),
+         * such as `sassLoaderOptions`, `include`, `exclude` and `rewriteUrls`.
+         *
+         * Passing the [sass-loader](https://github.com/webpack-contrib/sass-loader)
+         * options directly is still supported for backward compatibility, but is
+         * deprecated: move them under `sassLoaderOptions`.
          */
-        sass?: PluginSassOptions['sassLoaderOptions'];
+        sass?: PluginSassOptions['sassLoaderOptions'] | PluginSassOptions;
+        /**
+         * Modify the options of [@rsbuild/plugin-svgr](https://rsbuild.rs/plugins/list/plugin-svgr),
+         * such as `svgrOptions`, `parallel`, `exclude` and `query`.
+         * Set to `false` to disable SVGR; all `.svg` files are then treated as static assets.
+         */
+        svgr?: [RegisteredSvgOptions] extends [never] ? false : ConfigChain<RegisteredSvgOptions> | false;
     };
     dev?: {
         /** Set the page URL to open when the server starts. */
@@ -150,10 +170,13 @@ export type BuilderExtraConfig = {
          * The transform is enabled by default through Rsbuild's SWC integration.
          * Set this to `false` to disable it.
          *
+         * Only browser environments (`output.target: 'web'`) are compiled;
+         * `node` and `web-worker` (SSR, BFF) environments never are.
+         *
          * For React 17 or 18, install `react-compiler-runtime` and set the
          * matching target version, for example `{ target: '18' }`.
          */
-        reactCompiler?: PluginReactOptions['reactCompiler'];
+        reactCompiler?: Rspack.SwcLoaderTransformConfig['reactCompiler'];
     };
     output?: {
         /**
@@ -186,10 +209,14 @@ export type BuilderExtraConfig = {
         disableTsChecker?: boolean;
         /**
          * Configure the default export type of SVG files.
+         * @deprecated Use `tools.svgr.svgrOptions.exportType` instead:
+         * `'component'` maps to `exportType: 'default'`, `'url'` maps to `exportType: 'named'`.
          */
-        svgDefaultExport?: SvgDefaultExport;
+        svgDefaultExport?: 'component' | 'url';
         /**
          * Whether to transform SVGs into React components. If true, will treat all .svg files as assets.
+         * @deprecated Use `tools.svgr` instead: `output.disableSvgr: true` maps to `tools.svgr: false`;
+         * `false` is the default behavior and can simply be removed.
          */
         disableSvgr?: boolean;
     };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@bleedingdev/modern-js-builder",
-  "version": "3.9.0-ultramodern.9",
+  "version": "3.9.3-ultramodern.2",
   "description": "A builder for Modern.js",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/BleedingDev/ultramodern.js.git",
+    "url": "git+https://github.com/ultramodernjs/ultramodern.js.git",
     "directory": "packages/cli/builder"
   },
   "license": "MIT",
@@ -17,6 +17,9 @@
         "require": "./dist/cjs/index.js"
       },
       "default": "./dist/cjs/index.js"
+    },
+    "./types": {
+      "types": "./dist/types/types.d.ts"
     }
   },
   "main": "./dist/cjs/index.js",
@@ -27,57 +30,66 @@
   ],
   "dependencies": {
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.0-ultramodern.9",
-    "@rsbuild/core": "2.2.3",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.9.3-ultramodern.2",
+    "@rsbuild/core": "2.2.11",
     "@rsbuild/plugin-assets-retry": "2.0.2",
     "@rsbuild/plugin-check-syntax": "2.0.1",
     "@rsbuild/plugin-css-minimizer": "2.0.1",
     "@rsbuild/plugin-less": "2.0.1",
-    "@rsbuild/plugin-react": "2.1.0",
     "@rsbuild/plugin-rem": "1.0.6",
     "@rsbuild/plugin-sass": "2.0.1",
-    "@rsbuild/plugin-source-build": "1.0.6",
-    "@rsbuild/plugin-svgr": "2.0.5",
+    "@rsbuild/plugin-source-build": "1.0.7",
     "@rsbuild/plugin-type-check": "1.6.0",
     "@rsbuild/plugin-typed-css-modules": "1.2.4",
-    "@swc/core": "1.16.2",
+    "@swc/core": "1.16.13",
     "@swc/helpers": "^0.5.23",
-    "autoprefixer": "10.5.5",
-    "browserslist": "4.28.9",
+    "autoprefixer": "10.6.1",
+    "browserslist": "4.29.3",
     "core-js": "^3.50.0",
-    "cssnano": "9.0.3",
+    "cssnano": "9.1.2",
     "html-minifier-terser": "^7.2.0",
     "lodash": "^4.18.1",
     "postcss": "^8.5.28",
-    "postcss-custom-properties": "15.0.1",
+    "postcss-custom-properties": "15.0.3",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
     "postcss-initial": "4.0.1",
     "postcss-media-minmax": "5.0.0",
-    "postcss-nesting": "14.0.1",
+    "postcss-nesting": "14.0.2",
     "postcss-page-break": "3.0.4",
     "rspack-manifest-plugin": "5.2.2",
-    "sass-embedded": "1.100.0",
-    "ts-deepmerge": "8.0.0"
+    "sass-embedded": "1.105.1",
+    "ts-deepmerge": "8.0.0",
+    "typescript": "7.0.2",
+    "webpack": "5.111.1"
   },
   "devDependencies": {
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.0-ultramodern.9",
-    "@rsdoctor/rspack-plugin": "^1.6.3",
-    "@rslib/core": "1.0.0",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.9.3-ultramodern.2",
+    "@rsbuild/plugin-react": "2.1.1",
+    "@rsbuild/plugin-svgr": "2.0.5",
+    "@rsdoctor/rspack-plugin": "^1.6.4",
+    "@rslib/core": "1.0.3",
     "@scripts/rstest-config": "2.66.0",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/lodash": "^4.17.25",
-    "react": "^19.2.8",
+    "react": "^19.3.0",
     "react-server-dom-rspack": "0.1.0",
     "rsbuild-plugin-rsc": "0.1.1",
-    "terser": "^5.51.2",
-    "typescript": "^7.0.2"
+    "terser": "^5.51.2"
   },
   "peerDependencies": {
+    "@rsbuild/plugin-react": "2.1.1",
+    "@rsbuild/plugin-svgr": "2.0.5",
     "react-server-dom-rspack": "0.1.0",
     "rsbuild-plugin-rsc": "0.1.1"
   },
   "peerDependenciesMeta": {
+    "@rsbuild/plugin-react": {
+      "optional": true
+    },
+    "@rsbuild/plugin-svgr": {
+      "optional": true
+    },
     "react-server-dom-rspack": {
       "optional": true
     },
@@ -94,8 +106,11 @@
     "test": "rstest run",
     "test:watch": "rstest watch"
   },
-  "homepage": "https://github.com/BleedingDev/ultramodern.js#readme",
+  "homepage": "https://github.com/ultramodernjs/ultramodern.js#readme",
   "bugs": {
-    "url": "https://github.com/BleedingDev/ultramodern.js/issues"
+    "url": "https://github.com/ultramodernjs/ultramodern.js/issues"
+  },
+  "ultramodern": {
+    "sourceName": "@modern-js/builder"
   }
 }