@modern-js/prod-server 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @modern-js/prod-server
 
+## 1.0.4
+
+### Patch Changes
+
+- d95f28c3: should enable babel register before server plugin require
+- d95f28c3: remove server hook when api only
+- 0923c182: fix static handler when static file not exist
+- 2008fdbd: convert two packages server part, support server load plugin itself
+- ca0bcf13: publish prod-server local
+- Updated dependencies [5bf5868d]
+- Updated dependencies [d95f28c3]
+- Updated dependencies [2e8dec93]
+- Updated dependencies [2008fdbd]
+- Updated dependencies [2e8dec93]
+  - @modern-js/utils@1.3.5
+  - @modern-js/server-core@1.2.3
+
 ## 1.0.2
 
 ### Patch Changes

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

@@ -5,9 +5,8 @@ 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; }
 
 import path from 'path';
-import { serverManager, AppContext, ConfigContext } from '@modern-js/server-core';
-import { compatRequire, logger as defaultLogger } from '@modern-js/utils';
-import { initAppContext } from '@modern-js/core';
+import { serverManager, AppContext, ConfigContext, loadPlugins } from '@modern-js/server-core';
+import { logger as defaultLogger, SHARED_DIR } from '@modern-js/utils';
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { createProdServer } from "./modern-server-split";
 export class Server {
@@ -25,13 +24,13 @@ export class Server {
   async init() {
     const {
       options
-    } = this; // initialize server runner
-
-    this.runner = await this.createHookRunner(); // initialize server
+    } = this; // initialize server
 
     this.server = this.serverImpl(options); // create http-server
 
-    this.app = await this.server.createHTTPServer(this.getRequestHandler()); // runner can only be used after server init
+    this.app = await this.server.createHTTPServer(this.getRequestHandler()); // initialize server runner
+
+    this.runner = await this.createHookRunner(); // runner can only be used after server init
 
     await this.server.onInit(this.runner);
     return this;
@@ -68,26 +67,47 @@ export class Server {
       options
     } = this;
     const {
-      pwd: appDirectory,
-      plugins = []
+      plugins = [],
+      pwd,
+      config
     } = options; // server app context for serve plugin
 
-    const serverPlugins = plugins.map(p => {
-      serverManager.usePlugin(compatRequire(p.pluginPath));
-      return {
-        server: p
-      };
+    const loadedPlugins = loadPlugins(plugins, pwd);
+    loadedPlugins.forEach(p => {
+      serverManager.usePlugin(p);
     });
-    const appContext = initAppContext(appDirectory, serverPlugins, '');
+    const appContext = this.initAppContext();
     serverManager.run(() => {
-      var _options$config$outpu;
+      var _config$output;
 
-      ConfigContext.set(this.options.config);
+      ConfigContext.set(config);
       AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-        distDirectory: path.join(options.pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist')
+        distDirectory: path.join(pwd, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist')
       }));
     });
     return serverManager.init({});
   }
 
+  initAppContext() {
+    var _config$output2;
+
+    const {
+      options
+    } = this;
+    const {
+      pwd: appDirectory,
+      plugins = [],
+      config
+    } = options;
+    const serverPlugins = plugins.map(p => ({
+      server: p
+    }));
+    return {
+      appDirectory,
+      distDirectory: path.join(appDirectory, ((_config$output2 = config.output) === null || _config$output2 === void 0 ? void 0 : _config$output2.path) || 'dist'),
+      sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
+      plugins: serverPlugins
+    };
+  }
+
 }

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

@@ -576,7 +576,7 @@ export class ModernServer {
     }
 
     const text = ERROR_PAGE_TEXT[status] || ERROR_PAGE_TEXT[500];
-    res.end(createErrorDocument(status, text));
+    context.res.end(createErrorDocument(status, text));
   }
 
 }

package/dist/js/modern/utils.js

@@ -88,7 +88,7 @@ export const getStaticReg = (output = {}) => {
   } = output;
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter(v => Boolean(v));
-  const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''}|${staticFiles.join('|')})`);
+  const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''}${staticFiles.length > 0 ? `|${staticFiles.join('|')}` : ''})`);
   return staticPathRegExp;
 };
 export const prepareFavicons = (favicon, faviconByEntries) => {

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

@@ -11,8 +11,6 @@ var _serverCore = require("@modern-js/server-core");
 
 var _utils = require("@modern-js/utils");
 
-var _core = require("@modern-js/core");
-
 var _metrics = require("../libs/metrics");
 
 var _modernServerSplit = require("./modern-server-split");
@@ -40,13 +38,13 @@ class Server {
   async init() {
     const {
       options
-    } = this; // initialize server runner
-
-    this.runner = await this.createHookRunner(); // initialize server
+    } = this; // initialize server
 
     this.server = this.serverImpl(options); // create http-server
 
-    this.app = await this.server.createHTTPServer(this.getRequestHandler()); // runner can only be used after server init
+    this.app = await this.server.createHTTPServer(this.getRequestHandler()); // initialize server runner
+
+    this.runner = await this.createHookRunner(); // runner can only be used after server init
 
     await this.server.onInit(this.runner);
     return this;
@@ -84,32 +82,52 @@ class Server {
       options
     } = this;
     const {
-      pwd: appDirectory,
-      plugins = []
+      plugins = [],
+      pwd,
+      config
     } = options; // server app context for serve plugin
 
-    const serverPlugins = plugins.map(p => {
-      _serverCore.serverManager.usePlugin((0, _utils.compatRequire)(p.pluginPath));
-
-      return {
-        server: p
-      };
+    const loadedPlugins = (0, _serverCore.loadPlugins)(plugins, pwd);
+    loadedPlugins.forEach(p => {
+      _serverCore.serverManager.usePlugin(p);
     });
-    const appContext = (0, _core.initAppContext)(appDirectory, serverPlugins, '');
+    const appContext = this.initAppContext();
 
     _serverCore.serverManager.run(() => {
-      var _options$config$outpu;
+      var _config$output;
 
-      _serverCore.ConfigContext.set(this.options.config);
+      _serverCore.ConfigContext.set(config);
 
       _serverCore.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-        distDirectory: _path.default.join(options.pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist')
+        distDirectory: _path.default.join(pwd, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist')
       }));
     });
 
     return _serverCore.serverManager.init({});
   }
 
+  initAppContext() {
+    var _config$output2;
+
+    const {
+      options
+    } = this;
+    const {
+      pwd: appDirectory,
+      plugins = [],
+      config
+    } = options;
+    const serverPlugins = plugins.map(p => ({
+      server: p
+    }));
+    return {
+      appDirectory,
+      distDirectory: _path.default.join(appDirectory, ((_config$output2 = config.output) === null || _config$output2 === void 0 ? void 0 : _config$output2.path) || 'dist'),
+      sharedDirectory: _path.default.resolve(appDirectory, _utils.SHARED_DIR),
+      plugins: serverPlugins
+    };
+  }
+
 }
 
 exports.Server = Server;

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

@@ -611,7 +611,7 @@ class ModernServer {
     }
 
     const text = _constants.ERROR_PAGE_TEXT[status] || _constants.ERROR_PAGE_TEXT[500];
-    res.end((0, _utils2.createErrorDocument)(status, text));
+    context.res.end((0, _utils2.createErrorDocument)(status, text));
   }
 
 }

package/dist/js/node/utils.js

@@ -114,7 +114,7 @@ const getStaticReg = (output = {}) => {
   } = output;
   const favicons = prepareFavicons(favicon, faviconByEntries);
   const staticFiles = [cssPath, jsPath, mediaPath].filter(v => Boolean(v));
-  const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''}|${staticFiles.join('|')})`);
+  const staticPathRegExp = new RegExp(`^/(static/|upload/|favicon.ico|icon.png${favicons.length > 0 ? `|${favicons.join('|')}` : ''}${staticFiles.length > 0 ? `|${staticFiles.join('|')}` : ''})`);
   return staticPathRegExp;
 };
 

package/dist/types/server/index.d.ts

@@ -12,4 +12,5 @@ export declare class Server {
   listen(port: number | undefined, listener: any): void;
   getRequestHandler(): (req: IncomingMessage, res: ServerResponse, next?: (() => void) | undefined) => void;
   private createHookRunner;
+  private initAppContext;
 }

package/dist/types/type.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { IncomingMessage, Server, ServerResponse } from 'http';
-import { serverManager } from '@modern-js/server-core';
+import { serverManager, ServerPlugin } from '@modern-js/server-core';
 import type { NormalizedConfig } from '@modern-js/core';
 import type { Metrics, Logger, NextFunction } from '@modern-js/types/server';
 import { ModernRouteInterface } from './libs/route';
@@ -17,12 +17,11 @@ declare module '@modern-js/core' {
     };
   }
 }
+declare type Plugin = string | [string, any] | ServerPlugin;
 export declare type ModernServerOptions = {
   pwd: string;
   config: NormalizedConfig;
-  plugins?: {
-    pluginPath: string;
-  }[];
+  plugins?: Plugin[];
   routes?: ModernRouteInterface[];
   staticGenerate?: boolean;
   loggerOptions?: Record<string, string>;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.2",
+  "version": "1.0.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -28,10 +28,9 @@
     }
   },
   "dependencies": {
-    "@modern-js/core": "^1.4.6",
-    "@modern-js/utils": "^1.3.4",
+    "@modern-js/utils": "^1.3.5",
     "@babel/compat-data": "^7.17.0",
-    "@modern-js/server-core": "^1.2.2",
+    "@modern-js/server-core": "^1.2.3",
     "axios": "^0.24.0",
     "compare-versions": "^3.6.0",
     "http-proxy-middleware": "^2.0.1",
@@ -45,7 +44,8 @@
     "cookie": "^0.4.2"
   },
   "devDependencies": {
-    "@modern-js/types": "^1.3.4",
+    "@modern-js/types": "^1.3.5",
+    "@modern-js/core": "^1.5.0",
     "@scripts/jest-config": "0.0.0",
     "@scripts/build": "0.0.0",
     "del-cli": "^4.0.1",

package/src/server/index.ts

@@ -4,9 +4,11 @@ import {
   serverManager,
   AppContext,
   ConfigContext,
+  loadPlugins,
 } from '@modern-js/server-core';
-import { compatRequire, logger as defaultLogger } from '@modern-js/utils';
-import { initAppContext, UserConfig } from '@modern-js/core';
+import { logger as defaultLogger, SHARED_DIR } from '@modern-js/utils';
+import type { UserConfig } from '@modern-js/core';
+import { ISAppContext } from '@modern-js/types';
 import {
   ModernServerOptions,
   ServerHookRunner,
@@ -37,15 +39,15 @@ export class Server {
   public async init() {
     const { options } = this;
 
-    // initialize server runner
-    this.runner = await this.createHookRunner();
-
     // initialize server
     this.server = this.serverImpl(options);
 
     // create http-server
     this.app = await this.server.createHTTPServer(this.getRequestHandler());
 
+    // initialize server runner
+    this.runner = await this.createHookRunner();
+
     // runner can only be used after server init
     await this.server.onInit(this.runner);
 
@@ -83,27 +85,38 @@ export class Server {
     serverManager.clear();
 
     const { options } = this;
-    const { pwd: appDirectory, plugins = [] } = options;
+    const { plugins = [], pwd, config } = options;
 
     // server app context for serve plugin
-    const serverPlugins = plugins.map(p => {
-      serverManager.usePlugin(compatRequire(p.pluginPath));
-      return {
-        server: p,
-      };
+    const loadedPlugins = loadPlugins(plugins, pwd);
+    loadedPlugins.forEach(p => {
+      serverManager.usePlugin(p);
     });
-    const appContext = initAppContext(appDirectory, serverPlugins, '');
+
+    const appContext = this.initAppContext();
     serverManager.run(() => {
-      ConfigContext.set(this.options.config as UserConfig);
+      ConfigContext.set(config as UserConfig);
       AppContext.set({
         ...appContext,
-        distDirectory: path.join(
-          options.pwd,
-          options.config.output?.path || 'dist',
-        ),
+        distDirectory: path.join(pwd, config.output?.path || 'dist'),
       });
     });
 
     return serverManager.init({});
   }
+
+  private initAppContext(): ISAppContext {
+    const { options } = this;
+    const { pwd: appDirectory, plugins = [], config } = options;
+    const serverPlugins = plugins.map(p => ({
+      server: p,
+    }));
+
+    return {
+      appDirectory,
+      distDirectory: path.join(appDirectory, config.output?.path || 'dist'),
+      sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
+      plugins: serverPlugins,
+    };
+  }
 }

package/src/server/modern-server.ts

@@ -593,6 +593,7 @@ export class ModernServer implements ModernServerInterface {
     const matched =
       this.router.match(statusPage) || this.router.match(customErrorPage);
     // if no custom status page find
+
     if (matched) {
       const route = matched.generate(context.url);
       const { entryName } = route;
@@ -613,9 +614,8 @@ export class ModernServer implements ModernServerInterface {
         }
       }
     }
-
     const text = ERROR_PAGE_TEXT[status] || ERROR_PAGE_TEXT[500];
-    res.end(createErrorDocument(status, text));
+    context.res.end(createErrorDocument(status, text));
   }
 }
 /* eslint-enable max-lines */

package/src/type.ts

@@ -1,6 +1,6 @@
 import { Buffer } from 'buffer';
 import { IncomingMessage, Server, ServerResponse } from 'http';
-import { serverManager } from '@modern-js/server-core';
+import { serverManager, ServerPlugin } from '@modern-js/server-core';
 import type { NormalizedConfig } from '@modern-js/core';
 import type { Metrics, Logger, NextFunction } from '@modern-js/types/server';
 import { ModernRouteInterface } from './libs/route';
@@ -20,10 +20,11 @@ declare module '@modern-js/core' {
   }
 }
 
+type Plugin = string | [string, any] | ServerPlugin;
 export type ModernServerOptions = {
   pwd: string;
   config: NormalizedConfig;
-  plugins?: { pluginPath: string }[];
+  plugins?: Plugin[];
   routes?: ModernRouteInterface[];
   staticGenerate?: boolean;
   loggerOptions?: Record<string, string>;

package/src/utils.ts

@@ -94,7 +94,7 @@ export const getStaticReg = (output: NormalizedConfig['output'] = {}) => {
   const staticPathRegExp = new RegExp(
     `^/(static/|upload/|favicon.ico|icon.png${
       favicons.length > 0 ? `|${favicons.join('|')}` : ''
-    }|${staticFiles.join('|')})`,
+    }${staticFiles.length > 0 ? `|${staticFiles.join('|')}` : ''})`,
   );
 
   return staticPathRegExp;

package/tests/fixtures/pure/test-dist/route.json

@@ -8,6 +8,24 @@
       "isSSR": true,
       "enableModernMode": false,
       "bundle": "bundles/main.js"
+    },
+    {
+      "urlPath": "/500",
+      "entryName": "500",
+      "entryPath": "html/main/index.html",
+      "isSPA": true,
+      "isSSR": true,
+      "enableModernMode": false,
+      "bundle": "bundles/main.js"
+    },
+    {
+      "urlPath": "/404",
+      "entryName": "500",
+      "entryPath": "html/main/index.html",
+      "isSPA": true,
+      "isSSR": true,
+      "enableModernMode": false,
+      "bundle": "bundles/main.js"
     }
   ]
 }

package/tests/server.test.ts

@@ -130,6 +130,80 @@ describe('test server', () => {
 
       expect(html).toMatch('<div>Modern.js</div>');
     });
+
+    test('should error handler correctly with custom entry', async () => {
+      const server = await createServer({
+        config: {
+          ...(defaultsConfig as NormalizedConfig),
+          output: {
+            path: 'test-dist',
+          },
+        },
+        pwd: appDirectory,
+      });
+
+      const modernServer: ModernServer = (server as any).server;
+      const req = httpMocks.createRequest({
+        url: '/',
+        headers: {
+          host: 'modernjs.com',
+        },
+        eventEmitter: Readable,
+        method: 'GET',
+      });
+      const res = httpMocks.createResponse({ eventEmitter: EventEmitter });
+      const ctx = createContext(req, res);
+      ctx.error = () => {
+        // empty
+      };
+
+      setTimeout(() => {
+        (modernServer as any).onError(ctx, new Error('test error'));
+      }, 100);
+      const html = await new Promise((resolve, _reject) => {
+        res.on('finish', () => {
+          resolve(res._getData());
+        });
+      });
+      expect(html).toMatch('<div>Modern.js</div>');
+    });
+
+    test('should error handler correctly with fallback doc', async () => {
+      const server = await createServer({
+        config: {
+          ...(defaultsConfig as NormalizedConfig),
+          output: {
+            path: 'test-dist',
+          },
+        },
+        pwd: appDirectory,
+      });
+
+      const modernServer: ModernServer = (server as any).server;
+      const req = httpMocks.createRequest({
+        url: '/',
+        headers: {
+          host: 'modernjs.com',
+        },
+        eventEmitter: Readable,
+        method: 'GET',
+      });
+      const res = httpMocks.createResponse({ eventEmitter: EventEmitter });
+      const ctx = createContext(req, res);
+      ctx.error = () => {
+        // empty
+      };
+
+      setTimeout(() => {
+        (modernServer as any).renderErrorPage(ctx, 404);
+      }, 100);
+      const html = await new Promise((resolve, _reject) => {
+        res.on('finish', () => {
+          resolve(res._getData());
+        });
+      });
+      expect(html).toMatch('This page could not be found.');
+    });
   });
 
   describe('should split server work correctly', () => {

package/tests/utils.test.ts

@@ -79,8 +79,8 @@ describe('test server utils', () => {
   describe('test create static reg', () => {
     test('should test static path correctly', () => {
       const reg = getStaticReg();
-      expect(reg.test('/static')).toBeTruthy();
-      expect(reg.test('/upload')).toBeTruthy();
+      expect(reg.test('/static/')).toBeTruthy();
+      expect(reg.test('/upload/')).toBeTruthy();
     });
 
     test('should test custom static path correctly', () => {