mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Merge pull request #2185 from Human-Connection/dependabot/npm_and_yarn/webapp/prettier-1.19.1
build(deps-dev): bump prettier from 1.18.2 to 1.19.1 in /webapp
This commit is contained in:
commit
b6ecfa6ebb
@ -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)
|
||||
|
||||
@ -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",
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
<template>
|
||||
<ds-card :header="$t('admin.hashtags.name')">
|
||||
<ds-table :data="Tag" :fields="fields" condensed>
|
||||
<template slot="index" slot-scope="scope">
|
||||
{{ scope.index + 1 }}.
|
||||
</template>
|
||||
<template slot="index" slot-scope="scope">{{ scope.index + 1 }}.</template>
|
||||
<template slot="id" slot-scope="scope">
|
||||
<nuxt-link :to="{ path: '/', query: { hashtag: encodeURI(scope.row.id) } }">
|
||||
<b>#{{ scope.row.id | truncate(20) }}</b>
|
||||
|
||||
@ -20,9 +20,7 @@
|
||||
</ds-space>
|
||||
<ds-card v-if="User && User.length">
|
||||
<ds-table :data="User" :fields="fields" condensed>
|
||||
<template slot="index" slot-scope="scope">
|
||||
{{ scope.row.index + 1 }}.
|
||||
</template>
|
||||
<template slot="index" slot-scope="scope">{{ scope.row.index + 1 }}.</template>
|
||||
<template slot="name" slot-scope="scope">
|
||||
<nuxt-link
|
||||
:to="{
|
||||
|
||||
@ -45,7 +45,11 @@ export default ({ app = {} }) => {
|
||||
return value.join(glue)
|
||||
},
|
||||
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 = '') => {
|
||||
return value
|
||||
|
||||
@ -169,7 +169,10 @@ describe('actions', () => {
|
||||
|
||||
it('saves pending flags in order', () => {
|
||||
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' })
|
||||
} catch (err) {} // ignore
|
||||
expect(commit.mock.calls).toEqual(
|
||||
expect.arrayContaining([['SET_PENDING', true], ['SET_PENDING', false]]),
|
||||
expect.arrayContaining([
|
||||
['SET_PENDING', true],
|
||||
['SET_PENDING', false],
|
||||
]),
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
@ -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"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user