From c8bfc0c33bb4b5a8786a3cb9415389b4c7100564 Mon Sep 17 00:00:00 2001
From: Yasuaki Uechi <y@uechi.io>
Date: Thu, 10 Mar 2022 13:13:53 +0900
Subject: [PATCH] fix: js.org

---
 api/services/jsorg/[query].ts | 6 ++----
 package.json                  | 1 -
 src/components/Suggestion.tsx | 5 ++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/api/services/jsorg/[query].ts b/api/services/jsorg/[query].ts
index 9ff0610..598824b 100644
--- a/api/services/jsorg/[query].ts
+++ b/api/services/jsorg/[query].ts
@@ -1,5 +1,4 @@
 import { VercelRequest, VercelResponse } from '@vercel/node';
-import { VM } from 'vm2';
 import { fetch, send, sendError } from '../../../util/http';
 
 export default async function handler(
@@ -24,9 +23,7 @@ export default async function handler(
       `https://raw.githubusercontent.com/js-org/js.org/master/cnames_active.js`,
       'GET'
     ).then((res) => res.text());
-    const vm = new VM();
-    vm.run(source);
-    const cnames = Object.keys(vm.sandbox.cnames_active);
+    const cnames = Array.from(source.matchAll(/^  "(.+)":/gm)).map((m) => m[1]);
 
     if (cnames.includes(cname)) {
       send(res, { availability: false });
@@ -34,6 +31,7 @@ export default async function handler(
       send(res, { availability: true });
     }
   } catch (err: any) {
+    console.log(err);
     sendError(res, err);
   }
 }
diff --git a/package.json b/package.json
index d479a9b..ce4ff28 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
     "styled-components": "^5.3.3",
     "swr": "^1.0.1",
     "validator": "^13.7.0",
-    "vm2": "^3.9.5",
     "whois-json": "^2.0.4"
   },
   "devDependencies": {
diff --git a/src/components/Suggestion.tsx b/src/components/Suggestion.tsx
index 387afdc..d15c415 100644
--- a/src/components/Suggestion.tsx
+++ b/src/components/Suggestion.tsx
@@ -157,8 +157,7 @@ const modifiers: Modifier[] = [
 const fontFamilies = [
   `'Helvetica', sans-serif`,
   `'Avenir', sans-serif`,
-  `'Times New Roman', serif`,
-  `monospace`,
+  `'Futura', sans-serif`,
   `'Montserrat', sans-serif`,
 ];
 
@@ -312,7 +311,7 @@ const Item = styled.div<{ delay: number }>`
   cursor: pointer;
   font-weight: 600;
   font-size: 1.7rem;
-  letter-spacing: -1px;
+  /* letter-spacing: -0.5px; */
   border-bottom: 1px dashed black;
   color: black;
   overflow: hidden;