@modern-js/app-tools 2.60.3 → 2.60.4-alpha.1

package/dist/cjs/utils/register.js

@@ -98,6 +98,12 @@ const registerCompiler = async (appDir, distDir, alias) => {
           ],
           ...tsNodeOptions
         });
+      } else {
+        await registerEsbuild({
+          isTsProject,
+          tsConfig,
+          distDir
+        });
       }
     } catch (error) {
       import_utils.logger.error(error);
@@ -116,13 +122,10 @@ const registerCompiler = async (appDir, distDir, alias) => {
   }
   const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
   if (await import_utils.fs.pathExists(appDir)) {
-    const loaderRes = tsConfigPaths.loadConfig(appDir);
-    if (loaderRes.resultType === "success") {
-      tsConfigPaths.register({
-        baseUrl: absoluteBaseUrl || "./",
-        paths: tsPaths
-      });
-    }
+    tsConfigPaths.register({
+      baseUrl: absoluteBaseUrl || "./",
+      paths: tsPaths
+    });
   }
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/esm/utils/register.js

@@ -38,7 +38,7 @@ var registerEsbuild = function() {
 }();
 var registerCompiler = function() {
   var _ref = _async_to_generator(function(appDir, distDir, alias) {
-    var TS_CONFIG_FILENAME, tsconfigPath, isTsProject, aliasConfig, _aliasConfig_paths, paths, _aliasConfig_absoluteBaseUrl, absoluteBaseUrl, tsPaths, tsConfig, MODERN_NODE_LOADER, tsNode, tsNodeOptions, error, tsConfigPaths, loaderRes;
+    var TS_CONFIG_FILENAME, tsconfigPath, isTsProject, aliasConfig, _aliasConfig_paths, paths, _aliasConfig_absoluteBaseUrl, absoluteBaseUrl, tsPaths, tsConfig, MODERN_NODE_LOADER, tsNode, tsNodeOptions, error, tsConfigPaths;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -85,15 +85,15 @@ var registerCompiler = function() {
           if (!(MODERN_NODE_LOADER !== "esbuild"))
             return [
               3,
-              7
+              10
             ];
           _state.label = 2;
         case 2:
           _state.trys.push([
             2,
-            4,
+            7,
             ,
-            6
+            9
           ]);
           return [
             4,
@@ -102,26 +102,27 @@ var registerCompiler = function() {
         case 3:
           tsNode = _state.sent();
           tsNodeOptions = tsConfig["ts-node"];
-          if (isTsProject) {
-            tsNode.register(_object_spread({
-              project: tsconfigPath,
-              scope: true,
-              // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
-              files: true,
-              transpileOnly: true,
-              ignore: [
-                "(?:^|/)node_modules/",
-                "(?:^|/)".concat(path.relative(appDir, distDir), "/")
-              ]
-            }, tsNodeOptions));
-          }
+          if (!isTsProject)
+            return [
+              3,
+              4
+            ];
+          tsNode.register(_object_spread({
+            project: tsconfigPath,
+            scope: true,
+            // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
+            files: true,
+            transpileOnly: true,
+            ignore: [
+              "(?:^|/)node_modules/",
+              "(?:^|/)".concat(path.relative(appDir, distDir), "/")
+            ]
+          }, tsNodeOptions));
           return [
             3,
             6
           ];
         case 4:
-          error = _state.sent();
-          logger.error(error);
           return [
             4,
             registerEsbuild({
@@ -132,16 +133,15 @@ var registerCompiler = function() {
           ];
         case 5:
           _state.sent();
-          return [
-            3,
-            6
-          ];
+          _state.label = 6;
         case 6:
           return [
             3,
             9
           ];
         case 7:
+          error = _state.sent();
+          logger.error(error);
           return [
             4,
             registerEsbuild({
@@ -152,27 +152,44 @@ var registerCompiler = function() {
           ];
         case 8:
           _state.sent();
-          _state.label = 9;
+          return [
+            3,
+            9
+          ];
         case 9:
+          return [
+            3,
+            12
+          ];
+        case 10:
+          return [
+            4,
+            registerEsbuild({
+              isTsProject,
+              tsConfig,
+              distDir
+            })
+          ];
+        case 11:
+          _state.sent();
+          _state.label = 12;
+        case 12:
           return [
             4,
             import("@modern-js/utils/tsconfig-paths")
           ];
-        case 10:
+        case 13:
           tsConfigPaths = _state.sent().default;
           return [
             4,
             fs.pathExists(appDir)
           ];
-        case 11:
+        case 14:
           if (_state.sent()) {
-            loaderRes = tsConfigPaths.loadConfig(appDir);
-            if (loaderRes.resultType === "success") {
-              tsConfigPaths.register({
-                baseUrl: absoluteBaseUrl || "./",
-                paths: tsPaths
-              });
-            }
+            tsConfigPaths.register({
+              baseUrl: absoluteBaseUrl || "./",
+              paths: tsPaths
+            });
           }
           return [
             2

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

@@ -65,6 +65,12 @@ const registerCompiler = async (appDir, distDir, alias) => {
           ],
           ...tsNodeOptions
         });
+      } else {
+        await registerEsbuild({
+          isTsProject,
+          tsConfig,
+          distDir
+        });
       }
     } catch (error) {
       logger.error(error);
@@ -83,13 +89,10 @@ const registerCompiler = async (appDir, distDir, alias) => {
   }
   const tsConfigPaths = (await import("@modern-js/utils/tsconfig-paths")).default;
   if (await fs.pathExists(appDir)) {
-    const loaderRes = tsConfigPaths.loadConfig(appDir);
-    if (loaderRes.resultType === "success") {
-      tsConfigPaths.register({
-        baseUrl: absoluteBaseUrl || "./",
-        paths: tsPaths
-      });
-    }
+    tsConfigPaths.register({
+      baseUrl: absoluteBaseUrl || "./",
+      paths: tsPaths
+    });
   }
 };
 export {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.60.3",
+  "version": "2.60.4-alpha.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -88,19 +88,19 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
+    "@modern-js/core": "2.60.3",
     "@modern-js/node-bundle-require": "2.60.3",
-    "@modern-js/plugin": "2.60.3",
     "@modern-js/plugin-i18n": "2.60.3",
     "@modern-js/plugin-data-loader": "2.60.3",
-    "@modern-js/rsbuild-plugin-esbuild": "2.60.3",
     "@modern-js/prod-server": "2.60.3",
-    "@modern-js/server": "2.60.3",
-    "@modern-js/core": "2.60.3",
+    "@modern-js/types": "2.60.3",
     "@modern-js/server-core": "2.60.3",
+    "@modern-js/server": "2.60.3",
+    "@modern-js/plugin": "2.60.3",
+    "@modern-js/rsbuild-plugin-esbuild": "2.60.3",
     "@modern-js/server-utils": "2.60.3",
-    "@modern-js/types": "2.60.3",
-    "@modern-js/uni-builder": "2.60.3",
-    "@modern-js/utils": "2.60.3"
+    "@modern-js/utils": "2.60.3",
+    "@modern-js/uni-builder": "2.60.3"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "~1.0.3",
@@ -112,8 +112,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.95.0",
-    "@scripts/jest-config": "2.60.3",
-    "@scripts/build": "2.60.3"
+    "@scripts/build": "2.60.3",
+    "@scripts/jest-config": "2.60.3"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",