Skip to content

Commit

Permalink
Merge pull request #74 from kahirokunn/feature/fix
Browse files Browse the repository at this point in the history
修正
  • Loading branch information
kahirokunn authored Dec 6, 2019
2 parents d24f1d2 + 024cea7 commit 989b848
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 15 deletions.
8 changes: 8 additions & 0 deletions config/storybook/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ import {
import {
createVueProvider
} from '@/provider/createVueProvider'
import {
Upload
} from 'element-ui'
import ProxyComponent from 'vue-proxy-component'
import Vue from 'vue'

Vue.use(ProxyComponent)
Vue.use(Upload)

addDecorator(() => {
const container = new Container()
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"rxfire": "3.3.6",
"rxjs": "6.4.0",
"typescript-fsa-vuex": "3.0.2",
"vue": "2.6.6",
"vue": "^2.6.10",
"vue-class-component": "^7.0.1",
"vue-property-decorator": "8.0.0",
"vue-proxy-component": "0.0.8",
Expand Down Expand Up @@ -74,7 +74,7 @@
"vue-auto-routing": "0.3.0",
"vue-cli-plugin-auto-routing": "0.2.1",
"vue-cli-plugin-storybook": "^0.5.2",
"vue-template-compiler": "2.6.6",
"vue-template-compiler": "^2.6.10",
"zisui": "1.2.2"
},
"gitHooks": {
Expand Down
2 changes: 1 addition & 1 deletion src/store/root.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class ClassBasedStoreOption {
private readonly containerModule: ContainerModule,
@inject(MiddlewareModule)
private readonly middlewareModule: MiddlewareModule,
) {}
) { }

get modules() {
return {
Expand Down
4 changes: 0 additions & 4 deletions src/testConfiguration.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// tslint:disable-next-line ordered-imports
import { Upload } from 'element-ui'
import 'reflect-metadata'
import Vue from 'vue'
import ProxyComponent from 'vue-proxy-component'
import Router from 'vue-router'
import Vuetify from 'vuetify'
import Vuex from 'vuex'
Expand All @@ -21,5 +19,3 @@ Vue.use(Vuetify, {
success: '#4caf50',
},
})
Vue.use(ProxyComponent)
Vue.use(Upload)
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12449,10 +12449,10 @@ vue-style-loader@^4.1.0:
hash-sum "^1.0.2"
loader-utils "^1.0.2"

[email protected].6:
version "2.6.6"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.6.tgz#a807acbf3d51971d3721d75ecb1b927b517c1a02"
integrity sha512-OakxDGyrmMQViCjkakQFbDZlG0NibiOzpLauOfyCUVRQc9yPmTqpiz9nF0VeA+dFkXegetw0E5x65BFhhLXO0A==
vue-template-compiler@^2.6.10:
version "2.6.10"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz#323b4f3495f04faa3503337a82f5d6507799c9cc"
integrity sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
Expand All @@ -12461,10 +12461,10 @@ vue-template-es2015-compiler@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"

[email protected].6:
version "2.6.6"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.6.tgz#dde41e483c11c46a7bf523909f4f2f816ab60d25"
integrity sha512-Y2DdOZD8sxApS+iUlwv1v8U1qN41kq6Kw45lM6nVZKhygeWA49q7VCCXkjXqeDBXgurrKWkYQ9cJeEJwAq0b9Q==
vue@^2.6.10:
version "2.6.10"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz#a72b1a42a4d82a721ea438d1b6bf55e66195c637"
integrity sha512-ImThpeNU9HbdZL3utgMCq0oiMzAkt1mcgy3/E6zWC/G6AaQoeuFdsl9nDhTDU3X1R6FK7nsIUuRACVcjI+A2GQ==

[email protected]:
version "1.5.0"
Expand Down

0 comments on commit 989b848

Please sign in to comment.