@bleedingdev/modern-js-builder 3.5.0-ultramodern.7 → 3.5.0-ultramodern.75

package/dist/cjs/plugins/rscConfig.js

@@ -204,6 +204,13 @@ function pluginRscConfig() {
                 handler: (chain, { isServer })=>{
                     if (isServer) {
                         chain.resolve.alias.set(`${RENDER_RSC_RUNTIME}$`, RENDER_RSC_WORKER_RUNTIME);
+                        let emptyModulePath;
+                        try {
+                            emptyModulePath = require.resolve('../shared/rsc/rscEmptyModule');
+                        } catch  {
+                            emptyModulePath = external_path_default().resolve(__dirname, '../shared/rsc/rscEmptyModule');
+                        }
+                        chain.resolve.alias.set('server-only$', emptyModulePath);
                         const routeFilePattern = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.[tj]sx?$/;
                         const appFilePattern = /[/\\]App\.[tj]sx?$/;
                         const combinedPattern = new RegExp(`(${routeFilePattern.source}|${appFilePattern.source})`);
@@ -277,7 +284,8 @@ function pluginRscConfig() {
 }
 async function getRscPlugins(enableRsc, internalDirectory, environments) {
     if (enableRsc) {
-        const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        const routeDataFileReg = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.(?:loader|data)\.[tj]sx?(?:\?.*)?$/;
         const { pluginRSC } = await import("rsbuild-plugin-rsc");
         return [
             pluginRSC({
@@ -290,7 +298,7 @@ async function getRscPlugins(enableRsc, internalDirectory, environments) {
                         RENDER_RSC_SOURCE_PATTERN,
                         RENDER_RSC_RSLIB_ENTRY_PATTERN,
                         /AppProxy/,
-                        routesFileReg
+                        routeDataFileReg
                     ]
                 }
             }),

package/dist/cjs/shared/parseCommonConfig.js

@@ -49,6 +49,17 @@ const external_tsgo_js_namespaceObject = require("./tsgo.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
+const DEFAULT_CSS_MINIFIER_OPTIONS = {
+    minimizerOptions: {
+        preset: [
+            'default',
+            {
+                calc: false,
+                mergeLonghand: false
+            }
+        ]
+    }
+};
 const isLooseCssModules = (path)=>{
     if (external_utils_js_namespaceObject.NODE_MODULES_REGEX.test(path)) return CSS_MODULES_REGEX.test(path);
     return !GLOBAL_CSS_REGEX.test(path);
@@ -208,7 +219,7 @@ async function parseCommonConfig(builderConfig, options) {
         };
     }
     rsbuildPlugins.push((0, plugin_css_minimizer_namespaceObject.pluginCssMinimizer)({
-        pluginOptions: minifyCss
+        pluginOptions: minifyCss ?? DEFAULT_CSS_MINIFIER_OPTIONS
     }));
     if (enableAssetManifest) {
         const { pluginManifest } = await import("../plugins/manifest.js");

package/dist/cjs/shared/tsgo.js

@@ -50,7 +50,8 @@ const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const utils_namespaceObject = require("@modern-js/utils");
 const builderRequire = (0, external_node_module_namespaceObject.createRequire)(__rslib_import_meta_url__);
-const TSGO_PACKAGE = "@typescript/native-preview/package.json";
+const STABLE_TSGO_PACKAGE = "typescript/package.json";
+const NATIVE_PREVIEW_TSGO_PACKAGE = "@typescript/native-preview/package.json";
 const TSGO_CHECKER_DIR = external_node_path_default().join('.modern-js', 'tsgo');
 const tryResolve = (request, rootPath)=>{
     try {
@@ -63,6 +64,20 @@ const tryResolve = (request, rootPath)=>{
         return;
     }
 };
+const readPackageMajorVersion = (packageJsonPath)=>{
+    try {
+        const packageJson = JSON.parse(external_node_fs_default().readFileSync(packageJsonPath, 'utf8'));
+        const major = Number.parseInt(String(packageJson.version).split('.')[0], 10);
+        return Number.isFinite(major) ? major : void 0;
+    } catch  {
+        return;
+    }
+};
+const resolveTsgoPackagePath = (rootPath)=>{
+    const stableTypeScriptPath = tryResolve(STABLE_TSGO_PACKAGE, rootPath);
+    if (stableTypeScriptPath && (readPackageMajorVersion(stableTypeScriptPath) ?? 0) >= 7) return stableTypeScriptPath;
+    return tryResolve(NATIVE_PREVIEW_TSGO_PACKAGE, rootPath) ?? builderRequire.resolve(NATIVE_PREVIEW_TSGO_PACKAGE);
+};
 const toPosixPath = (input)=>input.replaceAll(external_node_path_default().sep, '/');
 const asTsConfigPath = (request)=>{
     if (external_node_path_default().extname(request)) return [
@@ -169,7 +184,7 @@ const normalizeTsgoConfig = (config, rootPath)=>{
     return config;
 };
 const withTsgoDefaults = (userOptions, rootPath)=>{
-    const tsgoPath = tryResolve(TSGO_PACKAGE, rootPath) ?? builderRequire.resolve(TSGO_PACKAGE);
+    const tsgoPath = resolveTsgoPackagePath(rootPath);
     const userChain = userOptions ? Array.isArray(userOptions) ? userOptions : [
         userOptions
     ] : [];

package/dist/esm/plugins/rscConfig.mjs

@@ -160,6 +160,13 @@ function pluginRscConfig() {
                 handler: (chain, { isServer })=>{
                     if (isServer) {
                         chain.resolve.alias.set(`${RENDER_RSC_RUNTIME}$`, RENDER_RSC_WORKER_RUNTIME);
+                        let emptyModulePath;
+                        try {
+                            emptyModulePath = require.resolve('../shared/rsc/rscEmptyModule');
+                        } catch  {
+                            emptyModulePath = path.resolve(__dirname, '../shared/rsc/rscEmptyModule');
+                        }
+                        chain.resolve.alias.set('server-only$', emptyModulePath);
                         const routeFilePattern = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.[tj]sx?$/;
                         const appFilePattern = /[/\\]App\.[tj]sx?$/;
                         const combinedPattern = new RegExp(`(${routeFilePattern.source}|${appFilePattern.source})`);
@@ -233,7 +240,8 @@ function pluginRscConfig() {
 }
 async function getRscPlugins(enableRsc, internalDirectory, environments) {
     if (enableRsc) {
-        const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        const routeDataFileReg = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.(?:loader|data)\.[tj]sx?(?:\?.*)?$/;
         const { pluginRSC } = await import("rsbuild-plugin-rsc");
         return [
             pluginRSC({
@@ -246,7 +254,7 @@ async function getRscPlugins(enableRsc, internalDirectory, environments) {
                         RENDER_RSC_SOURCE_PATTERN,
                         RENDER_RSC_RSLIB_ENTRY_PATTERN,
                         /AppProxy/,
-                        routesFileReg
+                        routeDataFileReg
                     ]
                 }
             }),

package/dist/esm/shared/parseCommonConfig.mjs

@@ -16,6 +16,17 @@ import { withTsgoDefaults } from "./tsgo.mjs";
 import { NODE_MODULES_REGEX } from "./utils.mjs";
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
+const DEFAULT_CSS_MINIFIER_OPTIONS = {
+    minimizerOptions: {
+        preset: [
+            'default',
+            {
+                calc: false,
+                mergeLonghand: false
+            }
+        ]
+    }
+};
 const isLooseCssModules = (path)=>{
     if (NODE_MODULES_REGEX.test(path)) return CSS_MODULES_REGEX.test(path);
     return !GLOBAL_CSS_REGEX.test(path);
@@ -175,7 +186,7 @@ async function parseCommonConfig(builderConfig, options) {
         };
     }
     rsbuildPlugins.push(pluginCssMinimizer({
-        pluginOptions: minifyCss
+        pluginOptions: minifyCss ?? DEFAULT_CSS_MINIFIER_OPTIONS
     }));
     if (enableAssetManifest) {
         const { pluginManifest } = await import("../plugins/manifest.mjs");

package/dist/esm/shared/tsgo.mjs

@@ -4,7 +4,8 @@ import { createRequire } from "node:module";
 import node_path from "node:path";
 import { json5 } from "@modern-js/utils";
 const builderRequire = createRequire(import.meta.url);
-const TSGO_PACKAGE = "@typescript/native-preview/package.json";
+const STABLE_TSGO_PACKAGE = "typescript/package.json";
+const NATIVE_PREVIEW_TSGO_PACKAGE = "@typescript/native-preview/package.json";
 const TSGO_CHECKER_DIR = node_path.join('.modern-js', 'tsgo');
 const tryResolve = (request, rootPath)=>{
     try {
@@ -17,6 +18,20 @@ const tryResolve = (request, rootPath)=>{
         return;
     }
 };
+const readPackageMajorVersion = (packageJsonPath)=>{
+    try {
+        const packageJson = JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf8'));
+        const major = Number.parseInt(String(packageJson.version).split('.')[0], 10);
+        return Number.isFinite(major) ? major : void 0;
+    } catch  {
+        return;
+    }
+};
+const resolveTsgoPackagePath = (rootPath)=>{
+    const stableTypeScriptPath = tryResolve(STABLE_TSGO_PACKAGE, rootPath);
+    if (stableTypeScriptPath && (readPackageMajorVersion(stableTypeScriptPath) ?? 0) >= 7) return stableTypeScriptPath;
+    return tryResolve(NATIVE_PREVIEW_TSGO_PACKAGE, rootPath) ?? builderRequire.resolve(NATIVE_PREVIEW_TSGO_PACKAGE);
+};
 const toPosixPath = (input)=>input.replaceAll(node_path.sep, '/');
 const asTsConfigPath = (request)=>{
     if (node_path.extname(request)) return [
@@ -123,7 +138,7 @@ const normalizeTsgoConfig = (config, rootPath)=>{
     return config;
 };
 const withTsgoDefaults = (userOptions, rootPath)=>{
-    const tsgoPath = tryResolve(TSGO_PACKAGE, rootPath) ?? builderRequire.resolve(TSGO_PACKAGE);
+    const tsgoPath = resolveTsgoPackagePath(rootPath);
     const userChain = userOptions ? Array.isArray(userOptions) ? userOptions : [
         userOptions
     ] : [];

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

@@ -165,6 +165,13 @@ function pluginRscConfig() {
                 handler: (chain, { isServer })=>{
                     if (isServer) {
                         chain.resolve.alias.set(`${RENDER_RSC_RUNTIME}$`, RENDER_RSC_WORKER_RUNTIME);
+                        let emptyModulePath;
+                        try {
+                            emptyModulePath = require.resolve('../shared/rsc/rscEmptyModule');
+                        } catch  {
+                            emptyModulePath = path.resolve(__rspack_import_meta_dirname__, '../shared/rsc/rscEmptyModule');
+                        }
+                        chain.resolve.alias.set('server-only$', emptyModulePath);
                         const routeFilePattern = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.[tj]sx?$/;
                         const appFilePattern = /[/\\]App\.[tj]sx?$/;
                         const combinedPattern = new RegExp(`(${routeFilePattern.source}|${appFilePattern.source})`);
@@ -238,7 +245,8 @@ function pluginRscConfig() {
 }
 async function getRscPlugins(enableRsc, internalDirectory, environments) {
     if (enableRsc) {
-        const routesFileReg = new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        new RegExp(`${internalDirectory.replace(/[/\\]/g, '[/\\\\]')}[/\\\\][^/\\\\]*[/\\\\]routes`);
+        const routeDataFileReg = /[/\\]routes[/\\](?:.*[/\\])?(?:layout|page|\$)\.(?:loader|data)\.[tj]sx?(?:\?.*)?$/;
         const { pluginRSC } = await import("rsbuild-plugin-rsc");
         return [
             pluginRSC({
@@ -251,7 +259,7 @@ async function getRscPlugins(enableRsc, internalDirectory, environments) {
                         RENDER_RSC_SOURCE_PATTERN,
                         RENDER_RSC_RSLIB_ENTRY_PATTERN,
                         /AppProxy/,
-                        routesFileReg
+                        routeDataFileReg
                     ]
                 }
             }),

package/dist/esm-node/shared/parseCommonConfig.mjs

@@ -17,6 +17,17 @@ import { withTsgoDefaults } from "./tsgo.mjs";
 import { NODE_MODULES_REGEX } from "./utils.mjs";
 const CSS_MODULES_REGEX = /\.modules?\.\w+$/i;
 const GLOBAL_CSS_REGEX = /\.global\.\w+$/;
+const DEFAULT_CSS_MINIFIER_OPTIONS = {
+    minimizerOptions: {
+        preset: [
+            'default',
+            {
+                calc: false,
+                mergeLonghand: false
+            }
+        ]
+    }
+};
 const isLooseCssModules = (path)=>{
     if (NODE_MODULES_REGEX.test(path)) return CSS_MODULES_REGEX.test(path);
     return !GLOBAL_CSS_REGEX.test(path);
@@ -176,7 +187,7 @@ async function parseCommonConfig(builderConfig, options) {
         };
     }
     rsbuildPlugins.push(pluginCssMinimizer({
-        pluginOptions: minifyCss
+        pluginOptions: minifyCss ?? DEFAULT_CSS_MINIFIER_OPTIONS
     }));
     if (enableAssetManifest) {
         const { pluginManifest } = await import("../plugins/manifest.mjs");

package/dist/esm-node/shared/tsgo.mjs

@@ -5,7 +5,8 @@ import { createRequire } from "node:module";
 import node_path from "node:path";
 import { json5 } from "@modern-js/utils";
 const builderRequire = createRequire(import.meta.url);
-const TSGO_PACKAGE = "@typescript/native-preview/package.json";
+const STABLE_TSGO_PACKAGE = "typescript/package.json";
+const NATIVE_PREVIEW_TSGO_PACKAGE = "@typescript/native-preview/package.json";
 const TSGO_CHECKER_DIR = node_path.join('.modern-js', 'tsgo');
 const tryResolve = (request, rootPath)=>{
     try {
@@ -18,6 +19,20 @@ const tryResolve = (request, rootPath)=>{
         return;
     }
 };
+const readPackageMajorVersion = (packageJsonPath)=>{
+    try {
+        const packageJson = JSON.parse(node_fs.readFileSync(packageJsonPath, 'utf8'));
+        const major = Number.parseInt(String(packageJson.version).split('.')[0], 10);
+        return Number.isFinite(major) ? major : void 0;
+    } catch  {
+        return;
+    }
+};
+const resolveTsgoPackagePath = (rootPath)=>{
+    const stableTypeScriptPath = tryResolve(STABLE_TSGO_PACKAGE, rootPath);
+    if (stableTypeScriptPath && (readPackageMajorVersion(stableTypeScriptPath) ?? 0) >= 7) return stableTypeScriptPath;
+    return tryResolve(NATIVE_PREVIEW_TSGO_PACKAGE, rootPath) ?? builderRequire.resolve(NATIVE_PREVIEW_TSGO_PACKAGE);
+};
 const toPosixPath = (input)=>input.replaceAll(node_path.sep, '/');
 const asTsConfigPath = (request)=>{
     if (node_path.extname(request)) return [
@@ -124,7 +139,7 @@ const normalizeTsgoConfig = (config, rootPath)=>{
     return config;
 };
 const withTsgoDefaults = (userOptions, rootPath)=>{
-    const tsgoPath = tryResolve(TSGO_PACKAGE, rootPath) ?? builderRequire.resolve(TSGO_PACKAGE);
+    const tsgoPath = resolveTsgoPackagePath(rootPath);
     const userChain = userOptions ? Array.isArray(userOptions) ? userOptions : [
         userOptions
     ] : [];

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

@@ -4,8 +4,8 @@ type TsCheckerFn = Extract<TsCheckerChain, (config: never) => unknown>;
 export type TsCheckerOptions = Parameters<TsCheckerFn>[0];
 /**
  * Type checking runs on TypeScript Go (`tsgo`) by default. The checker
- * prefers the project's own `@typescript/native-preview` and falls back to
- * the copy bundled with the builder, so it works without an extra install.
+ * 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.
  */
 export declare const withTsgoDefaults: (userOptions: TsCheckerChain | undefined, rootPath: string) => TsCheckerChain;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bleedingdev/modern-js-builder",
-  "version": "3.5.0-ultramodern.7",
+  "version": "3.5.0-ultramodern.75",
   "description": "A builder for Modern.js",
   "repository": {
     "type": "git",
@@ -26,29 +26,30 @@
     "dist"
   ],
   "dependencies": {
-    "@rsbuild/core": "2.1.1",
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.75",
+    "@rsbuild/core": "2.1.5",
     "@rsbuild/plugin-assets-retry": "2.0.1",
     "@rsbuild/plugin-check-syntax": "2.0.0",
     "@rsbuild/plugin-css-minimizer": "2.0.1",
-    "@rsbuild/plugin-less": "2.0.0",
+    "@rsbuild/plugin-less": "2.0.1",
     "@rsbuild/plugin-react": "2.1.0",
     "@rsbuild/plugin-rem": "1.0.6",
-    "@rsbuild/plugin-sass": "2.0.0",
+    "@rsbuild/plugin-sass": "2.0.1",
     "@rsbuild/plugin-source-build": "1.0.6",
-    "@rsbuild/plugin-svgr": "2.0.4",
+    "@rsbuild/plugin-svgr": "2.0.5",
     "@rsbuild/plugin-type-check": "1.5.0",
     "@rsbuild/plugin-typed-css-modules": "1.2.4",
-    "@rsdoctor/rspack-plugin": "^1.5.16",
+    "@rsdoctor/rspack-plugin": "^1.5.17",
     "@swc/core": "1.15.43",
     "@swc/helpers": "^0.5.23",
-    "@typescript/native-preview": "7.0.0-dev.20260628.1",
+    "@typescript/native-preview": "7.0.0-dev.20260707.2",
     "autoprefixer": "10.5.2",
-    "browserslist": "4.28.4",
+    "browserslist": "4.28.5",
     "core-js": "^3.49.0",
     "cssnano": "8.0.2",
     "html-minifier-terser": "^7.2.0",
     "lodash": "^4.18.1",
-    "postcss": "^8.5.15",
+    "postcss": "^8.5.16",
     "postcss-custom-properties": "15.0.1",
     "postcss-flexbugs-fixes": "5.0.2",
     "postcss-font-variant": "5.0.0",
@@ -58,22 +59,20 @@
     "postcss-page-break": "3.0.4",
     "rsbuild-plugin-rsc": "0.1.1",
     "rspack-manifest-plugin": "5.2.2",
-    "ts-deepmerge": "8.0.0",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.7"
+    "ts-deepmerge": "8.0.0"
   },
   "devDependencies": {
-    "@rslib/core": "0.23.1",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.75",
+    "@rslib/core": "0.23.2",
+    "@scripts/rstest-config": "2.66.0",
     "@types/html-minifier-terser": "^7.0.2",
     "@types/lodash": "^4.17.24",
     "react": "^19.2.7",
     "terser": "^5.48.0",
-    "typescript": "^6.0.3",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.5.0-ultramodern.7",
-    "@scripts/rstest-config": "2.66.0"
+    "typescript": "^7.0.2"
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
+    "access": "public"
   },
   "scripts": {
     "build": "rslib build && pnpm -w tsgo:dts \"$PWD\"",