@umijs/server 4.0.0-canary.20220628.2 → 4.0.0-canary.20220718.1

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { createServerRoutes } from './routes';
 export * from './server';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,cAAc,UAAU,CAAC"}

package/dist/routes.d.ts

@@ -14,3 +14,4 @@ export declare function createServerRoute(opts: {
     path: string | undefined;
     index: boolean | undefined;
 };
+//# sourceMappingURL=routes.d.ts.map

package/dist/routes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE9C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,UAAU,EAAE,WAAW,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;;;;IAkBA;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE;;;;EAOxD"}

package/dist/scripts.d.ts

@@ -10,3 +10,4 @@ export declare function normalizeScript(script: IScript): {
     src?: string | undefined;
     content?: string | undefined;
 };
+//# sourceMappingURL=scripts.d.ts.map

package/dist/scripts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scripts.d.ts","sourceRoot":"","sources":["../src/scripts.ts"],"names":[],"mappings":"AAEA,oBAAY,OAAO,GACf,MAAM,GACN;IACE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE;;;IAElD;AAID,wBAAgB,eAAe,CAAC,MAAM,EAAE,OAAO;;;EAqB9C"}

package/dist/server.d.ts

@@ -25,3 +25,4 @@ export declare function getMarkup(opts: Omit<IOpts, 'routes'> & {
     path?: string;
 }): Promise<string>;
 export declare function createRequestHandler(opts: IOpts): RequestHandler;
+//# sourceMappingURL=server.d.ts.map

package/dist/server.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAQ5E,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CACZ,MAAM,EACN;QACE,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CACF,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IACjC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC;IAC7C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC;IAClD,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC;IAC9C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACxE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC;AAED,wBAAsB,SAAS,CAC7B,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,mBAgHF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,KAAK,GAAG,cAAc,CA4BhE"}

package/dist/server.js

@@ -43,6 +43,24 @@ async function getMarkup(opts) {
         });
         return `<${opts.tagName} ${attrs} />`;
     }
+    function withDefaultMetas(metas = []) {
+        const hasAttr = (key, value) => metas.some((m) => {
+            var _a;
+            return value ? ((_a = m[key]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === value.toLowerCase() : m[key];
+        });
+        return [
+            !hasAttr('charset') && { charset: 'utf-8' },
+            !hasAttr('name', 'viewport') && {
+                name: 'viewport',
+                content: 'width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0',
+            },
+            !hasAttr('http-equiv', 'X-UA-Compatible') && {
+                'http-equiv': 'X-UA-Compatible',
+                content: 'ie=edge',
+            },
+            ...metas,
+        ].filter(Boolean);
+    }
     const favicons = [];
     if (Array.isArray(opts.favicons)) {
         opts.favicons.forEach((e) => {
@@ -50,7 +68,7 @@ async function getMarkup(opts) {
         });
     }
     const title = opts.title ? `<title>${opts.title}</title>` : '';
-    const metas = (opts.metas || []).map((meta) => getTagContent({ attrs: meta, tagName: 'meta' }));
+    const metas = withDefaultMetas(opts.metas).map((meta) => getTagContent({ attrs: meta, tagName: 'meta' }));
     const links = (opts.links || []).map((link) => getTagContent({ attrs: link, tagName: 'link' }));
     const styles = (0, styles_1.normalizeStyles)(opts.styles || []).map(getStyleContent);
     const headScripts = (0, scripts_1.normalizeScripts)(opts.headScripts || []).map(getScriptContent);
@@ -58,13 +76,7 @@ async function getMarkup(opts) {
     markup = [
         `<!DOCTYPE html>
 <html>
-<head>
-<meta charset="UTF-8" />
-<meta
-  name="viewport"
-  content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
-/>
-<meta http-equiv="X-UA-Compatible" content="ie=edge" />`,
+<head>`,
         metas.join('\n'),
         favicons.join('\n'),
         title,
@@ -95,7 +107,9 @@ function createRequestHandler(opts) {
             // 如果是 browser，并且配置了非 / base，访问 / 时 redirect 到 base 路径
             res.redirect(opts.base);
         }
-        else if ((_a = req.headers.accept) === null || _a === void 0 ? void 0 : _a.includes('text/html')) {
+        else if (((_a = req.headers.accept) === null || _a === void 0 ? void 0 : _a.includes('text/html')) ||
+            req.headers.accept === '*/*' ||
+            req.path === opts.base) {
             // 匹配路由，不匹配走 next()
             // const routes = createServerRoutes({
             //   routesById: opts.routes,

package/dist/ssr.d.ts

@@ -16,3 +16,4 @@ interface CreateRequestHandlerOptions {
 }
 export default function createRequestHandler(opts: CreateRequestHandlerOptions): (req: any, res: any, next: any) => Promise<any>;
 export {};
+//# sourceMappingURL=ssr.d.ts.map

package/dist/ssr.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ssr.d.ts","sourceRoot":"","sources":["../src/ssr.ts"],"names":[],"mappings":"AAIA,UAAU,YAAY;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;CACnC;AAED,UAAU,2BAA2B;IACnC,sBAAsB,EAAE,YAAY,CAAC;IACrC,aAAa,EAAE,GAAG,CAAC;IACnB,QAAQ,EACJ,CAAC,MAAM;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC,GAC1C;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IACvC,UAAU,EAAE,MAAM,GAAG,CAAC;IACtB,YAAY,EAAE,MAAM,GAAG,CAAC;IACxB,SAAS,EAAE,CAAC,aAAa,EAAE,GAAG,KAAK,GAAG,CAAC;IACvC,sBAAsB,EAAE,CAAC,aAAa,EAAE,GAAG,KAAK,GAAG,CAAC;CACrD;AAED,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAC1C,IAAI,EAAE,2BAA2B,SAEL,GAAG,OAAO,GAAG,QAAQ,GAAG,kBAgErD"}

package/dist/styles.d.ts

@@ -10,3 +10,4 @@ export declare function normalizeStyle(style: IStyle): {
     src?: string | undefined;
     content?: string | undefined;
 };
+//# sourceMappingURL=styles.d.ts.map

package/dist/styles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"styles.d.ts","sourceRoot":"","sources":["../src/styles.ts"],"names":[],"mappings":"AAEA,oBAAY,MAAM,GACd,MAAM,GACN;IACE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE;;;IAEhD;AAID,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM;;;EAqB3C"}

package/dist/types.d.ts

@@ -7,3 +7,4 @@ export interface IRoute {
 export interface IRoutesById {
     [id: string]: IRoute;
 }
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;CACtB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/server",
-  "version": "4.0.0-canary.20220628.2",
+  "version": "4.0.0-canary.20220718.1",
   "description": "@umijs/server",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/server#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -20,7 +20,7 @@
     "dev": "pnpm build --watch"
   },
   "dependencies": {
-    "@umijs/bundler-utils": "4.0.0-canary.20220628.2",
+    "@umijs/bundler-utils": "4.0.0-canary.20220718.1",
     "history": "5.3.0",
     "react": "18.1.0",
     "react-dom": "18.1.0",