Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118762
Change subject: Update to es6-shim 0.10.1.
......................................................................
Update to es6-shim 0.10.1.
Fixes broken json files, so that hashar can turn on json linting.
Change-Id: Iefc0ca6730fbff9de2112196c0c93b145c2fb1c7
---
M node_modules/es6-shim/.npmignore
D node_modules/es6-shim/.travis.yml
M node_modules/es6-shim/CHANGELOG.md
M node_modules/es6-shim/bower.json
M node_modules/es6-shim/component.json
M node_modules/es6-shim/es6-shim.js
M node_modules/es6-shim/package.json
D node_modules/es6-shim/testling.html
8 files changed, 21 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy
refs/changes/62/118762/1
diff --git a/node_modules/es6-shim/.npmignore b/node_modules/es6-shim/.npmignore
index eac196c..d681c02 100644
--- a/node_modules/es6-shim/.npmignore
+++ b/node_modules/es6-shim/.npmignore
@@ -3,3 +3,5 @@
test/
components
build
+.travis.yml
+testling.html
diff --git a/node_modules/es6-shim/.travis.yml
b/node_modules/es6-shim/.travis.yml
deleted file mode 100644
index 1560276..0000000
--- a/node_modules/es6-shim/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: node_js
-node_js:
- - "0.11"
- - "0.10"
- - "0.8"
- - "0.6"
- - "0.4"
-
-before_install:
- - '[ "${TRAVIS_NODE_VERSION}" != "0.6" ] || npm conf set strict-ssl false'
-
diff --git a/node_modules/es6-shim/CHANGELOG.md
b/node_modules/es6-shim/CHANGELOG.md
index 4b1525a..fd98786 100644
--- a/node_modules/es6-shim/CHANGELOG.md
+++ b/node_modules/es6-shim/CHANGELOG.md
@@ -1,4 +1,7 @@
-# es6-shim x.x.x (not yet released)
+# es6-shim 0.10.1 (13 Mar 2014)
+* Update bower.json, component.json, and .npmignore (#229, #230, #233)
+* Minor updates to `Promise` implementation and test suite.
+* Workaround lack of 'strict mode' in IE9. (#232)
# es6-shim 0.10.0 (1 March 2014)
* Implement `Promise`, per spec. (#209, #215, #224, #225)
diff --git a/node_modules/es6-shim/bower.json b/node_modules/es6-shim/bower.json
index 673383f..4e8e163 100644
--- a/node_modules/es6-shim/bower.json
+++ b/node_modules/es6-shim/bower.json
@@ -1,7 +1,7 @@
{
"name": "es6-shim",
"repo": "paulmillr/es6-shim",
- "version": "0.10.0",
+ "version": "0.10.1",
"description": "ECMAScript 6 (Harmony) compatibility shims for legacy
JavaScript engines",
"keywords": [
"ecmascript",
@@ -14,7 +14,7 @@
"map",
"set",
"__proto__"
- ]
+ ],
"main": "es6-shim.js",
"scripts": ["es6-shim.js"],
"dependencies": {},
diff --git a/node_modules/es6-shim/component.json
b/node_modules/es6-shim/component.json
index 461b3d1..8ab4c32 100644
--- a/node_modules/es6-shim/component.json
+++ b/node_modules/es6-shim/component.json
@@ -1,7 +1,7 @@
{
"name": "es6-shim",
"repo": "paulmillr/es6-shim",
- "version": "0.10.0",
+ "version": "0.10.1",
"description": "ECMAScript 6 (Harmony) compatibility shims for legacy
JavaScript engines",
"keywords": [
"ecmascript",
@@ -14,7 +14,7 @@
"map",
"set",
"__proto__"
- ]
+ ],
"main": "es6-shim.js",
"scripts": ["es6-shim.js"],
"dependencies": {},
diff --git a/node_modules/es6-shim/es6-shim.js
b/node_modules/es6-shim/es6-shim.js
index 654af55..d327499 100644
--- a/node_modules/es6-shim/es6-shim.js
+++ b/node_modules/es6-shim/es6-shim.js
@@ -1,4 +1,4 @@
-// ES6-shim 0.10.0 (c) 2013-2014 Paul Miller (http://paulmillr.com)
+// ES6-shim 0.10.1 (c) 2013-2014 Paul Miller (http://paulmillr.com)
// ES6-shim may be freely distributed under the MIT license.
// For more details and documentation:
// https://github.com/paulmillr/es6-shim/
@@ -191,7 +191,7 @@
IsIterable: function(o) {
return ES.TypeIsObject(o) &&
- (ES.IsCallable(o[$iterator$]) || isArguments(o));
+ (o[$iterator$] !== undefined || isArguments(o));
},
GetIterator: function(o) {
@@ -1093,6 +1093,10 @@
capability.reject = reject;
};
capability.promise = ES.Construct(C, [resolver]);
+ // see https://bugs.ecmascript.org/show_bug.cgi?id=2478
+ if (!capability.promise._es6construct) {
+ throw new TypeError('bad promise constructor');
+ }
if (!(ES.IsCallable(capability.resolve) &&
ES.IsCallable(capability.reject))) {
throw new TypeError('bad promise constructor');
diff --git a/node_modules/es6-shim/package.json
b/node_modules/es6-shim/package.json
index dd92b77..ae927cf 100644
--- a/node_modules/es6-shim/package.json
+++ b/node_modules/es6-shim/package.json
@@ -4,7 +4,7 @@
"url": "http://paulmillr.com";
},
"name": "es6-shim",
- "version": "0.10.0",
+ "version": "0.10.1",
"description": "ECMAScript 6 (Harmony) compatibility shims for legacy
JavaScript engines",
"keywords": [
"ecmascript",
@@ -57,10 +57,10 @@
"bugs": {
"url": "https://github.com/paulmillr/es6-shim/issues";
},
- "_id": "[email protected]",
+ "_id": "[email protected]",
"dist": {
- "shasum": "36cfb1e64aaade83c3bbd2770a7e819f320e4729"
+ "shasum": "6f3cec40e1a9378cf73e336aac23e2a9a4bdda16"
},
- "_from": "[email protected]",
- "_resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.10.0.tgz";
+ "_from": "es6-shim@~0.10.0",
+ "_resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.10.1.tgz";
}
diff --git a/node_modules/es6-shim/testling.html
b/node_modules/es6-shim/testling.html
deleted file mode 100644
index 1faea36..0000000
--- a/node_modules/es6-shim/testling.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-<head>
- <meta charset="utf-8">
- <title>es6-shim tests</title>
- <script src="node_modules/es5-shim/es5-shim.js"></script>
- <script src="node_modules/es5-shim/es5-sham.js"></script>
- <script src="node_modules/mocha/mocha.js"></script>
- <!-- note that chai uses Object.create() so needs es5-sham to be loaded -->
- <script src="node_modules/chai/chai.js"></script>
- <script src="es6-shim.js"></script>
- <script>chai.Assertion.includeStack=true; window.expect=chai.expect;
window.assert=chai.assert; mocha.setup({ui:'bdd',reporter:'tap'});</script>
- <script src="test/array.js"></script>
- <script src="test/collections.js"></script>
- <script src="test/math.js"></script>
- <script src="test/number.js"></script>
- <script src="test/object.js"></script>
- <script src="test/string.js"></script>
- <script src="test/promise/all.js"></script>
- <script src="test/promise/evil-promises.js"></script>
-<!--
- <script src="test/promise/promises-aplus.js"></script>
--->
- <script src="test/promise/race.js"></script>
- <script src="test/promise/simple.js"></script>
- <script src="test/promise/subclass.js"></script>
- <script>mocha.run()</script>
-</head>
-<body>
- <div id="mocha"></div>
-</body>
-</html>
--
To view, visit https://gerrit.wikimedia.org/r/118762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefc0ca6730fbff9de2112196c0c93b145c2fb1c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
