From 9f60f8ced43d12410754e3c0bc3e5606a80331f8 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Fri, 19 Oct 2018 01:21:08 -0300 Subject: [PATCH] Move about menu item for MacOS --- src/background/menus.js | 12 ++++---- yarn.lock | 64 ++++++++++++++++++++++------------------- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/background/menus.js b/src/background/menus.js index ce1fed96e4..540f9699eb 100644 --- a/src/background/menus.js +++ b/src/background/menus.js @@ -286,11 +286,13 @@ const createTemplate = ({ label: i18n.__('Learn more'), click: () => events.emit('open-url', 'https://rocket.chat'), }, - { - id: 'about', - label: i18n.__('About %s', appName), - click: () => events.emit('about'), - }, + ...(process.platform !== 'darwin' ? [ + { + id: 'about', + label: i18n.__('About %s', appName), + click: () => events.emit('about'), + }, + ] : []), ], }, ]); diff --git a/yarn.lock b/yarn.lock index 267f896b44..2bf5ae5aa9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -51,11 +51,9 @@ dependencies: array-from "^2.1.1" -"@sinonjs/samsam@^2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-2.1.1.tgz#f352621c24c9e9ab2ed293a7655e8d46bfd64c16" - dependencies: - array-from "^2.1.1" +"@sinonjs/samsam@^2.1.2": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-2.1.2.tgz#16947fce5f57258d01f1688fdc32723093c55d3f" "@types/estree@0.0.39": version "0.0.39" @@ -129,7 +127,7 @@ agentkeepalive@^3.4.1: dependencies: humanize-ms "^1.2.1" -ajv-keywords@^3.0.0, ajv-keywords@^3.2.0: +ajv-keywords@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" @@ -142,7 +140,7 @@ ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.0.1, ajv@^6.5.2, ajv@^6.5.3: +ajv@^6.5.2, ajv@^6.5.3: version "6.5.3" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9" dependencies: @@ -1440,6 +1438,12 @@ debug@^3.0.0, debug@^3.1.0: dependencies: ms "^2.1.1" +debug@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87" + dependencies: + ms "^2.1.1" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -1910,15 +1914,15 @@ eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@^5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.6.0.tgz#b6f7806041af01f71b3f1895cbb20971ea4b6223" +eslint@^5.7.0: + version "5.7.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.7.0.tgz#55c326d6fb2ad45fcbd0ce17c3846f025d1d819c" dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.5.3" chalk "^2.1.0" cross-spawn "^6.0.5" - debug "^3.1.0" + debug "^4.0.1" doctrine "^2.1.0" eslint-scope "^4.0.0" eslint-utils "^1.3.1" @@ -1945,12 +1949,12 @@ eslint@^5.6.0: path-is-inside "^1.0.2" pluralize "^7.0.0" progress "^2.0.0" - regexpp "^2.0.0" + regexpp "^2.0.1" require-uncached "^1.0.3" semver "^5.5.1" strip-ansi "^4.0.0" strip-json-comments "^2.0.1" - table "^4.0.3" + table "^5.0.2" text-table "^0.2.0" espree@^4.0.0: @@ -3915,10 +3919,14 @@ lodash@~1.0.1: version "1.0.2" resolved "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" -lolex@^2.3.2, lolex@^2.7.4: +lolex@^2.3.2: version "2.7.5" resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.7.5.tgz#113001d56bfc7e02d56e36291cc5c413d1aa0733" +lolex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lolex/-/lolex-3.0.0.tgz#f04ee1a8aa13f60f1abd7b0e8f4213ec72ec193e" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -5492,9 +5500,9 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexpp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365" +regexpp@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" registry-auth-token@^3.0.1: version "3.3.2" @@ -5810,16 +5818,16 @@ single-line-log@^1.1.2: dependencies: string-width "^1.0.1" -sinon@^6.3.4: - version "6.3.4" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-6.3.4.tgz#6f076d7ddcf381af6c16468ac83d30333a756ec8" +sinon@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.0.0.tgz#99f2e5198d90a01ccbcebd4dc181a24827cb90dd" dependencies: "@sinonjs/commons" "^1.0.2" "@sinonjs/formatio" "^3.0.0" - "@sinonjs/samsam" "^2.1.1" + "@sinonjs/samsam" "^2.1.2" diff "^3.5.0" lodash.get "^4.4.2" - lolex "^2.7.4" + lolex "^3.0.0" nise "^1.4.5" supports-color "^5.5.0" type-detect "^4.0.8" @@ -6230,14 +6238,12 @@ supports-color@~5.0.0: dependencies: has-flag "^2.0.0" -table@^4.0.3: - version "4.0.3" - resolved "http://registry.npmjs.org/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc" +table@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/table/-/table-5.1.0.tgz#69a54644f6f01ad1628f8178715b408dc6bf11f7" dependencies: - ajv "^6.0.1" - ajv-keywords "^3.0.0" - chalk "^2.1.0" - lodash "^4.17.4" + ajv "^6.5.3" + lodash "^4.17.10" slice-ansi "1.0.0" string-width "^2.1.1"