@modern-js/prod-server 1.2.1 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @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

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/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
@@ -541,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/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
@@ -578,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/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.2.1",
+  "version": "1.2.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -43,8 +43,8 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.6.0",
-    "@modern-js/core": "1.13.1",
+    "@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",