Merge branch 'next' into docs

package.json

@@ -44,9 +44,8 @@
   "typings": "types/index.d.ts",
   "scripts": {
     "build": "yarn build:other && yarn build:es",
-    "build:es": "rimraf es && babel src --env-name es --out-dir es --ignore 'src/browser.js'",
+    "build:es": "rimraf es && babel src --env-name es --out-dir es",
     "build:other": "rimraf lib && rollup -c scripts/rollup.config.js",
-    "codecov": "codecov",
     "dev": "cd examples && yarn dev && cd ..",
     "docs": "vuepress dev --host 0.0.0.0 --port 3000 docs",
     "docs:build": "vuepress build docs",
@@ -54,30 +53,33 @@
     "prerelease": "git checkout master && git pull -r",
     "release": "yarn lint && yarn test && yarn build && standard-version",
     "postrelease": "git push origin master --follow-tags && yarn publish",
-    "test": "jest"
+    "test": "yarn test:unit && yarn test:e2e",
+    "test:e2e": "jest test/e2e",
+    "test:unit": "jest test/unit"
   },
   "dependencies": {
-    "deepmerge": "^3.2.0",
-    "lodash.isplainobject": "^4.0.6",
-    "lodash.uniqueid": "^4.0.1"
+    "deepmerge": "^3.2.0"
   },
   "resolutions": {
     "webpack-dev-middleware": "3.6.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.3.3",
+    "@babel/core": "^7.3.4",
     "@babel/node": "^7.2.2",
-    "@babel/preset-env": "^7.3.1",
+    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+    "@babel/preset-env": "^7.3.4",
+    "@nuxt/babel-preset-app": "^2.4.5",
     "@nuxtjs/eslint-config": "^0.0.1",
     "@vue/server-test-utils": "^1.0.0-beta.29",
     "@vue/test-utils": "^1.0.0-beta.29",
     "babel-core": "^7.0.0-bridge",
     "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.1.0",
+    "babel-jest": "^24.4.0",
     "babel-loader": "^8.0.5",
+    "babel-plugin-dynamic-import-node": "^2.2.0",
     "codecov": "^3.2.0",
-    "eslint": "^5.14.1",
+    "eslint": "^5.15.1",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jest": "^22.3.0",
@@ -85,16 +87,22 @@
     "eslint-plugin-promise": "^4.0.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^5.2.2",
-    "esm": "^3.2.5",
-    "jest": "^24.1.0",
-    "jsdom": "^13.2.0",
-    "jsdom-global": "^3.0.2",
+    "esm": "^3.2.14",
+    "fs-extra": "^7.0.1",
+    "is-wsl": "^1.1.0",
+    "jest": "^24.4.0",
+    "jest-environment-jsdom": "^24.4.0",
+    "jest-environment-jsdom-global": "^1.1.1",
+    "jsdom": "^14.0.0",
+    "lodash": "^4.17.11",
+    "puppeteer-core": "^1.13.0",
     "rimraf": "^2.6.3",
-    "rollup": "^1.2.2",
+    "rollup": "^1.6.0",
     "rollup-plugin-buble": "^0.19.6",
-    "rollup-plugin-commonjs": "^9.2.0",
+    "rollup-plugin-commonjs": "^9.2.1",
     "rollup-plugin-json": "^3.1.0",
-    "rollup-plugin-node-resolve": "^4.0.0",
+    "rollup-plugin-node-resolve": "^4.0.1",
+    "rollup-plugin-replace": "^2.1.0",
     "rollup-plugin-terser": "^4.0.4",
     "standard-version": "^5.0.1",
     "vue": "^2.6.8",