Merge master into feat/ssr

umijs · Jun 15, 2019 · e9d51b9 · e9d51b9
2 parents 539f4c5 + 14750fd
commit e9d51b9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/packages/af-webpack/package.json b/packages/af-webpack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "af-webpack",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "bin": {
     "af-webpack": "./bin/af-webpack.js"
   },

diff --git a/packages/af-webpack/src/getConfig/index.js b/packages/af-webpack/src/getConfig/index.js
@@ -199,8 +199,7 @@ export default function(opts) {
 
   // module -> extraBabelIncludes
   // suport es5ImcompatibleVersions
-  const extraBabelIncludes = opts.extraBabelIncludes || [];
-  extraBabelIncludes.push(a => {
+  const extraBabelIncludes = (opts.extraBabelIncludes || []).concat(a => {
     if (!a.includes('node_modules')) return false;
     const pkgPath = getPkgPath(a);
     return shouldTransform(pkgPath);

diff --git a/packages/umi-build-dev/package.json b/packages/umi-build-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umi-build-dev",
-  "version": "1.9.5",
+  "version": "1.9.6",
   "dependencies": {
     "@babel/code-frame": "7.0.0",
     "@babel/generator": "7.3.0",
@@ -10,7 +10,7 @@
     "@babel/template": "7.2.2",
     "@babel/traverse": "7.2.3",
     "@babel/types": "7.3.0",
-    "af-webpack": "1.8.4",
+    "af-webpack": "1.8.5",
     "babel-plugin-module-resolver": "3.1.1",
     "babel-preset-umi": "1.5.0",
     "chalk": "2.4.1",
@@ -58,7 +58,7 @@
     "umi-history": "0.1.2",
     "umi-mock": "1.2.0",
     "umi-notify": "^0.1.1",
-    "umi-test": "1.5.11",
+    "umi-test": "1.5.12",
     "umi-utils": "1.4.4",
     "uppercamelcase": "3.0.0",
     "url-polyfill": "1.1.3",

diff --git a/packages/umi-test/package.json b/packages/umi-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umi-test",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "bin": {
     "umi-test": "./bin/umi-test.js"
   },
@@ -27,20 +27,20 @@
     "@babel/polyfill": "7.2.5",
     "@babel/preset-typescript": "7.3.3",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "24.1.0",
+    "babel-jest": "^24.8.0",
     "babel-plugin-module-resolver": "3.1.1",
     "babel-preset-umi": "1.5.0",
     "debug": "4.1.1",
-    "enzyme": "3.9.0",
-    "enzyme-adapter-react-16": "1.9.1",
+    "enzyme": "^3.10.0",
+    "enzyme-adapter-react-16": "^1.14.0",
     "identity-obj-proxy": "3.0.0",
-    "jest": "24.1.0",
-    "jest-cli": "24.1.0",
-    "jest-pnp-resolver": "1.1.0",
-    "jest-resolve": "24.1.0",
+    "jest": "^24.8.0",
+    "jest-cli": "^24.8.0",
+    "jest-pnp-resolver": "^1.2.0",
+    "jest-resolve": "^24.8.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
-    "typescript": "3.3.3",
+    "typescript": "^3.5.2",
     "umi-utils": "1.4.4",
     "yargs-parser": "13.0.0"
   }

diff --git a/packages/umi/package.json b/packages/umi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umi",
-  "version": "2.7.6",
+  "version": "2.7.7",
   "description": "Pluggable enterprise-level react application framework.",
   "dependencies": {
     "@babel/core": "7.2.2",
@@ -16,7 +16,7 @@
     "resolve-cwd": "2.0.0",
     "semver": "5.6.0",
     "signale": "1.3.0",
-    "umi-build-dev": "1.9.5",
+    "umi-build-dev": "1.9.6",
     "umi-utils": "1.4.4",
     "update-notifier": "2.5.0",
     "yargs-parser": "13.0.0"