@modern-js/prod-server 2.7.0 → 2.9.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @modern-js/prod-server
 
+## 2.9.0
+
+### Patch Changes
+
+- 49bb8cd0ef: fix: move chunkmap.css comment to bottom of head
+  fix: 将 chunkmap.css 标记移动到 head 底部
+  - @modern-js/server-core@2.9.0
+  - @modern-js/utils@2.9.0
+
+## 2.8.0
+
+### Patch Changes
+
+- 1104a9f18b: feat: support start web service only
+  feat: 支持只启动 web 服务
+- 70d82e1408: fix: use mock host instead real url host for url parse, for new URL not support ipv6, and we only need parse url path & search
+  fix: 使用虚拟的域名代替真实的主机名，因为 new URL 不支持解析 ipv6 的域名，并且我们只需要解析 url 的路径和查询字符串
+- Updated dependencies [1104a9f18b]
+- Updated dependencies [1f6ca2c7fb]
+  - @modern-js/utils@2.8.0
+  - @modern-js/server-core@2.8.0
+
 ## 2.7.0
 
 ### Minor Changes

package/README.md

@@ -19,8 +19,8 @@ Please follow [Quick Start](https://modernjs.dev/en/guides/get-started/quick-sta
 
 ## Contributing
 
-Please read the [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md).
+Please read the [Contributing Guide](https://github.com/web-infra-dev/modern.js/blob/main/CONTRIBUTING.md).
 
 ## License
 
-Modern.js is [MIT licensed](https://github.com/modern-js-dev/modern.js/blob/main/LICENSE).
+Modern.js is [MIT licensed](https://github.com/web-infra-dev/modern.js/blob/main/LICENSE).

package/dist/cjs/libs/context/context.js

@@ -36,6 +36,7 @@ var import_buffer = require("buffer");
 var import_etag = __toESM(require("etag"));
 var import_fresh = __toESM(require("fresh"));
 var import_utils = require("../../utils");
+const MOCK_URL_BASE = "https://modernjs.dev/";
 class ModernServerContext {
   constructor(req, res, options) {
     /**
@@ -55,6 +56,10 @@ class ModernServerContext {
   get metrics() {
     return this.req.metrics;
   }
+  get parsedURL() {
+    const url = new import_url.URL(this.req.url, MOCK_URL_BASE);
+    return url;
+  }
   bind() {
     const { req, res } = this;
     req.get = (key) => this.getReqHeader(key);
@@ -146,23 +151,17 @@ class ModernServerContext {
   get href() {
     return this.origin + this.url;
   }
-  get parsedURL() {
-    const url = new import_url.URL(this.req.url, this.origin);
-    return url;
-  }
   get path() {
     return this.parsedURL.pathname;
   }
   set path(p) {
-    const url = new import_url.URL(this.req.url, this.origin);
-    if (!url || !p) {
+    if (!p) {
       return;
     }
-    if (url.pathname === p) {
+    if (this.path === p) {
       return;
     }
-    url.pathname = p;
-    this.url = url.toString();
+    this.url = p + this.parsedURL.search;
   }
   get querystring() {
     if (!this.req) {

package/dist/cjs/server/modernServer.js

@@ -223,6 +223,13 @@ class ModernServer {
     const { workDir, runner, conf } = this;
     const { bff } = conf;
     const prefix = (bff == null ? void 0 : bff.prefix) || "/api";
+    const webOnly = await (0, import_utils.isWebOnly)();
+    if (webOnly && process.env.NODE_ENV === "development") {
+      return (req, res) => {
+        res.setHeader("Content-Type", "text/plain");
+        res.end(JSON.stringify(""));
+      };
+    }
     return runner.prepareApiServer(
       {
         pwd: workDir,

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

@@ -43,6 +43,7 @@ import { Buffer } from "buffer";
 import createEtag from "etag";
 import fresh from "fresh";
 import { headersWithoutCookie } from "../../utils";
+var MOCK_URL_BASE = "https://modernjs.dev/";
 var ModernServerContext = /*#__PURE__*/ function() {
     "use strict";
     function ModernServerContext(req, res, options) {
@@ -77,6 +78,13 @@ var ModernServerContext = /*#__PURE__*/ function() {
                 return this.req.metrics;
             }
         },
+        {
+            key: "parsedURL",
+            get: function get() {
+                var url = new URL(this.req.url, MOCK_URL_BASE);
+                return url;
+            }
+        },
         {
             key: "bind",
             value: function bind() {
@@ -213,28 +221,19 @@ var ModernServerContext = /*#__PURE__*/ function() {
                 return this.origin + this.url;
             }
         },
-        {
-            key: "parsedURL",
-            get: function get() {
-                var url = new URL(this.req.url, this.origin);
-                return url;
-            }
-        },
         {
             key: "path",
             get: function get() {
                 return this.parsedURL.pathname;
             },
             set: function set(p) {
-                var url = new URL(this.req.url, this.origin);
-                if (!url || !p) {
+                if (!p) {
                     return;
                 }
-                if (url.pathname === p) {
+                if (this.path === p) {
                     return;
                 }
-                url.pathname = p;
-                this.url = url.toString();
+                this.url = p + this.parsedURL.search;
             }
         },
         {

package/dist/esm/server/modernServer.js

@@ -198,7 +198,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
 };
 import { createServer } from "http";
 import path from "path";
-import { fs, isPromise, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import { fs, isPromise, isWebOnly, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serveFile";
@@ -600,25 +600,43 @@ var ModernServer = /*#__PURE__*/ function() {
             value: function prepareAPIHandler(extension) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var workDir, runner, conf, bff, prefix;
+                    var workDir, runner, conf, bff, prefix, webOnly;
                     return __generator(this, function(_state) {
-                        workDir = _this.workDir, runner = _this.runner, conf = _this.conf;
-                        bff = conf.bff;
-                        prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
-                        return [
-                            2,
-                            runner.prepareApiServer({
-                                pwd: workDir,
-                                config: extension,
-                                prefix: Array.isArray(prefix) ? prefix[0] : prefix,
-                                httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
-                                render: _this.render.bind(_this)
-                            }, {
-                                onLast: function() {
-                                    return null;
+                        switch(_state.label){
+                            case 0:
+                                workDir = _this.workDir, runner = _this.runner, conf = _this.conf;
+                                bff = conf.bff;
+                                prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
+                                return [
+                                    4,
+                                    isWebOnly()
+                                ];
+                            case 1:
+                                webOnly = _state.sent();
+                                if (webOnly && process.env.NODE_ENV === "development") {
+                                    return [
+                                        2,
+                                        function(req, res) {
+                                            res.setHeader("Content-Type", "text/plain");
+                                            res.end(JSON.stringify(""));
+                                        }
+                                    ];
                                 }
-                            })
-                        ];
+                                return [
+                                    2,
+                                    runner.prepareApiServer({
+                                        pwd: workDir,
+                                        config: extension,
+                                        prefix: Array.isArray(prefix) ? prefix[0] : prefix,
+                                        httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
+                                        render: _this.render.bind(_this)
+                                    }, {
+                                        onLast: function() {
+                                            return null;
+                                        }
+                                    })
+                                ];
+                        }
                     });
                 })();
             }

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

@@ -4,6 +4,7 @@ import { Buffer } from "buffer";
 import createEtag from "etag";
 import fresh from "fresh";
 import { headersWithoutCookie } from "../../utils";
+const MOCK_URL_BASE = "https://modernjs.dev/";
 class ModernServerContext {
   constructor(req, res, options) {
     /**
@@ -23,6 +24,10 @@ class ModernServerContext {
   get metrics() {
     return this.req.metrics;
   }
+  get parsedURL() {
+    const url = new URL(this.req.url, MOCK_URL_BASE);
+    return url;
+  }
   bind() {
     const { req, res } = this;
     req.get = (key) => this.getReqHeader(key);
@@ -114,23 +119,17 @@ class ModernServerContext {
   get href() {
     return this.origin + this.url;
   }
-  get parsedURL() {
-    const url = new URL(this.req.url, this.origin);
-    return url;
-  }
   get path() {
     return this.parsedURL.pathname;
   }
   set path(p) {
-    const url = new URL(this.req.url, this.origin);
-    if (!url || !p) {
+    if (!p) {
       return;
     }
-    if (url.pathname === p) {
+    if (this.path === p) {
       return;
     }
-    url.pathname = p;
-    this.url = url.toString();
+    this.url = p + this.parsedURL.search;
   }
   get querystring() {
     if (!this.req) {

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

@@ -1,6 +1,12 @@
 import { createServer } from "http";
 import path from "path";
-import { fs, isPromise, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
+import {
+  fs,
+  isPromise,
+  isWebOnly,
+  mime,
+  ROUTE_SPEC_FILE
+} from "@modern-js/utils";
 import {
   RouteMatchManager
 } from "../libs/route";
@@ -213,6 +219,13 @@ class ModernServer {
     const { workDir, runner, conf } = this;
     const { bff } = conf;
     const prefix = (bff == null ? void 0 : bff.prefix) || "/api";
+    const webOnly = await isWebOnly();
+    if (webOnly && process.env.NODE_ENV === "development") {
+      return (req, res) => {
+        res.setHeader("Content-Type", "text/plain");
+        res.end(JSON.stringify(""));
+      };
+    }
     return runner.prepareApiServer(
       {
         pwd: workDir,

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

@@ -1,11 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-/// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/NtW8DT-FXC5GraMEoP2PI/src/type" />
+/// <reference types=".dts-temp/XV7p0812FeqQvmefgYASU/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
-import { URL } from 'url';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface } from '@modern-js/types';
 export type ContextOptions = {
@@ -32,6 +30,7 @@ export declare class ModernServerContext implements ModernServerContextInterface
   serverData: Record<string, any>;
   private options;
   constructor(req: IncomingMessage, res: ServerResponse, options?: ContextOptions);
+  private get parsedURL();
   private bind;
   send(body: ResponseBody): void;
   setParams(params: Record<string, string>): void;
@@ -46,7 +45,6 @@ export declare class ModernServerContext implements ModernServerContextInterface
   get protocol(): string;
   get origin(): string;
   get href(): string;
-  get parsedURL(): URL;
   get path(): string;
   set path(p: string);
   get querystring(): string;

package/dist/types/utils.d.ts

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

package/package.json

@@ -2,8 +2,8 @@
   "name": "@modern-js/prod-server",
   "description": "A Progressive React Framework for modern web development.",
   "homepage": "https://modernjs.dev",
-  "bugs": "https://github.com/modern-js-dev/modern.js/issues",
-  "repository": "modern-js-dev/modern.js",
+  "bugs": "https://github.com/web-infra-dev/modern.js/issues",
+  "repository": "web-infra-dev/modern.js",
   "license": "MIT",
   "keywords": [
     "react",
@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.7.0",
+  "version": "2.9.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -54,8 +54,8 @@
     "merge-deep": "^3.0.3",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/utils": "2.7.0",
-    "@modern-js/server-core": "2.7.0"
+    "@modern-js/utils": "2.9.0",
+    "@modern-js/server-core": "2.9.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -71,10 +71,10 @@
     "node-mocks-http": "^1.11.0",
     "portfinder": "^1.0.28",
     "typescript": "^4",
-    "@modern-js/types": "2.7.0",
-    "@modern-js/server-core": "2.7.0",
-    "@scripts/jest-config": "2.7.0",
-    "@scripts/build": "2.7.0"
+    "@modern-js/types": "2.9.0",
+    "@modern-js/server-core": "2.9.0",
+    "@scripts/jest-config": "2.9.0",
+    "@scripts/build": "2.9.0"
   },
   "sideEffects": false,
   "publishConfig": {