From bf410c81ae30e2ac0a9064cd8e890449e29d34db Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Thu, 19 Dec 2019 10:23:04 +0300 Subject: [PATCH 1/2] + client: add X-DNS-Prefetch-Control meta tag --- client/package-lock.json | 70 ++++++++++++++++------------- client/package.json | 1 + client/src/components/Logs/index.js | 4 ++ 3 files changed, 45 insertions(+), 30 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 697279db..d287519f 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -5214,8 +5214,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -5236,14 +5235,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5258,20 +5255,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5388,8 +5382,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5401,7 +5394,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5416,7 +5408,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5424,14 +5415,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5450,7 +5439,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5531,8 +5519,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5544,7 +5531,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5630,8 +5616,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5667,7 +5652,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5687,7 +5671,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5731,14 +5714,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -10080,6 +10061,22 @@ "prop-types": "^15.6.0" } }, + "react-fast-compare": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", + "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" + }, + "react-helmet": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", + "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", + "requires": { + "object-assign": "^4.1.1", + "prop-types": "^15.5.4", + "react-fast-compare": "^2.0.2", + "react-side-effect": "^1.1.0" + } + }, "react-i18next": { "version": "8.3.8", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-8.3.8.tgz", @@ -10219,6 +10216,14 @@ "prop-types": "^15.6.0" } }, + "react-side-effect": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", + "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", + "requires": { + "shallowequal": "^1.0.1" + } + }, "react-table": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/react-table/-/react-table-6.10.3.tgz", @@ -10919,6 +10924,11 @@ "safe-buffer": "^5.0.1" } }, + "shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", diff --git a/client/package.json b/client/package.json index 93620f74..eab259b8 100644 --- a/client/package.json +++ b/client/package.json @@ -21,6 +21,7 @@ "react": "^16.4.0", "react-click-outside": "^3.0.1", "react-dom": "^16.4.0", + "react-helmet": "^5.2.1", "react-i18next": "^8.2.0", "react-modal": "^3.4.5", "react-redux": "^5.0.7", diff --git a/client/src/components/Logs/index.js b/client/src/components/Logs/index.js index 449a6538..339b21b6 100644 --- a/client/src/components/Logs/index.js +++ b/client/src/components/Logs/index.js @@ -5,6 +5,7 @@ import escapeRegExp from 'lodash/escapeRegExp'; import endsWith from 'lodash/endsWith'; import { Trans, withNamespaces } from 'react-i18next'; import { HashLink as Link } from 'react-router-hash-link'; +import { Helmet } from 'react-helmet'; import { formatTime, @@ -376,6 +377,9 @@ class Logs extends Component { return ( + + + {refreshButton} {enabled && processingGetConfig && } {enabled && !processingGetConfig && ( From 073643537612437430c7035cda679a758ca94d13 Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Thu, 19 Dec 2019 12:13:15 +0300 Subject: [PATCH 2/2] + client: add meta tag to index.html --- client/package-lock.json | 29 ----------------------------- client/package.json | 1 - client/public/index.html | 1 + client/src/components/Logs/index.js | 4 ---- 4 files changed, 1 insertion(+), 34 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index d287519f..85bf2e6a 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -10061,22 +10061,6 @@ "prop-types": "^15.6.0" } }, - "react-fast-compare": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", - "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" - }, - "react-helmet": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", - "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", - "requires": { - "object-assign": "^4.1.1", - "prop-types": "^15.5.4", - "react-fast-compare": "^2.0.2", - "react-side-effect": "^1.1.0" - } - }, "react-i18next": { "version": "8.3.8", "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-8.3.8.tgz", @@ -10216,14 +10200,6 @@ "prop-types": "^15.6.0" } }, - "react-side-effect": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.2.0.tgz", - "integrity": "sha512-v1ht1aHg5k/thv56DRcjw+WtojuuDHFUgGfc+bFHOWsF4ZK6C2V57DO0Or0GPsg6+LSTE0M6Ry/gfzhzSwbc5w==", - "requires": { - "shallowequal": "^1.0.1" - } - }, "react-table": { "version": "6.10.3", "resolved": "https://registry.npmjs.org/react-table/-/react-table-6.10.3.tgz", @@ -10924,11 +10900,6 @@ "safe-buffer": "^5.0.1" } }, - "shallowequal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", - "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" - }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", diff --git a/client/package.json b/client/package.json index eab259b8..93620f74 100644 --- a/client/package.json +++ b/client/package.json @@ -21,7 +21,6 @@ "react": "^16.4.0", "react-click-outside": "^3.0.1", "react-dom": "^16.4.0", - "react-helmet": "^5.2.1", "react-i18next": "^8.2.0", "react-modal": "^3.4.5", "react-redux": "^5.0.7", diff --git a/client/public/index.html b/client/public/index.html index 44ab2396..56d4bfda 100644 --- a/client/public/index.html +++ b/client/public/index.html @@ -5,6 +5,7 @@ + AdGuard Home diff --git a/client/src/components/Logs/index.js b/client/src/components/Logs/index.js index 339b21b6..449a6538 100644 --- a/client/src/components/Logs/index.js +++ b/client/src/components/Logs/index.js @@ -5,7 +5,6 @@ import escapeRegExp from 'lodash/escapeRegExp'; import endsWith from 'lodash/endsWith'; import { Trans, withNamespaces } from 'react-i18next'; import { HashLink as Link } from 'react-router-hash-link'; -import { Helmet } from 'react-helmet'; import { formatTime, @@ -377,9 +376,6 @@ class Logs extends Component { return ( - - - {refreshButton} {enabled && processingGetConfig && } {enabled && !processingGetConfig && (