From 17b4ff9c1974842c02071d2cd02144d2e5a99eb5 Mon Sep 17 00:00:00 2001 From: Justin Wind Date: Sat, 26 Feb 2022 14:32:19 -0800 Subject: [PATCH] update html template dependency and templates --- package-lock.json | 38 +++++++++++------------- package.json | 4 +-- src/template/admin-overview-html.js | 1 - src/template/admin-topic-details-html.js | 1 - src/template/root-html.js | 1 - 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index a5089d4..352a433 100644 --- a/package-lock.json +++ b/package-lock.json @@ -315,9 +315,9 @@ } }, "@eslint/eslintrc": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.1.0.tgz", - "integrity": "sha512-C1DfL7XX4nPqGd6jcP01W9pVM1HYCuUkFk1432D7F0v3JSlUIeOYn9oCoi3eoLZ+iwBSb29BMFxxny0YrrEZqg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz", + "integrity": "sha512-igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -355,9 +355,9 @@ } }, "@humanwhocodes/config-array": { - "version": "0.9.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz", - "integrity": "sha512-3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ==", + "version": "0.9.5", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", + "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", @@ -524,11 +524,17 @@ "@squeep/mystery-box": "git+https://git.squeep.com/squeep-mystery-box/#v1.0.3", "argon2": "^0.28.4", "node-linux-pam": "^0.2.1" + }, + "dependencies": { + "@squeep/html-template-helper": { + "version": "git+https://git.squeep.com/squeep-html-template-helper#5506e8de3b9c93e2ec2d37d71134eee8ee5fd27c", + "from": "git+https://git.squeep.com/squeep-html-template-helper#v1.0.2" + } } }, "@squeep/html-template-helper": { - "version": "git+https://git.squeep.com/squeep-html-template-helper#5506e8de3b9c93e2ec2d37d71134eee8ee5fd27c", - "from": "git+https://git.squeep.com/squeep-html-template-helper#v1.0.2" + "version": "git+https://git.squeep.com/squeep-html-template-helper#fe1bc47f58611b5dbf778e4673514d5e0a1ed2f7", + "from": "git+https://git.squeep.com/squeep-html-template-helper#v1.0.3" }, "@squeep/indieauth-helper": { "version": "git+https://git.squeep.com/squeep-indieauth-helper/#7ece3489799b5349e22e95e3bd9fe7a30a985ebf", @@ -939,7 +945,6 @@ "requires": { "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -1251,12 +1256,12 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "8.9.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.9.0.tgz", - "integrity": "sha512-PB09IGwv4F4b0/atrbcMFboF/giawbBLVC7fyDamk5Wtey4Jh2K+rYaBhCAbUyEI4QzB1ly09Uglc9iCtFaG2Q==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz", + "integrity": "sha512-tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.1.0", + "@eslint/eslintrc": "^1.2.0", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -1617,13 +1622,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", diff --git a/package.json b/package.json index 71843a3..367fb03 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "dependencies": { "@squeep/api-dingus": "git+https://git.squeep.com/squeep-api-dingus/#v1.2.4", "@squeep/authentication-module": "git+https://git.squeep.com/squeep-authentication-module/#v1.2.0", - "@squeep/html-template-helper": "git+https://git.squeep.com/squeep-html-template-helper#v1.0.2", + "@squeep/html-template-helper": "git+https://git.squeep.com/squeep-html-template-helper#v1.0.3", "@squeep/web-linking": "git+https://git.squeep.com/squeep-web-linking/#v1.0.3", "axios": "^0.26.0", "feedparser": "^2.2.10", @@ -46,7 +46,7 @@ "pg-promise": "^10.11.1" }, "devDependencies": { - "eslint": "^8.9.0", + "eslint": "^8.10.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-security": "^1.4.0", "eslint-plugin-sonarjs": "^0.12.0", diff --git a/src/template/admin-overview-html.js b/src/template/admin-overview-html.js index 525337d..1ec3d11 100644 --- a/src/template/admin-overview-html.js +++ b/src/template/admin-overview-html.js @@ -26,7 +26,6 @@ module.exports = (ctx, options) => { }; const content = [ - '', // This fixes a layout rendering flash on load in FF; do not know why this works but it does. `

${ctx.topics.length ? ctx.topics.length : 'no'} topic${(ctx.topics.length === 1) ? '' : 's'}

diff --git a/src/template/admin-topic-details-html.js b/src/template/admin-topic-details-html.js index 2b9a1af..8a20ec7 100644 --- a/src/template/admin-topic-details-html.js +++ b/src/template/admin-topic-details-html.js @@ -34,7 +34,6 @@ module.exports = (ctx, options) => { }; const content = [ - '', // This fixes a layout rendering flash on load in FF; do not know why this works but it does. `
`, diff --git a/src/template/root-html.js b/src/template/root-html.js index 6771fdd..9496c7e 100644 --- a/src/template/root-html.js +++ b/src/template/root-html.js @@ -160,7 +160,6 @@ module.exports = (ctx, options) => { navLinks, }; const content = [ - '', // This fixes a layout rendering flash on load in FF; do not know why this works but it does. aboutSection(), usageSection(isPublicHub, hubURL), contactSection(contactHTML), -- 2.45.2