@modern-js/prod-server 1.20.0 → 1.21.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @modern-js/prod-server
 
+## 1.21.0
+
+### Patch Changes
+
+- f51c59a: feat: remove node internal package like fs or path which import by ssr runtime
+  feat: 删除在 ssr runtime 中引用的 node 内部包
+- 8f3674a: chore: reduce parameters for dev-server & update default config value in builder startDevServer
+
+  chore: 缩简 devServer 配置定义 & 更新 builder startDevServer 方法 config 默认值
+
+- 519965e: fix: should not do render if set location header and 302 status in middleware
+  fix: 如果在 middleware 中设置了 location 头和 302 状态码，则不应该走渲染逻辑
+- 67d80b7: fix(prod-server): failed to match URL which ends with ".html"
+
+  fix(prod-server): 修复无法匹配到以 ".html" 结尾的 URL 的问题
+
+  - @modern-js/server-core@1.21.0
+  - @modern-js/utils@1.21.0
+
+## 1.20.1
+
+### Patch Changes
+
+- Updated dependencies [49515c5]
+  - @modern-js/utils@1.20.1
+  - @modern-js/server-core@1.20.1
+
 ## 1.20.0
 
 ### Patch Changes

package/dist/js/modern/libs/loadConfig.js

@@ -19,7 +19,7 @@ export const requireConfig = serverConfigPath => {
   return {};
 };
 /**
- * 对配置进行合并，开发环境下,cliConfig 与 serverConfig 进行深合并
+ * 对配置进行合并，开发环境下，cliConfig 与 serverConfig 进行深合并
  * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
  * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
  */

package/dist/js/modern/libs/render/index.js

@@ -32,7 +32,18 @@ export const createRenderHandler = ({
   const modernEntry = getModernEntry(entry);
   const useModern = // route.enableModernMode &&
   supportModern(ctx) && fs.existsSync(modernEntry);
-  const templateHTML = useModern ? modernEntry : entry; // handles ssr first
+  const templatePath = useModern ? modernEntry : entry;
+
+  if (!fs.existsSync(templatePath)) {
+    throw new Error(`Could not find template file: ${templatePath}`);
+  }
+
+  const content = await readFile(templatePath);
+
+  if (!content) {
+    return null;
+  } // handles ssr first
+
 
   if (route.isSSR) {
     try {
@@ -41,7 +52,7 @@ export const createRenderHandler = ({
         entryName: route.entryName,
         urlPath: route.urlPath,
         bundle: route.bundle,
-        template: templateHTML,
+        template: content.toString(),
         staticGenerate
       }, runner);
       return result;
@@ -51,14 +62,8 @@ export const createRenderHandler = ({
     }
   }
 
-  const content = await readFile(templateHTML);
-
-  if (!content) {
-    return null;
-  }
-
   return {
     content,
-    contentType: mime.contentType(path.extname(templateHTML))
+    contentType: mime.contentType(path.extname(templatePath))
   };
 };

package/dist/js/modern/libs/render/ssr.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { mime, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
+import { fs, LOADABLE_STATS_FILE, mime, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
 import cookie from 'cookie';
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
@@ -13,6 +13,8 @@ export const render = async (ctx, renderOptions, runner) => {
     staticGenerate
   } = renderOptions;
   const bundleJS = path.join(distDir, bundle);
+  const loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
+  const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : '';
   const context = {
     request: {
       baseUrl: urlPath,
@@ -34,8 +36,8 @@ export const render = async (ctx, renderOptions, runner) => {
     },
     redirection: {},
     template,
+    loadableStats,
     entryName,
-    distDir,
     staticGenerate,
     logger: undefined,
     metrics: undefined

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

@@ -56,7 +56,11 @@ export class RouteMatcher {
 
 
   matchUrlPath(requestUrl) {
-    const urlWithoutSlash = requestUrl.endsWith('/') && requestUrl !== '/' ? requestUrl.slice(0, -1) : requestUrl;
+    let urlWithoutSlash = requestUrl.endsWith('/') && requestUrl !== '/' ? requestUrl.slice(0, -1) : requestUrl;
+
+    if (urlWithoutSlash.endsWith('.html')) {
+      urlWithoutSlash = urlWithoutSlash.slice(0, -5);
+    }
 
     if (this.urlMatcher) {
       return Boolean(this.urlMatcher(urlWithoutSlash));

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

@@ -381,7 +381,7 @@ export class ModernServer {
       routeAPI
     });
 
-    if (res.headersSent) {
+    if (this.isSend(res)) {
       return;
     }
 
@@ -405,7 +405,7 @@ export class ModernServer {
     } // frameWebHandler has process request
 
 
-    if (res.headersSent) {
+    if (this.isSend(res)) {
       return;
     }
 
@@ -439,8 +439,7 @@ export class ModernServer {
       return;
     }
 
-    if (res.getHeader('Location') && isRedirect(res.statusCode)) {
-      res.end();
+    if (this.isSend(res)) {
       return;
     }
 
@@ -452,6 +451,11 @@ export class ModernServer {
         context,
         templateAPI
       });
+
+      if (this.isSend(res)) {
+        return;
+      }
+
       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.
@@ -465,6 +469,19 @@ export class ModernServer {
     res.end(response);
   }
 
+  isSend(res) {
+    if (res.headersSent) {
+      return true;
+    }
+
+    if (res.getHeader('Location') && isRedirect(res.statusCode)) {
+      res.end();
+      return true;
+    }
+
+    return false;
+  }
+
   async injectMicroFE(context, templateAPI) {
     var _conf$runtime, _conf$server;
 

package/dist/js/node/libs/loadConfig.js

@@ -38,7 +38,7 @@ const requireConfig = serverConfigPath => {
   return {};
 };
 /**
- * 对配置进行合并，开发环境下,cliConfig 与 serverConfig 进行深合并
+ * 对配置进行合并，开发环境下，cliConfig 与 serverConfig 进行深合并
  * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
  * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
  */

package/dist/js/node/libs/render/index.js

@@ -55,7 +55,18 @@ const createRenderHandler = ({
   const useModern = // route.enableModernMode &&
   (0, _modern.supportModern)(ctx) && _utils.fs.existsSync(modernEntry);
 
-  const templateHTML = useModern ? modernEntry : entry; // handles ssr first
+  const templatePath = useModern ? modernEntry : entry;
+
+  if (!_utils.fs.existsSync(templatePath)) {
+    throw new Error(`Could not find template file: ${templatePath}`);
+  }
+
+  const content = await (0, _reader.readFile)(templatePath);
+
+  if (!content) {
+    return null;
+  } // handles ssr first
+
 
   if (route.isSSR) {
     try {
@@ -64,7 +75,7 @@ const createRenderHandler = ({
         entryName: route.entryName,
         urlPath: route.urlPath,
         bundle: route.bundle,
-        template: templateHTML,
+        template: content.toString(),
         staticGenerate
       }, runner);
       return result;
@@ -74,15 +85,9 @@ const createRenderHandler = ({
     }
   }
 
-  const content = await (0, _reader.readFile)(templateHTML);
-
-  if (!content) {
-    return null;
-  }
-
   return {
     content,
-    contentType: _utils.mime.contentType(_path.default.extname(templateHTML))
+    contentType: _utils.mime.contentType(_path.default.extname(templatePath))
   };
 };
 

package/dist/js/node/libs/render/ssr.js

@@ -29,6 +29,9 @@ const render = async (ctx, renderOptions, runner) => {
 
   const bundleJS = _path.default.join(distDir, bundle);
 
+  const loadableUri = _path.default.join(distDir, _utils.LOADABLE_STATS_FILE);
+
+  const loadableStats = _utils.fs.existsSync(loadableUri) ? require(loadableUri) : '';
   const context = {
     request: {
       baseUrl: urlPath,
@@ -50,8 +53,8 @@ const render = async (ctx, renderOptions, runner) => {
     },
     redirection: {},
     template,
+    loadableStats,
     entryName,
-    distDir,
     staticGenerate,
     logger: undefined,
     metrics: undefined

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

@@ -68,7 +68,11 @@ class RouteMatcher {
 
 
   matchUrlPath(requestUrl) {
-    const urlWithoutSlash = requestUrl.endsWith('/') && requestUrl !== '/' ? requestUrl.slice(0, -1) : requestUrl;
+    let urlWithoutSlash = requestUrl.endsWith('/') && requestUrl !== '/' ? requestUrl.slice(0, -1) : requestUrl;
+
+    if (urlWithoutSlash.endsWith('.html')) {
+      urlWithoutSlash = urlWithoutSlash.slice(0, -5);
+    }
 
     if (this.urlMatcher) {
       return Boolean(this.urlMatcher(urlWithoutSlash));

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

@@ -418,7 +418,7 @@ class ModernServer {
       routeAPI
     });
 
-    if (res.headersSent) {
+    if (this.isSend(res)) {
       return;
     }
 
@@ -442,7 +442,7 @@ class ModernServer {
     } // frameWebHandler has process request
 
 
-    if (res.headersSent) {
+    if (this.isSend(res)) {
       return;
     }
 
@@ -476,8 +476,7 @@ class ModernServer {
       return;
     }
 
-    if (res.getHeader('Location') && (0, _utils2.isRedirect)(res.statusCode)) {
-      res.end();
+    if (this.isSend(res)) {
       return;
     }
 
@@ -489,6 +488,11 @@ class ModernServer {
         context,
         templateAPI
       });
+
+      if (this.isSend(res)) {
+        return;
+      }
+
       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.
@@ -502,6 +506,19 @@ class ModernServer {
     res.end(response);
   }
 
+  isSend(res) {
+    if (res.headersSent) {
+      return true;
+    }
+
+    if (res.getHeader('Location') && (0, _utils2.isRedirect)(res.statusCode)) {
+      res.end();
+      return true;
+    }
+
+    return false;
+  }
+
   async injectMicroFE(context, templateAPI) {
     var _conf$runtime, _conf$server;
 

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

@@ -1,9 +1,8 @@
-import type { NormalizedConfig } from '@modern-js/core';
-import type { ServerConfig } from '@modern-js/server-core';
+import type { ServerConfig, ServerOptions } from '@modern-js/server-core';
 export declare const getServerConfigPath: (distDirectory: string, serverConfigFile?: string) => string;
 export declare const requireConfig: (serverConfigPath: string) => any;
 /**
- * 对配置进行合并，开发环境下,cliConfig 与 serverConfig 进行深合并
+ * 对配置进行合并，开发环境下，cliConfig 与 serverConfig 进行深合并
  * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
  * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
  */
@@ -13,7 +12,7 @@ export declare const loadConfig: ({
   serverConfig,
   resolvedConfigPath
 }: {
-  cliConfig: NormalizedConfig;
+  cliConfig: ServerOptions;
   serverConfig: ServerConfig;
   resolvedConfigPath: string;
 }) => any;

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

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

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

@@ -1,7 +1,6 @@
 /// <reference types="node" />
 import { IncomingMessage, ServerResponse, Server } from 'http';
-import { Adapter, APIServerStartInput } from '@modern-js/server-core';
-import type { NormalizedConfig } from '@modern-js/core';
+import { Adapter, APIServerStartInput, ServerOptions } from '@modern-js/server-core';
 import type { ModernServerContext } from '@modern-js/types';
 import type { ContextOptions } from '../libs/context';
 import { ModernServerOptions, NextFunction, ServerHookRunner, Metrics, Logger, ModernServerInterface, HookNames, BuildOptions, ModernServerHandler } from '../type';
@@ -14,7 +13,7 @@ export declare class ModernServer implements ModernServerInterface {
   distDir: string;
   protected workDir: string;
   protected router: RouteMatchManager;
-  protected conf: NormalizedConfig;
+  protected conf: ServerOptions;
   protected handlers: ModernServerAsyncHandler[];
   protected presetRoutes?: ModernRouteInterface[];
   protected runner: ServerHookRunner;
@@ -70,6 +69,7 @@ export declare class ModernServer implements ModernServerInterface {
   protected warmupSSRBundle(): void;
   protected createContext(req: IncomingMessage, res: ServerResponse, options?: ContextOptions): import("../libs/context").ModernServerContext;
   private routeHandler;
+  private isSend;
   private injectMicroFE;
   private compose;
   private requestHandler;

package/dist/types/type.d.ts

@@ -1,9 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { IncomingMessage, Server, ServerResponse } from 'http';
-import { serverManager } from '@modern-js/server-core';
+import { serverManager, ServerOptions } from '@modern-js/server-core';
 import type { ServerPlugin } from '@modern-js/server-core';
-import type { NormalizedConfig } from '@modern-js/core';
 import type { Metrics, Logger, NextFunction, ModernServerContext } from '@modern-js/types';
 import type { ModernRouteInterface } from './libs/route';
 declare module 'http' {
@@ -15,7 +14,7 @@ declare module 'http' {
 declare type Plugin = string | [string, any] | ServerPlugin;
 export declare type ModernServerOptions = {
   pwd: string;
-  config: NormalizedConfig;
+  config: ServerOptions;
   plugins?: Plugin[];
   routes?: ModernRouteInterface[];
   staticGenerate?: boolean;
@@ -42,8 +41,8 @@ export declare type RenderResult = {
 export declare type ConfWithBFF = {
   bff?: {
     prefix: string;
-  };
-} & NormalizedConfig;
+  } & ServerOptions['bff'];
+};
 export declare type Then<T> = T extends PromiseLike<infer U> ? U : T;
 export declare type ServerHookRunner = Then<ReturnType<typeof serverManager.init>>;
 export declare type BuildOptions = {

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.20.0",
+  "version": "1.21.0",
   "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.20.0",
+    "@modern-js/utils": "1.21.0",
     "@babel/compat-data": "^7.17.10",
-    "@modern-js/server-core": "1.20.0",
+    "@modern-js/server-core": "1.21.0",
     "axios": "^0.24.0",
     "etag": "^1.8.1",
     "fresh": "^0.5.2",
@@ -45,10 +45,10 @@
     "ua-parser-js": "^0.7.28"
   },
   "devDependencies": {
-    "@modern-js/types": "1.20.0",
-    "@modern-js/core": "1.20.0",
-    "@scripts/jest-config": "1.20.0",
-    "@scripts/build": "1.20.0",
+    "@modern-js/types": "1.21.0",
+    "@modern-js/core": "1.21.0",
+    "@scripts/jest-config": "1.21.0",
+    "@scripts/build": "1.21.0",
     "@types/cookie": "^0.4.1",
     "@types/jest": "^27",
     "@types/lru-cache": "^5.1.1",