From 3dc78a3f10b4e094f326f0b292fbd1795c924b8c Mon Sep 17 00:00:00 2001 From: zombieJ Date: Fri, 14 Jun 2019 16:26:14 +0800 Subject: [PATCH 1/3] chore: update `umi-test` deps (#2605) * updat deps * update typescript * adjust it --- packages/umi-test/package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/umi-test/package.json b/packages/umi-test/package.json index 7856956f9e84..af1fa57b23d2 100644 --- a/packages/umi-test/package.json +++ b/packages/umi-test/package.json @@ -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" } From 258ef1a3c51b47c2c5387d038f6d104d0cf2ba04 Mon Sep 17 00:00:00 2001 From: chencheng Date: Fri, 14 Jun 2019 16:27:15 +0800 Subject: [PATCH 2/3] Publish - af-webpack@1.8.5 - umi-build-dev@1.9.6 - umi-test@1.5.12 - umi@2.7.7 --- packages/af-webpack/package.json | 2 +- packages/umi-build-dev/package.json | 6 +++--- packages/umi-test/package.json | 2 +- packages/umi/package.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/af-webpack/package.json b/packages/af-webpack/package.json index bf49402602fc..036a36bb2c01 100644 --- 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/umi-build-dev/package.json b/packages/umi-build-dev/package.json index ddb92596f034..24457713762c 100644 --- 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", @@ -57,7 +57,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 index af1fa57b23d2..ee010b2224f2 100644 --- 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" }, diff --git a/packages/umi/package.json b/packages/umi/package.json index 6a95c4ef22b0..0a25f6b2a52a 100644 --- 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" From 14750fd3632f39c61fb2175cfead42ca839088c2 Mon Sep 17 00:00:00 2001 From: Chen Yangjian <252317+cyjake@users.noreply.github.com> Date: Sat, 15 Jun 2019 08:07:15 +0800 Subject: [PATCH 3/3] fix: don't tamper the original opts.extraBabelIncludes (#2611) ...because the generated config is gonna be compared against the new version if use modifies config. --- packages/af-webpack/src/getConfig/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/af-webpack/src/getConfig/index.js b/packages/af-webpack/src/getConfig/index.js index 7bb552d5b1a9..f4c33fba9698 100644 --- 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);