@modern-js/app-tools 3.2.0 → 3.2.2

package/dist/cjs/utils/initAppContext.js

@@ -10,11 +10,15 @@ var __webpack_require__ = {};
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/utils/loadPlugins.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/utils/printInstructions.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/utils/register.js

@@ -10,11 +10,15 @@ var __webpack_require__ = {};
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{
@@ -94,8 +98,7 @@ const resolveTsRuntimeRegisterMode = (hasTsNode)=>{
     return 'unsupported';
 };
 const setupTsRuntime = async (appDir, distDir, alias, options = {})=>{
-    const TS_CONFIG_FILENAME = "tsconfig.json";
-    const tsconfigPath = external_node_path_default().resolve(appDir, TS_CONFIG_FILENAME);
+    const tsconfigPath = (0, utils_namespaceObject.resolveServerTsconfig)(appDir, options.tsconfigPath);
     const isTsProject = await utils_namespaceObject.fs.pathExists(tsconfigPath);
     const hasTsNode = (0, utils_namespaceObject.isDepExists)(appDir, 'ts-node');
     if (!isTsProject) return;

package/dist/cjs/utils/restart.js

@@ -1,11 +1,15 @@
 "use strict";
 var __webpack_require__ = {};
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/cjs/utils/routes.js

@@ -10,11 +10,15 @@ var __webpack_require__ = {};
     };
 })();
 (()=>{
-    __webpack_require__.d = (exports1, definition)=>{
-        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
-            enumerable: true,
-            get: definition[key]
-        });
+    __webpack_require__.d = (exports1, getters, values)=>{
+        var define = (defs, kind)=>{
+            for(var key in defs)if (__webpack_require__.o(defs, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+                enumerable: true,
+                [kind]: defs[key]
+            });
+        };
+        define(getters, "get");
+        define(values, "value");
     };
 })();
 (()=>{

package/dist/esm/builder/shared/builderPlugins/adapterHtml.mjs

@@ -38,7 +38,7 @@ function applyBottomHtmlPlugin({ chain, options, CHAIN_ID, HtmlBundlerPlugin, ht
         const baseTemplateParams = {
             entryName,
             title: modernConfig.html.title,
-            mountId: modernConfig.html.templateParameters
+            mountId: modernConfig.html.mountId
         };
         chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args)=>[
                 {

package/dist/esm/commands/build.mjs

@@ -33,7 +33,8 @@ const build = async (api, options)=>{
     const combinedAlias = [].concat(resolvedConfig?.resolve?.alias ?? []).concat(resolvedConfig?.source?.alias ?? []);
     await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
     await setupTsRuntime(appContext.appDirectory, appContext.distDirectory, combinedAlias, {
-        moduleType: appContext.moduleType
+        moduleType: appContext.moduleType,
+        tsconfigPath: resolvedConfig?.server?.tsconfigPath
     });
     const { apiOnly } = appContext;
     if (apiOnly) {

package/dist/esm/commands/dev.mjs

@@ -14,7 +14,8 @@ const dev = async (api, options, devServerOptions)=>{
     const hooks = api.getHooks();
     const combinedAlias = [].concat(normalizedConfig?.resolve?.alias ?? []).concat(normalizedConfig?.source?.alias ?? []);
     await setupTsRuntime(appContext.appDirectory, appContext.distDirectory, combinedAlias, {
-        moduleType: appContext.moduleType
+        moduleType: appContext.moduleType,
+        tsconfigPath: normalizedConfig?.server?.tsconfigPath
     });
     const { appDirectory, port, apiOnly, metaName, serverRoutes } = appContext;
     const meta = getMeta(metaName);

package/dist/esm/plugins/serverBuild.mjs

@@ -1,8 +1,7 @@
 import fs from "fs";
 import path from "path";
 import { compile } from "@modern-js/server-utils";
-import { SERVER_DIR, SHARED_DIR, getMeta } from "@modern-js/utils";
-const TS_CONFIG_FILENAME = 'tsconfig.json';
+import { SERVER_DIR, SHARED_DIR, getMeta, resolveServerTsconfig } from "@modern-js/utils";
 function checkHasCache(appDir) {
     const tsFilepath = path.resolve(appDir, SERVER_DIR, 'cache.ts');
     const jsfilepath = path.resolve(appDir, SERVER_DIR, 'cache.js');
@@ -24,7 +23,7 @@ const serverBuild = ()=>({
                 const distDir = path.resolve(distDirectory);
                 const serverDir = path.resolve(appDirectory, SERVER_DIR);
                 const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-                const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+                const tsconfigPath = resolveServerTsconfig(appDirectory, modernConfig?.server?.tsconfigPath);
                 const sourceDirs = [];
                 if (fs.existsSync(serverDir)) {
                     sourceDirs.push(serverDir);

package/dist/esm/utils/register.mjs

@@ -1,5 +1,5 @@
 import node_path from "node:path";
-import { fs, getAliasConfig, isDepExists, loadFromProject, mergeAlias, readTsConfigByFile } from "@modern-js/utils";
+import { fs, getAliasConfig, isDepExists, loadFromProject, mergeAlias, readTsConfigByFile, resolveServerTsconfig } from "@modern-js/utils";
 const normalizePathValue = ({ key, value, absoluteBaseUrl })=>{
     let normalizedValue = value;
     if (key.startsWith('@') && normalizedValue.startsWith('@')) try {
@@ -55,8 +55,7 @@ const resolveTsRuntimeRegisterMode = (hasTsNode)=>{
     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 tsconfigPath = resolveServerTsconfig(appDir, options.tsconfigPath);
     const isTsProject = await fs.pathExists(tsconfigPath);
     const hasTsNode = isDepExists(appDir, 'ts-node');
     if (!isTsProject) return;

package/dist/esm-node/builder/shared/builderPlugins/adapterHtml.mjs

@@ -39,7 +39,7 @@ function applyBottomHtmlPlugin({ chain, options, CHAIN_ID, HtmlBundlerPlugin, ht
         const baseTemplateParams = {
             entryName,
             title: modernConfig.html.title,
-            mountId: modernConfig.html.templateParameters
+            mountId: modernConfig.html.mountId
         };
         chain.plugin(`${CHAIN_ID.PLUGIN.HTML}-${entryName}`).tap((args)=>[
                 {

package/dist/esm-node/commands/build.mjs

@@ -34,7 +34,8 @@ const build = async (api, options)=>{
     const combinedAlias = [].concat(resolvedConfig?.resolve?.alias ?? []).concat(resolvedConfig?.source?.alias ?? []);
     await loadServerPlugins(api, appContext.appDirectory, appContext.metaName);
     await setupTsRuntime(appContext.appDirectory, appContext.distDirectory, combinedAlias, {
-        moduleType: appContext.moduleType
+        moduleType: appContext.moduleType,
+        tsconfigPath: resolvedConfig?.server?.tsconfigPath
     });
     const { apiOnly } = appContext;
     if (apiOnly) {

package/dist/esm-node/commands/dev.mjs

@@ -15,7 +15,8 @@ const dev = async (api, options, devServerOptions)=>{
     const hooks = api.getHooks();
     const combinedAlias = [].concat(normalizedConfig?.resolve?.alias ?? []).concat(normalizedConfig?.source?.alias ?? []);
     await setupTsRuntime(appContext.appDirectory, appContext.distDirectory, combinedAlias, {
-        moduleType: appContext.moduleType
+        moduleType: appContext.moduleType,
+        tsconfigPath: normalizedConfig?.server?.tsconfigPath
     });
     const { appDirectory, port, apiOnly, metaName, serverRoutes } = appContext;
     const meta = getMeta(metaName);

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

@@ -2,8 +2,7 @@ import "node:module";
 import fs from "fs";
 import path from "path";
 import { compile } from "@modern-js/server-utils";
-import { SERVER_DIR, SHARED_DIR, getMeta } from "@modern-js/utils";
-const TS_CONFIG_FILENAME = 'tsconfig.json';
+import { SERVER_DIR, SHARED_DIR, getMeta, resolveServerTsconfig } from "@modern-js/utils";
 function checkHasCache(appDir) {
     const tsFilepath = path.resolve(appDir, SERVER_DIR, 'cache.ts');
     const jsfilepath = path.resolve(appDir, SERVER_DIR, 'cache.js');
@@ -25,7 +24,7 @@ const serverBuild = ()=>({
                 const distDir = path.resolve(distDirectory);
                 const serverDir = path.resolve(appDirectory, SERVER_DIR);
                 const sharedDir = path.resolve(appDirectory, SHARED_DIR);
-                const tsconfigPath = path.resolve(appDirectory, TS_CONFIG_FILENAME);
+                const tsconfigPath = resolveServerTsconfig(appDirectory, modernConfig?.server?.tsconfigPath);
                 const sourceDirs = [];
                 if (fs.existsSync(serverDir)) {
                     sourceDirs.push(serverDir);

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

@@ -1,7 +1,7 @@
 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, mergeAlias, readTsConfigByFile } from "@modern-js/utils";
+import { fs, getAliasConfig, isDepExists, loadFromProject, mergeAlias, readTsConfigByFile, resolveServerTsconfig } from "@modern-js/utils";
 const normalizePathValue = ({ key, value, absoluteBaseUrl })=>{
     let normalizedValue = value;
     if (key.startsWith('@') && normalizedValue.startsWith('@')) try {
@@ -57,8 +57,7 @@ const resolveTsRuntimeRegisterMode = (hasTsNode)=>{
     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 tsconfigPath = resolveServerTsconfig(appDir, options.tsconfigPath);
     const isTsProject = await fs.pathExists(tsconfigPath);
     const hasTsNode = isDepExists(appDir, 'ts-node');
     if (!isTsProject) return;

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

@@ -3,6 +3,12 @@ import type { ConfigChain } from '@rsbuild/core';
 type TsRuntimeRegisterMode = 'ts-node' | 'node-loader' | 'unsupported';
 interface TsRuntimeSetupOptions {
     moduleType?: string;
+    /**
+     * User-configured `server.tsconfigPath`. Forwarded into the shared
+     * resolveServerTsconfig helper. Resolved relative to appDir when not
+     * absolute. Falls back to `<appDir>/tsconfig.json` when unset.
+     */
+    tsconfigPath?: string;
 }
 export declare const resolveTsRuntimeRegisterMode: (hasTsNode: boolean) => TsRuntimeRegisterMode;
 /**

package/lib/types.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="react" />
 /// <reference types="react-dom" />
+/// <reference types="@rsbuild/core/types" />
 /// <reference path="../dist/types/index.d.ts" />
 
 declare namespace NodeJS {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.2.0",
+  "version": "3.2.2",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -80,39 +80,39 @@
     "modern-app": "./bin/modern.js"
   },
   "dependencies": {
-    "@babel/parser": "^7.29.3",
-    "@babel/traverse": "^7.29.0",
-    "@babel/types": "^7.29.0",
-    "@rsbuild/core": "2.0.0",
+    "@babel/parser": "^7.29.7",
+    "@babel/traverse": "^7.29.7",
+    "@babel/types": "^7.29.7",
+    "@rsbuild/core": "2.0.10",
     "@swc/core": "1.15.33",
     "@swc/helpers": "^0.5.17",
     "es-module-lexer": "^1.7.0",
-    "import-meta-resolve": "^4.2.0",
     "flatted": "^3.4.2",
+    "import-meta-resolve": "^4.2.0",
     "mlly": "^1.8.2",
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/i18n-utils": "3.2.0",
-    "@modern-js/builder": "3.2.0",
-    "@modern-js/plugin": "3.2.0",
-    "@modern-js/plugin-data-loader": "3.2.0",
-    "@modern-js/server": "3.2.0",
-    "@modern-js/server-core": "3.2.0",
-    "@modern-js/prod-server": "3.2.0",
-    "@modern-js/types": "3.2.0",
-    "@modern-js/server-utils": "3.2.0",
-    "@modern-js/utils": "3.2.0"
+    "@modern-js/builder": "3.2.2",
+    "@modern-js/i18n-utils": "3.2.2",
+    "@modern-js/plugin-data-loader": "3.2.2",
+    "@modern-js/prod-server": "3.2.2",
+    "@modern-js/server": "3.2.2",
+    "@modern-js/plugin": "3.2.2",
+    "@modern-js/server-core": "3.2.2",
+    "@modern-js/types": "3.2.2",
+    "@modern-js/server-utils": "3.2.2",
+    "@modern-js/utils": "3.2.2"
   },
   "devDependencies": {
-    "@rslib/core": "0.21.4",
+    "@rslib/core": "0.21.5",
     "@types/babel__traverse": "7.28.0",
     "@types/node": "^20",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
-    "@scripts/rstest-config": "2.66.0",
-    "@modern-js/rslib": "2.68.10"
+    "@modern-js/rslib": "2.68.10",
+    "@scripts/rstest-config": "2.66.0"
   },
   "peerDependencies": {
     "ts-node": "^10.9.2",