@modern-js/server 1.15.1-beta.1 → 1.15.1-beta.2

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

@@ -7,16 +7,33 @@ 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'];
+
+const checkDep = (depName, paths) => {
+  let packagePath = '';
+
+  try {
+    packagePath = require.resolve('ts-node', {
+      paths
+    });
+  } catch (error) {}
+
+  return Boolean(packagePath);
+};
+
 export const enableRegister = (projectRoot, config // eslint-disable-next-line consistent-return
 ) => {
+  const registerDirs = ['./api', './server', './config/mock', './shared'];
   const TS_CONFIG_FILENAME = `tsconfig.json`;
   const tsconfigPath = path.resolve(projectRoot, TS_CONFIG_FILENAME);
   const isTsProject = fs.existsSync(tsconfigPath);
+  const existTsNode = checkDep('ts-node', [projectRoot]);
+  const existTsConfigPaths = checkDep('tsconfig-paths', [projectRoot]);
+
+  if (isTsProject && existTsNode && existTsConfigPaths) {
+    const tsNode = require('ts-node');
+
+    const tsConfigPaths = require('tsconfig-paths');
 
-  if (isTsProject) {
     const {
       alias
     } = config.source;

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

@@ -11,14 +11,6 @@ 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; }
@@ -27,17 +19,35 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-const registerDirs = ['./api', './server', './config/mock', './shared'];
+const checkDep = (depName, paths) => {
+  let packagePath = '';
+
+  try {
+    packagePath = require.resolve('ts-node', {
+      paths
+    });
+  } catch (error) {}
+
+  return Boolean(packagePath);
+};
 
 const enableRegister = (projectRoot, config // eslint-disable-next-line consistent-return
 ) => {
+  const registerDirs = ['./api', './server', './config/mock', './shared'];
   const TS_CONFIG_FILENAME = `tsconfig.json`;
 
   const tsconfigPath = _path.default.resolve(projectRoot, TS_CONFIG_FILENAME);
 
   const isTsProject = _utils.fs.existsSync(tsconfigPath);
 
-  if (isTsProject) {
+  const existTsNode = checkDep('ts-node', [projectRoot]);
+  const existTsConfigPaths = checkDep('tsconfig-paths', [projectRoot]);
+
+  if (isTsProject && existTsNode && existTsConfigPaths) {
+    const tsNode = require('ts-node');
+
+    const tsConfigPaths = require('tsconfig-paths');
+
     const {
       alias
     } = config.source;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.15.1-beta.1",
+  "version": "1.15.1-beta.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",