chore: optimize overlay page (#1908)

* chore: optimize overlay page * chore: update unless code * chore: remove benchmark ci * chore: bump runtime version
farm-fe · Nov 4, 2024 · ce93432 · ce93432
1 parent 615eec8
commit ce93432
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 115 deletions.
diff --git a/.changeset/sharp-pugs-lie.md b/.changeset/sharp-pugs-lie.md
@@ -0,0 +1,5 @@
+---
+"@farmfe/runtime-plugin-hmr": major
+---
+
+optimize runtime-hmr size
diff --git a/cspell.json b/cspell.json
@@ -12,7 +12,6 @@
     "Aceternity",
     "ACVHU",
     "addtional",
-    "arcgis",
     "Alexey",
     "Andale",
     "androideabi",
@@ -21,10 +20,12 @@
     "apng",
     "applescript",
     "AQDBI",
+    "arcgis",
     "Architecure",
     "armv",
     "arraify",
     "assuptions",
+    "atrule",
     "Avenir",
     "Bartosz",
     "Basepath",
@@ -99,6 +100,7 @@
     "Farmup",
     "feio",
     "fibo",
+    "Fira",
     "flac",
     "flexbox",
     "fnames",
@@ -198,6 +200,7 @@
     "preact",
     "prefixer",
     "primevue",
+    "prismjs",
     "procee",
     "proto",
     "protobuf",

diff --git a/packages/runtime-plugin-hmr/package.json b/packages/runtime-plugin-hmr/package.json
@@ -24,7 +24,8 @@
     "type-check": "tsc -p tsconfig.json --noEmit"
   },
   "devDependencies": {
-    "@farmfe/runtime": "workspace:1.0.0-nightly-20241023020505"
+    "@farmfe/runtime": "workspace:1.0.0-nightly-20241023020505",
+    "@types/prismjs": "^1.26.5"
   },
   "dependencies": {
     "core-js": "^3.30.1",

diff --git a/packages/runtime-plugin-hmr/src/overlay.ts b/packages/runtime-plugin-hmr/src/overlay.ts
@@ -7,8 +7,6 @@ import {
   stripAnsi
 } from './utils';
 
-const base = '/';
-
 // set :host styles to make playwright detect the element as visible
 const template = /*html*/ `
 <style>
@@ -130,8 +128,7 @@ code {
 
 kbd {
   line-height: 1.5;
-  font-family: ui-monospace, Menlo, Monaco, Consolas, 'Liberation Mono',
-    'Courier New', monospace;
+  font-family: ui-monospace, Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
   font-size: 0.75rem;
   font-weight: 700;
   background-color: rgb(38, 40, 44);
@@ -141,8 +138,8 @@ kbd {
   border-width: 0.0625rem 0.0625rem 0.1875rem;
   border-style: solid;
   border-color: rgb(54, 57, 64);
-  border-image: initial;
 }
+
 .message-container {
   padding: 10px 10px;
 }
@@ -155,24 +152,6 @@ kbd {
   margin: 10px 0;
 }
 
-
-
-kbd {
-  line-height: 1.5;
-  font-family: ui-monospace, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  font-size: 0.75rem;
-  font-weight: 700;
-  background-color: rgb(38, 40, 44);
-  color: rgb(166, 167, 171);
-  padding: 0.15rem 0.3rem;
-  border-radius: 0.25rem;
-  border-width: 0.0625rem 0.0625rem 0.1875rem;
-  border-style: solid;
-  border-color: rgb(54, 57, 64);
-  border-image: initial;
-}
-
-
 .code-block-wrapper {
   background-color: #282c34; /* Atom One Dark 背景色 */
   border-radius: 6px;
@@ -562,11 +541,7 @@ pre::-webkit-scrollbar-thumb:hover {
 </div>
 `;
 
-const errorAlert = (
-  message: string,
-  description: string,
-  _type: string
-) => /*html*/ `
+const errorAlert = (message: string, description: string) => /*html*/ `
     <div class="alert alert-error">
       <span class="alert-icon">
         <svg viewBox="64 64 896 896" focusable="false" data-icon="close-circle" width="1.2em" height="1.2em" fill="currentColor" aria-hidden="true">
@@ -580,20 +555,17 @@ const errorAlert = (
     </div>
 `;
 
-const warnAlert = (description: string, type = 'warn') => /*html*/ `
-    <div class="alert alert-${type}">
+const warnAlert = (description: string) => /*html*/ `
+    <div class="alert alert-warn">
       <span class="alert-icon">
-        ${getAlertIcon(type)}
+        ${getAlertIcon('warn')}
       </span>
       <div class="alert-content">
         <div class="alert-description">${description.replace(/\n/g, '<br>')}</div>
       </div>
     </div>
 `;
 
-const fileRE = /(?:[a-zA-Z]:\\|\/).*?:\d+:\d+/g;
-// const codeframeRE = /^(?:>?\s*\d+\s+\|.*|\s+\|\s*\^.*)\r?\n/gm;
-
 // Allow `ErrorOverlay` to extend `HTMLElement` even in environments where
 // `HTMLElement` was not originally defined.
 const { HTMLElement = class {} as typeof globalThis.HTMLElement } = globalThis;
@@ -627,66 +599,6 @@ export class ErrorOverlay extends HTMLElement {
     document.addEventListener('keydown', this.closeOnEsc);
   }
 
-  text(selector: string, text: string, linkFiles = false): void {
-    const el = this.root.querySelector(selector)!;
-    if (!linkFiles) {
-      el.textContent = text;
-    } else {
-      let curIndex = 0;
-      let match: RegExpExecArray | null;
-      fileRE.lastIndex = 0;
-      while ((match = fileRE.exec(text))) {
-        const { 0: file, index } = match;
-        if (index != null) {
-          const frag = text.slice(curIndex, index);
-          el.appendChild(document.createTextNode(frag));
-          const link = document.createElement('a');
-          link.textContent = file;
-          link.className = 'file-link';
-          link.onclick = () => {
-            fetch(
-              new URL(
-                `${base}__open-in-editor?file=${encodeURIComponent(file)}`,
-                // import.meta.url
-                window.location.href
-              )
-            );
-          };
-          el.appendChild(link);
-          curIndex += frag.length + file.length;
-        }
-      }
-    }
-  }
-
-  setMessageText(element: HTMLElement, text: string, linkFiles: boolean) {
-    if (!linkFiles) {
-      element.textContent = text;
-    } else {
-      element.innerHTML = '';
-      let lastIndex = 0;
-      text.replace(fileRE, (file, index) => {
-        if (index > lastIndex) {
-          element.appendChild(
-            document.createTextNode(text.substring(lastIndex, index))
-          );
-        }
-        const link = document.createElement('a');
-        link.textContent = file;
-        link.className = 'file-link';
-        link.onclick = () => {
-          fetch(`${base}__open-in-editor?file=${encodeURIComponent(file)}`);
-        };
-        element.appendChild(link);
-        lastIndex = index + file.length;
-        return file;
-      });
-      if (lastIndex < text.length) {
-        element.appendChild(document.createTextNode(text.substring(lastIndex)));
-      }
-    }
-  }
-
   highlightCode(code: string, language = 'javascript') {
     return Prism.highlight(code, Prism.languages[language], language);
   }
@@ -740,22 +652,16 @@ export class ErrorOverlay extends HTMLElement {
       msg = parseIfJSON(msg);
 
       if (msg.type) {
-        const TypeError = document.createElement('span');
-        TypeError.className = 'type-error';
-        TypeError.textContent = msg.type;
+        const typeError = document.createElement('span');
+        typeError.className = 'type-error';
+        typeError.textContent = msg.type;
         const TypeCodeError = document.createElement('div');
-        TypeCodeError.innerHTML = errorAlert(msg.type, msg.id, msg.type);
+        TypeCodeError.innerHTML = errorAlert(msg.type, msg.id);
         messageElement.appendChild(TypeCodeError);
       }
 
-      // if (msg.plugin) {
-      //   const pluginElement = document.createElement('span');
-      //   pluginElement.className = 'plugin';
-      //   pluginElement.textContent = `[plugin:${msg.plugin}] `;
-      //   messageElement.appendChild(pluginElement);
-      // }
-
       const messageBody = document.createElement('div');
+
       messageBody.className = 'message';
 
       const splitMessage = splitErrorMessage(msg);
@@ -880,13 +786,6 @@ export class ErrorOverlay extends HTMLElement {
         messageContainer.appendChild(messageElement);
       }
 
-      // if (msg.stack) {
-      //   const stack = document.createElement('pre');
-      //   stack.className = 'stack';
-      //   this.setMessageText(stack, msg.stack, links);
-      //   messageElement.appendChild(stack);
-      // }
-
       if (msg.cause) {
         const causeElement = document.createElement('div');
         causeElement.innerHTML = warnAlert(msg.cause);

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml