From 8ec91f46e7ad979a38aab0bc40ed117e7ff2648b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2019 09:55:41 +0000 Subject: [PATCH 1/2] build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp Bumps [prettier](https://github.com/prettier/prettier) from 1.18.2 to 1.19.1. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/1.18.2...1.19.1) Signed-off-by: dependabot-preview[bot] --- webapp/package.json | 2 +- webapp/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 322e88817..2485695d0 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -129,7 +129,7 @@ "jest": "~24.9.0", "mutation-observer": "^1.0.3", "node-sass": "~4.13.0", - "prettier": "~1.18.2", + "prettier": "~1.19.1", "sass-loader": "~8.0.0", "storybook-design-token": "^0.4.1", "storybook-vue-router": "^1.0.7", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 31a6085fe..8310dcd39 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -12901,10 +12901,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.1: + version "1.19.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" + integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== pretty-bytes@^5.3.0: version "5.3.0" From db2540342983db35539291fc9f8f691fffd37659 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Fri, 15 Nov 2019 11:20:50 +0100 Subject: [PATCH 2/2] Fix lint --- webapp/components/Editor/Editor.story.js | 6 +++++- webapp/pages/admin/hashtags.vue | 4 +--- webapp/pages/admin/users.vue | 4 +--- webapp/plugins/vue-filters.js | 6 +++++- webapp/store/auth.test.js | 10 ++++++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/webapp/components/Editor/Editor.story.js b/webapp/components/Editor/Editor.story.js index 7a69b347f..8efcf3f4c 100644 --- a/webapp/components/Editor/Editor.story.js +++ b/webapp/components/Editor/Editor.story.js @@ -27,7 +27,11 @@ const plugins = [ ] helpers.init({ plugins }) -const users = [{ id: 1, slug: 'peter' }, { id: 2, slug: 'sandra' }, { id: 3, slug: 'jane' }] +const users = [ + { id: 1, slug: 'peter' }, + { id: 2, slug: 'sandra' }, + { id: 3, slug: 'jane' }, +] storiesOf('Editor', module) .addDecorator(withA11y) diff --git a/webapp/pages/admin/hashtags.vue b/webapp/pages/admin/hashtags.vue index 76306873a..521d3110a 100644 --- a/webapp/pages/admin/hashtags.vue +++ b/webapp/pages/admin/hashtags.vue @@ -1,9 +1,7 @@