@modern-js/server-core 2.67.4 → 2.67.6

package/dist/cjs/adapters/node/plugins/static.js

@@ -88,9 +88,23 @@ function matchPublicRoute(req, routes) {
   }
   return void 0;
 }
+const extractPathname = (url) => {
+  try {
+    if (url.includes("://")) {
+      return new URL(url).pathname || "/";
+    }
+    if (url.startsWith("//")) {
+      return new URL(`http:${url}`).pathname || "/";
+    }
+    return url;
+  } catch (e) {
+    return url;
+  }
+};
 function createStaticMiddleware(options) {
   const { pwd, routes } = options;
   const prefix = options.output.assetPrefix || "/";
+  const pathPrefix = extractPathname(prefix);
   const { distPath: { css: cssPath, js: jsPath, media: mediaPath } = {} } = options.output;
   const { favicon, faviconByEntries } = options.html;
   const favicons = prepareFavicons(favicon, faviconByEntries);
@@ -109,7 +123,7 @@ function createStaticMiddleware(options) {
     "icon.png",
     ...favicons
   ];
-  const regPrefix = prefix.endsWith("/") ? prefix : `${prefix}/`;
+  const regPrefix = pathPrefix.endsWith("/") ? pathPrefix : `${pathPrefix}/`;
   const staticPathRegExp = new RegExp(`^${regPrefix}(${[
     ...staticReg,
     ...iconReg
@@ -122,7 +136,7 @@ function createStaticMiddleware(options) {
     }
     const hit = staticPathRegExp.test(pathname);
     if (hit) {
-      const filepath = import_path.default.join(pwd, pathname.replace(prefix, () => ""));
+      const filepath = import_path.default.join(pwd, pathname.replace(pathPrefix, () => ""));
       if (!await import_utils.fs.pathExists(filepath)) {
         return next();
       }

package/dist/cjs/plugins/render/ssrRender.js

@@ -41,7 +41,7 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
   }
   const renderBundle = (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[entryName || import_constants.MAIN_ENTRY_NAME];
   if (!renderBundle) {
-    throw new Error(`Can't found renderBundle ${entryName || import_constants.MAIN_ENTRY_NAME}`);
+    throw new Error(`Can't find renderBundle ${entryName || import_constants.MAIN_ENTRY_NAME}`);
   }
   const requestHandler = await renderBundle[SERVER_RUNTIME_ENTRY];
   const config = createRequestHandlerConfig(userConfig);

package/dist/esm/adapters/node/plugins/static.js

@@ -110,9 +110,23 @@ function matchPublicRoute(req, routes) {
   }
   return void 0;
 }
+var extractPathname = function(url) {
+  try {
+    if (url.includes("://")) {
+      return new URL(url).pathname || "/";
+    }
+    if (url.startsWith("//")) {
+      return new URL("http:".concat(url)).pathname || "/";
+    }
+    return url;
+  } catch (e) {
+    return url;
+  }
+};
 function createStaticMiddleware(options) {
   var pwd = options.pwd, routes = options.routes;
   var prefix = options.output.assetPrefix || "/";
+  var pathPrefix = extractPathname(prefix);
   var _options_output = options.output, tmp = _options_output.distPath, _ref = tmp === void 0 ? {} : tmp, cssPath = _ref.css, jsPath = _ref.js, mediaPath = _ref.media;
   var _options_html = options.html, favicon = _options_html.favicon, faviconByEntries = _options_html.faviconByEntries;
   var favicons = prepareFavicons(favicon, faviconByEntries);
@@ -131,7 +145,7 @@ function createStaticMiddleware(options) {
     "favicon.ico",
     "icon.png"
   ].concat(_to_consumable_array(favicons));
-  var regPrefix = prefix.endsWith("/") ? prefix : "".concat(prefix, "/");
+  var regPrefix = pathPrefix.endsWith("/") ? pathPrefix : "".concat(pathPrefix, "/");
   var staticPathRegExp = new RegExp("^".concat(regPrefix, "(").concat(_to_consumable_array(staticReg).concat(_to_consumable_array(iconReg)).join("|"), ")"));
   return function() {
     var _ref2 = _async_to_generator(function(c, next) {
@@ -153,7 +167,7 @@ function createStaticMiddleware(options) {
                 3,
                 4
               ];
-            filepath = path.join(pwd, pathname.replace(prefix, function() {
+            filepath = path.join(pwd, pathname.replace(pathPrefix, function() {
               return "";
             }));
             return [

package/dist/esm/plugins/render/ssrRender.js

@@ -29,7 +29,7 @@ function _ssrRender() {
           }
           renderBundle = (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[entryName || MAIN_ENTRY_NAME];
           if (!renderBundle) {
-            throw new Error("Can't found renderBundle ".concat(entryName || MAIN_ENTRY_NAME));
+            throw new Error("Can't find renderBundle ".concat(entryName || MAIN_ENTRY_NAME));
           }
           return [
             4,

package/dist/esm-node/adapters/node/plugins/static.js

@@ -53,9 +53,23 @@ function matchPublicRoute(req, routes) {
   }
   return void 0;
 }
+const extractPathname = (url) => {
+  try {
+    if (url.includes("://")) {
+      return new URL(url).pathname || "/";
+    }
+    if (url.startsWith("//")) {
+      return new URL(`http:${url}`).pathname || "/";
+    }
+    return url;
+  } catch (e) {
+    return url;
+  }
+};
 function createStaticMiddleware(options) {
   const { pwd, routes } = options;
   const prefix = options.output.assetPrefix || "/";
+  const pathPrefix = extractPathname(prefix);
   const { distPath: { css: cssPath, js: jsPath, media: mediaPath } = {} } = options.output;
   const { favicon, faviconByEntries } = options.html;
   const favicons = prepareFavicons(favicon, faviconByEntries);
@@ -74,7 +88,7 @@ function createStaticMiddleware(options) {
     "icon.png",
     ...favicons
   ];
-  const regPrefix = prefix.endsWith("/") ? prefix : `${prefix}/`;
+  const regPrefix = pathPrefix.endsWith("/") ? pathPrefix : `${pathPrefix}/`;
   const staticPathRegExp = new RegExp(`^${regPrefix}(${[
     ...staticReg,
     ...iconReg
@@ -87,7 +101,7 @@ function createStaticMiddleware(options) {
     }
     const hit = staticPathRegExp.test(pathname);
     if (hit) {
-      const filepath = path.join(pwd, pathname.replace(prefix, () => ""));
+      const filepath = path.join(pwd, pathname.replace(pathPrefix, () => ""));
       if (!await fs.pathExists(filepath)) {
         return next();
       }

package/dist/esm-node/plugins/render/ssrRender.js

@@ -18,7 +18,7 @@ async function ssrRender(request, { routeInfo, html, config: userConfig, staticG
   }
   const renderBundle = (_serverManifest_renderBundles = serverManifest.renderBundles) === null || _serverManifest_renderBundles === void 0 ? void 0 : _serverManifest_renderBundles[entryName || MAIN_ENTRY_NAME];
   if (!renderBundle) {
-    throw new Error(`Can't found renderBundle ${entryName || MAIN_ENTRY_NAME}`);
+    throw new Error(`Can't find renderBundle ${entryName || MAIN_ENTRY_NAME}`);
   }
   const requestHandler = await renderBundle[SERVER_RUNTIME_ENTRY];
   const config = createRequestHandlerConfig(userConfig);

package/dist/types/types/plugins/new.d.ts

@@ -1,6 +1,6 @@
 import type { AsyncHook, AsyncPipelineHook, ServerContext as BaseServerContext, ServerPlugin as BaseServerPlugin, ServerPluginExtends as BaseServerPluginExtends } from '@modern-js/plugin-v2';
 import type { Hooks } from '@modern-js/plugin-v2/server';
-import type { AfterMatchContext, AfterRenderContext, AfterStreamingRenderContext, ISAppContext, UnstableMiddleware } from '@modern-js/types';
+import type { AfterMatchContext, AfterRenderContext, AfterStreamingRenderContext, UnstableMiddleware } from '@modern-js/types';
 import type { MiddlewareHandler } from 'hono';
 import type { MiddlewareObj } from './base';
 import type { APIServerStartInput, FallbackInput, ServerConfig, WebAdapter, WebServerStartInput } from './base';
@@ -14,11 +14,7 @@ export interface ServerPluginExtends extends BaseServerPluginExtends {
     config: ServerConfig;
     extendContext: {
         middlewares: MiddlewareObj[];
-    };
-    extendApi: {
-        setAppContext: (c: ISAppContext) => void;
-        useAppContext: () => ISAppContext;
-        useConfigContext: () => ServerConfig;
+        renderMiddlewares: MiddlewareObj[];
     };
     extendHooks: {
         prepareWebServer: AsyncPipelineHook<PrepareWebServerFn>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.67.4",
+  "version": "2.67.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -46,7 +46,7 @@
     "node": ">=16.2.0"
   },
   "dependencies": {
-    "@swc/helpers": "0.5.13",
+    "@swc/helpers": "^0.5.17",
     "@web-std/fetch": "^4.2.1",
     "@web-std/file": "^3.0.3",
     "@web-std/stream": "^1.0.3",
@@ -54,10 +54,10 @@
     "flatted": "^3.2.9",
     "hono": "^3.12.2",
     "ts-deepmerge": "7.0.2",
-    "@modern-js/plugin": "2.67.4",
-    "@modern-js/plugin-v2": "2.67.4",
-    "@modern-js/runtime-utils": "2.67.4",
-    "@modern-js/utils": "2.67.4"
+    "@modern-js/plugin": "2.67.6",
+    "@modern-js/plugin-v2": "2.67.6",
+    "@modern-js/runtime-utils": "2.67.6",
+    "@modern-js/utils": "2.67.6"
   },
   "devDependencies": {
     "@types/cloneable-readable": "^2.0.3",
@@ -68,7 +68,7 @@
     "jest": "^29",
     "ts-jest": "^29.1.0",
     "typescript": "^5",
-    "@modern-js/types": "2.67.4",
+    "@modern-js/types": "2.67.6",
     "@scripts/build": "2.66.0",
     "@scripts/jest-config": "2.66.0"
   },