@modern-js/prod-server 1.0.3 → 1.0.6

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @modern-js/prod-server
 
+## 1.0.6
+
+### Patch Changes
+
+- bebb39b6: chore: improve devDependencies and peerDependencies
+- 132f7b53: feat: move config declarations to @modern-js/core
+- Updated dependencies [bebb39b6]
+- Updated dependencies [132f7b53]
+  - @modern-js/server-core@1.2.5
+  - @modern-js/utils@1.3.7
+
+## 1.0.5
+
+### Patch Changes
+
+- d2d0fa11: fix: missing devServer.proxy typing
+- Updated dependencies [a8df060e]
+- Updated dependencies [c2046f37]
+- Updated dependencies [18db013a]
+  - @modern-js/server-core@1.2.4
+  - @modern-js/utils@1.3.6
+
+## 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/libs/render/cache/index.js

@@ -46,8 +46,7 @@ export default ((renderFn, ctx) => {
     } else if (cacheFile.isStale) {
       // if file is stale, request async
       const render = withCoalescedInvoke(() => renderFn(context)).bind(null, namespaceHash('render', cacheFile.hash), []);
-      render() // eslint-disable-next-line promise/prefer-await-to-then
-      .then(res => {
+      render().then(res => {
         if (res.value && res.isOrigin) {
           const {
             cacheConfig
@@ -59,8 +58,7 @@ export default ((renderFn, ctx) => {
             sprCache.del(cacheContext, cacheHash);
           }
         }
-      }) // eslint-disable-next-line promise/prefer-await-to-then
-      .catch(e => {
+      }).catch(e => {
         sprCache.del(cacheContext, cacheHash);
         ctx.error(ERROR_DIGEST.ERENDER, e);
       });

package/dist/js/modern/libs/render/cache/spr.js

@@ -221,8 +221,7 @@ class CacheManager {
     let data = this.cache.get(cacheKey);
 
     if (!data) {
-      const caches = await createPageCaches(MAX_CACHE_EACH_REQ); // eslint-disable-next-line require-atomic-updates
-
+      const caches = await createPageCaches(MAX_CACHE_EACH_REQ);
       data = this.createCacheContent(cacheConfig, caches);
     }
 

package/dist/js/modern/libs/render/cache/util.js

@@ -39,7 +39,6 @@ export function withCoalescedInvoke(func) {
     const entry = globalInvokeCache.get(key);
 
     if (entry) {
-      // eslint-disable-next-line promise/prefer-await-to-then
       return entry.then(res => ({
         isOrigin: false,
         value: res.value
@@ -50,15 +49,13 @@ export function withCoalescedInvoke(func) {
       return func(...args);
     }
 
-    const future = __wrapper() // eslint-disable-next-line promise/prefer-await-to-then
-    .then(res => {
+    const future = __wrapper().then(res => {
       globalInvokeCache.delete(key);
       return {
         isOrigin: true,
         value: res
       };
-    }) // eslint-disable-next-line promise/prefer-await-to-then
-    .catch(err => {
+    }).catch(err => {
       globalInvokeCache.delete(key);
       throw err;
     });

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

@@ -5,8 +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, SHARED_DIR } from '@modern-js/utils';
+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 {
@@ -67,26 +67,29 @@ export class Server {
       options
     } = this;
     const {
-      plugins = []
+      plugins = [],
+      pwd,
+      config
     } = options; // server app context for serve plugin
 
-    plugins.forEach(p => {
-      serverManager.usePlugin(compatRequire(p.pluginPath));
+    const loadedPlugins = loadPlugins(plugins, pwd);
+    loadedPlugins.forEach(p => {
+      serverManager.usePlugin(p);
     });
     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$output;
+    var _config$output2;
 
     const {
       options
@@ -101,7 +104,7 @@ export class Server {
     }));
     return {
       appDirectory,
-      distDirectory: path.join(appDirectory, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist'),
+      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

@@ -509,8 +509,7 @@ export class ModernServer {
 
         if (!handler) {
           return next();
-        } // eslint-disable-next-line promise/prefer-await-to-then
-
+        }
 
         return handler(context, dispatch).catch(onError);
       };

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/libs/render/cache/index.js

@@ -56,8 +56,7 @@ var _default = (renderFn, ctx) => {
     } else if (cacheFile.isStale) {
       // if file is stale, request async
       const render = (0, _util.withCoalescedInvoke)(() => renderFn(context)).bind(null, (0, _util.namespaceHash)('render', cacheFile.hash), []);
-      render() // eslint-disable-next-line promise/prefer-await-to-then
-      .then(res => {
+      render().then(res => {
         if (res.value && res.isOrigin) {
           const {
             cacheConfig
@@ -69,8 +68,7 @@ var _default = (renderFn, ctx) => {
             sprCache.del(cacheContext, cacheHash);
           }
         }
-      }) // eslint-disable-next-line promise/prefer-await-to-then
-      .catch(e => {
+      }).catch(e => {
         sprCache.del(cacheContext, cacheHash);
         ctx.error(_constants.ERROR_DIGEST.ERENDER, e);
       });

package/dist/js/node/libs/render/cache/spr.js

@@ -237,8 +237,7 @@ class CacheManager {
     let data = this.cache.get(cacheKey);
 
     if (!data) {
-      const caches = await (0, _pageCaches.createPageCaches)(MAX_CACHE_EACH_REQ); // eslint-disable-next-line require-atomic-updates
-
+      const caches = await (0, _pageCaches.createPageCaches)(MAX_CACHE_EACH_REQ);
       data = this.createCacheContent(cacheConfig, caches);
     }
 

package/dist/js/node/libs/render/cache/util.js

@@ -64,7 +64,6 @@ function withCoalescedInvoke(func) {
     const entry = globalInvokeCache.get(key);
 
     if (entry) {
-      // eslint-disable-next-line promise/prefer-await-to-then
       return entry.then(res => ({
         isOrigin: false,
         value: res.value
@@ -75,15 +74,13 @@ function withCoalescedInvoke(func) {
       return func(...args);
     }
 
-    const future = __wrapper() // eslint-disable-next-line promise/prefer-await-to-then
-    .then(res => {
+    const future = __wrapper().then(res => {
       globalInvokeCache.delete(key);
       return {
         isOrigin: true,
         value: res
       };
-    }) // eslint-disable-next-line promise/prefer-await-to-then
-    .catch(err => {
+    }).catch(err => {
       globalInvokeCache.delete(key);
       throw err;
     });

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

@@ -82,21 +82,24 @@ class Server {
       options
     } = this;
     const {
-      plugins = []
+      plugins = [],
+      pwd,
+      config
     } = options; // server app context for serve plugin
 
-    plugins.forEach(p => {
-      _serverCore.serverManager.usePlugin((0, _utils.compatRequire)(p.pluginPath));
+    const loadedPlugins = (0, _serverCore.loadPlugins)(plugins, pwd);
+    loadedPlugins.forEach(p => {
+      _serverCore.serverManager.usePlugin(p);
     });
     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')
       }));
     });
 
@@ -104,7 +107,7 @@ class Server {
   }
 
   initAppContext() {
-    var _config$output;
+    var _config$output2;
 
     const {
       options
@@ -119,7 +122,7 @@ class Server {
     }));
     return {
       appDirectory,
-      distDirectory: _path.default.join(appDirectory, ((_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist'),
+      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
     };

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

@@ -544,8 +544,7 @@ class ModernServer {
 
         if (!handler) {
           return next();
-        } // eslint-disable-next-line promise/prefer-await-to-then
-
+        }
 
         return handler(context, dispatch).catch(onError);
       };

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/libs/proxy.d.ts

@@ -1,4 +1,4 @@
-import { NextFunction, ProxyOptions } from '@modern-js/types';
+import { NextFunction, BffProxyOptions } from '@modern-js/types';
 import { ModernServerContext } from './context';
-export type { ProxyOptions };
-export declare const createProxyHandler: (proxyOptions: ProxyOptions) => ((ctx: ModernServerContext, next: NextFunction) => Promise<void>)[] | null;
+export type { BffProxyOptions };
+export declare const createProxyHandler: (proxyOptions?: BffProxyOptions | undefined) => ((ctx: ModernServerContext, next: NextFunction) => Promise<void>)[] | null;

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';
@@ -10,19 +10,11 @@ declare module 'http' {
     metrics: Metrics;
   }
 }
-declare module '@modern-js/core' {
-  interface UserConfig {
-    bff?: {
-      proxy: Record<string, any>;
-    };
-  }
-}
+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/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   testEnvironment: 'node',
   rootDir: __dirname,

package/package.json

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

package/src/libs/proxy.ts

@@ -1,11 +1,11 @@
 import { createProxyMiddleware } from 'http-proxy-middleware';
-import { NextFunction, ProxyOptions } from '@modern-js/types';
+import { NextFunction, BffProxyOptions } from '@modern-js/types';
 import { formatProxyOptions } from '@modern-js/utils';
 import { ModernServerContext } from './context';
 
-export type { ProxyOptions };
+export type { BffProxyOptions };
 
-export const createProxyHandler = (proxyOptions: ProxyOptions) => {
+export const createProxyHandler = (proxyOptions?: BffProxyOptions) => {
   if (!proxyOptions) {
     return null;
   }

package/src/libs/render/cache/index.ts

@@ -49,7 +49,6 @@ export default (renderFn: RenderFunction, ctx: ModernServerContext) => {
       );
 
       render()
-        // eslint-disable-next-line promise/prefer-await-to-then
         .then(res => {
           if (res.value && res.isOrigin) {
             const { cacheConfig } = context;
@@ -60,7 +59,6 @@ export default (renderFn: RenderFunction, ctx: ModernServerContext) => {
             }
           }
         })
-        // eslint-disable-next-line promise/prefer-await-to-then
         .catch(e => {
           sprCache.del(cacheContext, cacheHash);
           ctx.error(ERROR_DIGEST.ERENDER, e);

package/src/libs/render/cache/spr.ts

@@ -236,7 +236,6 @@ class CacheManager {
     let data = this.cache.get(cacheKey);
     if (!data) {
       const caches = await createPageCaches(MAX_CACHE_EACH_REQ);
-      // eslint-disable-next-line require-atomic-updates
       data = this.createCacheContent(cacheConfig, caches);
     }
 

package/src/libs/render/cache/util.ts

@@ -58,7 +58,6 @@ export function withCoalescedInvoke<F extends (...args: any[]) => Promise<any>>(
   return async function (key: string, args: Parameters<F>) {
     const entry = globalInvokeCache.get(key);
     if (entry) {
-      // eslint-disable-next-line promise/prefer-await-to-then
       return entry.then(res => ({
         isOrigin: false,
         value: res.value as UnwrapPromise<ReturnType<F>>,
@@ -70,12 +69,10 @@ export function withCoalescedInvoke<F extends (...args: any[]) => Promise<any>>(
     }
 
     const future = __wrapper()
-      // eslint-disable-next-line promise/prefer-await-to-then
       .then(res => {
         globalInvokeCache.delete(key);
         return { isOrigin: true, value: res as UnwrapPromise<ReturnType<F>> };
       })
-      // eslint-disable-next-line promise/prefer-await-to-then
       .catch(err => {
         globalInvokeCache.delete(key);
         throw err;

package/src/server/index.ts

@@ -4,12 +4,9 @@ import {
   serverManager,
   AppContext,
   ConfigContext,
+  loadPlugins,
 } from '@modern-js/server-core';
-import {
-  compatRequire,
-  logger as defaultLogger,
-  SHARED_DIR,
-} from '@modern-js/utils';
+import { logger as defaultLogger, SHARED_DIR } from '@modern-js/utils';
 import type { UserConfig } from '@modern-js/core';
 import { ISAppContext } from '@modern-js/types';
 import {
@@ -88,22 +85,20 @@ export class Server {
     serverManager.clear();
 
     const { options } = this;
-    const { plugins = [] } = options;
+    const { plugins = [], pwd, config } = options;
 
     // server app context for serve plugin
-    plugins.forEach(p => {
-      serverManager.usePlugin(compatRequire(p.pluginPath));
+    const loadedPlugins = loadPlugins(plugins, pwd);
+    loadedPlugins.forEach(p => {
+      serverManager.usePlugin(p);
     });
 
     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'),
       });
     });
 

package/src/server/modern-server.ts

@@ -35,7 +35,7 @@ import {
   noop,
 } from '../utils';
 import * as reader from '../libs/render/reader';
-import { createProxyHandler, ProxyOptions } from '../libs/proxy';
+import { createProxyHandler, BffProxyOptions } from '../libs/proxy';
 import { createContext, ModernServerContext } from '../libs/context';
 import {
   AGGRED_DIR,
@@ -144,7 +144,7 @@ export class ModernServer implements ModernServerInterface {
     });
 
     // proxy handler, each proxy has own handler
-    this.proxyHandler = createProxyHandler(conf.bff?.proxy as ProxyOptions);
+    this.proxyHandler = createProxyHandler(conf.bff?.proxy as BffProxyOptions);
     if (this.proxyHandler) {
       this.proxyHandler.forEach(handler => {
         this.addHandler(handler);
@@ -547,7 +547,6 @@ export class ModernServer implements ModernServerInterface {
           return next();
         }
 
-        // eslint-disable-next-line promise/prefer-await-to-then
         return handler(context, dispatch as NextFunction).catch(onError);
       };
 

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';
@@ -12,18 +12,11 @@ declare module 'http' {
   }
 }
 
-declare module '@modern-js/core' {
-  interface UserConfig {
-    bff?: {
-      proxy: Record<string, any>;
-    };
-  }
-}
-
+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/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "deploy",
+  "name": "prod-server-pure",
   "version": "0.1.0",
   "scripts": {
     "reset": "del-cli node_modules",

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', () => {