From 8b27ebb96b386c6be88cff3491413b328a349268 Mon Sep 17 00:00:00 2001
From: liyasthomas <liyascthomas@gmail.com>
Date: Fri, 10 Sep 2021 00:44:14 +0530
Subject: [PATCH] feat: mixed html syntax, light theme for codemiror

---
 .../lenses/renderers/HTMLLensRenderer.vue      | 16 +++++++++++-----
 .../lenses/renderers/JSONLensRenderer.vue      |  2 +-
 helpers/editor/codemirror.ts                   |  4 ++--
 modules/emit-volar-types.ts                    |  7 +------
 package-lock.json                              | 18 +++++++++---------
 package.json                                   |  2 +-
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/components/lenses/renderers/HTMLLensRenderer.vue b/components/lenses/renderers/HTMLLensRenderer.vue
index d7f1044c0..8522976ef 100644
--- a/components/lenses/renderers/HTMLLensRenderer.vue
+++ b/components/lenses/renderers/HTMLLensRenderer.vue
@@ -53,10 +53,14 @@
       </div>
     </div>
     <div class="relative">
-      <div ref="htmlResponse" class="w-full block"></div>
+      <div
+        v-show="!previewEnabled"
+        ref="htmlResponse"
+        class="w-full block"
+      ></div>
       <iframe
+        v-show="previewEnabled"
         ref="previewFrame"
-        :class="{ hidden: !previewEnabled }"
         class="covers-response"
         src="about:blank"
       ></iframe>
@@ -68,6 +72,9 @@
 import { computed, ref, useContext, reactive } from "@nuxtjs/composition-api"
 import { useCodemirror } from "~/helpers/editor/codemirror"
 import { copyToClipboard } from "~/helpers/utils/clipboard"
+import "codemirror/mode/xml/xml"
+import "codemirror/mode/javascript/javascript"
+import "codemirror/mode/css/css"
 import "codemirror/mode/htmlmixed/htmlmixed"
 import { HoppRESTResponse } from "~/helpers/types/HoppRESTResponse"
 
@@ -109,7 +116,7 @@ useCodemirror(
   responseBodyText,
   reactive({
     extendedEditorConfig: {
-      mode: "javascript",
+      mode: "htmlmixed",
       readOnly: true,
       lineWrapping: linewrapEnabled,
     },
@@ -170,9 +177,8 @@ const togglePreview = () => {
 
 <style lang="scss" scoped>
 .covers-response {
-  @apply absolute;
-  @apply inset-0;
   @apply bg-white;
+  @apply min-h-64;
   @apply h-full;
   @apply w-full;
   @apply border;
diff --git a/components/lenses/renderers/JSONLensRenderer.vue b/components/lenses/renderers/JSONLensRenderer.vue
index ff8c11201..88be7d265 100644
--- a/components/lenses/renderers/JSONLensRenderer.vue
+++ b/components/lenses/renderers/JSONLensRenderer.vue
@@ -100,7 +100,7 @@ useCodemirror(
   jsonBodyText,
   reactive({
     extendedEditorConfig: {
-      mode: "javascript",
+      mode: "application/ld+json",
       readOnly: true,
       lineWrapping: linewrapEnabled,
     },
diff --git a/helpers/editor/codemirror.ts b/helpers/editor/codemirror.ts
index e7781ae7c..0c3121058 100644
--- a/helpers/editor/codemirror.ts
+++ b/helpers/editor/codemirror.ts
@@ -1,6 +1,6 @@
 import CodeMirror from "codemirror"
 
-import "codemirror-github-light/lib/codemirror-github-light-theme.css"
+import "codemirror-theme-github/theme/github.css"
 import "codemirror/theme/base16-dark.css"
 import "codemirror/theme/3024-night.css"
 
@@ -162,7 +162,7 @@ export function useCodemirror(
       case "system":
         return "default"
       case "light":
-        return "github-light"
+        return "github"
       case "dark":
         return "base16-dark"
       case "black":
diff --git a/modules/emit-volar-types.ts b/modules/emit-volar-types.ts
index c1ecb4f95..cad34e011 100644
--- a/modules/emit-volar-types.ts
+++ b/modules/emit-volar-types.ts
@@ -28,12 +28,7 @@ async function getAllVueComponentPaths(): Promise<string[]> {
     if (f.endsWith(".vue")) {
       const componentsIndex = f.split("/").indexOf("components")
 
-      vueFilePaths.push(
-        `./${f
-          .split("/")
-          .slice(componentsIndex)
-          .join("/")}`
-      )
+      vueFilePaths.push(`./${f.split("/").slice(componentsIndex).join("/")}`)
     }
   }
 
diff --git a/package-lock.json b/package-lock.json
index 6dab0aed6..84ac46f8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "acorn": "^8.5.0",
         "acorn-walk": "^8.2.0",
         "codemirror": "^5.62.3",
-        "codemirror-github-light": "^0.4.2",
+        "codemirror-theme-github": "^1.0.0",
         "core-js": "^3.17.2",
         "esprima": "^4.0.1",
         "firebase": "^9.0.1",
@@ -13116,10 +13116,10 @@
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.3.tgz",
       "integrity": "sha512-zZAyOfN8TU67ngqrxhOgtkSAGV9jSpN1snbl8elPtnh9Z5A11daR405+dhLzLnuXrwX0WCShWlybxPN3QC/9Pg=="
     },
-    "node_modules/codemirror-github-light": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/codemirror-github-light/-/codemirror-github-light-0.4.2.tgz",
-      "integrity": "sha1-iUl8JJWEipRaLNIaqj5Wa4d7FDU="
+    "node_modules/codemirror-theme-github": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/codemirror-theme-github/-/codemirror-theme-github-1.0.0.tgz",
+      "integrity": "sha512-suheFec2wlI4klyqn61MOFXjjrKPZiNY7d2py0OvTd5Z+7AsNxoGKDaS/HI59y7EAG1SkkXW/JQ1Rt2gDMxHfA=="
     },
     "node_modules/collect-v8-coverage": {
       "version": "1.0.1",
@@ -46167,10 +46167,10 @@
       "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.62.3.tgz",
       "integrity": "sha512-zZAyOfN8TU67ngqrxhOgtkSAGV9jSpN1snbl8elPtnh9Z5A11daR405+dhLzLnuXrwX0WCShWlybxPN3QC/9Pg=="
     },
-    "codemirror-github-light": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/codemirror-github-light/-/codemirror-github-light-0.4.2.tgz",
-      "integrity": "sha1-iUl8JJWEipRaLNIaqj5Wa4d7FDU="
+    "codemirror-theme-github": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/codemirror-theme-github/-/codemirror-theme-github-1.0.0.tgz",
+      "integrity": "sha512-suheFec2wlI4klyqn61MOFXjjrKPZiNY7d2py0OvTd5Z+7AsNxoGKDaS/HI59y7EAG1SkkXW/JQ1Rt2gDMxHfA=="
     },
     "collect-v8-coverage": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index 68477db16..fee6fe8e1 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "acorn": "^8.5.0",
     "acorn-walk": "^8.2.0",
     "codemirror": "^5.62.3",
-    "codemirror-github-light": "^0.4.2",
+    "codemirror-theme-github": "^1.0.0",
     "core-js": "^3.17.2",
     "esprima": "^4.0.1",
     "firebase": "^9.0.1",