@modern-js/server-utils 2.25.2 → 2.26.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @modern-js/server-utils
 
+## 2.26.0
+
+### Patch Changes
+
+- 1fb5804: fix: should load typescript from direct dependencies on demand
+  fix: 按需从直接依赖中加载 typescript
+  - @modern-js/babel-preset-base@2.26.0
+  - @modern-js/babel-compiler@2.26.0
+  - @modern-js/utils@2.26.0
+
 ## 2.25.2
 
 ### Patch Changes

package/dist/cjs/common/index.js

@@ -20,8 +20,6 @@ _export(exports, {
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _path = /* @__PURE__ */ _interop_require_wildcard._(require("path"));
 const _utils = require("@modern-js/utils");
-const _typescript = require("../compilers/typescript");
-const _babel = require("../compilers/babel");
 const FILE_EXTENSIONS = [
   ".js",
   ".ts",
@@ -44,8 +42,10 @@ const compile = async (appDirectory, modernConfig, compileOptions) => {
   const compiler = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_server = modernConfig.server) === null || _modernConfig_server === void 0 ? void 0 : _modernConfig_server.compiler;
   const isTsProject = tsconfigPath && await _utils.fs.pathExists(tsconfigPath);
   if (!isTsProject || compiler === "babel") {
-    await (0, _babel.compileByBabel)(appDirectory, modernConfig, compileOptions);
+    const { compileByBabel } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../compilers/babel")));
+    await compileByBabel(appDirectory, modernConfig, compileOptions);
   } else {
-    await (0, _typescript.compileByTs)(appDirectory, modernConfig, compileOptions);
+    const { compileByTs } = await Promise.resolve().then(() => /* @__PURE__ */ _interop_require_wildcard._(require("../compilers/typescript")));
+    await compileByTs(appDirectory, modernConfig, compileOptions);
   }
 };

package/dist/cjs/compilers/typescript/index.js

@@ -11,11 +11,10 @@ Object.defineProperty(exports, "compileByTs", {
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
-const _typescript = /* @__PURE__ */ _interop_require_default._(require("typescript"));
 const _typescriptLoader = require("./typescriptLoader");
 const _tsconfigPathsPlugin = require("./tsconfigPathsPlugin");
-const readTsConfigByFile = (tsConfigFile) => {
-  const parsedCmd = _typescript.default.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, _typescript.default.sys);
+const readTsConfigByFile = (tsConfigFile, tsInstance) => {
+  const parsedCmd = tsInstance.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, tsInstance.sys);
   const { options, fileNames, projectReferences } = parsedCmd;
   return {
     options,
@@ -51,7 +50,7 @@ const compileByTs = async (appDirectory, config, compileOptions) => {
     tsconfigPath
   });
   const { paths = {}, absoluteBaseUrl = "./" } = aliasOption;
-  const { options, fileNames, projectReferences } = readTsConfigByFile(tsconfigPath);
+  const { options, fileNames, projectReferences } = readTsConfigByFile(tsconfigPath, ts);
   const sourcePosixPaths = sourceDirs.map((sourceDir) => sourceDir.split(_path.default.sep).join(_path.default.posix.sep));
   const rootNames = fileNames.filter((fileName) => {
     return fileName.endsWith(".d.ts") || sourcePosixPaths.some((sourceDir) => {

package/dist/esm/common/index.js

@@ -2,8 +2,6 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import * as path from "path";
 import { fs } from "@modern-js/utils";
-import { compileByTs } from "../compilers/typescript";
-import { compileByBabel } from "../compilers/babel";
 export var FILE_EXTENSIONS = [
   ".js",
   ".ts",
@@ -22,7 +20,7 @@ var validateAbsolutePaths = function(filenames, messageFunc) {
 };
 export var compile = function() {
   var _ref = _async_to_generator(function(appDirectory, modernConfig, compileOptions) {
-    var _modernConfig_server, sourceDirs, distDir, tsconfigPath, compiler, isTsProject, _tmp;
+    var _modernConfig_server, sourceDirs, distDir, tsconfigPath, compiler, isTsProject, _tmp, compileByBabel, compileByTs;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -50,27 +48,39 @@ export var compile = function() {
           if (!(!isTsProject || compiler === "babel"))
             return [
               3,
-              4
+              5
             ];
           return [
             4,
-            compileByBabel(appDirectory, modernConfig, compileOptions)
+            import("../compilers/babel")
           ];
         case 3:
+          compileByBabel = _state.sent().compileByBabel;
+          return [
+            4,
+            compileByBabel(appDirectory, modernConfig, compileOptions)
+          ];
+        case 4:
           _state.sent();
           return [
             3,
-            6
+            8
           ];
-        case 4:
+        case 5:
+          return [
+            4,
+            import("../compilers/typescript")
+          ];
+        case 6:
+          compileByTs = _state.sent().compileByTs;
           return [
             4,
             compileByTs(appDirectory, modernConfig, compileOptions)
           ];
-        case 5:
+        case 7:
           _state.sent();
-          _state.label = 6;
-        case 6:
+          _state.label = 8;
+        case 8:
           return [
             2
           ];

package/dist/esm/compilers/typescript/index.js

@@ -4,11 +4,10 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { logger, getAliasConfig, fs } from "@modern-js/utils";
-import ts from "typescript";
 import { TypescriptLoader } from "./typescriptLoader";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfigPathsPlugin";
-var readTsConfigByFile = function(tsConfigFile) {
-  var parsedCmd = ts.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, ts.sys);
+var readTsConfigByFile = function(tsConfigFile, tsInstance) {
+  var parsedCmd = tsInstance.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, tsInstance.sys);
   var options = parsedCmd.options, fileNames = parsedCmd.fileNames, projectReferences = parsedCmd.projectReferences;
   return {
     options: options,
@@ -60,7 +59,7 @@ var copyFiles = function() {
 }();
 export var compileByTs = function() {
   var _ref = _async_to_generator(function(appDirectory, config, compileOptions) {
-    var sourceDirs, distDir, tsconfigPath, ts2, createProgram, formatHost, alias, aliasOption, _aliasOption_paths, paths, _aliasOption_absoluteBaseUrl, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, sourcePosixPaths, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, noEmitOnError, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, source, err;
+    var sourceDirs, distDir, tsconfigPath, ts, createProgram, formatHost, alias, aliasOption, _aliasOption_paths, paths, _aliasOption_absoluteBaseUrl, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, sourcePosixPaths, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, noEmitOnError, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, source, err;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -71,18 +70,18 @@ export var compileByTs = function() {
               2
             ];
           }
-          ts2 = new TypescriptLoader({
+          ts = new TypescriptLoader({
             appDirectory: appDirectory
           }).load();
-          createProgram = ts2.createIncrementalProgram || ts2.createProgram;
-          formatHost = getFormatHost(ts2);
+          createProgram = ts.createIncrementalProgram || ts.createProgram;
+          formatHost = getFormatHost(ts);
           alias = config.alias;
           aliasOption = getAliasConfig(alias, {
             appDirectory: appDirectory,
             tsconfigPath: tsconfigPath
           });
           _aliasOption_paths = aliasOption.paths, paths = _aliasOption_paths === void 0 ? {} : _aliasOption_paths, _aliasOption_absoluteBaseUrl = aliasOption.absoluteBaseUrl, absoluteBaseUrl = _aliasOption_absoluteBaseUrl === void 0 ? "./" : _aliasOption_absoluteBaseUrl;
-          _readTsConfigByFile = readTsConfigByFile(tsconfigPath), options = _readTsConfigByFile.options, fileNames = _readTsConfigByFile.fileNames, projectReferences = _readTsConfigByFile.projectReferences;
+          _readTsConfigByFile = readTsConfigByFile(tsconfigPath, ts), options = _readTsConfigByFile.options, fileNames = _readTsConfigByFile.fileNames, projectReferences = _readTsConfigByFile.projectReferences;
           sourcePosixPaths = sourceDirs.map(function(sourceDir) {
             return sourceDir.split(path.sep).join(path.posix.sep);
           });
@@ -91,7 +90,7 @@ export var compileByTs = function() {
               return fileName.includes(sourceDir);
             });
           });
-          program = createProgram.call(ts2, {
+          program = createProgram.call(ts, {
             rootNames: rootNames,
             projectReferences: projectReferences,
             options: _object_spread({
@@ -99,16 +98,16 @@ export var compileByTs = function() {
               outDir: distDir
             }, options)
           });
-          tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(ts2, absoluteBaseUrl, paths);
+          tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(ts, absoluteBaseUrl, paths);
           emitResult = program.emit(void 0, void 0, void 0, void 0, {
             before: [
               tsconfigPathsPlugin
             ]
           });
-          allDiagnostics = ts2.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+          allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
           noEmitOnError = options.noEmitOnError;
           if (allDiagnostics.length > 0) {
-            logger.error(ts2.formatDiagnosticsWithColorAndContext(_to_consumable_array(new Set(allDiagnostics)), formatHost));
+            logger.error(ts.formatDiagnosticsWithColorAndContext(_to_consumable_array(new Set(allDiagnostics)), formatHost));
             if (typeof noEmitOnError === "undefined" || noEmitOnError === true) {
               process.exit(1);
             }
@@ -182,14 +181,14 @@ export var compileByTs = function() {
     return _ref.apply(this, arguments);
   };
 }();
-var getFormatHost = function(ts2) {
+var getFormatHost = function(ts) {
   return {
     getCanonicalFileName: function(path2) {
       return path2;
     },
-    getCurrentDirectory: ts2.sys.getCurrentDirectory,
+    getCurrentDirectory: ts.sys.getCurrentDirectory,
     getNewLine: function() {
-      return ts2.sys.newLine;
+      return ts.sys.newLine;
     }
   };
 };

package/dist/esm-node/common/index.js

@@ -1,7 +1,5 @@
 import * as path from "path";
 import { fs } from "@modern-js/utils";
-import { compileByTs } from "../compilers/typescript";
-import { compileByBabel } from "../compilers/babel";
 export const FILE_EXTENSIONS = [
   ".js",
   ".ts",
@@ -24,8 +22,10 @@ export const compile = async (appDirectory, modernConfig, compileOptions) => {
   const compiler = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig_server = modernConfig.server) === null || _modernConfig_server === void 0 ? void 0 : _modernConfig_server.compiler;
   const isTsProject = tsconfigPath && await fs.pathExists(tsconfigPath);
   if (!isTsProject || compiler === "babel") {
+    const { compileByBabel } = await import("../compilers/babel");
     await compileByBabel(appDirectory, modernConfig, compileOptions);
   } else {
+    const { compileByTs } = await import("../compilers/typescript");
     await compileByTs(appDirectory, modernConfig, compileOptions);
   }
 };

package/dist/esm-node/compilers/typescript/index.js

@@ -1,10 +1,9 @@
 import path from "path";
 import { logger, getAliasConfig, fs } from "@modern-js/utils";
-import ts from "typescript";
 import { TypescriptLoader } from "./typescriptLoader";
 import { tsconfigPathsBeforeHookFactory } from "./tsconfigPathsPlugin";
-const readTsConfigByFile = (tsConfigFile) => {
-  const parsedCmd = ts.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, ts.sys);
+const readTsConfigByFile = (tsConfigFile, tsInstance) => {
+  const parsedCmd = tsInstance.getParsedCommandLineOfConfigFile(tsConfigFile, void 0, tsInstance.sys);
   const { options, fileNames, projectReferences } = parsedCmd;
   return {
     options,
@@ -29,25 +28,25 @@ export const compileByTs = async (appDirectory, config, compileOptions) => {
   if (!tsconfigPath) {
     return;
   }
-  const ts2 = new TypescriptLoader({
+  const ts = new TypescriptLoader({
     appDirectory
   }).load();
-  const createProgram = ts2.createIncrementalProgram || ts2.createProgram;
-  const formatHost = getFormatHost(ts2);
+  const createProgram = ts.createIncrementalProgram || ts.createProgram;
+  const formatHost = getFormatHost(ts);
   const { alias } = config;
   const aliasOption = getAliasConfig(alias, {
     appDirectory,
     tsconfigPath
   });
   const { paths = {}, absoluteBaseUrl = "./" } = aliasOption;
-  const { options, fileNames, projectReferences } = readTsConfigByFile(tsconfigPath);
+  const { options, fileNames, projectReferences } = readTsConfigByFile(tsconfigPath, ts);
   const sourcePosixPaths = sourceDirs.map((sourceDir) => sourceDir.split(path.sep).join(path.posix.sep));
   const rootNames = fileNames.filter((fileName) => {
     return fileName.endsWith(".d.ts") || sourcePosixPaths.some((sourceDir) => {
       return fileName.includes(sourceDir);
     });
   });
-  const program = createProgram.call(ts2, {
+  const program = createProgram.call(ts, {
     rootNames,
     projectReferences,
     options: {
@@ -56,16 +55,16 @@ export const compileByTs = async (appDirectory, config, compileOptions) => {
       ...options
     }
   });
-  const tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(ts2, absoluteBaseUrl, paths);
+  const tsconfigPathsPlugin = tsconfigPathsBeforeHookFactory(ts, absoluteBaseUrl, paths);
   const emitResult = program.emit(void 0, void 0, void 0, void 0, {
     before: [
       tsconfigPathsPlugin
     ]
   });
-  const allDiagnostics = ts2.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
+  const allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
   const { noEmitOnError } = options;
   if (allDiagnostics.length > 0) {
-    logger.error(ts2.formatDiagnosticsWithColorAndContext([
+    logger.error(ts.formatDiagnosticsWithColorAndContext([
       ...new Set(allDiagnostics)
     ], formatHost));
     if (typeof noEmitOnError === "undefined" || noEmitOnError === true) {
@@ -77,10 +76,10 @@ export const compileByTs = async (appDirectory, config, compileOptions) => {
   }
   logger.info(`Ts compile succeed`);
 };
-const getFormatHost = (ts2) => {
+const getFormatHost = (ts) => {
   return {
     getCanonicalFileName: (path2) => path2,
-    getCurrentDirectory: ts2.sys.getCurrentDirectory,
-    getNewLine: () => ts2.sys.newLine
+    getCurrentDirectory: ts.sys.getCurrentDirectory,
+    getNewLine: () => ts.sys.newLine
   };
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.25.2",
+  "version": "2.26.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -39,9 +39,9 @@
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "@swc/helpers": "0.5.1",
-    "@modern-js/babel-compiler": "2.25.2",
-    "@modern-js/utils": "2.25.2",
-    "@modern-js/babel-preset-base": "2.25.2"
+    "@modern-js/babel-compiler": "2.26.0",
+    "@modern-js/babel-preset-base": "2.26.0",
+    "@modern-js/utils": "2.26.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
@@ -50,9 +50,9 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/server-core": "2.25.2",
-    "@scripts/build": "2.25.2",
-    "@scripts/jest-config": "2.25.2"
+    "@modern-js/server-core": "2.26.0",
+    "@scripts/build": "2.26.0",
+    "@scripts/jest-config": "2.26.0"
   },
   "sideEffects": false,
   "publishConfig": {