Skip to content

Commit b34b0c3

Browse files
committed
2.5.4
1 parent 3119c26 commit b34b0c3

19 files changed

Lines changed: 193 additions & 183 deletions

README.md

Lines changed: 62 additions & 62 deletions
Large diffs are not rendered by default.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "core.js",
33
"main": "client/core.js",
4-
"version": "2.5.3",
4+
"version": "2.5.4",
55
"description": "Standard Library",
66
"keywords": [
77
"ES3",

build/core-js-builder/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "core-js-builder",
33
"description": "core-js builder",
4-
"version": "2.5.3",
4+
"version": "2.5.4",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/zloirock/core-js.git"
88
},
99
"main": "index.js",
1010
"dependencies": {
11-
"core-js": "2.5.3",
11+
"core-js": "2.5.4",
1212
"temp": "^0.8.3",
1313
"webpack": "^3.11.0"
1414
},

client/core.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
2-
* core-js 2.5.3
2+
* core-js 2.5.4
33
* https://github.com/zloirock/core-js
44
* License: http://rock.mit-license.org
5-
* © 2017 Denis Pushkarev
5+
* © 2018 Denis Pushkarev
66
*/
77
!function(__e, __g, undefined){
88
'use strict';
@@ -390,7 +390,7 @@ module.exports = function (NAME, exec) {
390390
/* 18 */
391391
/***/ (function(module, exports) {
392392

393-
var core = module.exports = { version: '2.5.3' };
393+
var core = module.exports = { version: '2.5.4' };
394394
if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
395395

396396

@@ -1573,7 +1573,6 @@ var LIBRARY = __webpack_require__(36);
15731573
var $export = __webpack_require__(0);
15741574
var redefine = __webpack_require__(14);
15751575
var hide = __webpack_require__(13);
1576-
var has = __webpack_require__(12);
15771576
var Iterators = __webpack_require__(40);
15781577
var $iterCreate = __webpack_require__(56);
15791578
var setToStringTag = __webpack_require__(44);
@@ -1600,7 +1599,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
16001599
var VALUES_BUG = false;
16011600
var proto = Base.prototype;
16021601
var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
1603-
var $default = (!BUGGY && $native) || getMethod(DEFAULT);
1602+
var $default = $native || getMethod(DEFAULT);
16041603
var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
16051604
var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
16061605
var methods, key, IteratorPrototype;
@@ -1611,7 +1610,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
16111610
// Set @@toStringTag to native iterators
16121611
setToStringTag(IteratorPrototype, TAG, true);
16131612
// fix for some old engines
1614-
if (!LIBRARY && !has(IteratorPrototype, ITERATOR)) hide(IteratorPrototype, ITERATOR, returnThis);
1613+
if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
16151614
}
16161615
}
16171616
// fix Array#{values, @@iterator}.name in V8 / FF
@@ -6224,7 +6223,7 @@ var notify = function (promise, isReject) {
62246223
var resolve = reaction.resolve;
62256224
var reject = reaction.reject;
62266225
var domain = reaction.domain;
6227-
var result, then;
6226+
var result, then, exited;
62286227
try {
62296228
if (handler) {
62306229
if (!ok) {
@@ -6234,8 +6233,11 @@ var notify = function (promise, isReject) {
62346233
if (handler === true) result = value;
62356234
else {
62366235
if (domain) domain.enter();
6237-
result = handler(value);
6238-
if (domain) domain.exit();
6236+
result = handler(value); // may throw
6237+
if (domain) {
6238+
domain.exit();
6239+
exited = true;
6240+
}
62396241
}
62406242
if (result === reaction.promise) {
62416243
reject(TypeError('Promise-chain cycle'));
@@ -6244,6 +6246,7 @@ var notify = function (promise, isReject) {
62446246
} else resolve(result);
62456247
} else reject(value);
62466248
} catch (e) {
6249+
if (domain && !exited) domain.exit();
62476250
reject(e);
62486251
}
62496252
};

client/core.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/core.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/library.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
2-
* core-js 2.5.3
2+
* core-js 2.5.4
33
* https://github.com/zloirock/core-js
44
* License: http://rock.mit-license.org
5-
* © 2017 Denis Pushkarev
5+
* © 2018 Denis Pushkarev
66
*/
77
!function(__e, __g, undefined){
88
'use strict';
@@ -79,6 +79,7 @@ var global = __webpack_require__(2);
7979
var core = __webpack_require__(12);
8080
var ctx = __webpack_require__(16);
8181
var hide = __webpack_require__(17);
82+
var has = __webpack_require__(15);
8283
var PROTOTYPE = 'prototype';
8384

8485
var $export = function (type, name, source) {
@@ -96,7 +97,7 @@ var $export = function (type, name, source) {
9697
for (key in source) {
9798
// contains in native
9899
own = !IS_FORCED && target && target[key] !== undefined;
99-
if (own && key in exports) continue;
100+
if (own && has(exports, key)) continue;
100101
// export native or passed
101102
out = own ? target[key] : source[key];
102103
// prevent global pollution for namespaces
@@ -281,7 +282,7 @@ module.exports = function (it) {
281282
/* 12 */
282283
/***/ (function(module, exports) {
283284

284-
var core = module.exports = { version: '2.5.3' };
285+
var core = module.exports = { version: '2.5.4' };
285286
if (typeof __e == 'number') __e = core; // eslint-disable-line no-undef
286287

287288

@@ -1537,7 +1538,6 @@ var LIBRARY = __webpack_require__(34);
15371538
var $export = __webpack_require__(0);
15381539
var redefine = __webpack_require__(62);
15391540
var hide = __webpack_require__(17);
1540-
var has = __webpack_require__(15);
15411541
var Iterators = __webpack_require__(36);
15421542
var $iterCreate = __webpack_require__(54);
15431543
var setToStringTag = __webpack_require__(41);
@@ -1564,7 +1564,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
15641564
var VALUES_BUG = false;
15651565
var proto = Base.prototype;
15661566
var $native = proto[ITERATOR] || proto[FF_ITERATOR] || DEFAULT && proto[DEFAULT];
1567-
var $default = (!BUGGY && $native) || getMethod(DEFAULT);
1567+
var $default = $native || getMethod(DEFAULT);
15681568
var $entries = DEFAULT ? !DEF_VALUES ? $default : getMethod('entries') : undefined;
15691569
var $anyNative = NAME == 'Array' ? proto.entries || $native : $native;
15701570
var methods, key, IteratorPrototype;
@@ -1575,7 +1575,7 @@ module.exports = function (Base, NAME, Constructor, next, DEFAULT, IS_SET, FORCE
15751575
// Set @@toStringTag to native iterators
15761576
setToStringTag(IteratorPrototype, TAG, true);
15771577
// fix for some old engines
1578-
if (!LIBRARY && !has(IteratorPrototype, ITERATOR)) hide(IteratorPrototype, ITERATOR, returnThis);
1578+
if (!LIBRARY && typeof IteratorPrototype[ITERATOR] != 'function') hide(IteratorPrototype, ITERATOR, returnThis);
15791579
}
15801580
}
15811581
// fix Array#{values, @@iterator}.name in V8 / FF
@@ -5800,7 +5800,7 @@ var notify = function (promise, isReject) {
58005800
var resolve = reaction.resolve;
58015801
var reject = reaction.reject;
58025802
var domain = reaction.domain;
5803-
var result, then;
5803+
var result, then, exited;
58045804
try {
58055805
if (handler) {
58065806
if (!ok) {
@@ -5810,8 +5810,11 @@ var notify = function (promise, isReject) {
58105810
if (handler === true) result = value;
58115811
else {
58125812
if (domain) domain.enter();
5813-
result = handler(value);
5814-
if (domain) domain.exit();
5813+
result = handler(value); // may throw
5814+
if (domain) {
5815+
domain.exit();
5816+
exited = true;
5817+
}
58155818
}
58165819
if (result === reaction.promise) {
58175820
reject(TypeError('Promise-chain cycle'));
@@ -5820,6 +5823,7 @@ var notify = function (promise, isReject) {
58205823
} else resolve(result);
58215824
} else reject(value);
58225825
} catch (e) {
5826+
if (domain && !exited) domain.exit();
58235827
reject(e);
58245828
}
58255829
};

client/library.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/library.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)