Skip to content

Commit e1e5801

Browse files
authored
fix: use core-js and regenerator-runtime instead of @babel/polyfill (#2630)
1 parent 55bf891 commit e1e5801

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

packages/umi-build-dev/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"@babel/code-frame": "7.0.0",
66
"@babel/generator": "7.4.4",
77
"@babel/parser": "7.4.5",
8-
"@babel/polyfill": "7.4.4",
98
"@babel/runtime": "7.4.5",
109
"@babel/template": "7.4.4",
1110
"@babel/traverse": "7.4.5",
@@ -45,6 +44,7 @@
4544
"react-router": "4.3.1",
4645
"react-router-config": "1.0.0-beta.4",
4746
"react-router-dom": "4.3.1",
47+
"regenerator-runtime": "0.13.2",
4848
"requireindex": "1.2.0",
4949
"resolve": "1.11.0",
5050
"rimraf": "2.6.3",

packages/umi-build-dev/src/plugins/targets.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { join, relative } from 'path';
1+
import { join, relative, dirname } from 'path';
22
import { readFileSync } from 'fs';
33
import chalk from 'chalk';
44
import { isPlainObject } from 'lodash';
@@ -48,7 +48,10 @@ export default function(api) {
4848
});
4949

5050
api.chainWebpackConfig(config => {
51-
config.resolve.alias.set('@babel/polyfill', require.resolve('@babel/polyfill'));
51+
config.resolve.alias.set(
52+
'regenerator-runtime',
53+
dirname(require.resolve('regenerator-runtime/package')),
54+
);
5255
});
5356
} else {
5457
log.warn(

packages/umi-test/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
],
2525
"dependencies": {
2626
"@babel/core": "7.4.5",
27-
"@babel/polyfill": "7.4.4",
2827
"@babel/preset-typescript": "7.3.3",
2928
"babel-core": "7.0.0-bridge.0",
3029
"babel-jest": "^24.8.0",
3130
"babel-plugin-module-resolver": "3.2.0",
3231
"babel-preset-umi": "1.5.0",
32+
"core-js": "3.1.4",
3333
"debug": "4.1.1",
3434
"enzyme": "^3.10.0",
3535
"enzyme-adapter-react-16": "^1.14.0",
@@ -40,6 +40,7 @@
4040
"jest-resolve": "^24.8.0",
4141
"react": "^16.8.6",
4242
"react-dom": "^16.8.6",
43+
"regenerator-runtime": "0.13.2",
4344
"typescript": "^3.5.2",
4445
"umi-utils": "1.4.4",
4546
"yargs-parser": "13.1.1"

packages/umi-test/src/shim.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import '@babel/polyfill';
1+
import 'core-js/stable';
2+
import 'regenerator-runtime/runtime';
23

34
/* eslint-disable import/first */
45
global.requestAnimationFrame =

packages/umi-test/yarn.lock

+6-1
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,11 @@ copy-descriptor@^0.1.0:
872872
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
873873
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
874874

875+
core-js@3.1.4:
876+
version "3.1.4"
877+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.1.4.tgz#3a2837fc48e582e1ae25907afcd6cf03b0cc7a07"
878+
integrity sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==
879+
875880
core-js@^2.6.5:
876881
version "2.6.9"
877882
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
@@ -3286,7 +3291,7 @@ reflect.ownkeys@^0.2.0:
32863291
resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
32873292
integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
32883293

3289-
regenerator-runtime@^0.13.2:
3294+
regenerator-runtime@0.13.2, regenerator-runtime@^0.13.2:
32903295
version "0.13.2"
32913296
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
32923297
integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==

0 commit comments

Comments
 (0)