@modern-js/prod-server 2.10.0 → 2.12.0

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/prod-server
 
+## 2.12.0
+
+### Patch Changes
+
+- 7980842: fix: function injectServerData name typo
+
+  fix: 修复 injectServerData 函数命名错误
+
+- Updated dependencies [c2ca6c8]
+- Updated dependencies [6d86e34]
+  - @modern-js/utils@2.12.0
+  - @modern-js/server-core@2.12.0
+
+## 2.11.0
+
+### Patch Changes
+
+- 381a3b9: feat(utils): move universal utils to the universal folder
+
+  feat(utils): 将运行时使用的 utils 移动到 universal 目录
+
+- Updated dependencies [cfb058f]
+- Updated dependencies [0bd018b]
+- Updated dependencies [5d624fd]
+- Updated dependencies [e2466a1]
+- Updated dependencies [02bb383]
+- Updated dependencies [381a3b9]
+- Updated dependencies [7a60f10]
+- Updated dependencies [274b2e5]
+- Updated dependencies [b9e1c54]
+  - @modern-js/utils@2.11.0
+  - @modern-js/server-core@2.11.0
+
 ## 2.10.0
 
 ### Minor Changes

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

@@ -88,7 +88,7 @@ const createRenderHandler = ({
     }
   }
   return {
-    content: route.entryName ? (0, import_utils2.injectSeverData)(content.toString(), ctx) : content,
+    content: route.entryName ? (0, import_utils2.injectServerData)(content.toString(), ctx) : content,
     contentType: import_utils.mime.contentType(import_path.default.extname(templatePath))
   };
 };

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

@@ -32,6 +32,7 @@ __export(ssr_exports, {
 module.exports = __toCommonJS(ssr_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
+var import_constants = require("@modern-js/utils/constants");
 var import_cache = __toESM(require("./cache"));
 var import_measure = require("./measure");
 var import_utils2 = require("./utils");
@@ -47,9 +48,9 @@ const render = async (ctx, renderOptions, runner) => {
     enableUnsafeCtx = false
   } = renderOptions;
   const bundleJS = import_path.default.join(distDir, bundle);
-  const loadableUri = import_path.default.join(distDir, import_utils.LOADABLE_STATS_FILE);
+  const loadableUri = import_path.default.join(distDir, import_constants.LOADABLE_STATS_FILE);
   const loadableStats = import_utils.fs.existsSync(loadableUri) ? require(loadableUri) : "";
-  const routesManifestUri = import_path.default.join(distDir, import_utils.ROUTE_MINIFEST_FILE);
+  const routesManifestUri = import_path.default.join(distDir, import_constants.ROUTE_MANIFEST_FILE);
   const routeManifest = import_utils.fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
   const context = {
     request: {
@@ -86,7 +87,7 @@ const render = async (ctx, renderOptions, runner) => {
   context.logger = (0, import_measure.createLogger)(context, ctx.logger);
   context.metrics = (0, import_measure.createMetrics)(context, ctx.metrics);
   runner.extendSSRContext(context);
-  const serverRender = require(bundleJS)[import_utils.SERVER_RENDER_FUNCTION_NAME];
+  const serverRender = require(bundleJS)[import_constants.SERVER_RENDER_FUNCTION_NAME];
   const content = await (0, import_cache.default)(serverRender, ctx)(context);
   const { url, status = 302 } = context.redirection;
   if (url) {
@@ -99,7 +100,7 @@ const render = async (ctx, renderOptions, runner) => {
   }
   if (typeof content === "string") {
     return {
-      content: (0, import_utils2.injectSeverData)(content, ctx),
+      content: (0, import_utils2.injectServerData)(content, ctx),
       contentType: import_utils.mime.contentType("html")
     };
   } else {

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

@@ -17,12 +17,12 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
-  injectServerDataStream: () => injectServerDataStream,
-  injectSeverData: () => injectSeverData
+  injectServerData: () => injectServerData,
+  injectServerDataStream: () => injectServerDataStream
 });
 module.exports = __toCommonJS(utils_exports);
 var import_template = require("../hook-api/template");
-const injectSeverData = (content, context) => {
+const injectServerData = (content, context) => {
   const template = new import_template.TemplateAPI(content);
   template.prependHead(
     `<script>window._SERVER_DATA=${JSON.stringify(
@@ -42,6 +42,6 @@ const injectServerDataStream = (content, context) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  injectServerDataStream,
-  injectSeverData
+  injectServerData,
+  injectServerDataStream
 });

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

@@ -128,7 +128,7 @@ import { ERROR_DIGEST } from "../../constants";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
-import { injectSeverData } from "./utils";
+import { injectServerData } from "./utils";
 var createRenderHandler = function(param) {
     var distDir = param.distDir, staticGenerate = param.staticGenerate, forceCSR = param.forceCSR;
     return function() {
@@ -219,7 +219,7 @@ var createRenderHandler = function(param) {
                         return [
                             2,
                             {
-                                content: route.entryName ? injectSeverData(content.toString(), ctx) : content,
+                                content: route.entryName ? injectServerData(content.toString(), ctx) : content,
                                 contentType: mime.contentType(path.extname(templatePath))
                             }
                         ];

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

@@ -123,10 +123,11 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import { fs, LOADABLE_STATS_FILE, mime, ROUTE_MINIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
+import { fs, mime } from "@modern-js/utils";
+import { LOADABLE_STATS_FILE, ROUTE_MANIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils/constants";
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
-import { injectServerDataStream, injectSeverData } from "./utils";
+import { injectServerDataStream, injectServerData } from "./utils";
 var render = function() {
     var _ref = _asyncToGenerator(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;
@@ -137,7 +138,7 @@ var render = function() {
                     bundleJS = path.join(distDir, bundle);
                     loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
                     loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
-                    routesManifestUri = path.join(distDir, ROUTE_MINIFEST_FILE);
+                    routesManifestUri = path.join(distDir, ROUTE_MANIFEST_FILE);
                     routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
                     context = {
                         request: {
@@ -197,7 +198,7 @@ var render = function() {
                         return [
                             2,
                             {
-                                content: injectSeverData(content, ctx),
+                                content: injectServerData(content, ctx),
                                 contentType: mime.contentType("html")
                             }
                         ];

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

@@ -1,5 +1,5 @@
 import { TemplateAPI, templateInjectableStream } from "../hook-api/template";
-var injectSeverData = function(content, context) {
+var injectServerData = function(content, context) {
     var template = new TemplateAPI(content);
     template.prependHead("<script>window._SERVER_DATA=".concat(JSON.stringify(context.serverData), "</script>"));
     return template.get();
@@ -9,4 +9,4 @@ var injectServerDataStream = function(content, context) {
         prependHead: "<script>window._SERVER_DATA=".concat(JSON.stringify(context.serverData), "</script>")
     }));
 };
-export { injectServerDataStream, injectSeverData };
+export { injectServerData, injectServerDataStream };

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

@@ -4,7 +4,7 @@ import { ERROR_DIGEST } from "../../constants";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
-import { injectSeverData } from "./utils";
+import { injectServerData } from "./utils";
 const createRenderHandler = ({
   distDir,
   staticGenerate,
@@ -56,7 +56,7 @@ const createRenderHandler = ({
     }
   }
   return {
-    content: route.entryName ? injectSeverData(content.toString(), ctx) : content,
+    content: route.entryName ? injectServerData(content.toString(), ctx) : content,
     contentType: mime.contentType(path.extname(templatePath))
   };
 };

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

@@ -1,14 +1,13 @@
 import path from "path";
+import { fs, mime } from "@modern-js/utils";
 import {
-  fs,
   LOADABLE_STATS_FILE,
-  mime,
-  ROUTE_MINIFEST_FILE,
+  ROUTE_MANIFEST_FILE,
   SERVER_RENDER_FUNCTION_NAME
-} from "@modern-js/utils";
+} from "@modern-js/utils/constants";
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
-import { injectServerDataStream, injectSeverData } from "./utils";
+import { injectServerDataStream, injectServerData } from "./utils";
 const render = async (ctx, renderOptions, runner) => {
   var _a;
   const {
@@ -23,7 +22,7 @@ const render = async (ctx, renderOptions, runner) => {
   const bundleJS = path.join(distDir, bundle);
   const loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
   const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
-  const routesManifestUri = path.join(distDir, ROUTE_MINIFEST_FILE);
+  const routesManifestUri = path.join(distDir, ROUTE_MANIFEST_FILE);
   const routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
   const context = {
     request: {
@@ -73,7 +72,7 @@ const render = async (ctx, renderOptions, runner) => {
   }
   if (typeof content === "string") {
     return {
-      content: injectSeverData(content, ctx),
+      content: injectServerData(content, ctx),
       contentType: mime.contentType("html")
     };
   } else {

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

@@ -1,5 +1,5 @@
 import { TemplateAPI, templateInjectableStream } from "../hook-api/template";
-const injectSeverData = (content, context) => {
+const injectServerData = (content, context) => {
   const template = new TemplateAPI(content);
   template.prependHead(
     `<script>window._SERVER_DATA=${JSON.stringify(
@@ -18,6 +18,6 @@ const injectServerDataStream = (content, context) => {
   );
 };
 export {
-  injectServerDataStream,
-  injectSeverData
+  injectServerData,
+  injectServerDataStream
 };

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/J6fbpWzvbo_85KxyybF4s/src/type" />
+/// <reference types=".dts-temp/DxlrmidoZSzE3A7elWdZ1/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
 import { Readable } from 'stream';
 import type { ModernServerContext } from '@modern-js/types';
-export declare const injectSeverData: (content: string, context: ModernServerContext) => string;
+export declare const injectServerData: (content: string, context: ModernServerContext) => string;
 export declare const injectServerDataStream: (content: Readable, context: ModernServerContext) => import("stream").Transform;

package/dist/types/utils.d.ts

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

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.10.0",
+  "version": "2.12.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -56,8 +56,8 @@
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.10.0",
-    "@modern-js/server-core": "2.10.0"
+    "@modern-js/utils": "2.12.0",
+    "@modern-js/server-core": "2.12.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -73,10 +73,10 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^4",
-    "@modern-js/types": "2.10.0",
-    "@modern-js/server-core": "2.10.0",
-    "@scripts/build": "2.10.0",
-    "@scripts/jest-config": "2.10.0"
+    "@modern-js/types": "2.12.0",
+    "@modern-js/server-core": "2.12.0",
+    "@scripts/jest-config": "2.12.0",
+    "@scripts/build": "2.12.0"
   },
   "sideEffects": false,
   "publishConfig": {