From 9e43bbcce29436a4790d60a1922495c891f23069 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 00:13:19 +0000 Subject: [PATCH 1/5] chore(deps): bump ace-builds from 1.4.7 to 1.4.8 Bumps [ace-builds](https://github.com/ajaxorg/ace-builds) from 1.4.7 to 1.4.8. - [Release notes](https://github.com/ajaxorg/ace-builds/releases) - [Changelog](https://github.com/ajaxorg/ace-builds/blob/master/ChangeLog.txt) - [Commits](https://github.com/ajaxorg/ace-builds/compare/v1.4.7...v1.4.8) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 43d04f543..e305cd524 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1834,9 +1834,9 @@ } }, "ace-builds": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.7.tgz", - "integrity": "sha512-gwQGVFewBopRLho08BfahyvRa9FlB43JUig5ItAKTYc9kJJsbA9QNz75p28QtQomoPQ9rJx82ymL21x4ZSZmdg==" + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.8.tgz", + "integrity": "sha512-8ZVAxwyCGAxQX8mOp9imSXH0hoSPkGfy8igJy+WO/7axL30saRhKgg1XPACSmxxPA7nfHVwM+ShWXT+vKsNuFg==" }, "acorn": { "version": "6.4.0", diff --git a/package.json b/package.json index df2b5d471..fc170337f 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@nuxtjs/robots": "^2.4.2", "@nuxtjs/sitemap": "^2.0.1", "@nuxtjs/toast": "^3.3.0", - "ace-builds": "^1.4.7", + "ace-builds": "^1.4.8", "graphql": "^14.5.8", "nuxt": "^2.11.0", "nuxt-i18n": "^6.4.1", From b6e5f7f3379eeff954ed1ae65b05602d82debfca Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 01:24:42 +0000 Subject: [PATCH 2/5] chore(deps-dev): bump sass-loader from 8.0.1 to 8.0.2 Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 8.0.1 to 8.0.2. - [Release notes](https://github.com/webpack-contrib/sass-loader/releases) - [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/sass-loader/compare/v8.0.1...v8.0.2) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e305cd524..37d9c4300 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9359,22 +9359,22 @@ } }, "sass-loader": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.1.tgz", - "integrity": "sha512-ANR2JHuoxzCI+OPDA0hJBv1Y16A2021hucu0S3DOGgpukKzq9W+4vX9jhIqs4qibT5E7RIRsHMMrN0kdF5nUig==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz", + "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==", "dev": true, "requires": { "clone-deep": "^4.0.1", "loader-utils": "^1.2.3", "neo-async": "^2.6.1", "schema-utils": "^2.6.1", - "semver": "^7.1.1" + "semver": "^6.3.0" }, "dependencies": { "semver": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz", - "integrity": "sha512-WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } diff --git a/package.json b/package.json index fc170337f..9a7ebbc62 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "devDependencies": { "cypress": "^3.8.2", "node-sass": "^4.13.0", - "sass-loader": "^8.0.1", + "sass-loader": "^8.0.2", "start-server-and-test": "^1.10.6" } } From 808e4545ae4b2e816e116ebb30af6fbcbe293508 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 01:51:14 +0000 Subject: [PATCH 3/5] chore(deps): bump @nuxtjs/axios from 5.9.2 to 5.9.3 Bumps [@nuxtjs/axios](https://github.com/nuxt-community/axios-module) from 5.9.2 to 5.9.3. - [Release notes](https://github.com/nuxt-community/axios-module/releases) - [Changelog](https://github.com/nuxt-community/axios-module/blob/dev/CHANGELOG.md) - [Commits](https://github.com/nuxt-community/axios-module/compare/v5.9.2...v5.9.3) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 22 ++++++++-------------- package.json | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 37d9c4300..aa2faeaa1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1413,12 +1413,12 @@ } }, "@nuxtjs/axios": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/@nuxtjs/axios/-/axios-5.9.2.tgz", - "integrity": "sha512-OwRy40N7Q0V0i5A8ojUy9TlvvaYDPlDmUDKPMVxkcFf+wnmgtJbLJGgHrPWof9Y0jb9EXLgxbRmk0LgrNk7QCw==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/@nuxtjs/axios/-/axios-5.9.3.tgz", + "integrity": "sha512-+P1BK7MxMRL4q1WeYM9vyfocJrRoskbuD2TztKU8ryunK8JgpkIvqCzQxTI2BLUbOPd7qvjPLwzA0QBdzqYlaA==", "requires": { "@nuxtjs/proxy": "^1.3.3", - "axios": "^0.19.0", + "axios": "^0.19.1", "axios-retry": "^3.1.2", "consola": "^2.11.3", "defu": "^0.0.4" @@ -2166,12 +2166,11 @@ "dev": true }, "axios": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", - "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.1.tgz", + "integrity": "sha512-Yl+7nfreYKaLRvAvjNPkvfjnQHJM1yLBY3zhqAwcJSwR/6ETkanUgylgtIvkvz0xJ+p/vZuNw8X7Hnb7Whsbpw==", "requires": { - "follow-redirects": "1.5.10", - "is-buffer": "^2.0.2" + "follow-redirects": "1.5.10" }, "dependencies": { "debug": { @@ -2190,11 +2189,6 @@ "debug": "=3.1.0" } }, - "is-buffer": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", - "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" - }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", diff --git a/package.json b/package.json index 9a7ebbc62..564519f3b 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "test": "start-server-and-test dev http://localhost:3000 e2e" }, "dependencies": { - "@nuxtjs/axios": "^5.9.2", + "@nuxtjs/axios": "^5.9.3", "@nuxtjs/google-analytics": "^2.2.3", "@nuxtjs/google-tag-manager": "^2.3.1", "@nuxtjs/pwa": "^3.0.0-beta.19", From 15e5edb1a36cb88d4fb81754a585e2476dfd2554 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2020 02:05:59 +0000 Subject: [PATCH 4/5] chore(deps-dev): bump node-sass from 4.13.0 to 4.13.1 Bumps [node-sass](https://github.com/sass/node-sass) from 4.13.0 to 4.13.1. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.13.0...v4.13.1) Signed-off-by: dependabot-preview[bot] --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa2faeaa1..596757fe5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1972,9 +1972,9 @@ }, "dependencies": { "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", @@ -5106,9 +5106,9 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, "globule": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz", + "integrity": "sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==", "dev": true, "requires": { "glob": "~7.1.1", @@ -7042,9 +7042,9 @@ } }, "node-sass": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.0.tgz", - "integrity": "sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==", + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.13.1.tgz", + "integrity": "sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -10020,9 +10020,9 @@ }, "dependencies": { "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { "core-util-is": "~1.0.0", diff --git a/package.json b/package.json index 564519f3b..2a375a7a3 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ }, "devDependencies": { "cypress": "^3.8.2", - "node-sass": "^4.13.0", + "node-sass": "^4.13.1", "sass-loader": "^8.0.2", "start-server-and-test": "^1.10.6" } From 5206aeead06cfd486b295e311993a312ce66958f Mon Sep 17 00:00:00 2001 From: Liyas Thomas Date: Sat, 18 Jan 2020 10:07:30 +0530 Subject: [PATCH 5/5] :zap: Don't show Extension toast if user opt-out of it once or have already installed it. --- layouts/default.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/layouts/default.vue b/layouts/default.vue index 74664578b..447e58ae4 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -619,7 +619,8 @@ export default { showExtensions: false, showShortcuts: false, showSupport: false, - firefoxExtInstalled: window.firefoxExtSendRequest, + firefoxExtInstalled: + window.firefoxExtSendRequest !== undefined ? true : false, chromeExtInstalled: false }; }, @@ -680,7 +681,11 @@ export default { } let showExtensionsToast = localStorage.getItem("showExtensionsToast") === "yes"; - if (!showExtensionsToast) { + if ( + !this.firefoxExtInstalled && + !this.chromeExtInstalled && + !showExtensionsToast + ) { setTimeout(() => { this.$toast.show(this.$t("extensions_info2"), { icon: "extension",