Make classes in ol/ available as named exports from ol

src/ol/format/EsriJSON.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/EsriJSON
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Feature from '../Feature.js';
 import {assert} from '../asserts.js';
 import {containsExtent} from '../extent.js';

src/ol/format/GML2.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/GML2
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {createOrUpdate} from '../extent.js';
 import {transformWithOptions} from '../format/Feature.js';
 import GMLBase, {GMLNS} from '../format/GMLBase.js';

src/ol/format/GML3.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/GML3
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import {createOrUpdate} from '../extent.js';
 import {transformWithOptions} from '../format/Feature.js';

src/ol/format/GMLBase.js

@@ -4,7 +4,7 @@
 // FIXME Envelopes should not be treated as geometries! readEnvelope_ is part
 // of GEOMETRY_PARSERS_ and methods using GEOMETRY_PARSERS_ do not expect
 // envelopes/extents, only geometries!
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import Feature from '../Feature.js';
 import {transformWithOptions} from '../format/Feature.js';

src/ol/format/GPX.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/GPX
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Feature from '../Feature.js';
 import {includes} from '../array.js';
 import {transformWithOptions} from '../format/Feature.js';

src/ol/format/GeoJSON.js

@@ -4,7 +4,7 @@
 // TODO: serialize dataProjection as crs member when writing
 // see https://github.com/openlayers/openlayers/issues/2078
 
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {assert} from '../asserts.js';
 import Feature from '../Feature.js';
 import {transformWithOptions} from '../format/Feature.js';

src/ol/format/IGC.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/IGC
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Feature from '../Feature.js';
 import {transformWithOptions} from '../format/Feature.js';
 import TextFeature from '../format/TextFeature.js';

src/ol/format/JSONFeature.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/JSONFeature
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import FeatureFormat from '../format/Feature.js';
 import FormatType from '../format/FormatType.js';
 

src/ol/format/KML.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/KML
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Feature from '../Feature.js';
 import {extend, includes} from '../array.js';
 import {assert} from '../asserts.js';

src/ol/format/MVT.js

@@ -3,7 +3,7 @@
  */
 //FIXME Implement projection handling
 
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {assert} from '../asserts.js';
 import PBF from 'pbf';
 import FeatureFormat, {transformWithOptions} from '../format/Feature.js';

src/ol/format/OSMXML.js

@@ -2,7 +2,7 @@
  * @module ol/format/OSMXML
  */
 // FIXME add typedef for stack state objects
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import Feature from '../Feature.js';
 import {transformWithOptions} from '../format/Feature.js';

src/ol/format/OWS.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/OWS
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {readHref} from '../format/XLink.js';
 import XML from '../format/XML.js';
 import {readString} from '../format/xsd.js';

src/ol/format/Polyline.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/Polyline
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {assert} from '../asserts.js';
 import Feature from '../Feature.js';
 import {transformWithOptions} from '../format/Feature.js';

src/ol/format/TextFeature.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/TextFeature
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import FeatureFormat from '../format/Feature.js';
 import FormatType from '../format/FormatType.js';
 

src/ol/format/TopoJSON.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/TopoJSON
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Feature from '../Feature.js';
 import {transformWithOptions} from '../format/Feature.js';
 import JSONFeature from '../format/JSONFeature.js';

src/ol/format/WFS.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WFS
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {assert} from '../asserts.js';
 import GML2 from '../format/GML2.js';
 import GML3 from '../format/GML3.js';

src/ol/format/WKT.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WKT
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Feature from '../Feature.js';
 import {transformWithOptions} from '../format/Feature.js';
 import TextFeature from '../format/TextFeature.js';

src/ol/format/WMSCapabilities.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WMSCapabilities
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {readHref} from '../format/XLink.js';
 import XML from '../format/XML.js';
 import {readDecimalString, readString, readNonNegativeInteger, readDecimal, readBooleanString, readNonNegativeIntegerString} from '../format/xsd.js';

src/ol/format/WMSGetFeatureInfo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WMSGetFeatureInfo
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend, includes} from '../array.js';
 import GML2 from '../format/GML2.js';
 import XMLFeature from '../format/XMLFeature.js';

src/ol/format/WMTSCapabilities.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/WMTSCapabilities
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {boundingExtent} from '../extent.js';
 import OWS from '../format/OWS.js';
 import {readHref} from '../format/XLink.js';

src/ol/format/XMLFeature.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/XMLFeature
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import FeatureFormat from '../format/Feature.js';
 import FormatType from '../format/FormatType.js';

src/ol/format/filter/And.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/And
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import LogicalNary from '../filter/LogicalNary.js';
 
 /**

src/ol/format/filter/Bbox.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Bbox
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Filter from '../filter/Filter.js';
 
 /**

src/ol/format/filter/Comparison.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Comparison
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Filter from '../filter/Filter.js';
 
 /**

src/ol/format/filter/ComparisonBinary.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/ComparisonBinary
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Comparison from '../filter/Comparison.js';
 
 /**

src/ol/format/filter/Contains.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Contains
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Spatial from '../filter/Spatial.js';
 
 /**

src/ol/format/filter/During.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/During
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Comparison from '../filter/Comparison.js';
 
 /**

src/ol/format/filter/EqualTo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/EqualTo
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**

src/ol/format/filter/GreaterThan.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/GreaterThan
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**

src/ol/format/filter/GreaterThanOrEqualTo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/GreaterThanOrEqualTo
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**

src/ol/format/filter/Intersects.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Intersects
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Spatial from '../filter/Spatial.js';
 
 /**

src/ol/format/filter/IsBetween.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/IsBetween
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Comparison from '../filter/Comparison.js';
 
 /**

src/ol/format/filter/IsLike.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/IsLike
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Comparison from '../filter/Comparison.js';
 
 /**

src/ol/format/filter/IsNull.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/IsNull
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Comparison from '../filter/Comparison.js';
 
 /**

src/ol/format/filter/LessThan.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/LessThan
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**

src/ol/format/filter/LessThanOrEqualTo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/LessThanOrEqualTo
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**

src/ol/format/filter/LogicalNary.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/LogicalNary
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import {assert} from '../../asserts.js';
 import Filter from '../filter/Filter.js';
 

src/ol/format/filter/Not.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Not
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Filter from '../filter/Filter.js';
 
 /**

src/ol/format/filter/NotEqualTo.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/NotEqualTo
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import ComparisonBinary from '../filter/ComparisonBinary.js';
 
 /**

src/ol/format/filter/Or.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Or
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import LogicalNary from '../filter/LogicalNary.js';
 
 /**

src/ol/format/filter/Spatial.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Spatial
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Filter from '../filter/Filter.js';
 
 /**

src/ol/format/filter/Within.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/format/filter/Within
  */
-import {inherits} from '../../index.js';
+import {inherits} from '../../util.js';
 import Spatial from '../filter/Spatial.js';
 
 /**