@modern-js/server 1.17.0 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @modern-js/server
 
+## 1.18.0
+
+### Patch Changes
+
+- 3d5e3a5: chore: get api mode from bff core
+  chore: 从 bff core 中获取 api mode
+- 8280920: chore(server): export DevServerOptions type
+
+  chore(server): 导出 DevServerOptions 类型
+
+- 2b7406d: feat: use typescript instead of babel as typescript compiler in server
+  feat: 服务端，增加 typescript 作为 typescipt 编译器
+- fc7214d: feat(server): export DevServerHttpsOptions type
+
+  feat(server): 导出 DevServerHttpsOptions 类型
+
+- Updated dependencies [8280920]
+- Updated dependencies [3d5e3a5]
+- Updated dependencies [2b7406d]
+- Updated dependencies [0a4d622]
+- Updated dependencies [60a2e3a]
+- Updated dependencies [5227370]
+- Updated dependencies [7928bae]
+  - @modern-js/utils@1.18.0
+  - @modern-js/prod-server@1.18.0
+  - @modern-js/server-utils@1.18.0
+
 ## 1.17.0
 
 ### Patch Changes

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

@@ -1,6 +1,6 @@
 import * as devcert from 'devcert';
 export const genHttpsOptions = async userOptions => {
-  const httpsOptions = userOptions === true ? {} : userOptions;
+  const httpsOptions = typeof userOptions === 'boolean' ? {} : userOptions;
 
   if (!httpsOptions.key || !httpsOptions.cert) {
     const selfsign = await devcert.certificateFor(['localhost']);

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

@@ -0,0 +1,99 @@
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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; }
+
+import path from 'path';
+import { resolveBabelConfig } from '@modern-js/server-utils';
+import { fs, getAlias, createDebugger } from '@modern-js/utils';
+const debug = createDebugger('server');
+
+const checkDep = (depName, paths) => {
+  let packagePath = '';
+
+  try {
+    packagePath = require.resolve(depName, {
+      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) {
+    debug('use ts-node');
+
+    const tsNode = require('ts-node');
+
+    const tsConfigPaths = require('tsconfig-paths');
+
+    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];
+
+      if (typeof tsPath === 'string' && path.isAbsolute(tsPath)) {
+        tsPath = path.relative(absoluteBaseUrl, tsPath);
+      }
+
+      if (typeof tsPath === 'string') {
+        tsPath = [tsPath];
+      }
+
+      return _objectSpread(_objectSpread({}, o), {}, {
+        [`${key}`]: tsPath
+      });
+    }, {});
+    tsConfigPaths.register({
+      baseUrl: absoluteBaseUrl || './',
+      paths: tsPaths
+    });
+    tsNode.register({
+      project: tsconfigPath,
+      // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
+      files: true,
+      transpileOnly: true
+    });
+  } else {
+    debug('use @babel/register');
+    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/modern/server/dev-server-split.js

@@ -1,7 +1,7 @@
 import { RUN_MODE } from '@modern-js/prod-server';
 import { ModernDevServer } from "./dev-server";
 export class ModernSSRDevServer extends ModernDevServer {
-  prepareAPIHandler(_m, _) {
+  prepareAPIHandler(_) {
     return null;
   }
 

package/dist/js/modern/server/dev-server.js

@@ -14,7 +14,7 @@ import { getDefaultDevOptions } from "../constants";
 import { createMockHandler } from "../dev-tools/mock";
 import SocketServer from "../dev-tools/socket-server";
 import DevServerPlugin from "../dev-tools/dev-server-plugin";
-import { enableRegister } from "../dev-tools/babel/register";
+import { enableRegister } from "../dev-tools/register";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 export class ModernDevServer extends ModernServer {
   constructor(options) {

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

@@ -12,7 +12,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; }
 
 const genHttpsOptions = async userOptions => {
-  const httpsOptions = userOptions === true ? {} : userOptions;
+  const httpsOptions = typeof userOptions === 'boolean' ? {} : userOptions;
 
   if (!httpsOptions.key || !httpsOptions.cert) {
     const selfsign = await devcert.certificateFor(['localhost']);

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

@@ -0,0 +1,116 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.enableRegister = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _serverUtils = require("@modern-js/server-utils");
+
+var _utils = require("@modern-js/utils");
+
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+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 debug = (0, _utils.createDebugger)('server');
+
+const checkDep = (depName, paths) => {
+  let packagePath = '';
+
+  try {
+    packagePath = require.resolve(depName, {
+      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);
+
+  const existTsNode = checkDep('ts-node', [projectRoot]);
+  const existTsConfigPaths = checkDep('tsconfig-paths', [projectRoot]);
+
+  if (isTsProject && existTsNode && existTsConfigPaths) {
+    debug('use ts-node');
+
+    const tsNode = require('ts-node');
+
+    const tsConfigPaths = require('tsconfig-paths');
+
+    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];
+
+      if (typeof tsPath === 'string' && _path.default.isAbsolute(tsPath)) {
+        tsPath = _path.default.relative(absoluteBaseUrl, tsPath);
+      }
+
+      if (typeof tsPath === 'string') {
+        tsPath = [tsPath];
+      }
+
+      return _objectSpread(_objectSpread({}, o), {}, {
+        [`${key}`]: tsPath
+      });
+    }, {});
+    tsConfigPaths.register({
+      baseUrl: absoluteBaseUrl || './',
+      paths: tsPaths
+    });
+    tsNode.register({
+      project: tsconfigPath,
+      // for env.d.ts, https://www.npmjs.com/package/ts-node#missing-types
+      files: true,
+      transpileOnly: true
+    });
+  } else {
+    debug('use @babel/register');
+    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/dist/js/node/server/dev-server-split.js

@@ -10,7 +10,7 @@ var _prodServer = require("@modern-js/prod-server");
 var _devServer = require("./dev-server");
 
 class ModernSSRDevServer extends _devServer.ModernDevServer {
-  prepareAPIHandler(_m, _) {
+  prepareAPIHandler(_) {
     return null;
   }
 

package/dist/js/node/server/dev-server.js

@@ -25,7 +25,7 @@ var _socketServer = _interopRequireDefault(require("../dev-tools/socket-server")
 
 var _devServerPlugin = _interopRequireDefault(require("../dev-tools/dev-server-plugin"));
 
-var _register = require("../dev-tools/babel/register");
+var _register = require("../dev-tools/register");
 
 var _watcher = _interopRequireWildcard(require("../dev-tools/watcher"));
 

package/dist/types/dev-tools/https/index.d.ts

@@ -1 +1,6 @@
-export declare const genHttpsOptions: (userOptions: any) => Promise<any>;
+import type Buffer from 'buffer';
+import type { DevServerHttpsOptions } from '../../types';
+export declare const genHttpsOptions: (userOptions: DevServerHttpsOptions) => Promise<{
+  key?: Buffer | string;
+  cert?: Buffer | string;
+}>;

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 import { DevServer as Server } from './server';
-import { ModernDevServerOptions } from './types';
+import type { DevServerOptions, DevServerHttpsOptions, ModernDevServerOptions } from './types';
 export { Server };
-export type { ModernDevServerOptions };
+export type { DevServerOptions, DevServerHttpsOptions, ModernDevServerOptions };
 
 declare const _default: (options: ModernDevServerOptions) => Promise<Server>;
 

package/dist/types/server/dev-server-split.d.ts

@@ -1,9 +1,9 @@
 import type { APIServerStartInput } from '@modern-js/server-core';
 import { ServerRoute as ModernRouteInterface } from '@modern-js/types';
-import { ApiServerMode, HookNames } from '@modern-js/prod-server';
+import { HookNames } from '@modern-js/prod-server';
 import { ModernDevServer } from './dev-server';
 export declare class ModernSSRDevServer extends ModernDevServer {
-  protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
+  protected prepareAPIHandler(_: APIServerStartInput['config']): any;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected setupBeforeProdMiddleware(): Promise<void>;
   protected emitRouteHook(_: HookNames, _input: any): Promise<void>;

package/dist/types/types.d.ts

@@ -1,5 +1,9 @@
 import type webpack from 'webpack';
 import type { ModernServerOptions } from '@modern-js/prod-server';
+export declare type DevServerHttpsOptions = boolean | {
+  key: string;
+  cert: string;
+};
 export declare type DevServerOptions = {
   client: {
     path?: string;
@@ -15,10 +19,7 @@ export declare type DevServerOptions = {
   watch: boolean;
   hot: boolean | string;
   liveReload: boolean;
-  https?: boolean | {
-    key: string;
-    cert: string;
-  };
+  https?: DevServerHttpsOptions;
   [propName: string]: any;
 };
 export declare type ExtraOptions = {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.17.0",
+  "version": "1.18.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,28 +30,34 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
-    "@modern-js/prod-server": "1.17.0",
-    "@modern-js/server-utils": "1.17.0",
-    "@modern-js/utils": "1.17.0",
+    "@modern-js/prod-server": "1.18.0",
+    "@modern-js/server-utils": "1.18.0",
+    "@modern-js/utils": "1.18.0",
     "devcert": "^1.2.2",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.17.0",
-    "@modern-js/server-core": "1.17.0",
-    "@modern-js/types": "1.17.0",
-    "@scripts/build": "1.17.0",
-    "@scripts/jest-config": "1.17.0",
+    "@modern-js/core": "1.18.0",
+    "@modern-js/server-core": "1.18.0",
+    "@modern-js/types": "1.18.0",
+    "@scripts/build": "1.18.0",
+    "@scripts/jest-config": "1.18.0",
     "@types/jest": "^27",
     "@types/minimatch": "^3.0.5",
     "@types/node": "^14",
     "@types/ws": "^7.4.7",
     "jest": "^27",
+    "ts-node": "^10.1.0",
+    "tsconfig-paths": "3.14.1",
     "typescript": "^4",
-    "websocket": "^1",
-    "webpack": "^5.71.0"
+    "webpack": "^5.71.0",
+    "websocket": "^1"
+  },
+  "peerDependencies": {
+    "ts-node": "^10.1.0",
+    "tsconfig-paths": "3.14.1"
   },
   "sideEffects": false,
   "modernConfig": {

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

@@ -1,33 +0,0 @@
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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; }
-
-import path from 'path';
-import { resolveBabelConfig } from '@modern-js/server-utils';
-const registerDirs = ['./api', './server', './config/mock', './shared'];
-export const enableRegister = (projectRoot, config) => {
-  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;
-      }
-
-      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

@@ -1,49 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.enableRegister = void 0;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _serverUtils = require("@modern-js/server-utils");
-
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-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 enableRegister = (projectRoot, config) => {
-  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;
-      }
-
-      return registerDirs.some(registerDir => filePath.startsWith(_path.default.join(projectRoot, registerDir)));
-    }],
-    extensions: ['.js', '.ts'],
-    babelrc: false,
-    configFile: false,
-    root: projectRoot
-  }));
-};
-
-exports.enableRegister = enableRegister;