diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js index 2906fa3f3c..81bc9496d1 100644 --- a/.electron-vue/webpack.renderer.config.js +++ b/.electron-vue/webpack.renderer.config.js @@ -24,7 +24,6 @@ const { VueLoaderPlugin } = require("vue-loader"); let whiteListedModules = [ "vue", "portal-vue", - "vue-property-decorator", "vue-class-component", "@arkecosystem/client", "got", diff --git a/.storybook/preview.ts b/.storybook/preview.ts index 39e7e33ecb..2c570074ba 100644 --- a/.storybook/preview.ts +++ b/.storybook/preview.ts @@ -4,9 +4,6 @@ import "reflect-metadata"; import "../src/renderer/app/styles/style.css"; import Vue from "vue"; -import CompositionApi from "@vue/composition-api"; - -Vue.use(CompositionApi); addParameters({ options: { diff --git a/jest.config.js b/jest.config.js index e8defa938f..cd7bfa880a 100644 --- a/jest.config.js +++ b/jest.config.js @@ -18,7 +18,6 @@ module.exports = { "src/renderer/app/router", "src/renderer/app/store", "src/renderer/main.js", - "src/renderer/registerComponentHooks.ts", "src/renderer/splashscreen.js", "src/renderer/support/enums", "stories.ts", diff --git a/package.json b/package.json index 164bf39905..53dfe9cbb1 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,6 @@ "@fortawesome/vue-fontawesome": "^0.1.9", "@kodekeep/reqwest": "^0.4.0", "@ledgerhq/hw-transport-node-hid-singleton": "^5.16.0", - "@vue/composition-api": "^0.5.0", "about-window": "^1.13.2", "animate.css": "^4.1.0", "async": "^3.2.0", @@ -107,17 +106,15 @@ "validate-npm-package-name": "^3.0.0", "vee-validate": "^3.3.1", "vm2": "^3.9.2", - "vue": "^2.6.11", + "vue": "next", "vue-chartjs": "^3.5.0", "vue-class-component": "^7.2.3", "vue-good-table": "^2.19.3", "vue-i18n": "^8.18.1", - "vue-property-decorator": "^8.4.2", "vue-qrcode-reader": "^2.3.0", - "vue-router": "^3.3.2", + "vue-router": "next", "vue-spinner": "^1.0.3", - "vuex": "^3.4.0", - "vuex-electron": "^1.0.3", + "vuex": "next", "wif": "^2.0.6" }, "devDependencies": { @@ -140,7 +137,7 @@ "@types/node": "^14.0.6", "@typescript-eslint/eslint-plugin": "^3.0.2", "@typescript-eslint/parser": "^3.0.2", - "@vue/test-utils": "1.0.3", + "@vue/test-utils": "next", "autoprefixer": "^9.8.0", "babel-core": "^7.0.0-0", "babel-eslint": "^10.1.0", @@ -175,7 +172,7 @@ "eslint-plugin-promise": "^4.2.1", "eslint-plugin-simple-import-sort": "^5.0.3", "eslint-plugin-standard": "^4.0.1", - "eslint-plugin-vue": "^6.2.2", + "eslint-plugin-vue": "next", "esm": "^3.2.25", "file-loader": "^6.0.0", "flush-promises": "^1.0.2", diff --git a/src/renderer/app/App.vue b/src/renderer/app/App.vue index b964f101cb..9c51910ef8 100644 --- a/src/renderer/app/App.vue +++ b/src/renderer/app/App.vue @@ -1,14 +1,13 @@ - - + + diff --git a/src/renderer/app/SplashScreen.vue b/src/renderer/app/SplashScreen.vue index bede353f08..73b7e5eb64 100644 --- a/src/renderer/app/SplashScreen.vue +++ b/src/renderer/app/SplashScreen.vue @@ -1,3 +1,17 @@ + + - -