@modern-js/app-tools 3.1.0 → 3.1.2

package/dist/esm-node/utils/register.mjs

@@ -2,12 +2,22 @@ import __rslib_shim_module__ from "node:module";
 const require = /*#__PURE__*/ __rslib_shim_module__.createRequire(/*#__PURE__*/ (()=>import.meta.url)());
 import node_path from "node:path";
 import { fs, getAliasConfig, isDepExists, loadFromProject, readTsConfigByFile } from "@modern-js/utils";
-const setupTsRuntime = async (appDir, distDir, alias)=>{
+const resolveTsRuntimeRegisterMode = (hasTsNode)=>{
+    const hasNativeTypeScriptSupport = process.features?.typescript;
+    const nodeMajorVersion = Number(process.versions.node.split('.')[0]);
+    const supportsNativeTypeScript = void 0 === hasNativeTypeScriptSupport ? nodeMajorVersion >= 22 : false !== hasNativeTypeScriptSupport;
+    if (supportsNativeTypeScript) return 'node-loader';
+    if (hasTsNode) return 'ts-node';
+    return 'unsupported';
+};
+const setupTsRuntime = async (appDir, distDir, alias, options = {})=>{
     const TS_CONFIG_FILENAME = "tsconfig.json";
     const tsconfigPath = node_path.resolve(appDir, TS_CONFIG_FILENAME);
     const isTsProject = await fs.pathExists(tsconfigPath);
     const hasTsNode = isDepExists(appDir, 'ts-node');
-    if (!isTsProject || !hasTsNode) return;
+    if (!isTsProject) return;
+    const preferredRegisterMode = resolveTsRuntimeRegisterMode(hasTsNode);
+    const registerMode = options.preferTsNodeForServerRuntime && hasTsNode ? 'ts-node' : preferredRegisterMode;
     const aliasConfig = getAliasConfig(alias, {
         appDirectory: appDir,
         tsconfigPath
@@ -32,24 +42,42 @@ const setupTsRuntime = async (appDir, distDir, alias)=>{
             [`${key}`]: tsPath
         };
     }, {});
-    const tsConfig = readTsConfigByFile(tsconfigPath);
-    const tsNode = await loadFromProject('ts-node', appDir);
-    const tsNodeOptions = tsConfig['ts-node'];
-    tsNode.register({
-        project: tsconfigPath,
-        scope: true,
-        files: true,
-        transpileOnly: true,
-        ignore: [
-            '(?:^|/)node_modules/',
-            `(?:^|/)${node_path.relative(appDir, distDir)}/`
-        ],
-        ...tsNodeOptions
-    });
+    if ('unsupported' === registerMode) return;
+    if ('ts-node' === registerMode) {
+        if ('module' === options.moduleType) {
+            const { registerModuleHooks } = await import("../esm/register-esm.mjs");
+            await registerModuleHooks({
+                appDir,
+                distDir,
+                alias: alias || {}
+            });
+        }
+        const tsConfig = readTsConfigByFile(tsconfigPath);
+        const tsNode = await loadFromProject('ts-node', appDir);
+        const tsNodeOptions = tsConfig['ts-node'];
+        tsNode.register({
+            project: tsconfigPath,
+            scope: true,
+            files: true,
+            transpileOnly: true,
+            ignore: [
+                '(?:^|/)node_modules/',
+                `(?:^|/)${node_path.relative(appDir, distDir)}/`
+            ],
+            ...tsNodeOptions
+        });
+    } else if ('node-loader' === registerMode) {
+        const { registerPathsLoader } = await import("../esm/register-esm.mjs");
+        await registerPathsLoader({
+            appDir,
+            baseUrl: absoluteBaseUrl || './',
+            paths: tsPaths
+        });
+    }
     const { register } = await import("@modern-js/utils/tsconfig-paths");
     register({
         baseUrl: absoluteBaseUrl || './',
         paths: tsPaths
     });
 };
-export { setupTsRuntime };
+export { resolveTsRuntimeRegisterMode, setupTsRuntime };

package/dist/types/esm/register-esm.d.mts

@@ -3,3 +3,8 @@ export function registerModuleHooks({ appDir, distDir, alias }: {
     distDir: any;
     alias: any;
 }): Promise<void>;
+export function registerPathsLoader({ appDir, baseUrl, paths }: {
+    appDir: any;
+    baseUrl: any;
+    paths: any;
+}): Promise<void>;

package/dist/types/esm/ts-paths-loader.d.mts

@@ -0,0 +1,6 @@
+export function initialize({ appDir: currentAppDir, baseUrl, paths }: {
+    appDir: any;
+    baseUrl: any;
+    paths: any;
+}): Promise<void>;
+export function resolve(specifier: any, context: any, defaultResolve: any): any;

package/dist/types/plugins/deploy/platforms/templates/netlify-entry.d.cts

@@ -1 +1,2 @@
-export function handler(request: any, context: any): Promise<any>;
+export default handler;
+declare function handler(request: any, context: any): Promise<any>;

package/dist/types/utils/register.d.ts

@@ -1,7 +1,14 @@
 import { type Alias } from '@modern-js/utils';
 import type { ConfigChain } from '@rsbuild/core';
+type TsRuntimeRegisterMode = 'ts-node' | 'node-loader' | 'unsupported';
+interface TsRuntimeSetupOptions {
+    moduleType?: string;
+    preferTsNodeForServerRuntime?: boolean;
+}
+export declare const resolveTsRuntimeRegisterMode: (hasTsNode: boolean) => TsRuntimeRegisterMode;
 /**
  * Setup TypeScript runtime support.
  * Register ts-node for compilation and tsconfig-paths for path alias resolution.
  */
-export declare const setupTsRuntime: (appDir: string, distDir: string, alias?: ConfigChain<Alias>) => Promise<void>;
+export declare const setupTsRuntime: (appDir: string, distDir: string, alias?: ConfigChain<Alias>, options?: TsRuntimeSetupOptions) => Promise<void>;
+export {};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.0",
+  "version": "3.1.2",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -80,33 +80,33 @@
     "modern-app": "./bin/modern.js"
   },
   "dependencies": {
-    "@babel/parser": "^7.29.0",
+    "@babel/parser": "^7.29.2",
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
-    "@rsbuild/core": "2.0.0-beta.4",
+    "@rsbuild/core": "2.0.0-rc.0",
     "@swc/helpers": "^0.5.17",
     "es-module-lexer": "^1.7.0",
     "esbuild": "0.25.5",
     "esbuild-register": "^3.6.0",
     "import-meta-resolve": "^4.2.0",
-    "flatted": "^3.4.0",
+    "flatted": "^3.4.2",
     "mlly": "^1.8.0",
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/builder": "3.1.0",
-    "@modern-js/i18n-utils": "3.1.0",
-    "@modern-js/plugin": "3.1.0",
-    "@modern-js/plugin-data-loader": "3.1.0",
-    "@modern-js/prod-server": "3.1.0",
-    "@modern-js/server": "3.1.0",
-    "@modern-js/server-utils": "3.1.0",
-    "@modern-js/server-core": "3.1.0",
-    "@modern-js/types": "3.1.0",
-    "@modern-js/utils": "3.1.0"
+    "@modern-js/builder": "3.1.2",
+    "@modern-js/i18n-utils": "3.1.2",
+    "@modern-js/plugin": "3.1.2",
+    "@modern-js/plugin-data-loader": "3.1.2",
+    "@modern-js/prod-server": "3.1.2",
+    "@modern-js/server": "3.1.2",
+    "@modern-js/server-core": "3.1.2",
+    "@modern-js/types": "3.1.2",
+    "@modern-js/utils": "3.1.2",
+    "@modern-js/server-utils": "3.1.2"
   },
   "devDependencies": {
-    "@rslib/core": "0.19.6",
+    "@rslib/core": "0.20.3",
     "@types/babel__traverse": "7.28.0",
     "@types/node": "^20",
     "ts-node": "^10.9.2",

package/{rstest.config.ts → rstest.config.mts}

@@ -7,10 +7,6 @@ export default withTestPreset({
   globals: true,
   tools: {
     rspack: {
-      optimization: {
-        // Disable tree shaking to avoid issues with rstest mocking '@modern-js/utils'.
-        providedExports: false,
-      },
       module: {
         parser: {
           javascript: {