@modern-js/prod-server 2.20.0 → 2.21.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @modern-js/prod-server
 
+## 2.21.0
+
+### Patch Changes
+
+- cfc5bda: feat: ssr mode support async entry
+  feat: ssr 模式支持异步入口
+- 26dcf3a: chore: bump typescript to v5 in devDependencies
+
+  chore: 升级 devDependencies 中的 typescript 版本到 v5
+
+- 43b4e83: feat: support security.nonce for add nonce attribute on script tag
+  feat: 支持 security.nonce 配置，为 script 标签添加 nonce 属性
+- Updated dependencies [e81eeaf]
+- Updated dependencies [26dcf3a]
+- Updated dependencies [056627f]
+- Updated dependencies [0fc15ca]
+- Updated dependencies [43b4e83]
+- Updated dependencies [ad78387]
+  - @modern-js/utils@2.21.0
+  - @modern-js/server-core@2.21.0
+
 ## 2.20.0
 
 ### Patch Changes

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

@@ -15,7 +15,7 @@ const _static = require("./static");
 const _reader = require("./reader");
 const _ssr = /* @__PURE__ */ _interop_require_wildcard._(require("./ssr"));
 const _utils1 = require("./utils");
-const createRenderHandler = ({ distDir, staticGenerate, forceCSR }) => async function render({ ctx, route, runner }) {
+const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce }) => async function render({ ctx, route, runner }) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -42,7 +42,8 @@ const createRenderHandler = ({ distDir, staticGenerate, forceCSR }) => async fun
         urlPath: route.urlPath,
         bundle: route.bundle,
         template: content.toString(),
-        staticGenerate
+        staticGenerate,
+        nonce
       }, runner);
       return result;
     } catch (err) {

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

@@ -14,7 +14,7 @@ const _measure = require("./measure");
 const _utils1 = require("./utils");
 const render = async (ctx, renderOptions, runner) => {
   var _ctx_res;
-  const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false } = renderOptions;
+  const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false, nonce } = renderOptions;
   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) : "";
@@ -49,12 +49,14 @@ const render = async (ctx, renderOptions, runner) => {
     metrics: void 0,
     req: ctx.req,
     res: ctx.res,
-    enableUnsafeCtx
+    enableUnsafeCtx,
+    nonce
   };
   context.logger = (0, _measure.createLogger)(context, ctx.logger);
   context.metrics = (0, _measure.createMetrics)(context, ctx.metrics);
   runner.extendSSRContext(context);
-  const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];
+  const bundleJSContent = await Promise.resolve(require(bundleJS));
+  const serverRender = bundleJSContent[_utils.SERVER_RENDER_FUNCTION_NAME];
   const content = await (0, _cache.default)(serverRender, ctx)(context);
   const { url, status = 302 } = context.redirection;
   if (url) {

package/dist/cjs/server/modernServer.js

@@ -25,7 +25,7 @@ const SERVER_DIR = "./server";
 class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _this_conf_server, _this_conf_output;
+    var _conf_bff, _this_conf_server, _conf_security, _this_conf_output;
     this.runner = runner;
     const { distDir, staticGenerate, conf } = this;
     (0, _utils1.debug)("final server conf", this.conf);
@@ -49,7 +49,8 @@ class ModernServer {
     this.routeRenderHandler = (0, _render.createRenderHandler)({
       distDir,
       staticGenerate,
-      forceCSR
+      forceCSR,
+      nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce
     });
     await this.setupBeforeProdMiddleware();
     this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));

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

@@ -8,7 +8,7 @@ import { readFile } from "./reader";
 import * as ssr from "./ssr";
 import { injectServerData } from "./utils";
 export var createRenderHandler = function(param) {
-  var distDir = param.distDir, staticGenerate = param.staticGenerate, forceCSR = param.forceCSR;
+  var distDir = param.distDir, staticGenerate = param.staticGenerate, forceCSR = param.forceCSR, nonce = param.nonce;
   return function() {
     var _render = _async_to_generator(function(param2) {
       var ctx, route, runner, entryPath, urlPath, entry, result, templatePath, content, useCSR, result1, err;
@@ -78,7 +78,8 @@ export var createRenderHandler = function(param) {
                 urlPath: route.urlPath,
                 bundle: route.bundle,
                 template: content.toString(),
-                staticGenerate: staticGenerate
+                staticGenerate: staticGenerate,
+                nonce: nonce
               }, runner)
             ];
           case 5:

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

@@ -7,11 +7,11 @@ import { createLogger, createMetrics } from "./measure";
 import { injectServerDataStream, injectServerData } from "./utils";
 export var render = function() {
   var _ref = _async_to_generator(function(ctx, renderOptions, runner) {
-    var _ctx_res, urlPath, bundle, distDir, template, entryName, staticGenerate, _renderOptions_enableUnsafeCtx, enableUnsafeCtx, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, serverRender, content, _context_redirection, url, _context_redirection_status, status;
+    var _ctx_res, urlPath, bundle, distDir, template, entryName, staticGenerate, _renderOptions_enableUnsafeCtx, enableUnsafeCtx, nonce, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, bundleJSContent, serverRender, content, _context_redirection, url, _context_redirection_status, status;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          urlPath = renderOptions.urlPath, bundle = renderOptions.bundle, distDir = renderOptions.distDir, template = renderOptions.template, entryName = renderOptions.entryName, staticGenerate = renderOptions.staticGenerate, _renderOptions_enableUnsafeCtx = renderOptions.enableUnsafeCtx, enableUnsafeCtx = _renderOptions_enableUnsafeCtx === void 0 ? false : _renderOptions_enableUnsafeCtx;
+          urlPath = renderOptions.urlPath, bundle = renderOptions.bundle, distDir = renderOptions.distDir, template = renderOptions.template, entryName = renderOptions.entryName, staticGenerate = renderOptions.staticGenerate, _renderOptions_enableUnsafeCtx = renderOptions.enableUnsafeCtx, enableUnsafeCtx = _renderOptions_enableUnsafeCtx === void 0 ? false : _renderOptions_enableUnsafeCtx, nonce = renderOptions.nonce;
           bundleJS = path.join(distDir, bundle);
           loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
           loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
@@ -46,17 +46,24 @@ export var render = function() {
             metrics: void 0,
             req: ctx.req,
             res: ctx.res,
-            enableUnsafeCtx: enableUnsafeCtx
+            enableUnsafeCtx: enableUnsafeCtx,
+            nonce: nonce
           };
           context.logger = createLogger(context, ctx.logger);
           context.metrics = createMetrics(context, ctx.metrics);
           runner.extendSSRContext(context);
-          serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
           return [
             4,
-            cache(serverRender, ctx)(context)
+            Promise.resolve(require(bundleJS))
           ];
         case 1:
+          bundleJSContent = _state.sent();
+          serverRender = bundleJSContent[SERVER_RENDER_FUNCTION_NAME];
+          return [
+            4,
+            cache(serverRender, ctx)(context)
+          ];
+        case 2:
           content = _state.sent();
           _context_redirection = context.redirection, url = _context_redirection.url, _context_redirection_status = _context_redirection.status, status = _context_redirection_status === void 0 ? 302 : _context_redirection_status;
           if (url) {

package/dist/esm/server/modernServer.js

@@ -65,7 +65,7 @@ export var ModernServer = /* @__PURE__ */ function() {
         function onInit(runner, app) {
           var _this = this;
           return _async_to_generator(function() {
-            var _conf_bff, _this_conf_server, _this_conf_output, distDir, staticGenerate, conf, usageRoutes, ssrConfig, forceCSR;
+            var _conf_bff, _this_conf_server, _conf_security, _this_conf_output, distDir, staticGenerate, conf, usageRoutes, ssrConfig, forceCSR;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -102,7 +102,8 @@ export var ModernServer = /* @__PURE__ */ function() {
                   _this.routeRenderHandler = createRenderHandler({
                     distDir: distDir,
                     staticGenerate: staticGenerate,
-                    forceCSR: forceCSR
+                    forceCSR: forceCSR,
+                    nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce
                   });
                   return [
                     4,

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

@@ -5,7 +5,7 @@ import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
 import { injectServerData } from "./utils";
-export const createRenderHandler = ({ distDir, staticGenerate, forceCSR }) => async function render({ ctx, route, runner }) {
+export const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce }) => async function render({ ctx, route, runner }) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -32,7 +32,8 @@ export const createRenderHandler = ({ distDir, staticGenerate, forceCSR }) => as
         urlPath: route.urlPath,
         bundle: route.bundle,
         template: content.toString(),
-        staticGenerate
+        staticGenerate,
+        nonce
       }, runner);
       return result;
     } catch (err) {

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

@@ -5,7 +5,7 @@ import { createLogger, createMetrics } from "./measure";
 import { injectServerDataStream, injectServerData } from "./utils";
 export const render = async (ctx, renderOptions, runner) => {
   var _ctx_res;
-  const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false } = renderOptions;
+  const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false, nonce } = renderOptions;
   const bundleJS = path.join(distDir, bundle);
   const loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
   const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
@@ -40,12 +40,14 @@ export const render = async (ctx, renderOptions, runner) => {
     metrics: void 0,
     req: ctx.req,
     res: ctx.res,
-    enableUnsafeCtx
+    enableUnsafeCtx,
+    nonce
   };
   context.logger = createLogger(context, ctx.logger);
   context.metrics = createMetrics(context, ctx.metrics);
   runner.extendSSRContext(context);
-  const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
+  const bundleJSContent = await Promise.resolve(require(bundleJS));
+  const serverRender = bundleJSContent[SERVER_RENDER_FUNCTION_NAME];
   const content = await cache(serverRender, ctx)(context);
   const { url, status = 302 } = context.redirection;
   if (url) {

package/dist/esm-node/server/modernServer.js

@@ -15,7 +15,7 @@ const SERVER_DIR = "./server";
 export class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _this_conf_server, _this_conf_output;
+    var _conf_bff, _this_conf_server, _conf_security, _this_conf_output;
     this.runner = runner;
     const { distDir, staticGenerate, conf } = this;
     debug("final server conf", this.conf);
@@ -39,7 +39,8 @@ export class ModernServer {
     this.routeRenderHandler = createRenderHandler({
       distDir,
       staticGenerate,
-      forceCSR
+      forceCSR,
+      nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce
     });
     await this.setupBeforeProdMiddleware();
     this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));

package/dist/types/index.d.ts

@@ -6,7 +6,5 @@ export { ModernServer } from './server/modernServer';
 export { createProxyHandler } from './libs/proxy';
 export * from './type';
 export * from './constants';
-
 declare const _default: (options: ModernServerOptions) => Promise<Server>;
-
 export default _default;

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

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/fH4DiwP0xq-KSokd2lFla/src/type" />
+/// <reference types=".dts-temp/dQl0PkddbjYymDTKBgvwm/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';
@@ -18,12 +18,10 @@ export declare class ModernServerContext implements ModernServerContextInterface
   /**
    * http response
    */
-
   res: ServerResponse;
   /**
    * url params
    */
-
   params: Record<string, string>;
   get logger(): import("@modern-js/types").Logger;
   get metrics(): import("@modern-js/types").Metrics;
@@ -54,7 +52,6 @@ export declare class ModernServerContext implements ModernServerContextInterface
   /**
    * 判断链接是否已经关闭
    */
-
   resHasHandled(): boolean;
   error(dig: string, e?: Error | string): void;
 }

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

@@ -6,7 +6,6 @@ export declare const requireConfig: (serverConfigPath: string) => any;
  * 生产环境下，resolvedConfig 与 serverConfig 进行深合并
  * resolvedConfigPath: 构建序列化后的 modern.config.js 文件路径
  */
-
 export declare const loadConfig: ({
   cliConfig,
   serverConfig,

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

@@ -44,7 +44,6 @@ declare const LOG_TYPES: {
     level: string;
   };
 };
-
 declare class Logger {
   private readonly level;
   private readonly config;
@@ -55,7 +54,6 @@ declare class Logger {
   private _log;
   private getLongestLabel;
 }
-
 type LoggerInterface = { [key in keyof typeof LOG_TYPES]: LoggerFunction };
 declare const logger: Logger & LoggerInterface;
 export { Logger };

package/dist/types/libs/render/cache/index.d.ts

@@ -2,7 +2,5 @@
 import { Readable } from 'stream';
 import type { ModernServerContext } from '@modern-js/types';
 import { RenderFunction, SSRServerContext } from '../type';
-
 declare const _default: (renderFn: RenderFunction, ctx: ModernServerContext) => (context: SSRServerContext) => Promise<string | Readable>;
-
 export default _default;

package/dist/types/libs/render/cache/spr.d.ts

@@ -1,6 +1,5 @@
 import LRUCache from 'lru-cache';
 import { CacheContent, CacheManagerOptions, CacheResult, CacheContext, CacheConfig } from './type';
-
 declare class CacheManager {
   cache: LRUCache<string, CacheContent>;
   cacheOptions: CacheManagerOptions;
@@ -18,7 +17,6 @@ declare class CacheManager {
   set(context: CacheContext, html: string, cacheConfig: CacheConfig, sync?: boolean): Promise<any>;
   del(context: CacheContext, cacheHash: string): Promise<void>;
 }
-
 export declare function createCache(): CacheManager;
 export declare function destroyCache(): void;
 export {};

package/dist/types/libs/render/index.d.ts

@@ -4,11 +4,13 @@ import { ModernRoute } from '../route';
 export declare const createRenderHandler: ({
   distDir,
   staticGenerate,
-  forceCSR
+  forceCSR,
+  nonce
 }: {
   distDir: string;
   staticGenerate: boolean;
   forceCSR?: boolean | undefined;
+  nonce?: string | undefined;
 }) => ({
   ctx,
   route,

package/dist/types/libs/render/ssr.d.ts

@@ -8,4 +8,5 @@ export declare const render: (ctx: ModernServerContext, renderOptions: {
   entryName: string;
   staticGenerate: boolean;
   enableUnsafeCtx?: boolean;
+  nonce?: string;
 }, runner: ServerHookRunner) => Promise<RenderResult>;

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

@@ -26,14 +26,12 @@ export declare class Server {
    * - 执行 prepare hook
    * - 执行 server init
    */
-
   init(): Promise<this>;
   /**
    * Execute config hooks
    * @param runner
    * @param options
    */
-
   private runConfigHook;
   private runPrepareHook;
   private initServerConfig;
@@ -41,7 +39,6 @@ export declare class Server {
    *
    * merge cliConfig and serverConfig
    */
-
   private initConfig;
   close(): Promise<void>;
   listen<T extends number | ListenOptions | undefined>(options: T, listener: any): void;

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/fH4DiwP0xq-KSokd2lFla/src/type" />
+/// <reference types=".dts-temp/dQl0PkddbjYymDTKBgvwm/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;

package/dist/types/workerServer.d.ts

@@ -19,7 +19,6 @@ export declare class ReturnResponse {
    * @param headers
    * @returns
    */
-
   appendHeaders(headers: Record<string, any>): this;
   /**
    * Iterate a Object
@@ -30,11 +29,11 @@ export declare class ReturnResponse {
    * @param headers
    * @returns
    */
-
   setHeaders(headers: Record<string, any>): this;
 }
 export type Manifest = {
-  pages: Record<string, // path
+  pages: Record<string,
+  // path
   {
     entryName: string;
     template: string;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.20.0",
+  "version": "2.21.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -61,8 +61,8 @@
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.20.0",
-    "@modern-js/server-core": "2.20.0"
+    "@modern-js/utils": "2.21.0",
+    "@modern-js/server-core": "2.21.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -77,11 +77,11 @@
     "jest": "^29",
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
-    "typescript": "^4",
-    "@modern-js/types": "2.20.0",
-    "@modern-js/server-core": "2.20.0",
-    "@scripts/jest-config": "2.20.0",
-    "@scripts/build": "2.20.0"
+    "typescript": "^5",
+    "@modern-js/types": "2.21.0",
+    "@modern-js/server-core": "2.21.0",
+    "@scripts/jest-config": "2.21.0",
+    "@scripts/build": "2.21.0"
   },
   "sideEffects": false,
   "publishConfig": {