From f87bb85f37c17bce84c009384fb3f8024b9ab5ba Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 9 Nov 2019 08:52:09 +0000 Subject: [PATCH 1/2] Update dependency prettier to v1.19.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 696be185..b3b0c351 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "postcss-import": "12.0.1", "postcss-loader": "3.0.0", "postcss-preset-env": "6.7.0", - "prettier": "1.18.2", + "prettier": "1.19.0", "pretty-quick": "2.0.1", "primer-tooltips": "2.0.0", "sinon": "7.5.0", diff --git a/yarn.lock b/yarn.lock index a597adf3..9e9257c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7309,10 +7309,10 @@ prettier@1.16.3: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== -prettier@1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" - integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== +prettier@1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.0.tgz#3bec4489d5eebcd52b95ddd2c22467b5c852fde1" + integrity sha512-GlAIjk6DjkNT6u/Bw5QCWrbzh9YlLKwwmJT//1YiCR3WDpZDnyss64aXHQZgF8VKeGlWnX6+tGsKSVxsZT/gtA== pretty-quick@2.0.1: version "2.0.1" From a13bcb8e9379550eb0164ea854e557b72da54c33 Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Sat, 9 Nov 2019 10:55:50 +0200 Subject: [PATCH 2/2] Format prettier after update --- .prettierignore | 1 + client/components/MessageTypes/topic.vue | 4 +--- client/js/socket-events/quit.js | 5 ++++- .../libs/handlebars/ircmessageparser/fill.js | 20 +++++++++++++++---- test/src/command-line/utilsTest.js | 6 +++--- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.prettierignore b/.prettierignore index c01534b0..2119df94 100644 --- a/.prettierignore +++ b/.prettierignore @@ -21,5 +21,6 @@ yarn.lock .editorconfig .eslintignore .gitattributes +.browserslistrc *.css diff --git a/client/components/MessageTypes/topic.vue b/client/components/MessageTypes/topic.vue index 18c066d4..7ec96e95 100644 --- a/client/components/MessageTypes/topic.vue +++ b/client/components/MessageTypes/topic.vue @@ -3,9 +3,7 @@ - + diff --git a/client/js/socket-events/quit.js b/client/js/socket-events/quit.js index 2ee34bdd..6dea3d45 100644 --- a/client/js/socket-events/quit.js +++ b/client/js/socket-events/quit.js @@ -6,7 +6,10 @@ const sidebar = $("#sidebar"); const {vueApp} = require("../vue"); socket.on("quit", function(data) { - vueApp.networks.splice(vueApp.networks.findIndex((n) => n.uuid === data.network), 1); + vueApp.networks.splice( + vueApp.networks.findIndex((n) => n.uuid === data.network), + 1 + ); vueApp.$nextTick(() => { const chan = sidebar.find(".chan"); diff --git a/test/client/js/libs/handlebars/ircmessageparser/fill.js b/test/client/js/libs/handlebars/ircmessageparser/fill.js index a046a452..10edb5aa 100644 --- a/test/client/js/libs/handlebars/ircmessageparser/fill.js +++ b/test/client/js/libs/handlebars/ircmessageparser/fill.js @@ -7,7 +7,10 @@ describe("fill", () => { const text = "01234567890123456789"; it("should return an entry for the unmatched end of string", () => { - const existingEntries = [{start: 0, end: 10}, {start: 5, end: 15}]; + const existingEntries = [ + {start: 0, end: 10}, + {start: 5, end: 15}, + ]; const expected = [{start: 15, end: 20}]; @@ -17,9 +20,15 @@ describe("fill", () => { }); it("should return an entry per unmatched areas of the text", () => { - const existingEntries = [{start: 0, end: 5}, {start: 10, end: 15}]; + const existingEntries = [ + {start: 0, end: 5}, + {start: 10, end: 15}, + ]; - const expected = [{start: 5, end: 10}, {start: 15, end: 20}]; + const expected = [ + {start: 5, end: 10}, + {start: 15, end: 20}, + ]; const actual = fill(existingEntries, text); @@ -27,7 +36,10 @@ describe("fill", () => { }); it("should not return anything when entries match all text", () => { - const existingEntries = [{start: 0, end: 10}, {start: 10, end: 20}]; + const existingEntries = [ + {start: 0, end: 10}, + {start: 10, end: 20}, + ]; const actual = fill(existingEntries, text); diff --git a/test/src/command-line/utilsTest.js b/test/src/command-line/utilsTest.js index 47f9aace..bd6b97ce 100644 --- a/test/src/command-line/utilsTest.js +++ b/test/src/command-line/utilsTest.js @@ -117,9 +117,9 @@ describe("Utils", function() { }); it("should maintain existing properties of a nested object", function() { - expect(Utils.parseConfigOptions("foo.bar=true", {foo: {baz: false}})).to.deep.equal( - {foo: {bar: true, baz: false}} - ); + expect( + Utils.parseConfigOptions("foo.bar=true", {foo: {baz: false}}) + ).to.deep.equal({foo: {bar: true, baz: false}}); }); it("should maintain existing entries of an array", function() {