ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2185 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.19.1

Browse Source 
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp
This commit is contained in:
Robert Schäfer 2019-11-15 15:49:29 +01:00 committed by GitHub
commit b6ecfa6ebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webapp/components/Editor/Editor.story.js
View File

@ -27,7 +27,11 @@ const plugins = [
] ]
helpers.init({ 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) storiesOf('Editor', module)
.addDecorator(withA11y) .addDecorator(withA11y)

2
webapp/package.json
View File

@ -129,7 +129,7 @@
"jest": "~24.9.0", "jest": "~24.9.0",
"mutation-observer": "^1.0.3", "mutation-observer": "^1.0.3",
"node-sass": "~4.13.0", "node-sass": "~4.13.0",
"prettier": "~1.18.2", "prettier": "~1.19.1",
"sass-loader": "~8.0.0", "sass-loader": "~8.0.0",
"storybook-design-token": "^0.4.1", "storybook-design-token": "^0.4.1",
"storybook-vue-router": "^1.0.7", "storybook-vue-router": "^1.0.7",

4
webapp/pages/admin/hashtags.vue
View File

@ -1,9 +1,7 @@
<template> <template>
<ds-card :header="$t('admin.hashtags.name')"> <ds-card :header="$t('admin.hashtags.name')">
<ds-table :data="Tag" :fields="fields" condensed> <ds-table :data="Tag" :fields="fields" condensed>
<template slot="index" slot-scope="scope"> <template slot="index" slot-scope="scope">{{ scope.index + 1 }}.</template>
{{ scope.index + 1 }}.
</template>
<template slot="id" slot-scope="scope"> <template slot="id" slot-scope="scope">
<nuxt-link :to="{ path: '/', query: { hashtag: encodeURI(scope.row.id) } }"> <nuxt-link :to="{ path: '/', query: { hashtag: encodeURI(scope.row.id) } }">
<b>#{{ scope.row.id | truncate(20) }}</b> <b>#{{ scope.row.id | truncate(20) }}</b>

4
webapp/pages/admin/users.vue
View File

@ -20,9 +20,7 @@
</ds-space> </ds-space>
<ds-card v-if="User && User.length"> <ds-card v-if="User && User.length">
<ds-table :data="User" :fields="fields" condensed> <ds-table :data="User" :fields="fields" condensed>
<template slot="index" slot-scope="scope"> <template slot="index" slot-scope="scope">{{ scope.row.index + 1 }}.</template>
{{ scope.row.index + 1 }}.
</template>
<template slot="name" slot-scope="scope"> <template slot="name" slot-scope="scope">
<nuxt-link <nuxt-link
:to="{ :to="{

6
webapp/plugins/vue-filters.js
View File

@ -45,7 +45,11 @@ export default ({ app = {} }) => {
return value.join(glue) return value.join(glue)
}, },
listByKey: (values, key, glue, truncate) => { listByKey: (values, key, glue, truncate) => {
return app.$filters.list(values.map(item => item[key]), glue, truncate) return app.$filters.list(
values.map(item => item[key]),
glue,
truncate,
)
}, },
camelCase: (value = '') => { camelCase: (value = '') => {
return value return value

10
webapp/store/auth.test.js
View File

@ -169,7 +169,10 @@ describe('actions', () => {
it('saves pending flags in order', () => { it('saves pending flags in order', () => {
expect(commit.mock.calls).toEqual( expect(commit.mock.calls).toEqual(
expect.arrayContaining([['SET_PENDING', true], ['SET_PENDING', false]]), expect.arrayContaining([
['SET_PENDING', true],
['SET_PENDING', false],
]),
) )
}) })
}) })
@ -207,7 +210,10 @@ describe('actions', () => {
await action({ commit }, { email: 'user@example.org', password: 'wrong' }) await action({ commit }, { email: 'user@example.org', password: 'wrong' })
} catch (err) {} // ignore } catch (err) {} // ignore
expect(commit.mock.calls).toEqual( expect(commit.mock.calls).toEqual(
expect.arrayContaining([['SET_PENDING', true], ['SET_PENDING', false]]), expect.arrayContaining([
['SET_PENDING', true],
['SET_PENDING', false],
]),
) )
}) })
}) })

8
webapp/yarn.lock
View File

@ -12901,10 +12901,10 @@ prettier@1.16.3:
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz#8c62168453badef702f34b45b6ee899574a6a65d"
integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw== integrity sha512-kn/GU6SMRYPxUakNXhpP0EedT/KmaPzr0H5lIsDogrykbaxOpOfAFfk5XA7DZrJyMAv1wlMV3CPcZruGXVVUZw==
prettier@~1.18.2: prettier@~1.19.1:
version "1.18.2" version "1.19.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
pretty-bytes@^5.3.0: pretty-bytes@^5.3.0:
version "5.3.0" version "5.3.0"