Merge branch 'master' into cuixiaorui-shape-flag

Author: lmiller1990

package.json

@@ -27,7 +27,6 @@
     "babel-jest": "^25.2.3",
     "babel-preset-jest": "^25.2.1",
     "dom-event-types": "^1.0.0",
-    "flush-promises": "^1.0.2",
     "husky": "^4.2.3",
     "jest": "^25.1.0",
     "jsdom": "^16.2.2",

src/index.ts

@@ -3,5 +3,14 @@ import { RouterLinkStub } from './components/RouterLinkStub'
 import { VueWrapper } from './vue-wrapper'
 import { DOMWrapper } from './dom-wrapper'
 import { config } from './config'
+import { flushPromises } from './utils/flushPromises'
 
-export { mount, shallowMount, RouterLinkStub, VueWrapper, DOMWrapper, config }
+export {
+  mount,
+  shallowMount,
+  RouterLinkStub,
+  VueWrapper,
+  DOMWrapper,
+  config,
+  flushPromises
+}

src/utils/flushPromises.ts

@@ -0,0 +1,7 @@
+const scheduler = typeof setImmediate === 'function' ? setImmediate : setTimeout
+
+export function flushPromises() {
+  return new Promise((resolve) => {
+    scheduler(resolve, 0)
+  })
+}

tests/features/async-components.spec.ts

@@ -1,7 +1,6 @@
 import { defineAsyncComponent, defineComponent, h, AppConfig } from 'vue'
-import flushPromises from 'flush-promises'
 
-import { mount } from '../../src'
+import { mount, flushPromises } from '../../src'
 
 const config: AppConfig = {
   devtools: false,

tests/features/suspense.spec.ts

@@ -1,7 +1,5 @@
-import flushPromises from 'flush-promises'
-
 import SuspenseComponent from '../components/Suspense.vue'
-import { mount } from '../../src'
+import { mount, flushPromises } from '../../src'
 
 let mockShouldError = false
 jest.mock('../utils', () => ({

yarn.lock

@@ -2572,11 +2572,6 @@ find-versions@^3.2.0:
   dependencies:
     semver-regex "^2.0.0"
 
-flush-promises@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flush-promises/-/flush-promises-1.0.2.tgz#4948fd58f15281fed79cbafc86293d5bb09b2ced"
-  integrity sha512-G0sYfLQERwKz4+4iOZYQEZVpOt9zQrlItIxQAAYAWpfby3gbHrx0osCHz5RLl/XoXevXk0xoN4hDFky/VV9TrA==
-
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"