From 7f806a55afda8f09913d5da132cbc597eb1e15ff Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Fri, 7 Feb 2020 23:50:38 +0100 Subject: [PATCH 01/15] Install concurrently package --- package-lock.json | 240 ++++++++++++++++++++++++++++++++++++---------- package.json | 1 + 2 files changed, 188 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index 440bba1..0e6f280 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ultravidify", - "version": "4.4.3", + "version": "4.4.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1419,7 +1419,6 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, "requires": { "color-convert": "^1.9.0" } @@ -2180,7 +2179,6 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -2359,7 +2357,6 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -2367,8 +2364,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-string": { "version": "0.3.0", @@ -2487,6 +2483,150 @@ } } }, + "concurrently": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-5.1.0.tgz", + "integrity": "sha512-9ViZMu3OOCID3rBgU31mjBftro2chOop0G2u1olq1OuwRBVRw/GxHTg80TVJBUTJfoswMmEUeuOg1g1yu1X2dA==", + "requires": { + "chalk": "^2.4.2", + "date-fns": "^2.0.1", + "lodash": "^4.17.15", + "read-pkg": "^4.0.1", + "rxjs": "^6.5.2", + "spawn-command": "^0.0.2-1", + "supports-color": "^6.1.0", + "tree-kill": "^1.2.2", + "yargs": "^13.3.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, + "read-pkg": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", + "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", + "requires": { + "normalize-package-data": "^2.3.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0" + } + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "requires": { + "has-flag": "^3.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "yargs": { + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", + "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.1" + } + }, + "yargs-parser": { + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, "console-browserify": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", @@ -2913,6 +3053,11 @@ "assert-plus": "^1.0.0" } }, + "date-fns": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.9.0.tgz", + "integrity": "sha512-khbFLu/MlzLjEzy9Gh8oY1hNt/Dvxw3J6Rbc28cVoYWQaC1S3YI4xwkF9ZWcjDLscbZlY9hISMr66RFzZagLsA==" + }, "de-indent": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", @@ -2931,8 +3076,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { "version": "0.2.0", @@ -3119,8 +3263,7 @@ "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, "emojis-list": { "version": "2.1.0", @@ -3188,7 +3331,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, "requires": { "is-arrayish": "^0.2.1" } @@ -3201,8 +3343,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint-scope": { "version": "4.0.3", @@ -3508,7 +3649,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, "requires": { "locate-path": "^3.0.0" } @@ -4474,8 +4614,7 @@ "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { "version": "1.0.1", @@ -4576,8 +4715,7 @@ "hosted-git-info": { "version": "2.8.5", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", - "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", - "dev": true + "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==" }, "html-comment-regex": { "version": "1.1.2", @@ -4769,8 +4907,7 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "1.0.1", @@ -5005,8 +5142,7 @@ "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", - "dev": true + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, "json-schema": { "version": "0.2.3", @@ -5164,7 +5300,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, "requires": { "p-locate": "^3.0.0", "path-exists": "^3.0.0" @@ -5173,8 +5308,7 @@ "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.camelcase": { "version": "4.3.0", @@ -5790,7 +5924,6 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, "requires": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -6002,7 +6135,6 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", - "dev": true, "requires": { "p-try": "^2.0.0" } @@ -6011,7 +6143,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, "requires": { "p-limit": "^2.0.0" } @@ -6019,8 +6150,7 @@ "p-try": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, "pako": { "version": "1.0.10", @@ -6106,8 +6236,7 @@ "path-exists": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" }, "path-is-absolute": { "version": "1.0.1", @@ -6124,8 +6253,7 @@ "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-type": { "version": "3.0.0", @@ -7080,8 +7208,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-main-filename": { "version": "1.0.1", @@ -7093,7 +7220,6 @@ "version": "1.12.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", - "dev": true, "requires": { "path-parse": "^1.0.6" } @@ -7176,6 +7302,14 @@ "aproba": "^1.1.1" } }, + "rxjs": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", + "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "requires": { + "tslib": "^1.9.0" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -7270,8 +7404,7 @@ "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "serialize-javascript": { "version": "1.9.1", @@ -7282,8 +7415,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-value": { "version": "2.0.1", @@ -7540,11 +7672,15 @@ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", "dev": true }, + "spawn-command": { + "version": "0.0.2-1", + "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", + "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=" + }, "spdx-correct": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", - "dev": true, "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -7553,14 +7689,12 @@ "spdx-exceptions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", - "dev": true + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" }, "spdx-expression-parse": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -7569,8 +7703,7 @@ "spdx-license-ids": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", - "dev": true + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" }, "split-string": { "version": "3.1.0", @@ -7796,7 +7929,6 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "requires": { "has-flag": "^3.0.0" } @@ -8090,6 +8222,11 @@ } } }, + "tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==" + }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", @@ -8108,8 +8245,7 @@ "tslib": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", - "dev": true + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" }, "tty-browserify": { "version": "0.0.0", @@ -8343,7 +8479,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -8784,8 +8919,7 @@ "y18n": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, "yallist": { "version": "2.1.2", diff --git a/package.json b/package.json index 5d56d6f..54656dc 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "dependencies": { "@types/core-js": "^2.5.0", "@types/es6-promise": "^3.3.0", + "concurrently": "^5.1.0", "fs-extra": "^7.0.1", "json-cyclic": "0.0.3", "vue": "^2.6.11", From 0ab21f836073599b4b78fe126ad98c88197200a7 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 8 Feb 2020 00:07:34 +0100 Subject: [PATCH 02/15] Remove unnecessary scripts, 'npm run dev' builds both chrome and ff builds --- package.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package.json b/package.json index 54656dc..c549256 100644 --- a/package.json +++ b/package.json @@ -14,16 +14,9 @@ "build-testing-chrome": "cross-env NODE_ENV=development BROWSER=chrome CHANNEL=testing webpack --hide-modules", "build-nightly-chrome": "cross-env NODE_ENV=development BROWSER=chrome CHANNEL=nightly webpack --hide-modules", "build-chrome:dev": "cross-env NODE_ENV=development BROWSER=chrome webpack --hide-modules", - "build-edge:dev": "cross-env NODE_ENV=development BROWSER=edge webpack --hide-modules", "build-all": "rm ./dist-zip/uw-amo-source.zip; mv ./dist-zip/*.zip ./dist-zip/old/; npm run build; node scripts/build-zip.js ff; npm run build-chrome; node scripts/build-zip.js chrome; ./scripts/prepare-amo-source.sh", "build-zip": "node scripts/build-zip.js", - "dev": "npm run build:dev -- --watch", - "watch": "npm run build:dev -- --watch", - "watch-chrome": "npm run build-chrome -- --watch", - "watch-edge": "npm run build-edge -- --watch", - "watch:dev": "cross-env HMR=true npm run build:dev -- --watch", - "watch-chrome:dev": "cross-env HMR=true npm run build-chrome:dev -- --watch", - "watch-edge:dev": "cross-env HMR=true npm run build-edge:dev -- --watch" + "dev": "concurrently \"cross-env NODE_ENV=development BROWSER=firefox CHANNEL=dev webpack --hide-modules\" \"cross-env NODE_ENV=development BROWSER=chrome CHANNEL=dev webpack --hide-modules\"" }, "dependencies": { "@types/core-js": "^2.5.0", From 806a889726d3b96602b8fc336de3611520f69aaf Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 8 Feb 2020 00:08:07 +0100 Subject: [PATCH 03/15] Gotta have separate dist folders for each browser --- scripts/build-zip.js | 19 +++++++++++-------- webpack.config.js | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/build-zip.js b/scripts/build-zip.js index 5bda202..079af9a 100644 --- a/scripts/build-zip.js +++ b/scripts/build-zip.js @@ -4,10 +4,6 @@ const fs = require('fs'); const path = require('path'); const archiver = require('archiver'); -const DEST_DIR = path.join(__dirname, '../dist'); -const DEST_ZIP_DIR = path.join(__dirname, '../dist-zip'); - - const extractExtensionData = () => { const extPackageJson = require('../dist/manifest.json'); @@ -43,7 +39,14 @@ const buildZip = (src, dist, zipFilename) => { const main = () => { const browser = process.argv[2]; const testingOrNightly = process.argv[3]; - + let distDir; + if (browser == 'firefox') { + distDir = '../dist-ff'; + } else { + distDir = `../dist-${browser}` + } + const destDir = path.join(__dirname, distDir); + const zipDir = path.join(__dirname, '../dist-zip'); const {name, version} = extractExtensionData(); // collapse spaces and dashes into single dash @@ -52,9 +55,9 @@ const main = () => { let realZipDir; if (!!testingOrNightly) { - realZipDir = path.join(DEST_ZIP_DIR, version); + realZipDir = path.join(zipDir, version); } else { - realZipDir = path.join(DEST_ZIP_DIR); + realZipDir = path.join(zipDir); } const zipFilename = `${baseFilename}-${browser}.zip`; @@ -65,7 +68,7 @@ const main = () => { console.error('Failed to make directory.\nDirectory we wanted to make', realZipDir, '\nerror we got:\n', e) return 1; } - buildZip(DEST_DIR, realZipDir, zipFilename) + buildZip(destDir, realZipDir, zipFilename) .then(() => console.info('OK')) .catch(console.err); }; diff --git a/webpack.config.js b/webpack.config.js index 553da87..5a73d6f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -17,7 +17,7 @@ const config = { 'options/options': './options/options.js', }, output: { - path: __dirname + '/dist', + path: __dirname + `/dist-${process.node.BROWSER == 'firefox' ? 'ff' : process.node.BROWSER}`, filename: '[name].js', }, resolve: { From ddf8c3210f905c6b46b6787584fc1df3ededefaf Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 8 Feb 2020 00:09:07 +0100 Subject: [PATCH 04/15] typo fix --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 5a73d6f..fed7bd0 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -17,7 +17,7 @@ const config = { 'options/options': './options/options.js', }, output: { - path: __dirname + `/dist-${process.node.BROWSER == 'firefox' ? 'ff' : process.node.BROWSER}`, + path: __dirname + `/dist-${process.env.BROWSER == 'firefox' ? 'ff' : process.env.BROWSER}`, filename: '[name].js', }, resolve: { From 9338711d4c5b57b9679ae7ba1dcc42aa63c0b021 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 8 Feb 2020 00:12:49 +0100 Subject: [PATCH 05/15] update gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f0e3313..06df04d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,7 @@ old/ build/ /node_modules /*.log -/dist -/dist-zip +/dist* /uw-git_keys *.pem From dd74725c0a8a60b64ea5cd20f184ce4727ab1b3a Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 8 Feb 2020 00:38:09 +0100 Subject: [PATCH 06/15] fix run scripts, but for real. Fix related stuff as well --- .vscode/launch.json | 2 +- package.json | 6 +++--- scripts/build-zip.js | 12 ++++++------ scripts/remove-evals.js | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 42e9f96..8d96487 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -11,7 +11,7 @@ "port":6000, "reAttach": true, "addonType": "webExtension", - "addonPath": "${workspaceFolder}/dist", + "addonPath": "${workspaceFolder}/dist-ff", } ], "firefox": { diff --git a/package.json b/package.json index c549256..dae41e2 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,11 @@ "description": "Aspect ratio fixer for youtube and other sites, with automatic aspect ratio detection. Supports ultrawide and other ratios.", "author": "Tamius Han ", "scripts": { - "start": "cross-env HMR=true npm run build:dev -- --watch", + "start": "npm run dev", "build": "cross-env NODE_ENV=production BROWSER=firefox CHANNEL=stable webpack --hide-modules", "build-chrome": "cross-env NODE_ENV=production BROWSER=chrome CHANNEL=stable webpack --hide-modules", "build-edge": "cross-env NODE_ENV=production BROWSER=edge CHANNEL=stable webpack --hide-modules", - "build:dev": "cross-env NODE_ENV=development BROWSER=firefox CHANNEL=dev webpack --hide-modules", + "build:dev": "webpack --hide-modules", "build-testing": "cross-env NODE_ENV=development BROWSER=firefox CHANNEL=testing webpack --hide-modules", "build-nightly": "cross-env NODE_ENV=development BROWSER=firefox CHANNEL=nightly webpack --hide-modules", "build-testing-chrome": "cross-env NODE_ENV=development BROWSER=chrome CHANNEL=testing webpack --hide-modules", @@ -16,7 +16,7 @@ "build-chrome:dev": "cross-env NODE_ENV=development BROWSER=chrome webpack --hide-modules", "build-all": "rm ./dist-zip/uw-amo-source.zip; mv ./dist-zip/*.zip ./dist-zip/old/; npm run build; node scripts/build-zip.js ff; npm run build-chrome; node scripts/build-zip.js chrome; ./scripts/prepare-amo-source.sh", "build-zip": "node scripts/build-zip.js", - "dev": "concurrently \"cross-env NODE_ENV=development BROWSER=firefox CHANNEL=dev webpack --hide-modules\" \"cross-env NODE_ENV=development BROWSER=chrome CHANNEL=dev webpack --hide-modules\"" + "dev": "cross-env NODE_ENV=development CHANNEL=dev concurrently \"cross-env BROWSER=firefox npm run build:dev -- --watch\" \"cross-env BROWSER=chrome npm run build:dev -- --watch\"" }, "dependencies": { "@types/core-js": "^2.5.0", diff --git a/scripts/build-zip.js b/scripts/build-zip.js index 079af9a..0e319d6 100644 --- a/scripts/build-zip.js +++ b/scripts/build-zip.js @@ -4,8 +4,8 @@ const fs = require('fs'); const path = require('path'); const archiver = require('archiver'); -const extractExtensionData = () => { - const extPackageJson = require('../dist/manifest.json'); +const extractExtensionData = (browserPostfix) => { + const extPackageJson = require(`../dist-${browserPostfix}/manifest.json`); return { name: extPackageJson.name, @@ -39,13 +39,13 @@ const buildZip = (src, dist, zipFilename) => { const main = () => { const browser = process.argv[2]; const testingOrNightly = process.argv[3]; - let distDir; + let browserPostfix; if (browser == 'firefox') { - distDir = '../dist-ff'; + browserPostfix = 'ff'; } else { - distDir = `../dist-${browser}` + browserPostfix = browser; } - const destDir = path.join(__dirname, distDir); + const destDir = path.join(__dirname, `../dist-${browserPostfix}`); const zipDir = path.join(__dirname, '../dist-zip'); const {name, version} = extractExtensionData(); diff --git a/scripts/remove-evals.js b/scripts/remove-evals.js index 10b826b..1ebaf23 100644 --- a/scripts/remove-evals.js +++ b/scripts/remove-evals.js @@ -3,7 +3,7 @@ const path = require('path'); const fs = require('fs'); -const BUNDLE_DIR = path.join(__dirname, '../dist'); +const BUNDLE_DIR = path.join(__dirname, `../dist-${process.env.BROWSER === 'firefox' ? 'ff' : process.env.BROWSER}`); const bundles = [ 'popup/popup.js', 'options/options.js', From 6b7f41ecf8f09d9dc880e37c4fd5199864ece66a Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 8 Feb 2020 00:38:40 +0100 Subject: [PATCH 07/15] update readme for AMO --- README-AMO.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README-AMO.md b/README-AMO.md index 19163d3..346f57f 100644 --- a/README-AMO.md +++ b/README-AMO.md @@ -14,4 +14,4 @@ Run `npm ci` `npm run build` -The compiled code pops up in /dist. \ No newline at end of file +The compiled code pops up in /dist-ff. \ No newline at end of file From 8945226d24df1e201ab0f4bc1d0de2ef723faf14 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 8 Feb 2020 00:41:10 +0100 Subject: [PATCH 08/15] Fixes for Edge --- src/ext/lib/comms/CommsServer.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ext/lib/comms/CommsServer.js b/src/ext/lib/comms/CommsServer.js index c6f37e6..3d4ba4d 100644 --- a/src/ext/lib/comms/CommsServer.js +++ b/src/ext/lib/comms/CommsServer.js @@ -138,6 +138,11 @@ class CommsServer { async getCurrentTabHostname() { const activeTab = await this._getActiveTab(); + + if (!activeTab || activeTab.length < 1) { + this.logger.log('warn', 'comms', 'There is no active tab for some reason. activeTab:', activeTab); + } + const url = activeTab[0].url; var hostname; @@ -180,11 +185,11 @@ class CommsServer { this.logger.log('info', 'comms', `%c[CommsServer::sendToFrame] attempting to send message to tab ${tab}, frame ${frame}`, "background: #dda; color: #11D", message); if (isNaN(tab)) { - if (tab === '__playing') { + if (frame === '__playing') { message['playing'] = true; this.sendToAll(message); return; - } else if (tab === '__all') { + } else if (frame === '__all') { this.sendToAll(message); return; } From 470f576b41340367c853bb4c0f2983d60cb3f06a Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sat, 8 Feb 2020 01:05:05 +0100 Subject: [PATCH 09/15] Fix build-zip script --- scripts/build-zip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-zip.js b/scripts/build-zip.js index 0e319d6..34cc08c 100644 --- a/scripts/build-zip.js +++ b/scripts/build-zip.js @@ -47,7 +47,7 @@ const main = () => { } const destDir = path.join(__dirname, `../dist-${browserPostfix}`); const zipDir = path.join(__dirname, '../dist-zip'); - const {name, version} = extractExtensionData(); + const {name, version} = extractExtensionData(browserPostfix); // collapse spaces and dashes into single dash const baseFilename = `${name.replace(/[ -]+/g, '-')}-${version}`; From c9f227c0f926b7ee7408221c3d778a9ef73f58c9 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sun, 9 Feb 2020 00:28:35 +0100 Subject: [PATCH 10/15] This appears to do exactly nothing? --- src/ext/lib/comms/CommsServer.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ext/lib/comms/CommsServer.js b/src/ext/lib/comms/CommsServer.js index 3d4ba4d..adb5486 100644 --- a/src/ext/lib/comms/CommsServer.js +++ b/src/ext/lib/comms/CommsServer.js @@ -92,7 +92,6 @@ class CommsServer { () => { this.settings.active.sites['@global'].autoar = "blacklist"; this.settings.save(); - this.sendToAll({cmd: "reload-settings", sender: "uwbg"}) this.logger.log('info', 'comms', "[uw-bg] autoar set to enabled (blacklist). evidenz:", this.settings.active); } ], @@ -105,7 +104,6 @@ class CommsServer { this.settings.active.arDetect.disabledReason = 'User disabled'; } this.settings.save(); - this.sendToAll({cmd: 'reload-settings', newConf: this.settings.active}); this.logger.log('info', 'comms', "[uw-bg] autoar set to disabled. evidenz:", this.settings.active); } ], @@ -117,7 +115,6 @@ class CommsServer { var timeout = message.timeout < 4 ? 4 : message.timeout; this.settings.active.arDetect.timer_playing = timeout; this.settings.save(); - this.sendToAll({cmd: 'reload-settings', newConf: this.settings.active}); } ], 'logging-stop-and-save': [ // TODO: possibly never used/superseded — check From f53faac3443c9a0005adc070bfbe024838479bae Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sun, 9 Feb 2020 01:13:29 +0100 Subject: [PATCH 11/15] Make logger thing a proper json, not just javascript object --- src/ext/uw.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ext/uw.js b/src/ext/uw.js index 6cbd0f3..5fb3368 100644 --- a/src/ext/uw.js +++ b/src/ext/uw.js @@ -60,22 +60,22 @@ class UW { enabled: false }, consoleOptions: { - enabled: true, - 'debug': true, - 'init': true, - 'settings': true, - 'keyboard': true, - 'mousemove': false, - 'actionHandler': true, - 'comms': true, - 'playerDetect': true, - 'resizer': true, - 'scaler': true, - 'stretcher': true, + "enabled": true, + "debug": true, + "init": true, + "settings": true, + "keyboard": true, + "mousemove": false, + "actionHandler": true, + "comms": true, + "playerDetect": true, + "resizer": true, + "scaler": true, + "stretcher": true, // 'videoRescan': true, // 'playerRescan': true, - 'arDetect': true, - 'arDetect_verbose': true + "arDetect": true, + "arDetect_verbose": true }, allowBlacklistedOrigins: { 'periodicPlayerCheck': false, From a5685fa420bfd61d2cd18f0d161212c555de5569 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sun, 9 Feb 2020 01:14:05 +0100 Subject: [PATCH 12/15] Improve logging of storage listener in logger --- src/ext/lib/Logger.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ext/lib/Logger.js b/src/ext/lib/Logger.js index 32157fa..587cac8 100644 --- a/src/ext/lib/Logger.js +++ b/src/ext/lib/Logger.js @@ -99,12 +99,18 @@ class Logger { br.storage.onChanged.addListener( (changes, area) => { if (process.env.CHANNEL === 'dev') { - console.log("[Logger::] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area); + if (!changes.uwLogger) { + console.info('[Logger:: No new logger settings!'); + } if (changes['uwLogger'] && changes['uwLogger'].newValue) { - console.log("[Logger::] new settings object:", JSON.parse(changes.uwLogger.newValue)); + console.log("[Logger::] Logger have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area); + console.info("[Logger::] new logger settings object (parsed):", JSON.parse(changes.uwLogger.newValue)); } } - if (changes['uwLogger'] && changes['uwLogger'].newValue) { + if (!changes['uwLogger']) { + return; + } + if (changes['uwLogger']?.newValue) { const newConf = JSON.parse(changes.uwLogger.newValue); if (this.isContentScript && this.conf.allowLogging && !newConf.allowLogging) { this.saveToVuex(); From c4914b4e5b7a800efc13fc4efbe0a1ff6aa46e23 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sun, 9 Feb 2020 01:16:46 +0100 Subject: [PATCH 13/15] Improve handling of change listener on settings, fix bug that prevented callback from triggering --- src/ext/lib/Settings.js | 28 ++++++++++++---------------- src/ext/uw.js | 10 +++++++++- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js index 2f69e25..5929b2c 100644 --- a/src/ext/lib/Settings.js +++ b/src/ext/lib/Settings.js @@ -15,17 +15,12 @@ class Settings { constructor(options) { // Options: activeSettings, updateCallback, logger this.logger = options.logger; - const activeSettings = options.activeSettings; - const updateCallback = options.updateCallback; - - this.active = activeSettings ? activeSettings : undefined; + this.onSettingsChanged = options.onSettingsChanged; + this.active = options.activeSettings ?? undefined; this.default = ExtensionConf; this.default['version'] = this.getExtensionVersion(); this.useSync = false; this.version = undefined; - this.updateCallback = updateCallback; - - const ths = this; if (currentBrowser.firefox) { browser.storage.onChanged.addListener((changes, area) => {this.storageChangeListener(changes, area)}); @@ -39,19 +34,20 @@ class Settings { return; } this.logger.log('info', 'settings', "[Settings::] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area); - if (changes['uwSettings'] && changes['uwSettings'].newValue) { - this.logger.log('info', 'settings',"[Settings::] new settings object:", JSON.parse(changes.uwSettings.newValue)); - } + // if (changes['uwSettings'] && changes['uwSettings'].newValue) { + // this.logger.log('info', 'settings',"[Settings::] new settings object:", JSON.parse(changes.uwSettings.newValue)); + // } const parsedSettings = JSON.parse(changes.uwSettings.newValue); - if(changes['uwSettings'] && changes['uwSettings'].newValue) { - this.setActive(parsedSettings); - } + this.setActive(parsedSettings); - if(!parsedSettings.preventReload && this.updateCallback) { + this.logger.log('info', 'debug', 'Does parsedSettings.preventReload exist?', parsedSettings.preventReload, "Does callback exist?", !!this.onSettingsChanged); + + if (!parsedSettings.preventReload && this.onSettingsChanged) { try { - updateCallback(ths); + this.onSettingsChanged(); + this.logger.log('info', 'settings', '[Settings] Update callback finished.') } catch (e) { - this.logger.log('error', 'settings', "[Settings] CALLING UPDATE CALLBACK FAILED.") + this.logger.log('error', 'settings', "[Settings] CALLING UPDATE CALLBACK FAILED. Reason:", e) } } } diff --git a/src/ext/uw.js b/src/ext/uw.js index 5fb3368..d499288 100644 --- a/src/ext/uw.js +++ b/src/ext/uw.js @@ -44,6 +44,11 @@ class UW { this.vuexStore = {}; } + reloadSettings() { + this.logger.log('info', 'debug', 'Things happened in the popup. Will reload extension settings.'); + this.init(); + } + async init(){ if (Debug.debug) { console.log("[uw::main] loading configuration ..."); @@ -112,7 +117,10 @@ class UW { if (!this.settings) { var ths = this; - this.settings = new Settings({updateCallback: (s) => {console.log("settings callback — ", s); ths.init()}, logger: this.logger}); + this.settings = new Settings({ + onSettingsChanged: () => this.reloadSettings(), + logger: this.logger + }); await this.settings.init(); } From 2ead2f8e4147d94c4959b0178d96bf3e0428f938 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sun, 9 Feb 2020 02:11:28 +0100 Subject: [PATCH 14/15] Changelog --- CHANGELOG.md | 2 ++ src/popup/panels/WhatsNewPanel.vue | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10ea068..86b5350 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ QoL improvements for me: * Tab detection in extension popup has been made more accurate * QoL: Added user-accessible logger (to make fixing sites I can't access a bit easier) * Changed links to reflect my github username change +* **[4.4.4.1]** Fix broken extension popup. +* **[4.4.4.1]** Fix global/site settings not getting applied immediately/only getting applied after page reload. ### v4.4.3 diff --git a/src/popup/panels/WhatsNewPanel.vue b/src/popup/panels/WhatsNewPanel.vue index 3ce1b5a..04decdb 100644 --- a/src/popup/panels/WhatsNewPanel.vue +++ b/src/popup/panels/WhatsNewPanel.vue @@ -7,6 +7,8 @@
  • Tab detection in extension popup has been made more accurate
  • QoL: Added user-accessible logger (to make fixing sites I can't access a bit easier)
  • Changed links to reflect my github username change
    • +
  • [4.4.4.1] There were multiple reports about popup being broken. This issue should be resolved.
    • +
  • [4.4.4.1] Setting global/site defaults should no longer require page reloads.
    • From 51526b5dcce11238a4e240f983ef8f2afbd65ada Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Sun, 9 Feb 2020 02:11:37 +0100 Subject: [PATCH 15/15] Version bump --- src/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifest.json b/src/manifest.json index 9d45477..0d22966 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Ultrawidify", "description": "Removes black bars on ultrawide videos and offers advanced options to fix aspect ratio.", - "version": "4.4.4", + "version": "4.4.4.1", "applications": { "gecko": { "id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}"