From f4a685b9f7170ac285e502faa0d1876fd1705146 Mon Sep 17 00:00:00 2001 From: Denis Pushkarev Date: Wed, 6 Dec 2017 00:01:25 +0700 Subject: [PATCH] rename modules related DOM collections --- CHANGELOG.md | 1 + README.md | 2 +- build/config.js | 6 +++--- es/map.js | 2 +- es/promise.js | 2 +- es/set.js | 2 +- es/weak-set.js | 2 +- fn/dom-collections/for-each.js | 2 +- fn/dom-collections/index.js | 4 ++-- fn/dom-collections/iterator.js | 2 +- fn/get-iterator-method.js | 2 +- fn/get-iterator.js | 2 +- fn/is-iterable.js | 2 +- fn/map/index.js | 2 +- fn/observable.js | 2 +- fn/promise.js | 2 +- fn/promise/index.js | 2 +- fn/set/index.js | 2 +- fn/symbol/iterator.js | 2 +- fn/weak-map.js | 2 +- fn/weak-map/index.js | 2 +- fn/weak-set.js | 2 +- fn/weak-set/index.js | 2 +- index.js | 4 ++-- ...{web.dom.for-each.js => web.dom-collections.for-each.js} | 0 ...{web.dom.iterable.js => web.dom-collections.iterator.js} | 0 tests/library/index.js | 2 +- ...{web.dom.iterable.js => web.dom-collections.iterator.js} | 0 tests/tests/index.js | 4 ++-- ...{web.dom.for-each.js => web.dom-collections.for-each.js} | 0 ...{web.dom.iterable.js => web.dom-collections.iterator.js} | 0 web/dom-collections.js | 4 ++-- web/index.js | 4 ++-- 33 files changed, 35 insertions(+), 34 deletions(-) rename modules/{web.dom.for-each.js => web.dom-collections.for-each.js} (100%) rename modules/{web.dom.iterable.js => web.dom-collections.iterator.js} (100%) rename tests/library/{web.dom.iterable.js => web.dom-collections.iterator.js} (100%) rename tests/tests/{web.dom.for-each.js => web.dom-collections.for-each.js} (100%) rename tests/tests/{web.dom.iterable.js => web.dom-collections.iterator.js} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08852967e6a4..50acb5b0b047 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ - Changed namespaces: - All features from ES5, ES2015, ES2016 and ES2017 moved to one ES namespace - it's available as `core-js/es`, all those features in `modules` folder has `es.` prefix. - Prefix for ES proposals changed from `es7.` to `esnext.`, they no longer available in `core-js/es7`, use `core-js/stage/*` instead of that. + - `web.dom.iterable` module renamed to `web.dom-collections.iterator`. - Finally removed `bower.json` ##### 2.5.1 - 2017.09.01 diff --git a/README.md b/README.md index d9c790d1fb6e..41d94d6425f7 100644 --- a/README.md +++ b/README.md @@ -1732,7 +1732,7 @@ clearImmediate(setImmediate(() => { })); ``` #### Iterable DOM collections -Some DOM collections should have [iterable interface](https://heycam.github.io/webidl/#idl-iterable) or should be [inherited from `Array`](https://heycam.github.io/webidl/#LegacyArrayClass). That mean they should have `keys`, `values`, `entries` and `@@iterator` methods for iteration. So add them. Module [`web.dom.iterable`](https://github.com/zloirock/core-js/blob/v3/modules/web.dom.iterable.js): +Some DOM collections should have [iterable interface](https://heycam.github.io/webidl/#idl-iterable) or should be [inherited from `Array`](https://heycam.github.io/webidl/#LegacyArrayClass). That mean they should have `forEach`, `keys`, `values`, `entries` and `@@iterator` methods for iteration. So add them. Modules [`web.dom-collections.iterator`](https://github.com/zloirock/core-js/blob/v3/modules/web.dom-collections.iterator.js) and [`web.dom-collections.for-each`](https://github.com/zloirock/core-js/blob/v3/modules/web.dom-collections.for-each.js). ```js class [ CSSRuleList, diff --git a/build/config.js b/build/config.js index 45c17b440c4a..32b52bb71d59 100644 --- a/build/config.js +++ b/build/config.js @@ -192,8 +192,8 @@ module.exports = { 'esnext.asap', 'esnext.observable', 'web.immediate', - 'web.dom.for-each', - 'web.dom.iterable', + 'web.dom-collections.for-each', + 'web.dom-collections.iterator', 'web.timers', 'core.get-iterator-method', 'core.get-iterator', @@ -213,7 +213,7 @@ module.exports = { 'es.date.to-string', 'es.date.to-primitive', 'esnext.symbol.description', - 'web.dom.for-each', + 'web.dom-collections.for-each', ], /* eslint-disable prefer-template */ banner: '/**\n' + diff --git a/es/map.js b/es/map.js index 3a0e9a33f57f..28f8378e7d53 100644 --- a/es/map.js +++ b/es/map.js @@ -1,5 +1,5 @@ require('../modules/es.object.to-string'); require('../modules/es.string.iterator'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.map'); module.exports = require('../modules/_core').Map; diff --git a/es/promise.js b/es/promise.js index d2bdfe23f929..4b09e6447c63 100644 --- a/es/promise.js +++ b/es/promise.js @@ -1,5 +1,5 @@ require('../modules/es.object.to-string'); require('../modules/es.string.iterator'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.promise'); module.exports = require('../modules/_core').Promise; diff --git a/es/set.js b/es/set.js index 8eddb0679f65..5b1ee5fd8764 100644 --- a/es/set.js +++ b/es/set.js @@ -1,5 +1,5 @@ require('../modules/es.object.to-string'); require('../modules/es.string.iterator'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.set'); module.exports = require('../modules/_core').Set; diff --git a/es/weak-set.js b/es/weak-set.js index 408917b22481..01dc4e133806 100644 --- a/es/weak-set.js +++ b/es/weak-set.js @@ -1,4 +1,4 @@ require('../modules/es.object.to-string'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.weak-set'); module.exports = require('../modules/_core').WeakSet; diff --git a/fn/dom-collections/for-each.js b/fn/dom-collections/for-each.js index 0efc0163e2db..70365ace4974 100644 --- a/fn/dom-collections/for-each.js +++ b/fn/dom-collections/for-each.js @@ -1,2 +1,2 @@ -require('../../modules/web.dom.for-each'); +require('../../modules/web.dom-collections.for-each'); module.exports = require('../../modules/_array-for-each'); diff --git a/fn/dom-collections/index.js b/fn/dom-collections/index.js index c58551180859..b66bb8177f43 100644 --- a/fn/dom-collections/index.js +++ b/fn/dom-collections/index.js @@ -1,5 +1,5 @@ -require('../../modules/web.dom.for-each'); -require('../../modules/web.dom.iterable'); +require('../../modules/web.dom-collections.for-each'); +require('../../modules/web.dom-collections.iterator'); var $iterators = require('../../modules/es.array.iterator'); module.exports = { keys: $iterators.keys, diff --git a/fn/dom-collections/iterator.js b/fn/dom-collections/iterator.js index 26c846ca63a1..eee1c74ff4cb 100644 --- a/fn/dom-collections/iterator.js +++ b/fn/dom-collections/iterator.js @@ -1,2 +1,2 @@ -require('../../modules/web.dom.iterable'); +require('../../modules/web.dom-collections.iterator'); module.exports = require('../../modules/_core').Array.values; diff --git a/fn/get-iterator-method.js b/fn/get-iterator-method.js index 4c125d1ab0ef..c90c3acd83a1 100644 --- a/fn/get-iterator-method.js +++ b/fn/get-iterator-method.js @@ -1,3 +1,3 @@ -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.string.iterator'); module.exports = require('../modules/core.get-iterator-method'); diff --git a/fn/get-iterator.js b/fn/get-iterator.js index 5e8033226658..685246ae374a 100644 --- a/fn/get-iterator.js +++ b/fn/get-iterator.js @@ -1,3 +1,3 @@ -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.string.iterator'); module.exports = require('../modules/core.get-iterator'); diff --git a/fn/is-iterable.js b/fn/is-iterable.js index 63b069b67621..c4662cf837f4 100644 --- a/fn/is-iterable.js +++ b/fn/is-iterable.js @@ -1,3 +1,3 @@ -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.string.iterator'); module.exports = require('../modules/core.is-iterable'); diff --git a/fn/map/index.js b/fn/map/index.js index 9b56abe53f5f..50c2255a5492 100644 --- a/fn/map/index.js +++ b/fn/map/index.js @@ -1,6 +1,6 @@ require('../../modules/es.object.to-string'); require('../../modules/es.string.iterator'); -require('../../modules/web.dom.iterable'); +require('../../modules/web.dom-collections.iterator'); require('../../modules/es.map'); require('../../modules/esnext.map.of'); require('../../modules/esnext.map.from'); diff --git a/fn/observable.js b/fn/observable.js index d303263c064b..a5df0d6bb5db 100644 --- a/fn/observable.js +++ b/fn/observable.js @@ -1,6 +1,6 @@ require('../modules/es.object.to-string'); require('../modules/es.string.iterator'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.promise'); require('../modules/esnext.symbol.observable'); require('../modules/esnext.observable'); diff --git a/fn/promise.js b/fn/promise.js index 5b05195a5467..8944770706ab 100644 --- a/fn/promise.js +++ b/fn/promise.js @@ -1,6 +1,6 @@ require('../modules/es.object.to-string'); require('../modules/es.string.iterator'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.promise'); require('../modules/esnext.promise.finally'); require('../modules/esnext.promise.try'); diff --git a/fn/promise/index.js b/fn/promise/index.js index c51939577ec0..417f844b30e4 100644 --- a/fn/promise/index.js +++ b/fn/promise/index.js @@ -1,6 +1,6 @@ require('../../modules/es.object.to-string'); require('../../modules/es.string.iterator'); -require('../../modules/web.dom.iterable'); +require('../../modules/web.dom-collections.iterator'); require('../../modules/es.promise'); require('../../modules/esnext.promise.finally'); require('../../modules/esnext.promise.try'); diff --git a/fn/set/index.js b/fn/set/index.js index 499f09c55116..bc9ac95b9ccc 100644 --- a/fn/set/index.js +++ b/fn/set/index.js @@ -1,6 +1,6 @@ require('../../modules/es.object.to-string'); require('../../modules/es.string.iterator'); -require('../../modules/web.dom.iterable'); +require('../../modules/web.dom-collections.iterator'); require('../../modules/es.set'); require('../../modules/esnext.set.of'); require('../../modules/esnext.set.from'); diff --git a/fn/symbol/iterator.js b/fn/symbol/iterator.js index 14c7cf8639eb..02dd7421b54b 100644 --- a/fn/symbol/iterator.js +++ b/fn/symbol/iterator.js @@ -1,3 +1,3 @@ require('../../modules/es.string.iterator'); -require('../../modules/web.dom.iterable'); +require('../../modules/web.dom-collections.iterator'); module.exports = require('../../modules/_wks-ext').f('iterator'); diff --git a/fn/weak-map.js b/fn/weak-map.js index c5e0d6d191ae..64735d38a26b 100644 --- a/fn/weak-map.js +++ b/fn/weak-map.js @@ -1,5 +1,5 @@ require('../modules/es.object.to-string'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.weak-map'); require('../modules/esnext.weak-map.of'); require('../modules/esnext.weak-map.from'); diff --git a/fn/weak-map/index.js b/fn/weak-map/index.js index 75c191439ea2..0e2fc3757ed5 100644 --- a/fn/weak-map/index.js +++ b/fn/weak-map/index.js @@ -1,5 +1,5 @@ require('../../modules/es.object.to-string'); -require('../../modules/web.dom.iterable'); +require('../../modules/web.dom-collections.iterator'); require('../../modules/es.weak-map'); require('../../modules/esnext.weak-map.of'); require('../../modules/esnext.weak-map.from'); diff --git a/fn/weak-set.js b/fn/weak-set.js index 9063c25fc921..7b94511af1f6 100644 --- a/fn/weak-set.js +++ b/fn/weak-set.js @@ -1,5 +1,5 @@ require('../modules/es.object.to-string'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.iterator'); require('../modules/es.weak-set'); require('../modules/esnext.weak-set.of'); require('../modules/esnext.weak-set.from'); diff --git a/fn/weak-set/index.js b/fn/weak-set/index.js index 7b10bf421a6f..879360503aae 100644 --- a/fn/weak-set/index.js +++ b/fn/weak-set/index.js @@ -1,5 +1,5 @@ require('../../modules/es.object.to-string'); -require('../../modules/web.dom.iterable'); +require('../../modules/web.dom-collections.iterator'); require('../../modules/es.weak-set'); require('../../modules/esnext.weak-set.of'); require('../../modules/esnext.weak-set.from'); diff --git a/index.js b/index.js index 73715b792912..ca52e373a7ae 100644 --- a/index.js +++ b/index.js @@ -191,6 +191,6 @@ require('./modules/esnext.asap'); require('./modules/esnext.observable'); require('./modules/web.timers'); require('./modules/web.immediate'); -require('./modules/web.dom.for-each'); -require('./modules/web.dom.iterable'); +require('./modules/web.dom-collections.for-each'); +require('./modules/web.dom-collections.iterator'); module.exports = require('./modules/_core'); diff --git a/modules/web.dom.for-each.js b/modules/web.dom-collections.for-each.js similarity index 100% rename from modules/web.dom.for-each.js rename to modules/web.dom-collections.for-each.js diff --git a/modules/web.dom.iterable.js b/modules/web.dom-collections.iterator.js similarity index 100% rename from modules/web.dom.iterable.js rename to modules/web.dom-collections.iterator.js diff --git a/tests/library/index.js b/tests/library/index.js index 64f17218098b..8ba4ed271ef6 100644 --- a/tests/library/index.js +++ b/tests/library/index.js @@ -181,7 +181,7 @@ import './esnext.weak-set.from'; import './esnext.weak-set.of'; QUnit.module('Web'); -import './web.dom.iterable'; +import './web.dom-collections.iterator'; import './web.immediate'; import './web.timers'; diff --git a/tests/library/web.dom.iterable.js b/tests/library/web.dom-collections.iterator.js similarity index 100% rename from tests/library/web.dom.iterable.js rename to tests/library/web.dom-collections.iterator.js diff --git a/tests/tests/index.js b/tests/tests/index.js index 15f252687505..f568615106f4 100644 --- a/tests/tests/index.js +++ b/tests/tests/index.js @@ -219,7 +219,7 @@ import './esnext.weak-set.from'; import './esnext.weak-set.of'; QUnit.module('Web'); -import './web.dom.for-each'; -import './web.dom.iterable'; +import './web.dom-collections.for-each'; +import './web.dom-collections.iterator'; import './web.immediate'; import './web.timers'; diff --git a/tests/tests/web.dom.for-each.js b/tests/tests/web.dom-collections.for-each.js similarity index 100% rename from tests/tests/web.dom.for-each.js rename to tests/tests/web.dom-collections.for-each.js diff --git a/tests/tests/web.dom.iterable.js b/tests/tests/web.dom-collections.iterator.js similarity index 100% rename from tests/tests/web.dom.iterable.js rename to tests/tests/web.dom-collections.iterator.js diff --git a/web/dom-collections.js b/web/dom-collections.js index 477e8037572f..aff0d0b991b2 100644 --- a/web/dom-collections.js +++ b/web/dom-collections.js @@ -1,3 +1,3 @@ -require('../modules/web.dom.for-each'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.for-each'); +require('../modules/web.dom-collections.iterator'); module.exports = require('../modules/_core'); diff --git a/web/index.js b/web/index.js index f131840b81ee..4d16af99ad97 100644 --- a/web/index.js +++ b/web/index.js @@ -1,5 +1,5 @@ require('../modules/web.timers'); require('../modules/web.immediate'); -require('../modules/web.dom.for-each'); -require('../modules/web.dom.iterable'); +require('../modules/web.dom-collections.for-each'); +require('../modules/web.dom-collections.iterator'); module.exports = require('../modules/_core');