Make classes in ol/ available as named exports from ol

src/ol/AssertionError.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/AssertionError
  */
-import {VERSION, inherits} from './index.js';
+import {VERSION, inherits} from './util.js';
 
 /**
  * Error object thrown when an assertion failed. This is an ECMA-262 Error,

src/ol/Collection.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/Collection
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import AssertionError from './AssertionError.js';
 import CollectionEventType from './CollectionEventType.js';
 import BaseObject from './Object.js';

src/ol/Feature.js

@@ -4,7 +4,7 @@
 import {assert} from './asserts.js';
 import {listen, unlisten, unlistenByKey} from './events.js';
 import EventType from './events/EventType.js';
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import BaseObject, {getChangeEventType} from './Object.js';
 import Geometry from './geom/Geometry.js';
 import Style from './style/Style.js';

src/ol/Geolocation.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/Geolocation
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import GeolocationProperty from './GeolocationProperty.js';
 import BaseObject, {getChangeEventType} from './Object.js';
 import {listen} from './events.js';

src/ol/Image.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/Image
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import ImageBase from './ImageBase.js';
 import ImageState from './ImageState.js';
 import {listenOnce, unlistenByKey} from './events.js';

src/ol/ImageBase.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/ImageBase
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import EventTarget from './events/EventTarget.js';
 import EventType from './events/EventType.js';
 

src/ol/ImageCanvas.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/ImageCanvas
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import ImageBase from './ImageBase.js';
 import ImageState from './ImageState.js';
 

src/ol/ImageTile.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/ImageTile
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import Tile from './Tile.js';
 import TileState from './TileState.js';
 import {createCanvasContext2D} from './dom.js';

src/ol/Map.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/Map
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import PluggableMap from './PluggableMap.js';
 import {defaults as defaultControls} from './control/util.js';
 import {defaults as defaultInteractions} from './interaction.js';

src/ol/MapBrowserEvent.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/MapBrowserEvent
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import MapEvent from './MapEvent.js';
 
 /**

src/ol/MapBrowserEventHandler.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/MapBrowserEventHandler
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import {DEVICE_PIXEL_RATIO} from './has.js';
 import MapBrowserEventType from './MapBrowserEventType.js';
 import MapBrowserPointerEvent from './MapBrowserPointerEvent.js';

src/ol/MapBrowserPointerEvent.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/MapBrowserPointerEvent
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import MapBrowserEvent from './MapBrowserEvent.js';
 
 /**

src/ol/MapEvent.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/MapEvent
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import Event from './events/Event.js';
 
 /**

src/ol/Object.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/Object
  */
-import {getUid, inherits} from './index.js';
+import {getUid, inherits} from './util.js';
 import ObjectEventType from './ObjectEventType.js';
 import Observable from './Observable.js';
 import Event from './events/Event.js';

src/ol/Observable.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/Observable
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import {listen, unlistenByKey, unlisten, listenOnce} from './events.js';
 import EventTarget from './events/EventTarget.js';
 import EventType from './events/EventType.js';

src/ol/Overlay.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/Overlay
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import MapEventType from './MapEventType.js';
 import BaseObject, {getChangeEventType} from './Object.js';
 import OverlayPositioning from './OverlayPositioning.js';

src/ol/PluggableMap.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/PluggableMap
  */
-import {getUid, inherits} from './index.js';
+import {getUid, inherits} from './util.js';
 import Collection from './Collection.js';
 import CollectionEventType from './CollectionEventType.js';
 import MapBrowserEvent from './MapBrowserEvent.js';

src/ol/Tile.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/Tile
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import TileState from './TileState.js';
 import {easeIn} from './easing.js';
 import EventTarget from './events/EventTarget.js';

src/ol/TileCache.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/TileCache
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import LRUCache from './structs/LRUCache.js';
 import {fromKey, getKey} from './tilecoord.js';
 

src/ol/TileQueue.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/TileQueue
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import TileState from './TileState.js';
 import {listen, unlisten} from './events.js';
 import EventType from './events/EventType.js';

src/ol/VectorImageTile.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/VectorImageTile
  */
-import {getUid, inherits} from './index.js';
+import {getUid, inherits} from './util.js';
 import Tile from './Tile.js';
 import TileState from './TileState.js';
 import {createCanvasContext2D} from './dom.js';

src/ol/VectorTile.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/VectorTile
  */
-import {getUid, inherits} from './index.js';
+import {getUid, inherits} from './util.js';
 import Tile from './Tile.js';
 import TileState from './TileState.js';
 

src/ol/View.js

@@ -2,7 +2,7 @@
  * @module ol/View
  */
 import {DEFAULT_TILE_SIZE} from './tilegrid/common.js';
-import {inherits, getUid} from './index.js';
+import {getUid, inherits} from './util.js';
 import {UNDEFINED} from './functions.js';
 import {createExtent, none as centerNone} from './centerconstraint.js';
 import BaseObject from './Object.js';

src/ol/WebGLMap.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/WebGLMap
  */
-import {inherits} from './index.js';
+import {inherits} from './util.js';
 import PluggableMap from './PluggableMap.js';
 import {defaults as defaultControls} from './control.js';
 import {defaults as defaultInteractions} from './interaction.js';

src/ol/control/Attribution.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/control/Attribution
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {equals} from '../array.js';
 import Control from '../control/Control.js';
 import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_COLLAPSED} from '../css.js';

src/ol/control/Control.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/control/Control
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {UNDEFINED} from '../functions.js';
 import MapEventType from '../MapEventType.js';
 import BaseObject from '../Object.js';

src/ol/control/FullScreen.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/control/FullScreen
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Control from '../control/Control.js';
 import {CLASS_CONTROL, CLASS_UNSELECTABLE, CLASS_UNSUPPORTED} from '../css.js';
 import {replaceNode} from '../dom.js';

src/ol/control/MousePosition.js

@@ -2,7 +2,7 @@
  * @module ol/control/MousePosition
  */
 
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {listen} from '../events.js';
 import EventType from '../events/EventType.js';
 import {getChangeEventType} from '../Object.js';

src/ol/control/OverviewMap.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/control/OverviewMap
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Collection from '../Collection.js';
 import Map from '../Map.js';
 import MapEventType from '../MapEventType.js';

src/ol/control/Rotate.js

@@ -7,7 +7,7 @@ import {CLASS_CONTROL, CLASS_HIDDEN, CLASS_UNSELECTABLE} from '../css.js';
 import {easeOut} from '../easing.js';
 import {listen} from '../events.js';
 import EventType from '../events/EventType.js';
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 
 
 /**

src/ol/control/ScaleLine.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/control/ScaleLine
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {getChangeEventType} from '../Object.js';
 import {assert} from '../asserts.js';
 import Control from '../control/Control.js';

src/ol/control/Zoom.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/control/Zoom
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {listen} from '../events.js';
 import EventType from '../events/EventType.js';
 import Control from '../control/Control.js';

src/ol/control/ZoomSlider.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/control/ZoomSlider
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import ViewHint from '../ViewHint.js';
 import Control from '../control/Control.js';
 import {CLASS_CONTROL, CLASS_UNSELECTABLE} from '../css.js';

src/ol/control/ZoomToExtent.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/control/ZoomToExtent
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {listen} from '../events.js';
 import EventType from '../events/EventType.js';
 import Control from '../control/Control.js';

src/ol/events/EventTarget.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/events/EventTarget
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Disposable from '../Disposable.js';
 import {unlistenAll} from '../events.js';
 import {UNDEFINED} from '../functions.js';

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';
 
 /**

src/ol/geom/Circle.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/Circle
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {createOrUpdate, forEachCorner, intersects} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
 import GeometryType from '../geom/GeometryType.js';

src/ol/geom/Geometry.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/Geometry
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import BaseObject from '../Object.js';
 import {createEmpty, getHeight, returnOrUpdate} from '../extent.js';
 import {FALSE} from '../functions.js';

src/ol/geom/GeometryCollection.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/GeometryCollection
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {listen, unlisten} from '../events.js';
 import EventType from '../events/EventType.js';
 import {createOrUpdateEmpty, closestSquaredDistanceXY, extend, getCenter} from '../extent.js';

src/ol/geom/LineString.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/LineString
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import {closestSquaredDistanceXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';

src/ol/geom/LinearRing.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/LinearRing
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {closestSquaredDistanceXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
 import GeometryType from '../geom/GeometryType.js';

src/ol/geom/MultiLineString.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/MultiLineString
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import {closestSquaredDistanceXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';

src/ol/geom/MultiPoint.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/MultiPoint
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import {closestSquaredDistanceXY, containsXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';

src/ol/geom/MultiPolygon.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/MultiPolygon
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import {closestSquaredDistanceXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';

src/ol/geom/Point.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/Point
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {createOrUpdateFromCoordinate, containsXY} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';
 import GeometryType from '../geom/GeometryType.js';

src/ol/geom/Polygon.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/Polygon
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {extend} from '../array.js';
 import {closestSquaredDistanceXY, getCenter} from '../extent.js';
 import GeometryLayout from '../geom/GeometryLayout.js';

src/ol/geom/SimpleGeometry.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/geom/SimpleGeometry
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {FALSE} from '../functions.js';
 import {createOrUpdateFromFlatCoordinates, getCenter} from '../extent.js';
 import Geometry from '../geom/Geometry.js';

src/ol/has.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/has
  */
-import {HAS_WEBGL} from './index.js';
 
 const ua = typeof navigator !== 'undefined' ?
   navigator.userAgent.toLowerCase() : '';
@@ -90,10 +89,4 @@ export const POINTER = 'PointerEvent' in window;
 export const MSPOINTER = !!(navigator.msPointerEnabled);
 
 
-/**
- * True if both OpenLayers and browser support WebGL.
- * @const
- * @type {boolean}
- * @api
- */
-export const WEBGL = HAS_WEBGL;
+export {HAS as WEBGL} from './webgl.js';

src/ol/index.js

@@ -2,8 +2,19 @@
  * @module ol
  */
 
-import {getContext} from './webgl.js';
+export {default as Collection} from './Collection.js';
+export {default as Feature} from './Feature.js';
+export {default as Geolocation} from './Geolocation.js';
+export {default as Graticule} from './Graticule.js';
+export {default as Kinetic} from './Kinetic.js';
+export {default as Map} from './Map.js';
+export {default as Observable} from './Observable.js';
+export {default as Overlay} from './Overlay.js';
+export {default as PluggableMap} from './PluggableMap.js';
+export {default as View} from './View.js';
+export {default as WebGLMap} from './WebGLMap.js';
 
+export {getUid, inherits, VERSION} from './util.js';
 
 /**
  * An array with two elements, representing a pixel. The first element is the
@@ -11,109 +22,3 @@ import {getContext} from './webgl.js';
  * @typedef {Array.<number>} Pixel
  * @api
  */
-
-
-/**
- * Include debuggable shader sources.  Default is `true`. This should be set to
- * `false` for production builds.
- * TODO: move to a separate ol-webgl package
- * @type {boolean}
- */
-export const DEBUG_WEBGL = true;
-
-
-/**
- * TODO: move to a separate ol-webgl package
- * The maximum supported WebGL texture size in pixels. If WebGL is not
- * supported, the value is set to `undefined`.
- * @type {number|undefined}
- */
-let WEBGL_MAX_TEXTURE_SIZE; // value is set below
-
-
-/**
- * TODO: move to a separate ol-webgl package
- * List of supported WebGL extensions.
- * @type {Array.<string>}
- */
-let WEBGL_EXTENSIONS; // value is set below
-
-
-/**
- * TODO: move to a separate ol-webgl package
- * WebGL is available.
- * @type {boolean}
- */
-let HAS_WEBGL = false;
-
-
-if (typeof window !== 'undefined' && 'WebGLRenderingContext' in window) {
-  try {
-    const canvas = /** @type {HTMLCanvasElement} */ (document.createElement('CANVAS'));
-    const gl = getContext(canvas, {failIfMajorPerformanceCaveat: true});
-    if (gl) {
-      HAS_WEBGL = true;
-      WEBGL_MAX_TEXTURE_SIZE = /** @type {number} */ (gl.getParameter(gl.MAX_TEXTURE_SIZE));
-      WEBGL_EXTENSIONS = gl.getSupportedExtensions();
-    }
-  } catch (e) {
-    // pass
-  }
-}
-
-export {HAS_WEBGL, WEBGL_MAX_TEXTURE_SIZE, WEBGL_EXTENSIONS};
-
-
-/**
- * OpenLayers version.
- * @type {string}
- */
-export const VERSION = '5.0.0-beta.14';
-
-
-/**
- * Inherit the prototype methods from one constructor into another.
- *
- * Usage:
- *
- *     function ParentClass(a, b) { }
- *     ParentClass.prototype.foo = function(a) { }
- *
- *     function ChildClass(a, b, c) {
- *       // Call parent constructor
- *       ParentClass.call(this, a, b);
- *     }
- *     inherits(ChildClass, ParentClass);
- *
- *     var child = new ChildClass('a', 'b', 'see');
- *     child.foo(); // This works.
- *
- * @param {!Function} childCtor Child constructor.
- * @param {!Function} parentCtor Parent constructor.
- * @function
- * @api
- */
-export function inherits(childCtor, parentCtor) {
-  childCtor.prototype = Object.create(parentCtor.prototype);
-  childCtor.prototype.constructor = childCtor;
-}
-
-
-/**
- * Counter for getUid.
- * @type {number}
- * @private
- */
-let uidCounter_ = 0;
-
-/**
- * Gets a unique ID for an object. This mutates the object so that further calls
- * with the same object as a parameter returns the same value. Unique IDs are generated
- * as a strictly increasing sequence. Adapted from goog.getUid.
- *
- * @param {Object} obj The object to get the unique ID for.
- * @return {number} The unique ID for the object.
- */
-export function getUid(obj) {
-  return obj.ol_uid || (obj.ol_uid = ++uidCounter_);
-}

src/ol/interaction/DoubleClickZoom.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/interaction/DoubleClickZoom
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import MapBrowserEventType from '../MapBrowserEventType.js';
 import Interaction, {zoomByDelta} from '../interaction/Interaction.js';
 

src/ol/interaction/DragAndDrop.js

@@ -3,7 +3,7 @@
  */
 // FIXME should handle all geo-referenced data, not just vector data
 
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {TRUE} from '../functions.js';
 import {listen, unlistenByKey} from '../events.js';
 import Event from '../events/Event.js';

src/ol/interaction/DragBox.js

@@ -3,7 +3,7 @@
  */
 // FIXME draw drag box
 import Event from '../events/Event.js';
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {always, mouseOnly, mouseActionButton} from '../events/condition.js';
 import {UNDEFINED} from '../functions.js';
 import PointerInteraction from '../interaction/Pointer.js';

src/ol/interaction/DragPan.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/interaction/DragPan
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import ViewHint from '../ViewHint.js';
 import {scale as scaleCoordinate, rotate as rotateCoordinate, add as addCoordinate} from '../coordinate.js';
 import {easeOut} from '../easing.js';

src/ol/interaction/DragRotate.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/interaction/DragRotate
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {disable} from '../rotationconstraint.js';
 import ViewHint from '../ViewHint.js';
 import {altShiftKeysOnly, mouseOnly, mouseActionButton} from '../events/condition.js';

src/ol/interaction/DragRotateAndZoom.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/interaction/DragRotateAndZoom
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {disable} from '../rotationconstraint.js';
 import ViewHint from '../ViewHint.js';
 import {shiftKeyOnly, mouseOnly} from '../events/condition.js';

src/ol/interaction/DragZoom.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/interaction/DragZoom
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import {easeOut} from '../easing.js';
 import {shiftKeyOnly} from '../events/condition.js';
 import {createOrUpdateFromCoordinates, getBottomLeft, getCenter, getTopRight, scaleFromCenter} from '../extent.js';

src/ol/interaction/Draw.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/interaction/Draw
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import EventType from '../events/EventType.js';
 import Feature from '../Feature.js';
 import MapBrowserEventType from '../MapBrowserEventType.js';

src/ol/interaction/Extent.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/interaction/Extent
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import Feature from '../Feature.js';
 import MapBrowserEventType from '../MapBrowserEventType.js';
 import MapBrowserPointerEvent from '../MapBrowserPointerEvent.js';

src/ol/interaction/Interaction.js

@@ -1,7 +1,7 @@
 /**
  * @module ol/interaction/Interaction
  */
-import {inherits} from '../index.js';
+import {inherits} from '../util.js';
 import BaseObject from '../Object.js';
 import {easeOut, linear} from '../easing.js';
 import InteractionProperty from '../interaction/Property.js';