@modern-js/server-utils 1.15.1-beta.2 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,59 @@
 # @modern-js/server-utils
 
+## 1.18.0
+
+### Patch Changes
+
+- 2b7406d: feat: use typescript instead of babel as typescript compiler in server
+  feat: 服务端，增加 typescript 作为 typescipt 编译器
+- 0a4d622: fix: compile ts with dynamic import should replace to correct alias name
+  fix: 编译 ts 时，动态导入的路径应该替换为正确的别名
+- 60a2e3a: feat: add compiler option for server
+  feat: 为 server 添加编译选项
+- Updated dependencies [8280920]
+- Updated dependencies [5227370]
+- Updated dependencies [7928bae]
+  - @modern-js/utils@1.18.0
+  - @modern-js/babel-preset-lib@1.18.0
+  - @modern-js/babel-compiler@1.18.0
+  - @modern-js/plugin@1.18.0
+
+## 1.17.0
+
+### Patch Changes
+
+- Updated dependencies [1b9176f]
+- Updated dependencies [77d3a38]
+- Updated dependencies [151329d]
+- Updated dependencies [5af9472]
+- Updated dependencies [6b6a534]
+- Updated dependencies [6b43a2b]
+- Updated dependencies [a7be124]
+- Updated dependencies [31547b4]
+  - @modern-js/utils@1.17.0
+  - @modern-js/babel-preset-lib@1.17.0
+  - @modern-js/plugin@1.17.0
+
+## 1.16.0
+
+### Minor Changes
+
+- 1100dd58c: chore: support react 18
+
+  chore: 支持 React 18
+
+### Patch Changes
+
+- Updated dependencies [641592f52]
+- Updated dependencies [3904b30a5]
+- Updated dependencies [1100dd58c]
+- Updated dependencies [e04e6e76a]
+- Updated dependencies [81c66e4a4]
+- Updated dependencies [2c305b6f5]
+  - @modern-js/utils@1.16.0
+  - @modern-js/babel-preset-lib@1.16.0
+  - @modern-js/plugin@1.16.0
+
 ## 1.15.0
 
 ### Patch Changes

package/dist/js/modern/common/index.js

@@ -15,6 +15,8 @@ const validateAbsolutePaths = (filenames, messageFunc) => {
 };
 
 export const compile = async (appDirectory, modernConfig, compileOptions) => {
+  var _modernConfig$server;
+
   const {
     sourceDirs,
     distDir,
@@ -22,11 +24,12 @@ export const compile = async (appDirectory, modernConfig, compileOptions) => {
   } = compileOptions;
   validateAbsolutePaths(sourceDirs, dir => `source dir ${dir} is not an absolute path.`);
   validateAbsolutePath(distDir, `dist dir ${distDir} is not an absolute path.`);
+  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) {
-    await compileByTs(appDirectory, modernConfig, compileOptions);
-  } else {
+  if (!isTsProject || compiler === 'babel') {
     await compileByBabel(appDirectory, modernConfig, compileOptions);
+  } else {
+    await compileByTs(appDirectory, modernConfig, compileOptions);
   }
 };

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

@@ -67,8 +67,9 @@ export const compileByTs = async (appDirectory, modernConfig, compileOptions) =>
     fileNames,
     projectReferences
   } = readTsConfigByFile(tsconfigPath);
+  const sourcePosixPaths = sourceDirs.map(sourceDir => sourceDir.split(path.sep).join(path.posix.sep));
   const rootNames = fileNames.filter(fileName => {
-    return fileName.endsWith('.d.ts') || sourceDirs.some(sourceDir => {
+    return fileName.endsWith('.d.ts') || sourcePosixPaths.some(sourceDir => {
       return fileName.includes(sourceDir);
     });
   });

package/dist/js/modern/compilers/typescript/tsconfig-paths-plugin.js

@@ -1,5 +1,6 @@
 import * as os from 'os';
 import path, { dirname, posix } from 'path';
+import * as ts from 'typescript';
 import { createMatchPath } from 'tsconfig-paths';
 
 const isRegExpKey = str => {
@@ -51,6 +52,10 @@ const createAliasMatcher = (baseUrl, alias) => {
   };
 };
 
+const isDynamicImport = (tsBinary, node) => {
+  return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
+};
+
 export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   const tsPaths = {};
   const alias = {};
@@ -81,6 +86,18 @@ export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   return ctx => {
     return sf => {
       const visitNode = node => {
+        if (isDynamicImport(tsBinary, node)) {
+          const importPathWithQuotes = node.arguments[0].getText(sf);
+          const text = importPathWithQuotes.slice(1, importPathWithQuotes.length - 1);
+          const result = getNotAliasedPath(sf, matchPath, text);
+
+          if (!result) {
+            return node;
+          }
+
+          return tsBinary.factory.updateCallExpression(node, node.expression, node.typeArguments, tsBinary.factory.createNodeArray([tsBinary.factory.createStringLiteral(result)]));
+        }
+
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
             var _node$moduleSpecifier;

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

@@ -31,6 +31,8 @@ const validateAbsolutePaths = (filenames, messageFunc) => {
 };
 
 const compile = async (appDirectory, modernConfig, compileOptions) => {
+  var _modernConfig$server;
+
   const {
     sourceDirs,
     distDir,
@@ -38,12 +40,13 @@ const compile = async (appDirectory, modernConfig, compileOptions) => {
   } = compileOptions;
   validateAbsolutePaths(sourceDirs, dir => `source dir ${dir} is not an absolute path.`);
   validateAbsolutePath(distDir, `dist dir ${distDir} is not an absolute path.`);
+  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) {
-    await (0, _typescript.compileByTs)(appDirectory, modernConfig, compileOptions);
-  } else {
+  if (!isTsProject || compiler === 'babel') {
     await (0, _babel.compileByBabel)(appDirectory, modernConfig, compileOptions);
+  } else {
+    await (0, _typescript.compileByTs)(appDirectory, modernConfig, compileOptions);
   }
 };
 

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

@@ -84,8 +84,9 @@ const compileByTs = async (appDirectory, modernConfig, compileOptions) => {
     fileNames,
     projectReferences
   } = readTsConfigByFile(tsconfigPath);
+  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') || sourceDirs.some(sourceDir => {
+    return fileName.endsWith('.d.ts') || sourcePosixPaths.some(sourceDir => {
       return fileName.includes(sourceDir);
     });
   });

package/dist/js/node/compilers/typescript/tsconfig-paths-plugin.js

@@ -9,6 +9,8 @@ var os = _interopRequireWildcard(require("os"));
 
 var _path = _interopRequireWildcard(require("path"));
 
+var ts = _interopRequireWildcard(require("typescript"));
+
 var _tsconfigPaths = require("tsconfig-paths");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -64,6 +66,10 @@ const createAliasMatcher = (baseUrl, alias) => {
   };
 };
 
+const isDynamicImport = (tsBinary, node) => {
+  return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
+};
+
 function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   const tsPaths = {};
   const alias = {};
@@ -94,6 +100,18 @@ function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   return ctx => {
     return sf => {
       const visitNode = node => {
+        if (isDynamicImport(tsBinary, node)) {
+          const importPathWithQuotes = node.arguments[0].getText(sf);
+          const text = importPathWithQuotes.slice(1, importPathWithQuotes.length - 1);
+          const result = getNotAliasedPath(sf, matchPath, text);
+
+          if (!result) {
+            return node;
+          }
+
+          return tsBinary.factory.updateCallExpression(node, node.expression, node.typeArguments, tsBinary.factory.createNodeArray([tsBinary.factory.createStringLiteral(result)]));
+        }
+
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
             var _node$moduleSpecifier;

package/dist/js/treeshaking/common/index.js

@@ -20,7 +20,9 @@ var validateAbsolutePaths = function validateAbsolutePaths(filenames, messageFun
 
 export var compile = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(appDirectory, modernConfig, compileOptions) {
-    var sourceDirs, distDir, tsconfigPath, isTsProject;
+    var _modernConfig$server;
+
+    var sourceDirs, distDir, tsconfigPath, compiler, isTsProject;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -30,39 +32,40 @@ export var compile = /*#__PURE__*/function () {
               return "source dir ".concat(dir, " is not an absolute path.");
             });
             validateAbsolutePath(distDir, "dist dir ".concat(distDir, " is not an absolute path."));
+            compiler = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$server = modernConfig.server) === null || _modernConfig$server === void 0 ? void 0 : _modernConfig$server.compiler;
             _context.t0 = tsconfigPath;
 
             if (!_context.t0) {
-              _context.next = 8;
+              _context.next = 9;
               break;
             }
 
-            _context.next = 7;
+            _context.next = 8;
             return fs.pathExists(tsconfigPath);
 
-          case 7:
+          case 8:
             _context.t0 = _context.sent;
 
-          case 8:
+          case 9:
             isTsProject = _context.t0;
 
-            if (!isTsProject) {
-              _context.next = 14;
+            if (!(!isTsProject || compiler === 'babel')) {
+              _context.next = 15;
               break;
             }
 
-            _context.next = 12;
-            return compileByTs(appDirectory, modernConfig, compileOptions);
+            _context.next = 13;
+            return compileByBabel(appDirectory, modernConfig, compileOptions);
 
-          case 12:
-            _context.next = 16;
+          case 13:
+            _context.next = 17;
             break;
 
-          case 14:
-            _context.next = 16;
-            return compileByBabel(appDirectory, modernConfig, compileOptions);
+          case 15:
+            _context.next = 17;
+            return compileByTs(appDirectory, modernConfig, compileOptions);
 
-          case 16:
+          case 17:
           case "end":
             return _context.stop();
         }

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

@@ -61,7 +61,7 @@ var copyFiles = /*#__PURE__*/function () {
 
 export var compileByTs = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appDirectory, modernConfig, compileOptions) {
-    var sourceDirs, distDir, tsconfigPath, ts, createProgram, formatHost, alias, aliasOption, _aliasOption$paths, paths, _aliasOption$absolute, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, _iterator, _step, source;
+    var sourceDirs, distDir, tsconfigPath, ts, createProgram, formatHost, alias, aliasOption, _aliasOption$paths, paths, _aliasOption$absolute, absoluteBaseUrl, _readTsConfigByFile, options, fileNames, projectReferences, sourcePosixPaths, rootNames, program, tsconfigPathsPlugin, emitResult, allDiagnostics, _iterator, _step, source;
 
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
@@ -90,8 +90,11 @@ export var compileByTs = /*#__PURE__*/function () {
             });
             _aliasOption$paths = aliasOption.paths, paths = _aliasOption$paths === void 0 ? {} : _aliasOption$paths, _aliasOption$absolute = aliasOption.absoluteBaseUrl, absoluteBaseUrl = _aliasOption$absolute === void 0 ? './' : _aliasOption$absolute;
             _readTsConfigByFile = readTsConfigByFile(tsconfigPath), options = _readTsConfigByFile.options, fileNames = _readTsConfigByFile.fileNames, projectReferences = _readTsConfigByFile.projectReferences;
+            sourcePosixPaths = sourceDirs.map(function (sourceDir) {
+              return sourceDir.split(path.sep).join(path.posix.sep);
+            });
             rootNames = fileNames.filter(function (fileName) {
-              return fileName.endsWith('.d.ts') || sourceDirs.some(function (sourceDir) {
+              return fileName.endsWith('.d.ts') || sourcePosixPaths.some(function (sourceDir) {
                 return fileName.includes(sourceDir);
               });
             });
@@ -116,47 +119,47 @@ export var compileByTs = /*#__PURE__*/function () {
             }
 
             _iterator = _createForOfIteratorHelper(sourceDirs);
-            _context2.prev = 18;
+            _context2.prev = 19;
 
             _iterator.s();
 
-          case 20:
+          case 21:
             if ((_step = _iterator.n()).done) {
-              _context2.next = 26;
+              _context2.next = 27;
               break;
             }
 
             source = _step.value;
-            _context2.next = 24;
+            _context2.next = 25;
             return copyFiles(source, distDir, tsconfigPath);
 
-          case 24:
-            _context2.next = 20;
+          case 25:
+            _context2.next = 21;
             break;
 
-          case 26:
-            _context2.next = 31;
+          case 27:
+            _context2.next = 32;
             break;
 
-          case 28:
-            _context2.prev = 28;
-            _context2.t0 = _context2["catch"](18);
+          case 29:
+            _context2.prev = 29;
+            _context2.t0 = _context2["catch"](19);
 
             _iterator.e(_context2.t0);
 
-          case 31:
-            _context2.prev = 31;
+          case 32:
+            _context2.prev = 32;
 
             _iterator.f();
 
-            return _context2.finish(31);
+            return _context2.finish(32);
 
-          case 34:
+          case 35:
           case "end":
             return _context2.stop();
         }
       }
-    }, _callee2, null, [[18, 28, 31, 34]]);
+    }, _callee2, null, [[19, 29, 32, 35]]);
   }));
 
   return function compileByTs(_x4, _x5, _x6) {

package/dist/js/treeshaking/compilers/typescript/tsconfig-paths-plugin.js

@@ -3,6 +3,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import * as os from 'os';
 import path, { dirname, posix } from 'path';
+import * as ts from 'typescript';
 import { createMatchPath } from 'tsconfig-paths';
 
 var isRegExpKey = function isRegExpKey(str) {
@@ -68,6 +69,10 @@ var createAliasMatcher = function createAliasMatcher(baseUrl, alias) {
   };
 };
 
+var isDynamicImport = function isDynamicImport(tsBinary, node) {
+  return tsBinary.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword;
+};
+
 export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   var tsPaths = {};
   var alias = {};
@@ -98,24 +103,37 @@ export function tsconfigPathsBeforeHookFactory(tsBinary, baseUrl, paths) {
   return function (ctx) {
     return function (sf) {
       var visitNode = function visitNode(node) {
+        if (isDynamicImport(tsBinary, node)) {
+          var importPathWithQuotes = node.arguments[0].getText(sf);
+          var text = importPathWithQuotes.slice(1, importPathWithQuotes.length - 1);
+          var result = getNotAliasedPath(sf, matchPath, text);
+
+          if (!result) {
+            return node;
+          }
+
+          return tsBinary.factory.updateCallExpression(node, node.expression, node.typeArguments, tsBinary.factory.createNodeArray([tsBinary.factory.createStringLiteral(result)]));
+        }
+
         if (tsBinary.isImportDeclaration(node) || tsBinary.isExportDeclaration(node) && node.moduleSpecifier) {
           try {
             var _node$moduleSpecifier;
 
-            var importPathWithQuotes = node === null || node === void 0 ? void 0 : (_node$moduleSpecifier = node.moduleSpecifier) === null || _node$moduleSpecifier === void 0 ? void 0 : _node$moduleSpecifier.getText();
+            var _importPathWithQuotes = node === null || node === void 0 ? void 0 : (_node$moduleSpecifier = node.moduleSpecifier) === null || _node$moduleSpecifier === void 0 ? void 0 : _node$moduleSpecifier.getText();
 
-            if (!importPathWithQuotes) {
+            if (!_importPathWithQuotes) {
               return node;
             }
 
-            var text = importPathWithQuotes.substring(1, importPathWithQuotes.length - 1);
-            var result = getNotAliasedPath(sf, matchPath, text);
+            var _text = _importPathWithQuotes.substring(1, _importPathWithQuotes.length - 1);
+
+            var _result = getNotAliasedPath(sf, matchPath, _text);
 
-            if (!result) {
+            if (!_result) {
               return node;
             }
 
-            var moduleSpecifier = tsBinary.factory.createStringLiteral(result);
+            var moduleSpecifier = tsBinary.factory.createStringLiteral(_result);
             moduleSpecifier.parent = node.moduleSpecifier.parent;
 
             if (tsBinary.isImportDeclaration(node)) {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.15.1-beta.2",
+  "version": "1.18.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -35,23 +35,21 @@
     "@babel/preset-env": "^7.18.0",
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.18.0",
-    "@modern-js/babel-compiler": "^1.15.0",
-    "@modern-js/babel-preset-lib": "1.15.0",
-    "@modern-js/plugin": "1.15.0",
-    "@modern-js/utils": "1.15.0",
+    "@modern-js/babel-compiler": "^1.18.0",
+    "@modern-js/babel-preset-lib": "1.18.0",
+    "@modern-js/plugin": "1.18.0",
+    "@modern-js/utils": "1.18.0",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "tsconfig-paths": "3.14.1"
   },
   "devDependencies": {
-    "@modern-js/core": "1.15.0",
-    "@scripts/build": "1.15.0",
-    "@scripts/jest-config": "1.15.0",
+    "@modern-js/core": "1.18.0",
+    "@scripts/build": "1.18.0",
+    "@scripts/jest-config": "1.18.0",
     "@types/babel__core": "^7.1.15",
     "@types/jest": "^27",
     "@types/node": "^14",
-    "@types/react": "^17",
-    "@types/react-dom": "^17",
     "jest": "^27",
     "ts-jest": "^27.0.4",
     "typescript": "^4"
@@ -59,8 +57,7 @@
   "sideEffects": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public",
-    "types": "./dist/types/index.d.ts"
+    "access": "public"
   },
   "wireit": {
     "build": {