@modern-js/server 1.15.0 → 1.15.1-beta.0

package/dist/js/modern/dev-tools/babel/register.js

@@ -6,28 +6,71 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import path from 'path';
 import { resolveBabelConfig } from '@modern-js/server-utils';
+import { fs, getAlias } from '@modern-js/utils';
+import * as tsNode from 'ts-node';
+import * as tsConfigPaths from 'tsconfig-paths';
 const registerDirs = ['./api', './server', './config/mock', './shared'];
-export const enableRegister = (projectRoot, config) => {
+export const enableRegister = (projectRoot, config // eslint-disable-next-line consistent-return
+) => {
   const TS_CONFIG_FILENAME = `tsconfig.json`;
   const tsconfigPath = path.resolve(projectRoot, TS_CONFIG_FILENAME);
-  const babelConfig = resolveBabelConfig(projectRoot, config, {
-    tsconfigPath,
-    syntax: 'es6+',
-    type: 'commonjs'
-  });
-  return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
-    only: [function (filePath) {
-      // TODO: wait params
-      // FIXME: 删除hardcode，根据 AppContext 中的 metaName 设置路径
-      if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
-        return true;
+  const isTsProject = fs.existsSync(tsconfigPath);
+
+  if (isTsProject) {
+    const {
+      alias
+    } = config.source;
+    const aliasOption = getAlias(alias || {}, {
+      appDirectory: projectRoot,
+      tsconfigPath
+    });
+    const {
+      paths = {},
+      absoluteBaseUrl = './'
+    } = aliasOption;
+    const tsPaths = Object.keys(paths).reduce((o, key) => {
+      let tsPath = paths[key]; // 要不要把对 modern 的判断去掉
+
+      if (typeof tsPath === 'string' && path.isAbsolute(tsPath)) {
+        tsPath = path.relative(absoluteBaseUrl, tsPath);
       }
 
-      return registerDirs.some(registerDir => filePath.startsWith(path.join(projectRoot, registerDir)));
-    }],
-    extensions: ['.js', '.ts'],
-    babelrc: false,
-    configFile: false,
-    root: projectRoot
-  }));
+      if (typeof tsPath === 'string') {
+        tsPath = [tsPath];
+      }
+
+      return _objectSpread(_objectSpread({}, o), {}, {
+        [`${key}`]: tsPath
+      });
+    }, {});
+    tsConfigPaths.register({
+      baseUrl: absoluteBaseUrl || './',
+      paths: tsPaths
+    });
+    tsNode.register({
+      project: tsconfigPath,
+      transpileOnly: true
+    });
+  } else {
+    const babelConfig = resolveBabelConfig(projectRoot, config, {
+      tsconfigPath,
+      syntax: 'es6+',
+      type: 'commonjs'
+    });
+    return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
+      only: [function (filePath) {
+        // TODO: wait params
+        // FIXME: 删除hardcode，根据 AppContext 中的 metaName 设置路径
+        if (filePath.includes(`node_modules${path.sep}.modern-js`)) {
+          return true;
+        }
+
+        return registerDirs.some(registerDir => filePath.startsWith(path.join(projectRoot, registerDir)));
+      }],
+      extensions: ['.js', '.ts'],
+      babelrc: false,
+      configFile: false,
+      root: projectRoot
+    }));
+  }
 };

package/dist/js/node/dev-tools/babel/register.js

@@ -9,6 +9,16 @@ var _path = _interopRequireDefault(require("path"));
 
 var _serverUtils = require("@modern-js/server-utils");
 
+var _utils = require("@modern-js/utils");
+
+var tsNode = _interopRequireWildcard(require("ts-node"));
+
+var tsConfigPaths = _interopRequireWildcard(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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -19,31 +29,71 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 const registerDirs = ['./api', './server', './config/mock', './shared'];
 
-const enableRegister = (projectRoot, config) => {
+const enableRegister = (projectRoot, config // eslint-disable-next-line consistent-return
+) => {
   const TS_CONFIG_FILENAME = `tsconfig.json`;
 
   const tsconfigPath = _path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
 
-  const babelConfig = (0, _serverUtils.resolveBabelConfig)(projectRoot, config, {
-    tsconfigPath,
-    syntax: 'es6+',
-    type: 'commonjs'
-  });
-  return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
-    only: [function (filePath) {
-      // TODO: wait params
-      // FIXME: 删除hardcode，根据 AppContext 中的 metaName 设置路径
-      if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {
-        return true;
+  const isTsProject = _utils.fs.existsSync(tsconfigPath);
+
+  if (isTsProject) {
+    const {
+      alias
+    } = config.source;
+    const aliasOption = (0, _utils.getAlias)(alias || {}, {
+      appDirectory: projectRoot,
+      tsconfigPath
+    });
+    const {
+      paths = {},
+      absoluteBaseUrl = './'
+    } = aliasOption;
+    const tsPaths = Object.keys(paths).reduce((o, key) => {
+      let tsPath = paths[key]; // 要不要把对 modern 的判断去掉
+
+      if (typeof tsPath === 'string' && _path.default.isAbsolute(tsPath)) {
+        tsPath = _path.default.relative(absoluteBaseUrl, tsPath);
       }
 
-      return registerDirs.some(registerDir => filePath.startsWith(_path.default.join(projectRoot, registerDir)));
-    }],
-    extensions: ['.js', '.ts'],
-    babelrc: false,
-    configFile: false,
-    root: projectRoot
-  }));
+      if (typeof tsPath === 'string') {
+        tsPath = [tsPath];
+      }
+
+      return _objectSpread(_objectSpread({}, o), {}, {
+        [`${key}`]: tsPath
+      });
+    }, {});
+    tsConfigPaths.register({
+      baseUrl: absoluteBaseUrl || './',
+      paths: tsPaths
+    });
+    tsNode.register({
+      project: tsconfigPath,
+      transpileOnly: true
+    });
+  } else {
+    const babelConfig = (0, _serverUtils.resolveBabelConfig)(projectRoot, config, {
+      tsconfigPath,
+      syntax: 'es6+',
+      type: 'commonjs'
+    });
+    return require('@babel/register')(_objectSpread(_objectSpread({}, babelConfig), {}, {
+      only: [function (filePath) {
+        // TODO: wait params
+        // FIXME: 删除hardcode，根据 AppContext 中的 metaName 设置路径
+        if (filePath.includes(`node_modules${_path.default.sep}.modern-js`)) {
+          return true;
+        }
+
+        return registerDirs.some(registerDir => filePath.startsWith(_path.default.join(projectRoot, registerDir)));
+      }],
+      extensions: ['.js', '.ts'],
+      babelrc: false,
+      configFile: false,
+      root: projectRoot
+    }));
+  }
 };
 
 exports.enableRegister = enableRegister;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.15.0",
+  "version": "1.15.1-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -32,11 +32,12 @@
     "@babel/register": "^7.17.7",
     "@modern-js/prod-server": "1.15.0",
     "@modern-js/server-utils": "1.15.0",
-    "@modern-js/webpack": "1.15.0",
     "@modern-js/utils": "1.15.0",
+    "@modern-js/webpack": "1.15.0",
     "devcert": "^1.2.2",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
+    "tsconfig-paths": "3.14.1",
     "ws": "^8.2.0"
   },
   "devDependencies": {
@@ -50,9 +51,13 @@
     "@types/node": "^14",
     "@types/ws": "^7.4.7",
     "jest": "^27",
+    "ts-node": "^10.1.0",
     "typescript": "^4",
-    "websocket": "^1",
-    "webpack": "^5.71.0"
+    "webpack": "^5.71.0",
+    "websocket": "^1"
+  },
+  "peerDependencies": {
+    "ts-node": "^10.1.0"
   },
   "sideEffects": false,
   "modernConfig": {
@@ -62,7 +67,8 @@
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "types": "./dist/types/index.d.ts"
   },
   "wireit": {
     "build": {