@umijs/server 4.0.0-beta.6 → 4.0.0-rc.1

package/dist/scripts.js

@@ -13,7 +13,7 @@ const RE_URL = /^(http:|https:)?\/\//;
 function normalizeScript(script) {
     if (typeof script === 'string') {
         const isUrl = RE_URL.test(script) ||
-            script.startsWith('/') ||
+            (script.startsWith('/') && !script.startsWith('/*')) ||
             script.startsWith('./') ||
             script.startsWith('../');
         return isUrl

package/dist/server.d.ts

@@ -1,5 +1,6 @@
 import type { RequestHandler } from 'express';
-interface IOpts {
+export interface IOpts {
+    base: string;
     routes: Record<string, {
         path: string;
         file: string;
@@ -12,6 +13,7 @@ interface IOpts {
     favicon?: string;
     headScripts?: (Record<string, string> | string)[];
     scripts?: (Record<string, string> | string)[];
+    mountElementId?: string;
     esmScript?: boolean;
     modifyHTML?: (html: string, args: {
         path?: string;
@@ -21,4 +23,3 @@ export declare function getMarkup(opts: Omit<IOpts, 'routes'> & {
     path?: string;
 }): Promise<string>;
 export declare function createRequestHandler(opts: IOpts): RequestHandler;
-export {};

package/dist/server.js

@@ -22,7 +22,7 @@ const styles_1 = require("./styles");
 function getMarkup(opts) {
     return __awaiter(this, void 0, void 0, function* () {
         // TODO: use real component
-        let markup = server_1.default.renderToString(react_1.default.createElement('div', { id: 'root' }));
+        let markup = server_1.default.renderToString(react_1.default.createElement('div', { id: opts.mountElementId || 'root' }));
         function propsToString(opts) {
             return Object.keys(opts.props)
                 .filter((key) => !(opts.filters || []).includes(key))
@@ -44,7 +44,7 @@ function getMarkup(opts) {
                 filters: ['src', 'content'],
             });
             return style.src
-                ? `<link rel="stylesheet" ${attrs} src="${style.src}" />`
+                ? `<link rel="stylesheet" ${attrs} href="${style.src}" />`
                 : `<style ${attrs}>${style.content}</style>`;
         }
         function getTagContent(opts) {
@@ -99,7 +99,7 @@ function createRequestHandler(opts) {
         const routes = (0, routes_1.createServerRoutes)({
             routesById: opts.routes,
         });
-        const matches = (0, react_router_dom_1.matchRoutes)(routes, req.path);
+        const matches = (0, react_router_dom_1.matchRoutes)(routes, req.path, opts.base);
         if (matches) {
             res.set('Content-Type', 'text/html');
             const markup = yield getMarkup(Object.assign(Object.assign({}, opts), { path: req.path }));

package/dist/styles.js

@@ -13,7 +13,7 @@ const RE_URL = /^(http:|https:)?\/\//;
 function normalizeStyle(style) {
     if (typeof style === 'string') {
         const isUrl = RE_URL.test(style) ||
-            style.startsWith('/') ||
+            (style.startsWith('/') && !style.startsWith('/*')) ||
             style.startsWith('./') ||
             style.startsWith('../');
         return isUrl

package/package.json

@@ -1,7 +1,14 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-beta.6",
+  "version": "4.0.0-rc.1",
   "description": "@umijs/server",
+  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/server#readme",
+  "bugs": "https://github.com/umijs/umi-next/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/umijs/umi-next"
+  },
+  "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -12,26 +19,19 @@
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
     "dev": "pnpm build -- --watch"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/umijs/umi-next"
-  },
-  "authors": [
-    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
-  ],
-  "license": "MIT",
-  "bugs": "https://github.com/umijs/umi-next/issues",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/server#readme",
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "history": "5.0.1",
-    "react": "18.0.0-alpha-4298ddbc5-20211023",
-    "react-dom": "18.0.0-alpha-4298ddbc5-20211023",
-    "react-router-dom": "6.0.0-beta.8"
+    "history": "5.1.0",
+    "react": "18.0.0-rc.0",
+    "react-dom": "18.0.0-rc.0",
+    "react-router-dom": "6.1.1"
   },
   "devDependencies": {
     "@types/express": "4.17.13"
-  }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": [
+    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
+  ]
 }