Skip to content
This repository was archived by the owner on Jul 10, 2019. It is now read-only.

Commit 330f7de

Browse files
authored
Merge pull request #22 from hisasann/feature/renovate-nuxt-2.8.1
Feature/renovate nuxt 2.8.1
2 parents 9305938 + 3c623a0 commit 330f7de

File tree

11 files changed

+1288
-1330
lines changed

11 files changed

+1288
-1330
lines changed

package.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
},
4949
"dependencies": {
5050
"@lollipop-onl/vuex-typesafe-helper": "^0.2.6",
51-
"@nuxt/typescript": "^2.8.0",
52-
"@nuxtjs/axios": "^5.5.3",
51+
"@nuxt/typescript": "^2.8.1",
52+
"@nuxtjs/axios": "^5.5.4",
5353
"@nuxtjs/pwa": "^3.0.0-beta.14",
5454
"@nuxtjs/sentry": "^3.0.0",
5555
"@types/shortid": "^0.0.29",
5656
"@types/swiper": "^4.4.3",
57-
"@types/webpack": "^4.4.32",
57+
"@types/webpack": "^4.4.34",
5858
"@ungap/url-search-params": "^0.1.2",
5959
"animejs": "^3.0.1",
6060
"body-parser": "^1.19.0",
@@ -63,57 +63,57 @@
6363
"express": "^4.17.1",
6464
"js-cookie": "^2.2.0",
6565
"moment": "^2.24.0",
66-
"nuxt": "^2.8.0",
66+
"nuxt": "^2.8.1",
6767
"nuxt-client-init-module": "^0.1.4",
6868
"nuxt-env": "^0.1.0",
69-
"nuxt-property-decorator": "^2.1.3",
69+
"nuxt-property-decorator": "^2.3.0",
7070
"shortid": "^2.2.14",
7171
"throttle-debounce": "^2.1.0",
72-
"ts-node": "^8.2.0",
73-
"vee-validate": "^2.2.9",
72+
"ts-node": "^8.3.0",
73+
"vee-validate": "^2.2.11",
7474
"vue-awesome-swiper": "^3.1.3",
7575
"vue-carousel": "^0.18.0",
7676
"vue-i18n": "^8.11.2",
77-
"vue-lazyload": "^1.2.6"
77+
"vue-lazyload": "^1.3.1"
7878
},
7979
"devDependencies": {
8080
"@nuxtjs/eslint-config": "^0.0.1",
8181
"@nuxtjs/style-resources": "^0.1.2",
82-
"@storybook/vue": "^5.0.11",
82+
"@storybook/vue": "^5.1.9",
8383
"@types/animejs": "^2.0.2",
8484
"@types/babel-core": "6.25.6",
8585
"@types/eslint": "^4.16.6",
8686
"@types/eslint-plugin-prettier": "2.2.0",
87-
"@types/express": "^4.16.1",
88-
"@types/jest": "^24.0.13",
87+
"@types/express": "^4.17.0",
88+
"@types/jest": "^24.0.15",
8989
"@types/js-cookie": "^2.2.2",
9090
"@types/moment": "^2.13.0",
9191
"@types/prettier": "1.16.4",
92-
"@types/storybook__vue": "^5.0.1",
93-
"@typescript-eslint/eslint-plugin": "^1.9.0",
94-
"@typescript-eslint/parser": "^1.9.0",
92+
"@types/storybook__vue": "^5.0.2",
93+
"@typescript-eslint/eslint-plugin": "^1.11.0",
94+
"@typescript-eslint/parser": "^1.11.0",
9595
"@vue/test-utils": "^1.0.0-beta.29",
9696
"babel-core": "7.0.0-bridge.0",
97-
"babel-eslint": "^10.0.1",
97+
"babel-eslint": "^10.0.2",
9898
"babel-jest": "^24.8.0",
9999
"babel-preset-vue": "^2.0.2",
100-
"eslint": "^5.16.0",
101-
"eslint-config-prettier": "^4.3.0",
100+
"eslint": "^6.0.1",
101+
"eslint-config-prettier": "^6.0.0",
102102
"eslint-config-standard": ">=12.0.0",
103103
"eslint-loader": "^2.1.2",
104-
"eslint-plugin-import": ">=2.17.3",
105-
"eslint-plugin-jest": ">=22.6.4",
104+
"eslint-plugin-import": ">=2.18.0",
105+
"eslint-plugin-jest": ">=22.7.1",
106106
"eslint-plugin-node": ">=9.1.0",
107107
"eslint-plugin-prettier": "3.1.0",
108-
"eslint-plugin-promise": ">=4.1.1",
108+
"eslint-plugin-promise": ">=4.2.1",
109109
"eslint-plugin-standard": ">=4.0.0",
110-
"eslint-plugin-vue": "^5.2.2",
111-
"husky": "^2.3.0",
110+
"eslint-plugin-vue": "^5.2.3",
111+
"husky": "^3.0.0",
112112
"jest": "^24.8.0",
113113
"node-sass": "^4.12.0",
114114
"nodemon": "^1.19.1",
115-
"prettier": "1.17.1",
116-
"pug": "^2.0.3",
115+
"prettier": "1.18.2",
116+
"pug": "^2.0.4",
117117
"pug-plain-loader": "^1.0.0",
118118
"rimraf": "^2.6.3",
119119
"sass-loader": "^7.1.0",

src/api/healthcheck.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ module.exports = (req, res, next) => {
1212

1313
if (process.env.BUILD_ENV === 'docker') {
1414
/** docker のビルド環境の環境変数から値を取ってくる */
15-
internalHealthcheckUrl = `${
16-
process.env.internalEndpointUrl
17-
}${HEALTHCHECK_PATH}`
15+
internalHealthcheckUrl = `${process.env.internalEndpointUrl}${HEALTHCHECK_PATH}`
1816
} else {
1917
/** docker でビルドされていない場合は、 .env.local から値を取ってくる */
2018
internalHealthcheckUrl = `http://localhost:5000${HEALTHCHECK_PATH}`

src/pages/example/vue-awesome-swiper.vue

+1-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,7 @@ export default class VueAwesomeSwiper extends Vue {
5454
spaceBetween: 30,
5555
slidesPerGroup: 3,
5656
pagination: {
57-
el: `.swiper-pagination-bullets[data-component-id="${
58-
this.componentId
59-
}"]`,
57+
el: `.swiper-pagination-bullets[data-component-id="${this.componentId}"]`,
6058
clickable: true,
6159
bulletElement: 'li'
6260
},

src/plugins/directives/scroll.ts

+4-7
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ import { throttle } from 'throttle-debounce'
1111

1212
export default {
1313
inserted: (el, binding): void => {
14-
const f = throttle(
15-
20,
16-
(evt): void => {
17-
if (binding.value(evt, el)) {
18-
window.removeEventListener('scroll', f)
19-
}
14+
const f = throttle(20, (evt): void => {
15+
if (binding.value(evt, el)) {
16+
window.removeEventListener('scroll', f)
2017
}
21-
)
18+
})
2219

2320
window.addEventListener('scroll', f)
2421
}

src/plugins/libraries/axios.ts

+28-34
Original file line numberDiff line numberDiff line change
@@ -10,55 +10,49 @@ export default ({ $axios, app, req, error }): void => {
1010
/**
1111
* $axios.onRequest
1212
*/
13-
$axios.onRequest(
14-
(config: AxiosRequestConfig): void => {
15-
const token = getTokenFromCookie(req)
16-
console.log('$axios.onRequest', token)
13+
$axios.onRequest((config: AxiosRequestConfig): void => {
14+
const token = getTokenFromCookie(req)
15+
console.log('$axios.onRequest', token)
1716

18-
// トークンがあればログイン済みなのでリクエストヘッダで送信する
19-
if (token) {
20-
config.headers[app.$C.ACCESS_TOKEN_NAME] = token
21-
}
17+
// トークンがあればログイン済みなのでリクエストヘッダで送信する
18+
if (token) {
19+
config.headers[app.$C.ACCESS_TOKEN_NAME] = token
2220
}
23-
)
21+
})
2422

2523
/**
2624
* $axios.onResponse
2725
*/
28-
$axios.onResponse(
29-
(response): void => {
30-
const token = response.headers[app.$C.ACCESS_TOKEN_NAME]
31-
console.log('$axios.onResponse', token)
26+
$axios.onResponse((response): void => {
27+
const token = response.headers[app.$C.ACCESS_TOKEN_NAME]
28+
console.log('$axios.onResponse', token)
3229

33-
// CSR のときだけトークンをセットする、 SSR のときは nuxtClientInit でセットしている
34-
if (process.client) {
35-
if (token) {
36-
setToken(token)
37-
} else {
38-
unsetToken()
39-
}
30+
// CSR のときだけトークンをセットする、 SSR のときは nuxtClientInit でセットしている
31+
if (process.client) {
32+
if (token) {
33+
setToken(token)
34+
} else {
35+
unsetToken()
4036
}
4137
}
42-
)
38+
})
4339

4440
/**
4541
* $axios.onResponseError
4642
*/
47-
$axios.onResponseError(
48-
(response: AxiosError): void => {
49-
console.log('$axios.onResponseError')
50-
// 通信エラー
51-
if (!response.response) {
52-
return
53-
}
43+
$axios.onResponseError((response: AxiosError): void => {
44+
console.log('$axios.onResponseError')
45+
// 通信エラー
46+
if (!response.response) {
47+
return
48+
}
5449

55-
const { status } = response.response
50+
const { status } = response.response
5651

57-
if (status === app.$C.HTTP_STATUS.UNAUTHORIZED) {
58-
const message = '401 error'
52+
if (status === app.$C.HTTP_STATUS.UNAUTHORIZED) {
53+
const message = '401 error'
5954

60-
error({ statusCode: 401, message })
61-
}
55+
error({ statusCode: 401, message })
6256
}
63-
)
57+
})
6458
}

src/utilities/VuexDecorator.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/**
22
* @file 最低限の定義でVuexの型をType-safeに定義するライブラリ
33
*/
4-
/* eslint-disable interface-name */
54
/* eslint-disable @typescript-eslint/explicit-function-return-type */
65

76
import {

src/utilities/auth.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ export const getTokenFromCookie = (req?: any): string | undefined => {
3232
console.log('req.headers.cookie:', req.headers.cookie)
3333
const cookie: string = req.headers.cookie
3434
.split(';')
35-
.find(
36-
(c: string): boolean =>
37-
c.trim().startsWith(`${ACCESS_TOKEN_COOKIE_NAME}=`)
35+
.find((c: string): boolean =>
36+
c.trim().startsWith(`${ACCESS_TOKEN_COOKIE_NAME}=`)
3837
)
3938

4039
if (!cookie) {

src/utilities/cancelToken.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,9 @@ export class CancelTokenMap {
5555
* @param message キャンセルメッセージ
5656
*/
5757
public cancelAll(keys: any[], message?: string): void {
58-
keys.forEach(
59-
(key): void => {
60-
this.cancel(key, message)
61-
}
62-
)
58+
keys.forEach((key): void => {
59+
this.cancel(key, message)
60+
})
6361
}
6462
}
6563

src/utilities/sleep.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
* @param {number} milliseconds
44
*/
55
export function sleep(milliseconds: number): Promise<void> {
6-
return new Promise<void>(
7-
(resolve): void => {
8-
setTimeout((): void => resolve(), milliseconds)
9-
}
10-
)
6+
return new Promise<void>((resolve): void => {
7+
setTimeout((): void => resolve(), milliseconds)
8+
})
119
}

stories/index.ts

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import { storiesOf } from '@storybook/vue'
22
import HelloWorld from '@/components/HelloWorld.vue'
33

4-
storiesOf('HelloWorld', module).add(
5-
'default',
6-
(): any => ({
7-
components: { HelloWorld },
8-
template: `<HelloWorld message="HelloWorld" />`
9-
})
10-
)
4+
storiesOf('HelloWorld', module).add('default', (): any => ({
5+
components: { HelloWorld },
6+
template: `<HelloWorld message="HelloWorld" />`
7+
}))

0 commit comments

Comments
 (0)