@modern-js/prod-server 1.1.10-beta.0 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,44 @@
 # @modern-js/prod-server
 
+## 1.2.2
+
+### Patch Changes
+
+- 0e28456: fix assets prefix bug in prod env
+- 44e3bb1: feat: support response headers
+  feat: 支持设置响应头
+  - @modern-js/server-core@1.4.1
+  - @modern-js/utils@1.8.0
+
+## 1.2.1
+
+### Patch Changes
+
+- 2ed8f7d: fix: the \_SERVER_DATA injection twice causes the prod-server route error.
+  fix: \_SERVER_DATA 二次注入，导致服务器路由错误
+- Updated dependencies [4fc801f]
+- Updated dependencies [c8614b8]
+  - @modern-js/utils@1.8.0
+  - @modern-js/server-core@1.4.1
+
+## 1.2.0
+
+### Minor Changes
+
+- 3d64b2f: feat: prod-server supports that load server env from .env.\*
+
+  feat: prod-server 支持从 .env.\* 文件加载服务器环境变量
+
+### Patch Changes
+
+- 7b902b3: feat: support ListenOptions for prod-server
+
+  feat: server 支持传入 listernOptions 参数
+
+- Updated dependencies [a27ab8d]
+  - @modern-js/server-core@1.4.1
+  - @modern-js/utils@1.7.12
+
 ## 1.1.9
 
 ### Patch Changes

package/dist/js/modern/libs/route/route.js

@@ -22,6 +22,8 @@ export class ModernRoute {
 
     _defineProperty(this, "params", {});
 
+    _defineProperty(this, "responseHeaders", void 0);
+
     this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
@@ -30,6 +32,7 @@ export class ModernRoute {
     this.isApi = routeSpec.isApi || false;
     this.bundle = routeSpec.bundle || '';
     this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
+    this.responseHeaders = routeSpec.responseHeaders;
   }
 
 }

package/dist/js/modern/libs/serve-file.js

@@ -1,13 +1,30 @@
 // Todo 看看是不是能 fork 一份，即使命中也返回
 import serve from 'serve-static';
 import { isString, isRegExp } from '@modern-js/utils';
-export const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
+import { useLocalPrefix } from "../utils";
+
+const removedPrefix = (req, prefix) => {
+  if (useLocalPrefix(prefix)) {
+    req.url = req.url.slice(prefix.length);
+    return () => {
+      req.url = prefix + req.url;
+    };
+  } else {
+    return () => {// emptyy
+    };
+  }
+};
+
+export const createStaticFileHandler = (rules, output = {}) => // eslint-disable-next-line consistent-return
 async (context, next) => {
   const {
     url: requestUrl,
     req,
     res
   } = context;
+  const {
+    assetPrefix = '/'
+  } = output;
   const hitRule = rules.find(item => {
     if (isString(item.path) && requestUrl.startsWith(item.path)) {
       return true;
@@ -19,7 +36,9 @@ async (context, next) => {
   });
 
   if (hitRule) {
+    const resume = removedPrefix(req, assetPrefix);
     serve(hitRule.target)(req, res, () => {
+      resume();
       next();
     });
   } else {

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

@@ -5,8 +5,9 @@ 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 fs from 'fs';
+import { Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand } from '@modern-js/utils';
 import { serverManager, AppContext, ConfigContext, loadPlugins } from '@modern-js/server-core';
-import { Logger, SHARED_DIR, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
 import { debug } from "../utils";
@@ -34,6 +35,7 @@ export class Server {
   }
   /**
    * 初始化顺序
+   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
    * - 获取 server runtime config
    * - 设置 context
    * - 创建 hooksRunner
@@ -51,6 +53,7 @@ export class Server {
     const {
       options
     } = this;
+    this.loadServerEnv(options);
     this.initServerConfig(options);
     await this.injectContext(this.runner, options); // initialize server runner
 
@@ -128,22 +131,18 @@ export class Server {
   }
 
   listen(options, listener) {
-    if (typeof options === 'object') {
-      this.app.listen(options, () => {
-        if (listener) {
-          listener();
-        }
+    const callback = () => {
+      if (listener) {
+        listener();
+      }
 
-        this.server.onListening(this.app);
-      });
-    } else {
-      this.app.listen(process.env.PORT || options || 8080, () => {
-        if (listener) {
-          listener();
-        }
+      this.server.onListening(this.app);
+    };
 
-        this.server.onListening(this.app);
-      });
+    if (typeof options === 'object') {
+      this.app.listen(options, callback);
+    } else {
+      this.app.listen(process.env.PORT || options || 8080, callback);
     }
   }
 
@@ -214,4 +213,19 @@ export class Server {
     };
   }
 
+  loadServerEnv(options) {
+    const {
+      pwd: appDirectory
+    } = options;
+    const serverEnv = process.env.MODERN_ENV;
+    const serverEnvPath = path.resolve(appDirectory, `.env.${serverEnv}`);
+
+    if (serverEnv && fs.existsSync(serverEnvPath) && !fs.statSync(serverEnvPath).isDirectory()) {
+      const envConfig = dotenv.config({
+        path: serverEnvPath
+      });
+      dotenvExpand(envConfig);
+    }
+  }
+
 }

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

@@ -136,7 +136,7 @@ export class ModernServer {
     this.staticFileHandler = createStaticFileHandler([{
       path: staticPathRegExp,
       target: distDir
-    }]);
+    }], this.conf.output);
     this.routeRenderHandler = createRenderHandler({
       distDir,
       staticGenerate
@@ -415,6 +415,16 @@ export class ModernServer {
       return;
     }
 
+    if (route.responseHeaders) {
+      Object.keys(route.responseHeaders).forEach(key => {
+        const value = route.responseHeaders[key];
+
+        if (value) {
+          context.res.setHeader(key, value);
+        }
+      });
+    }
+
     if (route.entryName) {
       await this.emitRouteHook('beforeRender', {
         context
@@ -443,8 +453,12 @@ export class ModernServer {
         context,
         templateAPI
       });
-      await this.injectMicroFE(context, templateAPI);
-      templateAPI.appendHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
+      await this.injectMicroFE(context, templateAPI); // It will inject _SERVER_DATA twice, when SSG mode.
+      // The first time was in ssg html created, the seoncd time was in prod-server start.
+      // but the second wound causes route error.
+      // To ensure that the second injection fails, the _SERVER_DATA inject at the front of head,
+
+      templateAPI.prependHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
       response = templateAPI.get();
     }
 
@@ -537,7 +551,11 @@ export class ModernServer {
     this._handler = (context, next) => {
       let i = 0;
 
-      const dispatch = () => {
+      const dispatch = error => {
+        if (error) {
+          return this.onError(context, error);
+        }
+
         const handler = handlers[i++];
 
         if (!handler) {

package/dist/js/modern/utils.js

@@ -1,5 +1,5 @@
 import { compile } from 'path-to-regexp';
-import { createDebugger } from '@modern-js/utils';
+import { createDebugger, isProd } from '@modern-js/utils';
 export const debug = createDebugger('prod-server');
 export const mergeExtension = users => {
   const output = [];
@@ -71,17 +71,25 @@ export const toPath = (reg, params) => {
   });
   return fn(params);
 };
+export const useLocalPrefix = url => {
+  return isProd() && !url.includes('.');
+};
 export const getStaticReg = (output = {}) => {
   const {
     favicon,
     faviconByEntries,
     cssPath,
     jsPath,
-    mediaPath
+    mediaPath,
+    assetPrefix = '/'
   } = output;
+  const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
   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.length > 0 ? `|${staticFiles.join('|')}` : ''})`);
+  const staticReg = ['static/', 'upload/', ...staticFiles];
+  const iconReg = ['favicon.ico', 'icon.png', ...favicons];
+  const regPrefix = prefix === '/' ? '' : prefix;
+  const staticPathRegExp = new RegExp(`^${regPrefix}/(${[...staticReg, ...iconReg].join('|')})`);
   return staticPathRegExp;
 };
 export const prepareFavicons = (favicon, faviconByEntries) => {

package/dist/js/node/libs/route/route.js

@@ -29,6 +29,8 @@ class ModernRoute {
 
     _defineProperty(this, "params", {});
 
+    _defineProperty(this, "responseHeaders", void 0);
+
     this.entryName = routeSpec.entryName || '';
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
@@ -37,6 +39,7 @@ class ModernRoute {
     this.isApi = routeSpec.isApi || false;
     this.bundle = routeSpec.bundle || '';
     this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
+    this.responseHeaders = routeSpec.responseHeaders;
   }
 
 }

package/dist/js/node/libs/serve-file.js

@@ -9,16 +9,33 @@ var _serveStatic = _interopRequireDefault(require("serve-static"));
 
 var _utils = require("@modern-js/utils");
 
+var _utils2 = require("../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Todo 看看是不是能 fork 一份，即使命中也返回
-const createStaticFileHandler = rules => // eslint-disable-next-line consistent-return
+const removedPrefix = (req, prefix) => {
+  if ((0, _utils2.useLocalPrefix)(prefix)) {
+    req.url = req.url.slice(prefix.length);
+    return () => {
+      req.url = prefix + req.url;
+    };
+  } else {
+    return () => {// emptyy
+    };
+  }
+};
+
+const createStaticFileHandler = (rules, output = {}) => // eslint-disable-next-line consistent-return
 async (context, next) => {
   const {
     url: requestUrl,
     req,
     res
   } = context;
+  const {
+    assetPrefix = '/'
+  } = output;
   const hitRule = rules.find(item => {
     if ((0, _utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
       return true;
@@ -30,7 +47,9 @@ async (context, next) => {
   });
 
   if (hitRule) {
+    const resume = removedPrefix(req, assetPrefix);
     (0, _serveStatic.default)(hitRule.target)(req, res, () => {
+      resume();
       next();
     });
   } else {

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

@@ -7,10 +7,12 @@ exports.Server = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _serverCore = require("@modern-js/server-core");
+var _fs = _interopRequireDefault(require("fs"));
 
 var _utils = require("@modern-js/utils");
 
+var _serverCore = require("@modern-js/server-core");
+
 var _metrics = require("../libs/metrics");
 
 var _loadConfig = require("../libs/loadConfig");
@@ -50,6 +52,7 @@ class Server {
   }
   /**
    * 初始化顺序
+   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
    * - 获取 server runtime config
    * - 设置 context
    * - 创建 hooksRunner
@@ -67,6 +70,7 @@ class Server {
     const {
       options
     } = this;
+    this.loadServerEnv(options);
     this.initServerConfig(options);
     await this.injectContext(this.runner, options); // initialize server runner
 
@@ -148,22 +152,18 @@ class Server {
   }
 
   listen(options, listener) {
-    if (typeof options === 'object') {
-      this.app.listen(options, () => {
-        if (listener) {
-          listener();
-        }
+    const callback = () => {
+      if (listener) {
+        listener();
+      }
 
-        this.server.onListening(this.app);
-      });
-    } else {
-      this.app.listen(process.env.PORT || options || 8080, () => {
-        if (listener) {
-          listener();
-        }
+      this.server.onListening(this.app);
+    };
 
-        this.server.onListening(this.app);
-      });
+    if (typeof options === 'object') {
+      this.app.listen(options, callback);
+    } else {
+      this.app.listen(process.env.PORT || options || 8080, callback);
     }
   }
 
@@ -237,6 +237,23 @@ class Server {
     };
   }
 
+  loadServerEnv(options) {
+    const {
+      pwd: appDirectory
+    } = options;
+    const serverEnv = process.env.MODERN_ENV;
+
+    const serverEnvPath = _path.default.resolve(appDirectory, `.env.${serverEnv}`);
+
+    if (serverEnv && _fs.default.existsSync(serverEnvPath) && !_fs.default.statSync(serverEnvPath).isDirectory()) {
+      const envConfig = _utils.dotenv.config({
+        path: serverEnvPath
+      });
+
+      (0, _utils.dotenvExpand)(envConfig);
+    }
+  }
+
 }
 
 exports.Server = Server;

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

@@ -165,7 +165,7 @@ class ModernServer {
     this.staticFileHandler = (0, _serveFile.createStaticFileHandler)([{
       path: staticPathRegExp,
       target: distDir
-    }]);
+    }], this.conf.output);
     this.routeRenderHandler = (0, _render.createRenderHandler)({
       distDir,
       staticGenerate
@@ -452,6 +452,16 @@ class ModernServer {
       return;
     }
 
+    if (route.responseHeaders) {
+      Object.keys(route.responseHeaders).forEach(key => {
+        const value = route.responseHeaders[key];
+
+        if (value) {
+          context.res.setHeader(key, value);
+        }
+      });
+    }
+
     if (route.entryName) {
       await this.emitRouteHook('beforeRender', {
         context
@@ -480,8 +490,12 @@ class ModernServer {
         context,
         templateAPI
       });
-      await this.injectMicroFE(context, templateAPI);
-      templateAPI.appendHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
+      await this.injectMicroFE(context, templateAPI); // It will inject _SERVER_DATA twice, when SSG mode.
+      // The first time was in ssg html created, the seoncd time was in prod-server start.
+      // but the second wound causes route error.
+      // To ensure that the second injection fails, the _SERVER_DATA inject at the front of head,
+
+      templateAPI.prependHead(`<script>window._SERVER_DATA=${JSON.stringify(context.serverData)}</script>`);
       response = templateAPI.get();
     }
 
@@ -574,7 +588,11 @@ class ModernServer {
     this._handler = (context, next) => {
       let i = 0;
 
-      const dispatch = () => {
+      const dispatch = error => {
+        if (error) {
+          return this.onError(context, error);
+        }
+
         const handler = handlers[i++];
 
         if (!handler) {

package/dist/js/node/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toPath = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.getStaticReg = exports.debug = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
+exports.useLocalPrefix = exports.toPath = exports.prepareFavicons = exports.noop = exports.mergeExtension = exports.getStaticReg = exports.debug = exports.createMiddlewareCollecter = exports.createErrorDocument = void 0;
 
 var _pathToRegexp = require("path-to-regexp");
 
@@ -97,17 +97,28 @@ const toPath = (reg, params) => {
 
 exports.toPath = toPath;
 
+const useLocalPrefix = url => {
+  return (0, _utils.isProd)() && !url.includes('.');
+};
+
+exports.useLocalPrefix = useLocalPrefix;
+
 const getStaticReg = (output = {}) => {
   const {
     favicon,
     faviconByEntries,
     cssPath,
     jsPath,
-    mediaPath
+    mediaPath,
+    assetPrefix = '/'
   } = output;
+  const prefix = useLocalPrefix(assetPrefix) ? assetPrefix : '';
   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.length > 0 ? `|${staticFiles.join('|')}` : ''})`);
+  const staticReg = ['static/', 'upload/', ...staticFiles];
+  const iconReg = ['favicon.ico', 'icon.png', ...favicons];
+  const regPrefix = prefix === '/' ? '' : prefix;
+  const staticPathRegExp = new RegExp(`^${regPrefix}/(${[...staticReg, ...iconReg].join('|')})`);
   return staticPathRegExp;
 };
 

package/dist/types/libs/route/route.d.ts

@@ -10,5 +10,6 @@ export declare class ModernRoute implements ModernRouteInterface {
   isSPA: boolean;
   enableModernMode?: boolean;
   params: Record<string, any>;
+  responseHeaders?: Record<string, any>;
   constructor(routeSpec: ModernRouteInterface);
 }

package/dist/types/libs/serve-file.d.ts

@@ -1,8 +1,9 @@
+import { NormalizedConfig } from '@modern-js/core';
 import { NextFunction } from '../type';
 import { ModernServerContext } from './context';
 declare type Rule = {
   path: string | RegExp;
   target: string;
 };
-export declare const createStaticFileHandler: (rules: Rule[]) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
+export declare const createStaticFileHandler: (rules: Rule[], output?: NormalizedConfig['output']) => (context: ModernServerContext, next: NextFunction) => Promise<void>;
 export {};

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

@@ -12,6 +12,7 @@ export declare class Server {
   constructor(options: ModernServerOptions);
   /**
    * 初始化顺序
+   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
    * - 获取 server runtime config
    * - 设置 context
    * - 创建 hooksRunner
@@ -46,4 +47,5 @@ export declare class Server {
   private createHookRunner;
   private injectContext;
   private initAppContext;
+  private loadServerEnv;
 }

package/dist/types/utils.d.ts

@@ -15,5 +15,6 @@ export declare const createMiddlewareCollecter: () => {
   addAPIMiddleware: (input: any) => void;
 };
 export declare const toPath: (reg: string, params: Record<string, any>) => string;
+export declare const useLocalPrefix: (url: string) => boolean;
 export declare const getStaticReg: (output?: NormalizedConfig['output']) => RegExp;
 export declare const prepareFavicons: (favicon: string | undefined, faviconByEntries?: Record<string, string | undefined>) => string[];

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.1.10-beta.0",
+  "version": "1.2.2",
   "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.7.11",
+    "@modern-js/utils": "^1.8.0",
     "@babel/compat-data": "^7.17.10",
-    "@modern-js/server-core": "^1.4.0",
+    "@modern-js/server-core": "^1.4.1",
     "axios": "^0.24.0",
     "compare-versions": "^3.6.0",
     "cookie": "^0.4.2",
@@ -43,8 +43,8 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.5.5",
-    "@modern-js/core": "1.12.4",
+    "@modern-js/types": "1.6.1",
+    "@modern-js/core": "1.13.2",
     "@scripts/jest-config": "0.0.0",
     "@scripts/build": "0.0.0",
     "@types/cookie": "^0.4.1",
@@ -67,8 +67,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org/",
-    "types": "./dist/types/index.d.ts"
+    "registry": "https://registry.npmjs.org/"
   },
   "wireit": {
     "build": {