@abtnode/router-templates 1.8.6 → 1.8.7

package/lib/common.js

@@ -72,6 +72,11 @@ const style = `
   </style>
 `;
 
+const staticResources = (inBlockletContext) => {
+  const baseUrl = inBlockletContext ? '/.well-known/service/static/' : '/';
+  return `<link rel="stylesheet" href="${baseUrl}router-template-styles/styles.css">`;
+};
+
 module.exports = ({
   status,
   icon,
@@ -85,6 +90,8 @@ module.exports = ({
 }) => {
   const hiddenText = `Blocklet Server version: ${nodeInfo.version}, mode: ${nodeInfo.mode}`;
   const adminPath = nodeInfo.routing ? nodeInfo.routing.adminPath : '';
+  // 如果传入了 appName, 认为模板渲染时处于 blocklet 环境中 (比如 blocklet-not-running)
+  const inBlockletContext = !!appName;
   // 明确指定了 status, 使用 result-html-pages 默认的渲染样式 (如 404/502/500)
   if (status) {
     return render(
@@ -95,7 +102,7 @@ module.exports = ({
         title,
         description: content,
         hiddenText,
-        extra: inputExtra,
+        extra: (inputExtra || '') + staticResources(inBlockletContext),
       })
     );
   }
@@ -119,7 +126,7 @@ module.exports = ({
     `;
 
   let extra = inputExtra === undefined ? defaultExtra : inputExtra;
-  extra = (extra || '') + style;
+  extra = (extra || '') + style + staticResources(inBlockletContext);
 
   return render(
     filterNullOrUndefined({

package/lib/styles/styles.css

@@ -0,0 +1,26 @@
+/* lato-latin-ext-400-normal*/
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url('./fonts/lato-latin-ext-400-normal.woff2') format('woff2'),
+    url('./fonts/lato-all-400-normal.woff') format('woff');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* lato-latin-400-normal*/
+@font-face {
+  font-family: 'Lato';
+  font-style: normal;
+  font-display: swap;
+  font-weight: 400;
+  src: url('./fonts/lato-latin-400-normal.woff2') format('woff2'),
+    url('./fonts/lato-all-400-normal.woff') format('woff');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC,
+    U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+body {
+  font-family: Lato, Avenir, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif,
+    'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.6",
+  "version": "1.8.7",
   "description": "Provide page templates for ABT Node router",
   "main": "lib/index.js",
   "files": [
@@ -19,11 +19,11 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/result-html-pages": "^2.1.70",
-    "@blocklet/meta": "1.8.6"
+    "@arcblock/result-html-pages": "^2.4.0",
+    "@blocklet/meta": "1.8.7"
   },
   "devDependencies": {
-    "jest": "^27.4.5"
+    "jest": "^27.5.1"
   },
-  "gitHead": "070dad4ce5e12c8961399788f9d206bf7d9d263f"
+  "gitHead": "9807ea28b3ae634f5806c875774ac3b7e38502a1"
 }