@modern-js/prod-server 2.17.1 → 2.18.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/prod-server
 
+## 2.18.1
+
+### Patch Changes
+
+- @modern-js/server-core@2.18.1
+- @modern-js/utils@2.18.1
+
+## 2.18.0
+
+### Patch Changes
+
+- @modern-js/server-core@2.18.0
+- @modern-js/utils@2.18.0
+
 ## 2.17.1
 
 ### Patch Changes

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

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "render", {
 });
 const _path = /* @__PURE__ */ _interop_require_default(require("path"));
 const _utils = require("@modern-js/utils");
-const _constants = require("@modern-js/utils/constants");
 const _cache = /* @__PURE__ */ _interop_require_default(require("./cache"));
 const _measure = require("./measure");
 const _utils1 = require("./utils");
@@ -21,9 +20,9 @@ const render = async (ctx, renderOptions, runner) => {
   var _ctx_res;
   const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false } = renderOptions;
   const bundleJS = _path.default.join(distDir, bundle);
-  const loadableUri = _path.default.join(distDir, _constants.LOADABLE_STATS_FILE);
+  const loadableUri = _path.default.join(distDir, _utils.LOADABLE_STATS_FILE);
   const loadableStats = _utils.fs.existsSync(loadableUri) ? require(loadableUri) : "";
-  const routesManifestUri = _path.default.join(distDir, _constants.ROUTE_MANIFEST_FILE);
+  const routesManifestUri = _path.default.join(distDir, _utils.ROUTE_MANIFEST_FILE);
   const routeManifest = _utils.fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
   const context = {
     request: {
@@ -59,7 +58,7 @@ const render = async (ctx, renderOptions, runner) => {
   context.logger = (0, _measure.createLogger)(context, ctx.logger);
   context.metrics = (0, _measure.createMetrics)(context, ctx.metrics);
   runner.extendSSRContext(context);
-  const serverRender = require(bundleJS)[_constants.SERVER_RENDER_FUNCTION_NAME];
+  const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];
   const content = await (0, _cache.default)(serverRender, ctx)(context);
   const { url, status = 302 } = context.redirection;
   if (url) {

package/dist/esm/libs/context/context.js

@@ -23,7 +23,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/hook-api/index.js

@@ -34,7 +34,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/hook-api/route.js

@@ -23,7 +23,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/hook-api/template.js

@@ -23,7 +23,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/loadConfig.js

@@ -1,7 +1,7 @@
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/logger.js

@@ -38,7 +38,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/proxy.js

@@ -41,7 +41,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/render/cache/__tests__/cache.test.js

@@ -41,7 +41,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

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

@@ -30,7 +30,7 @@ function _async_to_generator(fn) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/render/cache/page-caches/index.js

@@ -140,7 +140,7 @@ function _createPageCaches() {
       switch (_state.label) {
         case 0:
           constructorOptions = {
-            max
+            max: max
           };
           cacheInstance = new LRUCaches(constructorOptions);
           return [

package/dist/esm/libs/render/cache/page-caches/lru.js

@@ -23,7 +23,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/render/cache/spr.js

@@ -52,7 +52,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -333,7 +333,7 @@ var CacheManager = /* @__PURE__ */ function() {
           includes: config.includes || null,
           limit: config.staleLimit,
           matches: config.matches || null,
-          caches
+          caches: caches
         };
       }
     },
@@ -374,8 +374,8 @@ var CacheManager = /* @__PURE__ */ function() {
                   {
                     content: html || "",
                     contentType: mime.contentType("html"),
-                    isStale,
-                    isGarbage,
+                    isStale: isStale,
+                    isGarbage: isGarbage,
                     hash: cacheHash
                   }
                 ];
@@ -438,9 +438,9 @@ var CacheManager = /* @__PURE__ */ function() {
                             next.caches.set(cacheHash, {
                               expireTime: Date.now() + cacheConfig.interval * 1e3,
                               limitTime: typeof limit === "number" ? Date.now() + limit * 1e3 : null,
-                              cacheHash,
+                              cacheHash: cacheHash,
                               html: storeHTML,
-                              size
+                              size: size
                             })
                           ];
                         case 1:

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

@@ -202,12 +202,12 @@ export var createRenderHandler = function(param) {
             return [
               4,
               ssr.render(ctx, {
-                distDir,
+                distDir: distDir,
                 entryName: route.entryName,
                 urlPath: route.urlPath,
                 bundle: route.bundle,
                 template: content.toString(),
-                staticGenerate
+                staticGenerate: staticGenerate
               }, runner)
             ];
           case 5:

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

@@ -12,7 +12,7 @@ function _array_without_holes(arr) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -98,20 +98,20 @@ export var createMetrics = function(context, metrics) {
   var emitTimer = function(name, cost) {
     var tags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
     metrics.emitTimer(name, cost, _object_spread_props(_object_spread({}, tags), {
-      pathname,
-      entry
+      pathname: pathname,
+      entry: entry
     }));
   };
   var emitCounter = function(name, counter) {
     var tags = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {};
     metrics.emitCounter(name, counter, _object_spread_props(_object_spread({}, tags), {
-      pathname,
-      entry
+      pathname: pathname,
+      entry: entry
     }));
   };
   return {
-    emitTimer,
-    emitCounter
+    emitTimer: emitTimer,
+    emitCounter: emitCounter
   };
 };
 export var createLogger = function(serverContext, logger) {
@@ -147,8 +147,8 @@ export var createLogger = function(serverContext, logger) {
     logger.error("SSR Error - ".concat(message, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, pathname, headersWithoutCookie(headers));
   };
   return {
-    error,
-    info,
-    debug
+    error: error,
+    info: info,
+    debug: debug
   };
 };

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

@@ -52,7 +52,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -187,8 +187,8 @@ var createCacheItem = function() {
           return [
             2,
             {
-              content,
-              mtime
+              content: content,
+              mtime: mtime
             }
           ];
       }
@@ -234,7 +234,7 @@ export var LruReader = /* @__PURE__ */ function() {
                   return [
                     2,
                     {
-                      content
+                      content: content
                     }
                   ];
                 }

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

@@ -130,8 +130,7 @@ var __generator = function(thisArg, body) {
   }
 };
 import path from "path";
-import { fs, mime } from "@modern-js/utils";
-import { LOADABLE_STATS_FILE, ROUTE_MANIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils/constants";
+import { fs, mime, LOADABLE_STATS_FILE, ROUTE_MANIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
 import { injectServerDataStream, injectServerData } from "./utils";
@@ -167,16 +166,16 @@ export var render = function() {
               locals: ((_ctx_res = ctx.res) === null || _ctx_res === void 0 ? void 0 : _ctx_res.locals) || {}
             },
             redirection: {},
-            template,
-            loadableStats,
-            routeManifest,
-            entryName,
-            staticGenerate,
+            template: template,
+            loadableStats: loadableStats,
+            routeManifest: routeManifest,
+            entryName: entryName,
+            staticGenerate: staticGenerate,
             logger: void 0,
             metrics: void 0,
             req: ctx.req,
             res: ctx.res,
-            enableUnsafeCtx
+            enableUnsafeCtx: enableUnsafeCtx
           };
           context.logger = createLogger(context, ctx.logger);
           context.metrics = createMetrics(context, ctx.metrics);

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

@@ -209,7 +209,7 @@ function _handleDirectory() {
           return [
             2,
             {
-              content,
+              content: content,
               contentType: contentType || ""
             }
           ];

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

@@ -23,7 +23,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

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

@@ -23,7 +23,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/libs/route/route.js

@@ -6,7 +6,7 @@ function _class_call_check(instance, Constructor) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true

package/dist/esm/server/index.js

@@ -63,7 +63,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -403,7 +403,7 @@ export var Server = /* @__PURE__ */ function() {
               options.config = loadConfig({
                 cliConfig: config,
                 serverConfig: finalServerConfig,
-                resolvedConfigPath
+                resolvedConfigPath: resolvedConfigPath
               });
               return [
                 2
@@ -483,7 +483,7 @@ export var Server = /* @__PURE__ */ function() {
                 _options_internalPlugins = options.internalPlugins, internalPlugins = _options_internalPlugins === void 0 ? INTERNAL_SERVER_PLUGINS : _options_internalPlugins, pwd = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins;
                 serverPlugins = _this.serverConfig.plugins || [];
                 loadedPlugins = loadPlugins(pwd, _to_consumable_array(serverPlugins).concat(_to_consumable_array(plugins)), {
-                  internalPlugins
+                  internalPlugins: internalPlugins
                 });
                 debug("plugins", loadedPlugins);
                 loadedPlugins.forEach(function(p) {
@@ -535,7 +535,7 @@ export var Server = /* @__PURE__ */ function() {
           };
         });
         return {
-          appDirectory,
+          appDirectory: appDirectory,
           apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
           lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
           sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),

package/dist/esm/server/modernServer.js

@@ -52,7 +52,7 @@ function _create_class(Constructor, protoProps, staticProps) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -306,9 +306,9 @@ export var ModernServer = /* @__PURE__ */ function() {
                   ssrConfig = (_this_conf_server = _this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
                   forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
                   _this.routeRenderHandler = createRenderHandler({
-                    distDir,
-                    staticGenerate,
-                    forceCSR
+                    distDir: distDir,
+                    staticGenerate: staticGenerate,
+                    forceCSR: forceCSR
                   });
                   return [
                     4,
@@ -356,8 +356,8 @@ export var ModernServer = /* @__PURE__ */ function() {
                 return [
                   4,
                   _this.prepareFrameHandler({
-                    onlyWeb,
-                    onlyApi
+                    onlyWeb: onlyWeb,
+                    onlyApi: onlyApi
                   })
                 ];
               case 1:
@@ -491,7 +491,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                   4,
                   runner.prepareLoaderHandler({
                     serverRoutes: specs,
-                    distDir
+                    distDir: distDir
                   }, {
                     onLast: function() {
                       return null;
@@ -771,7 +771,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                   4,
                   _this.routeRenderHandler({
                     ctx: context,
-                    route,
+                    route: route,
                     runner: _this.runner
                   })
                 ];
@@ -1153,7 +1153,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                 return [
                   4,
                   _this.routeRenderHandler({
-                    route,
+                    route: route,
                     ctx: context,
                     runner: _this.runner
                   })

package/dist/esm/utils.js

@@ -12,7 +12,7 @@ function _array_without_holes(arr) {
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
-      value,
+      value: value,
       enumerable: true,
       configurable: true,
       writable: true
@@ -90,9 +90,9 @@ export var createMiddlewareCollecter = function() {
     };
   };
   return {
-    getMiddlewares,
-    addWebMiddleware,
-    addAPIMiddleware
+    getMiddlewares: getMiddlewares,
+    addWebMiddleware: addWebMiddleware,
+    addAPIMiddleware: addAPIMiddleware
   };
 };
 export var getStaticReg = function() {

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

@@ -1,6 +1,5 @@
 import path from "path";
-import { fs, mime } from "@modern-js/utils";
-import { LOADABLE_STATS_FILE, ROUTE_MANIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils/constants";
+import { fs, mime, LOADABLE_STATS_FILE, ROUTE_MANIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
 import { injectServerDataStream, injectServerData } from "./utils";

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

package/dist/types/utils.d.ts

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

package/package.json

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