fix: cdn script in terminal template

jkga · jkga · commit 194b79caba58 · 2020-04-13T22:36:49.000+08:00
diff --git a/app.js b/app.js
@@ -173,10 +173,12 @@ app.get('/history/charts/:country', async (req, res, next) => {
 
     if(!screenOutput.length || !h) res.send('Unable to load the chart.Please refresh the page')
 
-    return util.isCommandline(userAgent) ? res.send(screenOutput+terminator) : res.send(xtermHTMLTemplate(screenOutput))
+    return util.isCommandline(userAgent) ? res.send(screenOutput+terminator) : res.send(xtermHTMLTemplate(screenOutput.replace("'", "\\'")))
 })
 
-app.use('/xterm', express.static(__dirname + '/node_modules/xterm'));
-app.use('/xterm/addons', express.static(__dirname + '/node_modules/xterm-addon-fit'));
+app.get('*', (req, res) => res.send(`
+Welcome to COVID-19 Tracker CLI v${pkg.version} by Waren Gonzaga\n
+Please visit: https://warengonza.ga/covid19-tracker-cli
+\n`));
 
 app.listen(port, () => console.log(`COVID-19 Tracker v${pkg.version} is listening on port ${port}!`));
diff --git a/lib/cli/gfx/terminal-template.js b/lib/cli/gfx/terminal-template.js
@@ -3,8 +3,8 @@ const html = (data) => {
     return (`<!doctype html>
         <html>
             <head>
-            <script src="/xterm/lib/xterm.js"></script>
-            <script src='/xterm/addons/lib/xterm-addon-fit.js'></script>
+            <script src="https://cdn.jsdelivr.net/npm/xterm@4.5.0/lib/xterm.min.js"></script>
+            <script src='https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.3.0/lib/xterm-addon-fit.min.js'></script>
             </head>
             <body>
             <div id="terminal" style='width: 105%;height: 100vh;padding-left: 2px;'></div>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,8 +39,6 @@
     "express": "^4.17.1",
     "figlet": "^1.3.0",
     "ora": "^4.0.3",
-    "xterm": "^4.5.0",
-    "xterm-addon-fit": "^0.3.0",
     "yargs": "^15.3.1"
   },
   "devDependencies": {
