From be10125112d43bb56c59f8f59bf2e3946218a021 Mon Sep 17 00:00:00 2001 From: DIYgod Date: Wed, 18 Apr 2018 23:35:52 +0800 Subject: [PATCH] reset to 5ee12a1 --- package.json | 1 - router.js | 5 +---- views/welcome.art | 2 +- yarn.lock | 42 +++--------------------------------------- 4 files changed, 5 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index e6dc5ac49..e25132f1a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "cheerio": "1.0.0-rc.2", "crypto": "1.0.1", "eslint": "4.19.1", - "git-rev-sync": "1.11.1", "koa": "2.5.0", "koa-redis-cache": "3.0.0", "koa-router": "7.4.0", diff --git a/router.js b/router.js index 3f29e4314..21e0bca79 100644 --- a/router.js +++ b/router.js @@ -2,15 +2,12 @@ const Router = require('koa-router'); const router = new Router(); const art = require('art-template'); const path = require('path'); -const gitHash = require('git-rev-sync'); router.get('/', async (ctx) => { ctx.set({ 'Content-Type': 'text/html; charset=UTF-8', }); - ctx.body = art(path.resolve(__dirname, './views/welcome.art'), { - hash: gitHash.short() - }); + ctx.body = art(path.resolve(__dirname, './views/welcome.art'), {}); }); // // bilibili diff --git a/views/welcome.art b/views/welcome.art index d70768453..4b2ad1384 100644 --- a/views/welcome.art +++ b/views/welcome.art @@ -13,7 +13,7 @@

Welcome to RSSHub!

-

If you see this page, the RSSHub ({{ hash }}) is successfully installed and working.

+

If you see this page, the RSSHub is successfully installed and working.

For online documentation and support please refer to rsshub.js.org.

diff --git a/yarn.lock b/yarn.lock index db7b53b09..5aaedac3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -462,7 +462,7 @@ escape-html@~1.0.1: version "1.0.3" resolved "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -630,15 +630,7 @@ functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" -git-rev-sync@1.11.1: - version "1.11.1" - resolved "https://registry.npmjs.org/git-rev-sync/-/git-rev-sync-1.11.1.tgz#d92846500107e2d2f9c43420b0e995d24b3912ca" - dependencies: - escape-string-regexp "1.0.5" - graceful-fs "4.1.11" - shelljs "0.7.7" - -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2: +glob@^7.0.3, glob@^7.0.5, glob@^7.1.2: version "7.1.2" resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -664,7 +656,7 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -graceful-fs@4.1.11, graceful-fs@^4.1.2: +graceful-fs@^4.1.2: version "4.1.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -763,10 +755,6 @@ inquirer@^3.0.6: strip-ansi "^4.0.0" through "^2.3.6" -interpret@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" - is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" @@ -1092,10 +1080,6 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" -path-parse@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" - path-to-regexp@1, path-to-regexp@^1.1.1: version "1.7.0" resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" @@ -1158,12 +1142,6 @@ readall@1, readall@1.0.0: dependencies: debug "0.7.4" -rechoir@^0.6.2: - version "0.6.2" - resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - dependencies: - resolve "^1.1.6" - redis-commands@^1.2.0: version "1.3.5" resolved "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz#4495889414f1e886261180b1442e7295602d83a2" @@ -1199,12 +1177,6 @@ resolve-from@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226" -resolve@^1.1.6: - version "1.7.1" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" - dependencies: - path-parse "^1.0.5" - restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -1256,14 +1228,6 @@ shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" -shelljs@0.7.7: - version "0.7.7" - resolved "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1" - dependencies: - glob "^7.0.0" - interpret "^1.0.0" - rechoir "^0.6.2" - signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"