@modern-js/server 1.1.1-canary.1 → 1.1.2-beta.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @modern-js/server
 
+## 1.1.1
+
+### Patch Changes
+
+- c0fc0700: feat: support deploy plugin
+- Updated dependencies [687c92c7]
+- Updated dependencies [c0fc0700]
+  - @modern-js/core@1.1.1
+  - @modern-js/utils@1.1.1
+
 ## 1.1.0
 
 ### Minor Changes

package/dist/js/modern/server/index.js

@@ -1,12 +1,12 @@
 import { createServer } from 'http';
 import { createServer as createHttpsServer } from 'https';
 import { serverManager } from '@modern-js/server-plugin';
-import { compatRequire, logger as defaultLogger } from '@modern-js/utils';
+import { logger as defaultLogger } from '@modern-js/utils';
 import { ModernServer } from "./modern-server";
 import { measure as defaultMeasure } from "../libs/measure";
 export class Server {
   constructor(options) {
-    var _options$plugins, _options$config, _options$config$outpu;
+    var _options$plugins;
 
     this.options = void 0;
     this.server = void 0;
@@ -16,10 +16,6 @@ export class Server {
     (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
       serverManager.usePlugin(p);
     });
-
-    if (((_options$config = options.config) === null || _options$config === void 0 ? void 0 : (_options$config$outpu = _options$config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.polyfill) === 'ua') {
-      serverManager.usePlugin(compatRequire('@modern-js/plugin-polyfill'));
-    }
   }
 
   getRequestHandler() {

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

@@ -225,7 +225,9 @@ export class ModernServer {
       const mode = fs.existsSync(path.join(apiDir, AGGRED_DIR.lambda)) ? ApiServerMode.frame : ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
 
       const apiExtension = mergeExtension(pluginAPIExt, mode === ApiServerMode.frame ? [] : userAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, _objectSpread(_objectSpread({}, apiExtension), {}, {
+        modernJsConfig: this.conf
+      }));
     }
   }
   /* —————————————————————— function will be overwrite —————————————————————— */

package/dist/js/node/server/index.js

@@ -19,7 +19,7 @@ var _measure = require("../libs/measure");
 
 class Server {
   constructor(options) {
-    var _options$plugins, _options$config, _options$config$outpu;
+    var _options$plugins;
 
     this.options = void 0;
     this.server = void 0;
@@ -29,10 +29,6 @@ class Server {
     (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
       _serverPlugin.serverManager.usePlugin(p);
     });
-
-    if (((_options$config = options.config) === null || _options$config === void 0 ? void 0 : (_options$config$outpu = _options$config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.polyfill) === 'ua') {
-      _serverPlugin.serverManager.usePlugin((0, _utils.compatRequire)('@modern-js/plugin-polyfill'));
-    }
   }
 
   getRequestHandler() {

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

@@ -258,7 +258,9 @@ class ModernServer {
       const mode = _utils.fs.existsSync(_path.default.join(apiDir, _constants.AGGRED_DIR.lambda)) ? _constants.ApiServerMode.frame : _constants.ApiServerMode.func; // if use lambda/, mean framework style of writing, then discard user extension
 
       const apiExtension = (0, _utils2.mergeExtension)(pluginAPIExt, mode === _constants.ApiServerMode.frame ? [] : userAPIExt);
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, _objectSpread(_objectSpread({}, apiExtension), {}, {
+        modernJsConfig: this.conf
+      }));
     }
   }
   /* —————————————————————— function will be overwrite —————————————————————— */

package/dist/types/server/api-server.d.ts

@@ -1,3 +1,4 @@
+import { APIServerStartInput } from '@modern-js/server-plugin';
 import { ModernDevServer } from './dev-server';
 import { ModernServer } from './modern-server';
 import { mergeExtension } from "../utils.d";
@@ -5,13 +6,13 @@ import { ModernRouteInterface } from "../libs/route";
 import { ApiServerMode } from "../constants.d";
 export declare class APIModernServer extends ModernServer {
   protected prepareWebHandler(_: ReturnType<typeof mergeExtension>): any;
-  protected prepareAPIHandler(mode: ApiServerMode, extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
+  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected preServerInit(): Promise<void>;
 }
 export declare class APIModernDevServer extends ModernDevServer {
   protected prepareWebHandler(_: ReturnType<typeof mergeExtension>): any;
-  protected prepareAPIHandler(mode: ApiServerMode, extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
+  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected preServerInit(): Promise<void>;
 }

package/dist/types/server/modern-server.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse, Server } from 'http';
-import { Adapter } from '@modern-js/server-plugin';
+import { Adapter, APIServerStartInput } from '@modern-js/server-plugin';
 import type { NormalizedConfig } from '@modern-js/core';
 import { ModernServerOptions, NextFunction, ServerHookRunner, Measure, Logger, ReadyOptions } from '../type';
 import { RouteMatchManager, ModernRouteInterface } from '../libs/route';
@@ -48,7 +48,7 @@ export declare class ModernServer {
   protected render404(context: ModernServerContext): void;
   protected prepareFrameHandler(): Promise<void>;
   protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<Adapter>;
-  protected prepareAPIHandler(mode: ApiServerMode, extension: ReturnType<typeof mergeExtension>): Promise<Adapter>;
+  protected prepareAPIHandler(mode: ApiServerMode, extension: APIServerStartInput['config']): Promise<Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
   protected preServerInit(): Promise<void>;
   private routeHandler;

package/dist/types/server/web-server.d.ts

@@ -1,15 +1,16 @@
+import type { APIServerStartInput } from '@modern-js/server-plugin';
 import { ModernDevServer } from './dev-server';
 import { ModernServer } from './modern-server';
 import { mergeExtension } from "../utils.d";
 import { ModernRouteInterface } from "../libs/route";
 import { ApiServerMode } from "../constants.d";
 export declare class WebModernServer extends ModernServer {
-  protected prepareAPIHandler(_m: ApiServerMode, _: ReturnType<typeof mergeExtension>): any;
+  protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
   protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
 }
 export declare class WebModernDevServer extends ModernDevServer {
-  protected prepareAPIHandler(_m: ApiServerMode, _: ReturnType<typeof mergeExtension>): any;
+  protected prepareAPIHandler(_m: ApiServerMode, _: APIServerStartInput['config']): any;
   protected prepareWebHandler(extension: ReturnType<typeof mergeExtension>): Promise<import("@modern-js/server-plugin").Adapter>;
   protected filterRoutes(routes: ModernRouteInterface[]): ModernRouteInterface[];
 }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.1-canary.1",
+  "version": "1.1.2-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -41,13 +41,12 @@
     "@babel/preset-typescript": "^7.15.0",
     "@babel/register": "^7.15.3",
     "@babel/runtime": "^7",
-    "@modern-js/core": "^1.1.0",
-    "@modern-js/hmr-client": "^1.1.0",
-    "@modern-js/plugin-polyfill": "^1.1.0",
-    "@modern-js/server-plugin": "^1.1.0",
-    "@modern-js/server-utils": "^1.1.0",
-    "@modern-js/bff-utils": "^1.1.0",
-    "@modern-js/utils": "^1.1.0",
+    "@modern-js/core": "workspace:^1.1.1",
+    "@modern-js/hmr-client": "workspace:^1.1.0",
+    "@modern-js/server-plugin": "workspace:^1.1.0",
+    "@modern-js/server-utils": "workspace:^1.1.0",
+    "@modern-js/bff-utils": "workspace:^1.1.0",
+    "@modern-js/utils": "workspace:^1.1.1",
     "axios": "^0.21.4",
     "babel-plugin-module-resolver": "^4.1.0",
     "chokidar": "^3.5.2",
@@ -72,7 +71,7 @@
   "devDependencies": {
     "@modern-js/module-tools": "^1.1.0",
     "@modern-js/plugin-testing": "^1.1.0",
-    "@modern-js/types": "^1.1.0",
+    "@modern-js/types": "workspace:^1.1.1",
     "@types/jest": "^26",
     "@types/lru-cache": "^5.1.1",
     "@types/mime-types": "^2.1.0",

package/src/server/api-server.ts

@@ -1,3 +1,4 @@
+import { APIServerStartInput } from '@modern-js/server-plugin';
 import { ModernDevServer } from './dev-server';
 import { ModernServer } from './modern-server';
 import { mergeExtension } from '@/utils';
@@ -11,7 +12,7 @@ export class APIModernServer extends ModernServer {
 
   protected async prepareAPIHandler(
     mode: ApiServerMode,
-    extension: ReturnType<typeof mergeExtension>,
+    extension: APIServerStartInput['config'],
   ) {
     return super.prepareAPIHandler(mode, extension);
   }
@@ -32,7 +33,7 @@ export class APIModernDevServer extends ModernDevServer {
 
   protected async prepareAPIHandler(
     mode: ApiServerMode,
-    extension: ReturnType<typeof mergeExtension>,
+    extension: APIServerStartInput['config'],
   ) {
     return super.prepareAPIHandler(mode, extension);
   }

package/src/server/index.ts

@@ -6,7 +6,7 @@ import {
 } from 'http';
 import { createServer as createHttpsServer } from 'https';
 import { serverManager } from '@modern-js/server-plugin';
-import { compatRequire, logger as defaultLogger } from '@modern-js/utils';
+import { logger as defaultLogger } from '@modern-js/utils';
 import { ModernServerOptions, ServerHookRunner, ReadyOptions } from '../type';
 import { ModernServer } from './modern-server';
 import type { ModernDevServer } from './dev-server';
@@ -26,10 +26,6 @@ export class Server {
     options.plugins?.forEach(p => {
       serverManager.usePlugin(p);
     });
-
-    if (options.config?.output?.polyfill === 'ua') {
-      serverManager.usePlugin(compatRequire('@modern-js/plugin-polyfill'));
-    }
   }
 
   public getRequestHandler() {

package/src/server/modern-server.ts

@@ -3,7 +3,7 @@ import { IncomingMessage, ServerResponse, Server } from 'http';
 import util from 'util';
 import path from 'path';
 import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
-import { Adapter } from '@modern-js/server-plugin';
+import { Adapter, APIServerStartInput } from '@modern-js/server-plugin';
 import { gather, createMiddlewareCollecter } from '@modern-js/server-utils';
 import type { NormalizedConfig } from '@modern-js/core';
 import mime from 'mime-types';
@@ -263,7 +263,10 @@ export class ModernServer {
         pluginAPIExt,
         mode === ApiServerMode.frame ? [] : userAPIExt,
       );
-      this.frameAPIHandler = await this.prepareAPIHandler(mode, apiExtension);
+      this.frameAPIHandler = await this.prepareAPIHandler(mode, {
+        ...apiExtension,
+        modernJsConfig: this.conf,
+      });
     }
   }
 
@@ -284,7 +287,7 @@ export class ModernServer {
 
   protected async prepareAPIHandler(
     mode: ApiServerMode,
-    extension: ReturnType<typeof mergeExtension>,
+    extension: APIServerStartInput['config'],
   ) {
     const { workDir, runner, conf } = this;
     const { bff } = conf as ConfWithBFF;

package/src/server/web-server.ts

@@ -1,3 +1,4 @@
+import type { APIServerStartInput } from '@modern-js/server-plugin';
 import { ModernDevServer } from './dev-server';
 import { ModernServer } from './modern-server';
 import { mergeExtension } from '@/utils';
@@ -7,7 +8,7 @@ import { ApiServerMode } from '@/constants';
 export class WebModernServer extends ModernServer {
   protected prepareAPIHandler(
     _m: ApiServerMode,
-    _: ReturnType<typeof mergeExtension>,
+    _: APIServerStartInput['config'],
   ) {
     return null as any;
   }
@@ -26,7 +27,7 @@ export class WebModernServer extends ModernServer {
 export class WebModernDevServer extends ModernDevServer {
   protected prepareAPIHandler(
     _m: ApiServerMode,
-    _: ReturnType<typeof mergeExtension>,
+    _: APIServerStartInput['config'],
   ) {
     return null as any;
   }