diff --git a/config/storybook/config.js b/config/storybook/config.js index 63f42b3..4493fd4 100644 --- a/config/storybook/config.js +++ b/config/storybook/config.js @@ -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() diff --git a/package.json b/package.json index 4131d8b..3f45438 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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": { diff --git a/src/store/root.ts b/src/store/root.ts index 73caf38..e665673 100644 --- a/src/store/root.ts +++ b/src/store/root.ts @@ -17,7 +17,7 @@ export class ClassBasedStoreOption { private readonly containerModule: ContainerModule, @inject(MiddlewareModule) private readonly middlewareModule: MiddlewareModule, - ) {} + ) { } get modules() { return { diff --git a/src/testConfiguration.ts b/src/testConfiguration.ts index b0fb665..36e86ea 100644 --- a/src/testConfiguration.ts +++ b/src/testConfiguration.ts @@ -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' @@ -21,5 +19,3 @@ Vue.use(Vuetify, { success: '#4caf50', }, }) -Vue.use(ProxyComponent) -Vue.use(Upload) diff --git a/yarn.lock b/yarn.lock index 41f8ec2..b6d0e26 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12449,10 +12449,10 @@ vue-style-loader@^4.1.0: hash-sum "^1.0.2" loader-utils "^1.0.2" -vue-template-compiler@2.6.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" @@ -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" -vue@2.6.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== vuetify@1.5.0: version "1.5.0"