chore: migrate latest Vuex 3 changes

sarvex · May 11, 2020 · f8833a9 · f8833a9
1 parent af6971e
commit f8833a9
Show file tree

Hide file tree

Showing 13 changed files with 2,681 additions and 1,227 deletions.
diff --git a/examples/classic/chat/app.js b/examples/classic/chat/app.js
@@ -1,4 +1,3 @@
-import 'babel-polyfill'
 import { createApp } from 'vue'
 import App from './components/App.vue'
 import store from './store'

diff --git a/examples/classic/counter/app.js b/examples/classic/counter/app.js
@@ -1,4 +1,3 @@
-import 'babel-polyfill'
 import { createApp } from 'vue'
 import Counter from './Counter.vue'
 import store from './store'

diff --git a/examples/composition/chat/app.js b/examples/composition/chat/app.js
@@ -1,4 +1,3 @@
-import 'babel-polyfill'
 import { createApp } from 'vue'
 import App from './components/App.vue'
 import store from './store'

diff --git a/examples/composition/counter/app.js b/examples/composition/counter/app.js
@@ -1,4 +1,3 @@
-import 'babel-polyfill'
 import { createApp } from 'vue'
 import Counter from './Counter.vue'
 import store from './store'

diff --git a/examples/composition/shopping-cart/app.js b/examples/composition/shopping-cart/app.js
@@ -1,11 +1,8 @@
-import 'babel-polyfill'
 import { createApp } from 'vue'
 import App from './components/App.vue'
 import store from './store'
 import { currency } from './currency'
 
-// Vue.filter('currency', currency)
-
 const app = createApp(App)
 
 app.use(store)

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
   },
   "homepage": "https://github.com/vuejs/vuex#readme",
   "peerDependencies": {
-    "vue": "3.0.0-beta.4"
+    "vue": "^3.0.0-beta.10"
   },
   "devDependencies": {
     "@babel/core": "^7.9.6",
@@ -53,6 +53,7 @@
     "@rollup/plugin-node-resolve": "^7.1.3",
     "@rollup/plugin-replace": "^2.3.2",
     "@types/node": "^13.13.5",
+    "@vue/compiler-sfc": "^3.0.0-beta.10",
     "babel-jest": "^26.0.1",
     "babel-loader": "^8.1.0",
     "brotli": "^1.3.2",
@@ -76,8 +77,8 @@
     "semver": "^7.3.2",
     "todomvc-app-css": "^2.1.0",
     "typescript": "^3.8.3",
-    "vue": "^2.5.22",
-    "vue-loader": "^15.2.1",
+    "vue": "^3.0.0-beta.10",
+    "vue-loader": "^16.0.0-beta.1",
     "vue-template-compiler": "^2.5.22",
     "vuepress": "^0.14.1",
     "vuepress-theme-vue": "^1.1.0",

diff --git a/test/unit/support/helpers.js → test/helpers.js b/test/unit/support/helpers.js → test/helpers.js
diff --git a/test/setup.js b/test/setup.js
@@ -1,5 +1 @@
 import 'regenerator-runtime/runtime'
-import Vue from 'vue'
-import Vuex from '@/index'
-
-Vue.use(Vuex)
diff --git a/test/unit/helpers.spec.js b/test/unit/helpers.spec.js
@@ -1,5 +1,5 @@
-import { mount } from './support/helpers'
-import Vuex, { mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers } from '../../src/index'
+import { mount } from 'test/helpers'
+import Vuex, { mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers } from '@/index'
 
 describe('Helpers', () => {
   it('mapState (array)', () => {

diff --git a/test/unit/hot-reload.spec.js b/test/unit/hot-reload.spec.js
@@ -1,6 +1,6 @@
 import { nextTick } from 'vue'
-import { mount } from './support/helpers'
-import Vuex from '../../src/index'
+import { mount } from 'test/helpers'
+import Vuex from '@/index'
 
 const TEST = 'TEST'
 const isSSR = process.env.VUE_ENV === 'server'

diff --git a/test/unit/modules.spec.js b/test/unit/modules.spec.js
@@ -1,5 +1,5 @@
 import { nextTick } from 'vue'
-import Vuex from '../../src/index'
+import Vuex from '@/index'
 
 const TEST = 'TEST'
 
@@ -758,7 +758,7 @@ describe('Modules', () => {
         store.state
       )
       expect(afterSpy).not.toHaveBeenCalled()
-      Vue.nextTick(() => {
+      nextTick(() => {
         expect(afterSpy).not.toHaveBeenCalledWith(
           { type: TEST, payload: 2 },
           store.state

diff --git a/test/unit/store.spec.js b/test/unit/store.spec.js
@@ -1,6 +1,6 @@
 import { nextTick } from 'vue'
-import { mount } from './support/helpers'
-import Vuex from '@/src/index'
+import { mount } from 'test/helpers'
+import Vuex from '@/index'
 
 const TEST = 'TEST'
 const isSSR = process.env.VUE_ENV === 'server'