From c051f5b3a031b7942301a18961f6b731d2171c30 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 29 Dec 2024 17:23:50 -0700 Subject: [PATCH] Rework ref handling --- lib/Map.js | 74 +-- lib/Overlay.js | 10 +- lib/View.js | 10 +- lib/control/Attribution.js | 10 +- lib/control/Control.js | 10 +- lib/control/FullScreen.js | 10 +- lib/control/MousePosition.js | 10 +- lib/control/OverviewMap.js | 10 +- lib/control/Rotate.js | 10 +- lib/control/ScaleLine.js | 10 +- lib/control/Zoom.js | 10 +- lib/control/ZoomSlider.js | 10 +- lib/control/ZoomToExtent.js | 10 +- lib/interaction/DblClickDragZoom.js | 10 +- lib/interaction/DoubleClickZoom.js | 10 +- lib/interaction/DragAndDrop.js | 10 +- lib/interaction/DragBox.js | 10 +- lib/interaction/DragPan.js | 10 +- lib/interaction/DragRotate.js | 10 +- lib/interaction/DragRotateAndZoom.js | 14 +- lib/interaction/DragZoom.js | 10 +- lib/interaction/Draw.js | 10 +- lib/interaction/Extent.js | 10 +- lib/interaction/Interaction.js | 10 +- lib/interaction/KeyboardPan.js | 10 +- lib/interaction/KeyboardZoom.js | 10 +- lib/interaction/Link.js | 10 +- lib/interaction/Modify.js | 10 +- lib/interaction/MouseWheelZoom.js | 10 +- lib/interaction/PinchRotate.js | 10 +- lib/interaction/PinchZoom.js | 10 +- lib/interaction/Pointer.js | 10 +- lib/interaction/Property.js | 10 +- lib/interaction/Select.js | 10 +- lib/interaction/Snap.js | 10 +- lib/interaction/Translate.js | 10 +- lib/layer/Base.js | 10 +- lib/layer/BaseImage.js | 10 +- lib/layer/BaseTile.js | 10 +- lib/layer/BaseVector.js | 10 +- lib/layer/Flow.js | 10 +- lib/layer/Graticule.js | 10 +- lib/layer/Group.js | 10 +- lib/layer/Heatmap.js | 10 +- lib/layer/Image.js | 10 +- lib/layer/Layer.js | 10 +- lib/layer/MapboxVector.js | 14 +- lib/layer/Tile.js | 10 +- lib/layer/Vector.js | 10 +- lib/layer/VectorImage.js | 10 +- lib/layer/VectorTile.js | 10 +- lib/layer/WebGLPoints.js | 10 +- lib/layer/WebGLTile.js | 10 +- lib/layer/WebGLVector.js | 10 +- lib/source/BingMaps.js | 10 +- lib/source/CartoDB.js | 10 +- lib/source/Cluster.js | 10 +- lib/source/DataTile.js | 10 +- lib/source/GeoTIFF.js | 10 +- lib/source/Google.js | 10 +- lib/source/IIIF.js | 10 +- lib/source/Image.js | 10 +- lib/source/ImageArcGISRest.js | 10 +- lib/source/ImageCanvas.js | 10 +- lib/source/ImageMapGuide.js | 10 +- lib/source/ImageStatic.js | 10 +- lib/source/ImageTile.js | 10 +- lib/source/ImageWMS.js | 10 +- lib/source/OGCMapTile.js | 10 +- lib/source/OGCVectorTile.js | 10 +- lib/source/OSM.js | 10 +- lib/source/Raster.js | 10 +- lib/source/SentinelHub.js | 10 +- lib/source/Source.js | 10 +- lib/source/StadiaMaps.js | 10 +- lib/source/Tile.js | 10 +- lib/source/TileArcGISRest.js | 10 +- lib/source/TileDebug.js | 10 +- lib/source/TileImage.js | 10 +- lib/source/TileJSON.js | 10 +- lib/source/TileWMS.js | 10 +- lib/source/UTFGrid.js | 10 +- lib/source/UrlTile.js | 10 +- lib/source/Vector.js | 10 +- lib/source/VectorTile.js | 10 +- lib/source/WMTS.js | 10 +- lib/source/XYZ.js | 10 +- lib/source/Zoomify.js | 10 +- package-lock.json | 651 +++++++++++++++------------ package.json | 18 +- templates/control.js.mustache | 12 +- templates/interaction.js.mustache | 12 +- templates/layer.js.mustache | 10 +- templates/source.js.mustache | 12 +- 94 files changed, 790 insertions(+), 877 deletions(-) diff --git a/lib/Map.js b/lib/Map.js index 0af0a6e8..94dc37d1 100644 --- a/lib/Map.js +++ b/lib/Map.js @@ -15,8 +15,8 @@ */ import OLMap from 'ol/Map.js'; import propTypes from 'prop-types'; -import {Component, createElement, createRef, forwardRef} from 'react'; import {MAP} from './internal/config.js'; +import {createElement, useCallback, useEffect, useRef} from 'react'; import {render, updateInstanceFromProps} from './internal/render.js'; const defaultDivStyle = { @@ -24,38 +24,51 @@ const defaultDivStyle = { width: '100%', }; -class Map extends Component { - constructor(props) { - super(props); +export default function Map({ + id, + style = defaultDivStyle, + className, + children, + ref, + options, + ...mapProps +}) { + const targetRef = useRef(); + const mapRef = useRef(); - this.targetRef = createRef(); + const getMap = useCallback(() => { + // avoid creating new map when options object is different + if (mapRef.current) { + return mapRef.current; + } + + const map = new OLMap(options); + mapRef.current = map; + return map; + }, [options]); - const {id, style, className, innerRef, options, ...mapProps} = props; - this.map = new OLMap({...options}); - if (innerRef) { - if (typeof innerRef === 'function') { - innerRef(this.map); + useEffect(() => { + const map = getMap(); + map.setTarget(targetRef.current); + }, [getMap]); + + useEffect(() => { + const map = getMap(); + if (ref) { + if (typeof ref === 'function') { + ref(map); } else { - innerRef.current = this.map; + ref.current = map; } } - updateInstanceFromProps(this.map, MAP, {}, mapProps); - } - - componentDidMount() { - this.map.setTarget(this.targetRef.current); - render(this.props.children, this.map); - } - - componentDidUpdate() { - // TODO: apply map prop changes - render(this.props.children, this.map); - } + if (!mapRef.current) { + return; + } + updateInstanceFromProps(map, MAP, {}, mapProps); + render(children, map); + }, [children, getMap, mapProps, ref]); - render() { - const {id, style = defaultDivStyle, className} = this.props; - return createElement('div', {ref: this.targetRef, id, style, className}); - } + return createElement('div', {ref: targetRef, id, style, className}); } Map.propTypes = { @@ -63,12 +76,9 @@ Map.propTypes = { id: propTypes.string, style: propTypes.object, children: propTypes.node, - innerRef: propTypes.oneOfType([ + options: propTypes.object, + ref: propTypes.oneOfType([ propTypes.func, propTypes.shape({current: propTypes.any}), ]), }; - -export default forwardRef((props, ref) => - createElement(Map, {innerRef: ref, ...props}), -); diff --git a/lib/Overlay.js b/lib/Overlay.js index 5d09be3e..d5e01598 100644 --- a/lib/Overlay.js +++ b/lib/Overlay.js @@ -15,10 +15,8 @@ */ import OLOverlay from 'ol/Overlay.js'; import {OVERLAY} from './internal/config.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Overlay = forwardRef((props, ref) => { - return createElement(OVERLAY, {cls: OLOverlay, ref, ...props}); -}); - -export default Overlay; +export default function Overlay(props) { + return createElement(OVERLAY, {cls: OLOverlay, ...props}); +} diff --git a/lib/View.js b/lib/View.js index 31d3f2c0..1d7da98b 100644 --- a/lib/View.js +++ b/lib/View.js @@ -15,10 +15,8 @@ */ import OLView from 'ol/View.js'; import {VIEW} from './internal/config.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const View = forwardRef((props, ref) => { - return createElement(VIEW, {cls: OLView, ref, ...props}); -}); - -export default View; +export default function View(props) { + return createElement(VIEW, {cls: OLView, ...props}); +} diff --git a/lib/control/Attribution.js b/lib/control/Attribution.js index 31de257d..db06aa80 100644 --- a/lib/control/Attribution.js +++ b/lib/control/Attribution.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLAttribution from 'ol/control/Attribution.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Attribution = forwardRef((props, ref) => { - return createElement('control', {cls: OLAttribution, ref, ...props}); -}); - -export default Attribution; +export default function Attribution(props) { + return createElement('control', {cls: OLAttribution, ...props}); +} diff --git a/lib/control/Control.js b/lib/control/Control.js index f4b97297..6d20fdce 100644 --- a/lib/control/Control.js +++ b/lib/control/Control.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLControl from 'ol/control/Control.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Control = forwardRef((props, ref) => { - return createElement('control', {cls: OLControl, ref, ...props}); -}); - -export default Control; +export default function Control(props) { + return createElement('control', {cls: OLControl, ...props}); +} diff --git a/lib/control/FullScreen.js b/lib/control/FullScreen.js index b69a85be..bf90cbf6 100644 --- a/lib/control/FullScreen.js +++ b/lib/control/FullScreen.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLFullScreen from 'ol/control/FullScreen.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const FullScreen = forwardRef((props, ref) => { - return createElement('control', {cls: OLFullScreen, ref, ...props}); -}); - -export default FullScreen; +export default function FullScreen(props) { + return createElement('control', {cls: OLFullScreen, ...props}); +} diff --git a/lib/control/MousePosition.js b/lib/control/MousePosition.js index 7952fbcc..de17b742 100644 --- a/lib/control/MousePosition.js +++ b/lib/control/MousePosition.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLMousePosition from 'ol/control/MousePosition.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const MousePosition = forwardRef((props, ref) => { - return createElement('control', {cls: OLMousePosition, ref, ...props}); -}); - -export default MousePosition; +export default function MousePosition(props) { + return createElement('control', {cls: OLMousePosition, ...props}); +} diff --git a/lib/control/OverviewMap.js b/lib/control/OverviewMap.js index fc727173..aee32542 100644 --- a/lib/control/OverviewMap.js +++ b/lib/control/OverviewMap.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLOverviewMap from 'ol/control/OverviewMap.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const OverviewMap = forwardRef((props, ref) => { - return createElement('control', {cls: OLOverviewMap, ref, ...props}); -}); - -export default OverviewMap; +export default function OverviewMap(props) { + return createElement('control', {cls: OLOverviewMap, ...props}); +} diff --git a/lib/control/Rotate.js b/lib/control/Rotate.js index b74327d7..f93903ac 100644 --- a/lib/control/Rotate.js +++ b/lib/control/Rotate.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLRotate from 'ol/control/Rotate.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Rotate = forwardRef((props, ref) => { - return createElement('control', {cls: OLRotate, ref, ...props}); -}); - -export default Rotate; +export default function Rotate(props) { + return createElement('control', {cls: OLRotate, ...props}); +} diff --git a/lib/control/ScaleLine.js b/lib/control/ScaleLine.js index d2e6b529..6260e82d 100644 --- a/lib/control/ScaleLine.js +++ b/lib/control/ScaleLine.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLScaleLine from 'ol/control/ScaleLine.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ScaleLine = forwardRef((props, ref) => { - return createElement('control', {cls: OLScaleLine, ref, ...props}); -}); - -export default ScaleLine; +export default function ScaleLine(props) { + return createElement('control', {cls: OLScaleLine, ...props}); +} diff --git a/lib/control/Zoom.js b/lib/control/Zoom.js index e1341bf9..d41b7677 100644 --- a/lib/control/Zoom.js +++ b/lib/control/Zoom.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLZoom from 'ol/control/Zoom.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Zoom = forwardRef((props, ref) => { - return createElement('control', {cls: OLZoom, ref, ...props}); -}); - -export default Zoom; +export default function Zoom(props) { + return createElement('control', {cls: OLZoom, ...props}); +} diff --git a/lib/control/ZoomSlider.js b/lib/control/ZoomSlider.js index 8ca5689a..d9a739df 100644 --- a/lib/control/ZoomSlider.js +++ b/lib/control/ZoomSlider.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLZoomSlider from 'ol/control/ZoomSlider.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ZoomSlider = forwardRef((props, ref) => { - return createElement('control', {cls: OLZoomSlider, ref, ...props}); -}); - -export default ZoomSlider; +export default function ZoomSlider(props) { + return createElement('control', {cls: OLZoomSlider, ...props}); +} diff --git a/lib/control/ZoomToExtent.js b/lib/control/ZoomToExtent.js index 2eb2ec39..79d351b1 100644 --- a/lib/control/ZoomToExtent.js +++ b/lib/control/ZoomToExtent.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLZoomToExtent from 'ol/control/ZoomToExtent.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ZoomToExtent = forwardRef((props, ref) => { - return createElement('control', {cls: OLZoomToExtent, ref, ...props}); -}); - -export default ZoomToExtent; +export default function ZoomToExtent(props) { + return createElement('control', {cls: OLZoomToExtent, ...props}); +} diff --git a/lib/interaction/DblClickDragZoom.js b/lib/interaction/DblClickDragZoom.js index 59993c4c..440d2e0c 100644 --- a/lib/interaction/DblClickDragZoom.js +++ b/lib/interaction/DblClickDragZoom.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDblClickDragZoom from 'ol/interaction/DblClickDragZoom.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DblClickDragZoom = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLDblClickDragZoom, ref, ...props}); -}); - -export default DblClickDragZoom; +export default function DblClickDragZoom(props) { + return createElement('interaction', {cls: OLDblClickDragZoom, ...props}); +} diff --git a/lib/interaction/DoubleClickZoom.js b/lib/interaction/DoubleClickZoom.js index c73683f8..dfecc448 100644 --- a/lib/interaction/DoubleClickZoom.js +++ b/lib/interaction/DoubleClickZoom.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDoubleClickZoom from 'ol/interaction/DoubleClickZoom.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DoubleClickZoom = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLDoubleClickZoom, ref, ...props}); -}); - -export default DoubleClickZoom; +export default function DoubleClickZoom(props) { + return createElement('interaction', {cls: OLDoubleClickZoom, ...props}); +} diff --git a/lib/interaction/DragAndDrop.js b/lib/interaction/DragAndDrop.js index f92d241c..a0a345ad 100644 --- a/lib/interaction/DragAndDrop.js +++ b/lib/interaction/DragAndDrop.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDragAndDrop from 'ol/interaction/DragAndDrop.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DragAndDrop = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLDragAndDrop, ref, ...props}); -}); - -export default DragAndDrop; +export default function DragAndDrop(props) { + return createElement('interaction', {cls: OLDragAndDrop, ...props}); +} diff --git a/lib/interaction/DragBox.js b/lib/interaction/DragBox.js index 720315c3..fa5d67f3 100644 --- a/lib/interaction/DragBox.js +++ b/lib/interaction/DragBox.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDragBox from 'ol/interaction/DragBox.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DragBox = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLDragBox, ref, ...props}); -}); - -export default DragBox; +export default function DragBox(props) { + return createElement('interaction', {cls: OLDragBox, ...props}); +} diff --git a/lib/interaction/DragPan.js b/lib/interaction/DragPan.js index 94624962..43c3d610 100644 --- a/lib/interaction/DragPan.js +++ b/lib/interaction/DragPan.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDragPan from 'ol/interaction/DragPan.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DragPan = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLDragPan, ref, ...props}); -}); - -export default DragPan; +export default function DragPan(props) { + return createElement('interaction', {cls: OLDragPan, ...props}); +} diff --git a/lib/interaction/DragRotate.js b/lib/interaction/DragRotate.js index 8f593277..f6c39e68 100644 --- a/lib/interaction/DragRotate.js +++ b/lib/interaction/DragRotate.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDragRotate from 'ol/interaction/DragRotate.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DragRotate = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLDragRotate, ref, ...props}); -}); - -export default DragRotate; +export default function DragRotate(props) { + return createElement('interaction', {cls: OLDragRotate, ...props}); +} diff --git a/lib/interaction/DragRotateAndZoom.js b/lib/interaction/DragRotateAndZoom.js index 2f0b1a29..b63ea723 100644 --- a/lib/interaction/DragRotateAndZoom.js +++ b/lib/interaction/DragRotateAndZoom.js @@ -15,14 +15,8 @@ * limitations under the License. */ import OLDragRotateAndZoom from 'ol/interaction/DragRotateAndZoom.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DragRotateAndZoom = forwardRef((props, ref) => { - return createElement('interaction', { - cls: OLDragRotateAndZoom, - ref, - ...props, - }); -}); - -export default DragRotateAndZoom; +export default function DragRotateAndZoom(props) { + return createElement('interaction', {cls: OLDragRotateAndZoom, ...props}); +} diff --git a/lib/interaction/DragZoom.js b/lib/interaction/DragZoom.js index 3e4b53ba..e3e6abb5 100644 --- a/lib/interaction/DragZoom.js +++ b/lib/interaction/DragZoom.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDragZoom from 'ol/interaction/DragZoom.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DragZoom = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLDragZoom, ref, ...props}); -}); - -export default DragZoom; +export default function DragZoom(props) { + return createElement('interaction', {cls: OLDragZoom, ...props}); +} diff --git a/lib/interaction/Draw.js b/lib/interaction/Draw.js index 835dee97..655459ce 100644 --- a/lib/interaction/Draw.js +++ b/lib/interaction/Draw.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDraw from 'ol/interaction/Draw.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Draw = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLDraw, ref, ...props}); -}); - -export default Draw; +export default function Draw(props) { + return createElement('interaction', {cls: OLDraw, ...props}); +} diff --git a/lib/interaction/Extent.js b/lib/interaction/Extent.js index cc980404..21d6f3f8 100644 --- a/lib/interaction/Extent.js +++ b/lib/interaction/Extent.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLExtent from 'ol/interaction/Extent.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Extent = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLExtent, ref, ...props}); -}); - -export default Extent; +export default function Extent(props) { + return createElement('interaction', {cls: OLExtent, ...props}); +} diff --git a/lib/interaction/Interaction.js b/lib/interaction/Interaction.js index 489bf884..6860c227 100644 --- a/lib/interaction/Interaction.js +++ b/lib/interaction/Interaction.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLInteraction from 'ol/interaction/Interaction.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Interaction = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLInteraction, ref, ...props}); -}); - -export default Interaction; +export default function Interaction(props) { + return createElement('interaction', {cls: OLInteraction, ...props}); +} diff --git a/lib/interaction/KeyboardPan.js b/lib/interaction/KeyboardPan.js index 46395b10..d33b384c 100644 --- a/lib/interaction/KeyboardPan.js +++ b/lib/interaction/KeyboardPan.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLKeyboardPan from 'ol/interaction/KeyboardPan.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const KeyboardPan = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLKeyboardPan, ref, ...props}); -}); - -export default KeyboardPan; +export default function KeyboardPan(props) { + return createElement('interaction', {cls: OLKeyboardPan, ...props}); +} diff --git a/lib/interaction/KeyboardZoom.js b/lib/interaction/KeyboardZoom.js index 042f1a3e..a1787966 100644 --- a/lib/interaction/KeyboardZoom.js +++ b/lib/interaction/KeyboardZoom.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLKeyboardZoom from 'ol/interaction/KeyboardZoom.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const KeyboardZoom = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLKeyboardZoom, ref, ...props}); -}); - -export default KeyboardZoom; +export default function KeyboardZoom(props) { + return createElement('interaction', {cls: OLKeyboardZoom, ...props}); +} diff --git a/lib/interaction/Link.js b/lib/interaction/Link.js index 626770f6..4c98ca97 100644 --- a/lib/interaction/Link.js +++ b/lib/interaction/Link.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLLink from 'ol/interaction/Link.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Link = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLLink, ref, ...props}); -}); - -export default Link; +export default function Link(props) { + return createElement('interaction', {cls: OLLink, ...props}); +} diff --git a/lib/interaction/Modify.js b/lib/interaction/Modify.js index 03040c48..1e657133 100644 --- a/lib/interaction/Modify.js +++ b/lib/interaction/Modify.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLModify from 'ol/interaction/Modify.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Modify = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLModify, ref, ...props}); -}); - -export default Modify; +export default function Modify(props) { + return createElement('interaction', {cls: OLModify, ...props}); +} diff --git a/lib/interaction/MouseWheelZoom.js b/lib/interaction/MouseWheelZoom.js index 1f7ee03b..e8933474 100644 --- a/lib/interaction/MouseWheelZoom.js +++ b/lib/interaction/MouseWheelZoom.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLMouseWheelZoom from 'ol/interaction/MouseWheelZoom.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const MouseWheelZoom = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLMouseWheelZoom, ref, ...props}); -}); - -export default MouseWheelZoom; +export default function MouseWheelZoom(props) { + return createElement('interaction', {cls: OLMouseWheelZoom, ...props}); +} diff --git a/lib/interaction/PinchRotate.js b/lib/interaction/PinchRotate.js index 149d7f88..9bb38529 100644 --- a/lib/interaction/PinchRotate.js +++ b/lib/interaction/PinchRotate.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLPinchRotate from 'ol/interaction/PinchRotate.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const PinchRotate = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLPinchRotate, ref, ...props}); -}); - -export default PinchRotate; +export default function PinchRotate(props) { + return createElement('interaction', {cls: OLPinchRotate, ...props}); +} diff --git a/lib/interaction/PinchZoom.js b/lib/interaction/PinchZoom.js index dbc0f5e9..3b510a99 100644 --- a/lib/interaction/PinchZoom.js +++ b/lib/interaction/PinchZoom.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLPinchZoom from 'ol/interaction/PinchZoom.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const PinchZoom = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLPinchZoom, ref, ...props}); -}); - -export default PinchZoom; +export default function PinchZoom(props) { + return createElement('interaction', {cls: OLPinchZoom, ...props}); +} diff --git a/lib/interaction/Pointer.js b/lib/interaction/Pointer.js index 4f97842d..3e94ee3a 100644 --- a/lib/interaction/Pointer.js +++ b/lib/interaction/Pointer.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLPointer from 'ol/interaction/Pointer.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Pointer = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLPointer, ref, ...props}); -}); - -export default Pointer; +export default function Pointer(props) { + return createElement('interaction', {cls: OLPointer, ...props}); +} diff --git a/lib/interaction/Property.js b/lib/interaction/Property.js index af9faeb8..321fcbde 100644 --- a/lib/interaction/Property.js +++ b/lib/interaction/Property.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLProperty from 'ol/interaction/Property.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Property = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLProperty, ref, ...props}); -}); - -export default Property; +export default function Property(props) { + return createElement('interaction', {cls: OLProperty, ...props}); +} diff --git a/lib/interaction/Select.js b/lib/interaction/Select.js index 558214f8..632f1e58 100644 --- a/lib/interaction/Select.js +++ b/lib/interaction/Select.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLSelect from 'ol/interaction/Select.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Select = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLSelect, ref, ...props}); -}); - -export default Select; +export default function Select(props) { + return createElement('interaction', {cls: OLSelect, ...props}); +} diff --git a/lib/interaction/Snap.js b/lib/interaction/Snap.js index 6e948ced..7cdd9387 100644 --- a/lib/interaction/Snap.js +++ b/lib/interaction/Snap.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLSnap from 'ol/interaction/Snap.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Snap = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLSnap, ref, ...props}); -}); - -export default Snap; +export default function Snap(props) { + return createElement('interaction', {cls: OLSnap, ...props}); +} diff --git a/lib/interaction/Translate.js b/lib/interaction/Translate.js index e6df392c..f3c79d53 100644 --- a/lib/interaction/Translate.js +++ b/lib/interaction/Translate.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLTranslate from 'ol/interaction/Translate.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Translate = forwardRef((props, ref) => { - return createElement('interaction', {cls: OLTranslate, ref, ...props}); -}); - -export default Translate; +export default function Translate(props) { + return createElement('interaction', {cls: OLTranslate, ...props}); +} diff --git a/lib/layer/Base.js b/lib/layer/Base.js index c07e3adb..eb0845b5 100644 --- a/lib/layer/Base.js +++ b/lib/layer/Base.js @@ -16,14 +16,12 @@ */ import OLBase from 'ol/layer/Base.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Base = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLBase, ref, ...props}, children); -}); +export default function Base({children, ...props}) { + return createElement('layer', {cls: OLBase, ...props}, children); +} Base.propTypes = { children: propTypes.node, }; - -export default Base; diff --git a/lib/layer/BaseImage.js b/lib/layer/BaseImage.js index f6b18af4..b9a3a8a6 100644 --- a/lib/layer/BaseImage.js +++ b/lib/layer/BaseImage.js @@ -16,14 +16,12 @@ */ import OLBaseImage from 'ol/layer/BaseImage.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const BaseImage = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLBaseImage, ref, ...props}, children); -}); +export default function BaseImage({children, ...props}) { + return createElement('layer', {cls: OLBaseImage, ...props}, children); +} BaseImage.propTypes = { children: propTypes.node, }; - -export default BaseImage; diff --git a/lib/layer/BaseTile.js b/lib/layer/BaseTile.js index d856ff1a..05cc6685 100644 --- a/lib/layer/BaseTile.js +++ b/lib/layer/BaseTile.js @@ -16,14 +16,12 @@ */ import OLBaseTile from 'ol/layer/BaseTile.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const BaseTile = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLBaseTile, ref, ...props}, children); -}); +export default function BaseTile({children, ...props}) { + return createElement('layer', {cls: OLBaseTile, ...props}, children); +} BaseTile.propTypes = { children: propTypes.node, }; - -export default BaseTile; diff --git a/lib/layer/BaseVector.js b/lib/layer/BaseVector.js index 285427a3..a3ec3c5b 100644 --- a/lib/layer/BaseVector.js +++ b/lib/layer/BaseVector.js @@ -16,14 +16,12 @@ */ import OLBaseVector from 'ol/layer/BaseVector.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const BaseVector = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLBaseVector, ref, ...props}, children); -}); +export default function BaseVector({children, ...props}) { + return createElement('layer', {cls: OLBaseVector, ...props}, children); +} BaseVector.propTypes = { children: propTypes.node, }; - -export default BaseVector; diff --git a/lib/layer/Flow.js b/lib/layer/Flow.js index 666021b7..c7d13876 100644 --- a/lib/layer/Flow.js +++ b/lib/layer/Flow.js @@ -16,14 +16,12 @@ */ import OLFlow from 'ol/layer/Flow.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Flow = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLFlow, ref, ...props}, children); -}); +export default function Flow({children, ...props}) { + return createElement('layer', {cls: OLFlow, ...props}, children); +} Flow.propTypes = { children: propTypes.node, }; - -export default Flow; diff --git a/lib/layer/Graticule.js b/lib/layer/Graticule.js index 6a274e05..dcfb83b7 100644 --- a/lib/layer/Graticule.js +++ b/lib/layer/Graticule.js @@ -16,14 +16,12 @@ */ import OLGraticule from 'ol/layer/Graticule.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Graticule = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLGraticule, ref, ...props}, children); -}); +export default function Graticule({children, ...props}) { + return createElement('layer', {cls: OLGraticule, ...props}, children); +} Graticule.propTypes = { children: propTypes.node, }; - -export default Graticule; diff --git a/lib/layer/Group.js b/lib/layer/Group.js index be96729b..b7bb84e6 100644 --- a/lib/layer/Group.js +++ b/lib/layer/Group.js @@ -16,14 +16,12 @@ */ import OLGroup from 'ol/layer/Group.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Group = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLGroup, ref, ...props}, children); -}); +export default function Group({children, ...props}) { + return createElement('layer', {cls: OLGroup, ...props}, children); +} Group.propTypes = { children: propTypes.node, }; - -export default Group; diff --git a/lib/layer/Heatmap.js b/lib/layer/Heatmap.js index 9f41f4f5..2d7cb83a 100644 --- a/lib/layer/Heatmap.js +++ b/lib/layer/Heatmap.js @@ -16,14 +16,12 @@ */ import OLHeatmap from 'ol/layer/Heatmap.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Heatmap = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLHeatmap, ref, ...props}, children); -}); +export default function Heatmap({children, ...props}) { + return createElement('layer', {cls: OLHeatmap, ...props}, children); +} Heatmap.propTypes = { children: propTypes.node, }; - -export default Heatmap; diff --git a/lib/layer/Image.js b/lib/layer/Image.js index e1a5b406..5ad9c8ee 100644 --- a/lib/layer/Image.js +++ b/lib/layer/Image.js @@ -16,14 +16,12 @@ */ import OLImage from 'ol/layer/Image.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Image = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLImage, ref, ...props}, children); -}); +export default function Image({children, ...props}) { + return createElement('layer', {cls: OLImage, ...props}, children); +} Image.propTypes = { children: propTypes.node, }; - -export default Image; diff --git a/lib/layer/Layer.js b/lib/layer/Layer.js index 9b557f2f..6778790a 100644 --- a/lib/layer/Layer.js +++ b/lib/layer/Layer.js @@ -16,14 +16,12 @@ */ import OLLayer from 'ol/layer/Layer.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Layer = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLLayer, ref, ...props}, children); -}); +export default function Layer({children, ...props}) { + return createElement('layer', {cls: OLLayer, ...props}, children); +} Layer.propTypes = { children: propTypes.node, }; - -export default Layer; diff --git a/lib/layer/MapboxVector.js b/lib/layer/MapboxVector.js index eb85f313..b8886226 100644 --- a/lib/layer/MapboxVector.js +++ b/lib/layer/MapboxVector.js @@ -16,18 +16,12 @@ */ import propTypes from 'prop-types'; import {MapboxVectorLayer as OLMBVectorLayer} from 'ol-mapbox-style'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const MapboxVector = forwardRef(({children, ...props}, ref) => { - return createElement( - 'layer', - {cls: OLMBVectorLayer, ref, ...props}, - children, - ); -}); +export default function MapboxVector({children, ...props}) { + return createElement('layer', {cls: OLMBVectorLayer, ...props}, children); +} MapboxVector.propTypes = { children: propTypes.node, }; - -export default MapboxVector; diff --git a/lib/layer/Tile.js b/lib/layer/Tile.js index facc5eeb..98d758ff 100644 --- a/lib/layer/Tile.js +++ b/lib/layer/Tile.js @@ -16,14 +16,12 @@ */ import OLTile from 'ol/layer/Tile.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Tile = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLTile, ref, ...props}, children); -}); +export default function Tile({children, ...props}) { + return createElement('layer', {cls: OLTile, ...props}, children); +} Tile.propTypes = { children: propTypes.node, }; - -export default Tile; diff --git a/lib/layer/Vector.js b/lib/layer/Vector.js index 25555e7f..6f9a3588 100644 --- a/lib/layer/Vector.js +++ b/lib/layer/Vector.js @@ -16,14 +16,12 @@ */ import OLVector from 'ol/layer/Vector.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Vector = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLVector, ref, ...props}, children); -}); +export default function Vector({children, ...props}) { + return createElement('layer', {cls: OLVector, ...props}, children); +} Vector.propTypes = { children: propTypes.node, }; - -export default Vector; diff --git a/lib/layer/VectorImage.js b/lib/layer/VectorImage.js index 9712af58..532691ba 100644 --- a/lib/layer/VectorImage.js +++ b/lib/layer/VectorImage.js @@ -16,14 +16,12 @@ */ import OLVectorImage from 'ol/layer/VectorImage.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const VectorImage = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLVectorImage, ref, ...props}, children); -}); +export default function VectorImage({children, ...props}) { + return createElement('layer', {cls: OLVectorImage, ...props}, children); +} VectorImage.propTypes = { children: propTypes.node, }; - -export default VectorImage; diff --git a/lib/layer/VectorTile.js b/lib/layer/VectorTile.js index c354ffdb..37256f53 100644 --- a/lib/layer/VectorTile.js +++ b/lib/layer/VectorTile.js @@ -16,14 +16,12 @@ */ import OLVectorTile from 'ol/layer/VectorTile.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const VectorTile = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLVectorTile, ref, ...props}, children); -}); +export default function VectorTile({children, ...props}) { + return createElement('layer', {cls: OLVectorTile, ...props}, children); +} VectorTile.propTypes = { children: propTypes.node, }; - -export default VectorTile; diff --git a/lib/layer/WebGLPoints.js b/lib/layer/WebGLPoints.js index 7363a3c6..c2e491f1 100644 --- a/lib/layer/WebGLPoints.js +++ b/lib/layer/WebGLPoints.js @@ -16,14 +16,12 @@ */ import OLWebGLPoints from 'ol/layer/WebGLPoints.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const WebGLPoints = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLWebGLPoints, ref, ...props}, children); -}); +export default function WebGLPoints({children, ...props}) { + return createElement('layer', {cls: OLWebGLPoints, ...props}, children); +} WebGLPoints.propTypes = { children: propTypes.node, }; - -export default WebGLPoints; diff --git a/lib/layer/WebGLTile.js b/lib/layer/WebGLTile.js index ad3888f8..d8d6fd5b 100644 --- a/lib/layer/WebGLTile.js +++ b/lib/layer/WebGLTile.js @@ -16,14 +16,12 @@ */ import OLWebGLTile from 'ol/layer/WebGLTile.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const WebGLTile = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLWebGLTile, ref, ...props}, children); -}); +export default function WebGLTile({children, ...props}) { + return createElement('layer', {cls: OLWebGLTile, ...props}, children); +} WebGLTile.propTypes = { children: propTypes.node, }; - -export default WebGLTile; diff --git a/lib/layer/WebGLVector.js b/lib/layer/WebGLVector.js index 980e55e3..54422628 100644 --- a/lib/layer/WebGLVector.js +++ b/lib/layer/WebGLVector.js @@ -16,14 +16,12 @@ */ import OLWebGLVector from 'ol/layer/WebGLVector.js'; import propTypes from 'prop-types'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const WebGLVector = forwardRef(({children, ...props}, ref) => { - return createElement('layer', {cls: OLWebGLVector, ref, ...props}, children); -}); +export default function WebGLVector({children, ...props}) { + return createElement('layer', {cls: OLWebGLVector, ...props}, children); +} WebGLVector.propTypes = { children: propTypes.node, }; - -export default WebGLVector; diff --git a/lib/source/BingMaps.js b/lib/source/BingMaps.js index 0ffdef0a..7aeec983 100644 --- a/lib/source/BingMaps.js +++ b/lib/source/BingMaps.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLBingMaps from 'ol/source/BingMaps.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const BingMaps = forwardRef((props, ref) => { - return createElement('source', {cls: OLBingMaps, ref, ...props}); -}); - -export default BingMaps; +export default function BingMaps(props) { + return createElement('source', {cls: OLBingMaps, ...props}); +} diff --git a/lib/source/CartoDB.js b/lib/source/CartoDB.js index f3518afb..ab336781 100644 --- a/lib/source/CartoDB.js +++ b/lib/source/CartoDB.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLCartoDB from 'ol/source/CartoDB.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const CartoDB = forwardRef((props, ref) => { - return createElement('source', {cls: OLCartoDB, ref, ...props}); -}); - -export default CartoDB; +export default function CartoDB(props) { + return createElement('source', {cls: OLCartoDB, ...props}); +} diff --git a/lib/source/Cluster.js b/lib/source/Cluster.js index d52fa801..03380d7b 100644 --- a/lib/source/Cluster.js +++ b/lib/source/Cluster.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLCluster from 'ol/source/Cluster.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Cluster = forwardRef((props, ref) => { - return createElement('source', {cls: OLCluster, ref, ...props}); -}); - -export default Cluster; +export default function Cluster(props) { + return createElement('source', {cls: OLCluster, ...props}); +} diff --git a/lib/source/DataTile.js b/lib/source/DataTile.js index 78391a26..c824d59e 100644 --- a/lib/source/DataTile.js +++ b/lib/source/DataTile.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLDataTile from 'ol/source/DataTile.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const DataTile = forwardRef((props, ref) => { - return createElement('source', {cls: OLDataTile, ref, ...props}); -}); - -export default DataTile; +export default function DataTile(props) { + return createElement('source', {cls: OLDataTile, ...props}); +} diff --git a/lib/source/GeoTIFF.js b/lib/source/GeoTIFF.js index fff973a1..3e3507e9 100644 --- a/lib/source/GeoTIFF.js +++ b/lib/source/GeoTIFF.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLGeoTIFF from 'ol/source/GeoTIFF.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const GeoTIFF = forwardRef((props, ref) => { - return createElement('source', {cls: OLGeoTIFF, ref, ...props}); -}); - -export default GeoTIFF; +export default function GeoTIFF(props) { + return createElement('source', {cls: OLGeoTIFF, ...props}); +} diff --git a/lib/source/Google.js b/lib/source/Google.js index 3adaf99a..d2b8b653 100644 --- a/lib/source/Google.js +++ b/lib/source/Google.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLGoogle from 'ol/source/Google.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Google = forwardRef((props, ref) => { - return createElement('source', {cls: OLGoogle, ref, ...props}); -}); - -export default Google; +export default function Google(props) { + return createElement('source', {cls: OLGoogle, ...props}); +} diff --git a/lib/source/IIIF.js b/lib/source/IIIF.js index 90a5e3c3..e158b3d8 100644 --- a/lib/source/IIIF.js +++ b/lib/source/IIIF.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLIIIF from 'ol/source/IIIF.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const IIIF = forwardRef((props, ref) => { - return createElement('source', {cls: OLIIIF, ref, ...props}); -}); - -export default IIIF; +export default function IIIF(props) { + return createElement('source', {cls: OLIIIF, ...props}); +} diff --git a/lib/source/Image.js b/lib/source/Image.js index 302e128f..035e844c 100644 --- a/lib/source/Image.js +++ b/lib/source/Image.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLImage from 'ol/source/Image.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Image = forwardRef((props, ref) => { - return createElement('source', {cls: OLImage, ref, ...props}); -}); - -export default Image; +export default function Image(props) { + return createElement('source', {cls: OLImage, ...props}); +} diff --git a/lib/source/ImageArcGISRest.js b/lib/source/ImageArcGISRest.js index fd55b822..b6124b9f 100644 --- a/lib/source/ImageArcGISRest.js +++ b/lib/source/ImageArcGISRest.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLImageArcGISRest from 'ol/source/ImageArcGISRest.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ImageArcGISRest = forwardRef((props, ref) => { - return createElement('source', {cls: OLImageArcGISRest, ref, ...props}); -}); - -export default ImageArcGISRest; +export default function ImageArcGISRest(props) { + return createElement('source', {cls: OLImageArcGISRest, ...props}); +} diff --git a/lib/source/ImageCanvas.js b/lib/source/ImageCanvas.js index 1c66b330..043e4d9b 100644 --- a/lib/source/ImageCanvas.js +++ b/lib/source/ImageCanvas.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLImageCanvas from 'ol/source/ImageCanvas.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ImageCanvas = forwardRef((props, ref) => { - return createElement('source', {cls: OLImageCanvas, ref, ...props}); -}); - -export default ImageCanvas; +export default function ImageCanvas(props) { + return createElement('source', {cls: OLImageCanvas, ...props}); +} diff --git a/lib/source/ImageMapGuide.js b/lib/source/ImageMapGuide.js index 07303009..efa86590 100644 --- a/lib/source/ImageMapGuide.js +++ b/lib/source/ImageMapGuide.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLImageMapGuide from 'ol/source/ImageMapGuide.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ImageMapGuide = forwardRef((props, ref) => { - return createElement('source', {cls: OLImageMapGuide, ref, ...props}); -}); - -export default ImageMapGuide; +export default function ImageMapGuide(props) { + return createElement('source', {cls: OLImageMapGuide, ...props}); +} diff --git a/lib/source/ImageStatic.js b/lib/source/ImageStatic.js index fa7454ef..02da284e 100644 --- a/lib/source/ImageStatic.js +++ b/lib/source/ImageStatic.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLImageStatic from 'ol/source/ImageStatic.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ImageStatic = forwardRef((props, ref) => { - return createElement('source', {cls: OLImageStatic, ref, ...props}); -}); - -export default ImageStatic; +export default function ImageStatic(props) { + return createElement('source', {cls: OLImageStatic, ...props}); +} diff --git a/lib/source/ImageTile.js b/lib/source/ImageTile.js index 50128964..ca9d7aac 100644 --- a/lib/source/ImageTile.js +++ b/lib/source/ImageTile.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLImageTile from 'ol/source/ImageTile.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ImageTile = forwardRef((props, ref) => { - return createElement('source', {cls: OLImageTile, ref, ...props}); -}); - -export default ImageTile; +export default function ImageTile(props) { + return createElement('source', {cls: OLImageTile, ...props}); +} diff --git a/lib/source/ImageWMS.js b/lib/source/ImageWMS.js index af21cead..1bb822ce 100644 --- a/lib/source/ImageWMS.js +++ b/lib/source/ImageWMS.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLImageWMS from 'ol/source/ImageWMS.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const ImageWMS = forwardRef((props, ref) => { - return createElement('source', {cls: OLImageWMS, ref, ...props}); -}); - -export default ImageWMS; +export default function ImageWMS(props) { + return createElement('source', {cls: OLImageWMS, ...props}); +} diff --git a/lib/source/OGCMapTile.js b/lib/source/OGCMapTile.js index c87ba972..265167b1 100644 --- a/lib/source/OGCMapTile.js +++ b/lib/source/OGCMapTile.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLOGCMapTile from 'ol/source/OGCMapTile.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const OGCMapTile = forwardRef((props, ref) => { - return createElement('source', {cls: OLOGCMapTile, ref, ...props}); -}); - -export default OGCMapTile; +export default function OGCMapTile(props) { + return createElement('source', {cls: OLOGCMapTile, ...props}); +} diff --git a/lib/source/OGCVectorTile.js b/lib/source/OGCVectorTile.js index ce2f0dd1..b84122ac 100644 --- a/lib/source/OGCVectorTile.js +++ b/lib/source/OGCVectorTile.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLOGCVectorTile from 'ol/source/OGCVectorTile.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const OGCVectorTile = forwardRef((props, ref) => { - return createElement('source', {cls: OLOGCVectorTile, ref, ...props}); -}); - -export default OGCVectorTile; +export default function OGCVectorTile(props) { + return createElement('source', {cls: OLOGCVectorTile, ...props}); +} diff --git a/lib/source/OSM.js b/lib/source/OSM.js index 9ef1aa5e..a49c4c77 100644 --- a/lib/source/OSM.js +++ b/lib/source/OSM.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLOSM from 'ol/source/OSM.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const OSM = forwardRef((props, ref) => { - return createElement('source', {cls: OLOSM, ref, ...props}); -}); - -export default OSM; +export default function OSM(props) { + return createElement('source', {cls: OLOSM, ...props}); +} diff --git a/lib/source/Raster.js b/lib/source/Raster.js index 6b0c5bed..77d8c45b 100644 --- a/lib/source/Raster.js +++ b/lib/source/Raster.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLRaster from 'ol/source/Raster.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Raster = forwardRef((props, ref) => { - return createElement('source', {cls: OLRaster, ref, ...props}); -}); - -export default Raster; +export default function Raster(props) { + return createElement('source', {cls: OLRaster, ...props}); +} diff --git a/lib/source/SentinelHub.js b/lib/source/SentinelHub.js index ab41e268..e3a606a5 100644 --- a/lib/source/SentinelHub.js +++ b/lib/source/SentinelHub.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLSentinelHub from 'ol/source/SentinelHub.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const SentinelHub = forwardRef((props, ref) => { - return createElement('source', {cls: OLSentinelHub, ref, ...props}); -}); - -export default SentinelHub; +export default function SentinelHub(props) { + return createElement('source', {cls: OLSentinelHub, ...props}); +} diff --git a/lib/source/Source.js b/lib/source/Source.js index 78a5c25d..a66c12db 100644 --- a/lib/source/Source.js +++ b/lib/source/Source.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLSource from 'ol/source/Source.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Source = forwardRef((props, ref) => { - return createElement('source', {cls: OLSource, ref, ...props}); -}); - -export default Source; +export default function Source(props) { + return createElement('source', {cls: OLSource, ...props}); +} diff --git a/lib/source/StadiaMaps.js b/lib/source/StadiaMaps.js index 4b2a26ec..31d12ae3 100644 --- a/lib/source/StadiaMaps.js +++ b/lib/source/StadiaMaps.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLStadiaMaps from 'ol/source/StadiaMaps.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const StadiaMaps = forwardRef((props, ref) => { - return createElement('source', {cls: OLStadiaMaps, ref, ...props}); -}); - -export default StadiaMaps; +export default function StadiaMaps(props) { + return createElement('source', {cls: OLStadiaMaps, ...props}); +} diff --git a/lib/source/Tile.js b/lib/source/Tile.js index e581c875..87b380d7 100644 --- a/lib/source/Tile.js +++ b/lib/source/Tile.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLTile from 'ol/source/Tile.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Tile = forwardRef((props, ref) => { - return createElement('source', {cls: OLTile, ref, ...props}); -}); - -export default Tile; +export default function Tile(props) { + return createElement('source', {cls: OLTile, ...props}); +} diff --git a/lib/source/TileArcGISRest.js b/lib/source/TileArcGISRest.js index 8b2b78ab..0d61114d 100644 --- a/lib/source/TileArcGISRest.js +++ b/lib/source/TileArcGISRest.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLTileArcGISRest from 'ol/source/TileArcGISRest.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const TileArcGISRest = forwardRef((props, ref) => { - return createElement('source', {cls: OLTileArcGISRest, ref, ...props}); -}); - -export default TileArcGISRest; +export default function TileArcGISRest(props) { + return createElement('source', {cls: OLTileArcGISRest, ...props}); +} diff --git a/lib/source/TileDebug.js b/lib/source/TileDebug.js index a4db2514..b3df6eb7 100644 --- a/lib/source/TileDebug.js +++ b/lib/source/TileDebug.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLTileDebug from 'ol/source/TileDebug.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const TileDebug = forwardRef((props, ref) => { - return createElement('source', {cls: OLTileDebug, ref, ...props}); -}); - -export default TileDebug; +export default function TileDebug(props) { + return createElement('source', {cls: OLTileDebug, ...props}); +} diff --git a/lib/source/TileImage.js b/lib/source/TileImage.js index 836a7688..b31f6430 100644 --- a/lib/source/TileImage.js +++ b/lib/source/TileImage.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLTileImage from 'ol/source/TileImage.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const TileImage = forwardRef((props, ref) => { - return createElement('source', {cls: OLTileImage, ref, ...props}); -}); - -export default TileImage; +export default function TileImage(props) { + return createElement('source', {cls: OLTileImage, ...props}); +} diff --git a/lib/source/TileJSON.js b/lib/source/TileJSON.js index c6c7c076..675afe7b 100644 --- a/lib/source/TileJSON.js +++ b/lib/source/TileJSON.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLTileJSON from 'ol/source/TileJSON.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const TileJSON = forwardRef((props, ref) => { - return createElement('source', {cls: OLTileJSON, ref, ...props}); -}); - -export default TileJSON; +export default function TileJSON(props) { + return createElement('source', {cls: OLTileJSON, ...props}); +} diff --git a/lib/source/TileWMS.js b/lib/source/TileWMS.js index e10eea11..9cd6fdfa 100644 --- a/lib/source/TileWMS.js +++ b/lib/source/TileWMS.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLTileWMS from 'ol/source/TileWMS.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const TileWMS = forwardRef((props, ref) => { - return createElement('source', {cls: OLTileWMS, ref, ...props}); -}); - -export default TileWMS; +export default function TileWMS(props) { + return createElement('source', {cls: OLTileWMS, ...props}); +} diff --git a/lib/source/UTFGrid.js b/lib/source/UTFGrid.js index e0f670b0..b5ea2413 100644 --- a/lib/source/UTFGrid.js +++ b/lib/source/UTFGrid.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLUTFGrid from 'ol/source/UTFGrid.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const UTFGrid = forwardRef((props, ref) => { - return createElement('source', {cls: OLUTFGrid, ref, ...props}); -}); - -export default UTFGrid; +export default function UTFGrid(props) { + return createElement('source', {cls: OLUTFGrid, ...props}); +} diff --git a/lib/source/UrlTile.js b/lib/source/UrlTile.js index bc3d7d17..26afee2e 100644 --- a/lib/source/UrlTile.js +++ b/lib/source/UrlTile.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLUrlTile from 'ol/source/UrlTile.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const UrlTile = forwardRef((props, ref) => { - return createElement('source', {cls: OLUrlTile, ref, ...props}); -}); - -export default UrlTile; +export default function UrlTile(props) { + return createElement('source', {cls: OLUrlTile, ...props}); +} diff --git a/lib/source/Vector.js b/lib/source/Vector.js index 41d1f212..d38c9c9c 100644 --- a/lib/source/Vector.js +++ b/lib/source/Vector.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLVector from 'ol/source/Vector.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Vector = forwardRef((props, ref) => { - return createElement('source', {cls: OLVector, ref, ...props}); -}); - -export default Vector; +export default function Vector(props) { + return createElement('source', {cls: OLVector, ...props}); +} diff --git a/lib/source/VectorTile.js b/lib/source/VectorTile.js index 468f6c3e..6ba7a33c 100644 --- a/lib/source/VectorTile.js +++ b/lib/source/VectorTile.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLVectorTile from 'ol/source/VectorTile.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const VectorTile = forwardRef((props, ref) => { - return createElement('source', {cls: OLVectorTile, ref, ...props}); -}); - -export default VectorTile; +export default function VectorTile(props) { + return createElement('source', {cls: OLVectorTile, ...props}); +} diff --git a/lib/source/WMTS.js b/lib/source/WMTS.js index 6eff98db..09029616 100644 --- a/lib/source/WMTS.js +++ b/lib/source/WMTS.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLWMTS from 'ol/source/WMTS.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const WMTS = forwardRef((props, ref) => { - return createElement('source', {cls: OLWMTS, ref, ...props}); -}); - -export default WMTS; +export default function WMTS(props) { + return createElement('source', {cls: OLWMTS, ...props}); +} diff --git a/lib/source/XYZ.js b/lib/source/XYZ.js index a2acf029..cb66cfb5 100644 --- a/lib/source/XYZ.js +++ b/lib/source/XYZ.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLXYZ from 'ol/source/XYZ.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const XYZ = forwardRef((props, ref) => { - return createElement('source', {cls: OLXYZ, ref, ...props}); -}); - -export default XYZ; +export default function XYZ(props) { + return createElement('source', {cls: OLXYZ, ...props}); +} diff --git a/lib/source/Zoomify.js b/lib/source/Zoomify.js index 7d49c20e..3d5b3e86 100644 --- a/lib/source/Zoomify.js +++ b/lib/source/Zoomify.js @@ -15,10 +15,8 @@ * limitations under the License. */ import OLZoomify from 'ol/source/Zoomify.js'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; -const Zoomify = forwardRef((props, ref) => { - return createElement('source', {cls: OLZoomify, ref, ...props}); -}); - -export default Zoomify; +export default function Zoomify(props) { + return createElement('source', {cls: OLZoomify, ...props}); +} diff --git a/package-lock.json b/package-lock.json index 88fe8f6f..db02e933 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,7 +48,7 @@ "peerDependencies": { "ol": "*", "ol-mapbox-style": "*", - "react": "*" + "react": ">=19" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -809,6 +809,23 @@ "node": ">=12" } }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz", + "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/netbsd-x64": { "version": "0.21.5", "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", @@ -826,9 +843,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz", - "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz", + "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==", "cpu": [ "arm64" ], @@ -1467,10 +1484,11 @@ } }, "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -1987,14 +2005,16 @@ } }, "node_modules/@octokit/rest/node_modules/@octokit/request": { - "version": "9.1.3", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.3.tgz", - "integrity": "sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==", + "version": "9.1.4", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.4.tgz", + "integrity": "sha512-tMbOwGm6wDII6vygP3wUVqFTw3Aoo0FnVQyhihh8vVq12uO3P+vQZeo2CKMpWtPSogpACD0yyZAlVlQnjW71DA==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/endpoint": "^10.0.0", "@octokit/request-error": "^6.0.1", - "@octokit/types": "^13.1.0", + "@octokit/types": "^13.6.2", + "fast-content-type-parse": "^2.0.0", "universal-user-agent": "^7.0.2" }, "engines": { @@ -2002,12 +2022,13 @@ } }, "node_modules/@octokit/rest/node_modules/@octokit/request-error": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.4.tgz", - "integrity": "sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==", + "version": "6.1.6", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.6.tgz", + "integrity": "sha512-pqnVKYo/at0NuOjinrgcQYpEbv4snvP3bKMRqHaD9kIsk9u1LCpb2smHZi8/qJfgeNqLo5hNW4Z7FezNdEo0xg==", "dev": true, + "license": "MIT", "dependencies": { - "@octokit/types": "^13.0.0" + "@octokit/types": "^13.6.2" }, "engines": { "node": ">= 18" @@ -2026,10 +2047,11 @@ "dev": true }, "node_modules/@octokit/types": { - "version": "13.5.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", - "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", + "version": "13.6.2", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.6.2.tgz", + "integrity": "sha512-WpbZfZUcZU77DrSW4wbsSgTPfKcp286q3ItaIgvSbBpZJlu6mnYXAkjZz6LVZPXkEvLIM8McanyZejKTYUHipA==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/openapi-types": "^22.2.0" } @@ -2750,10 +2772,11 @@ "license": "MIT" }, "node_modules/@types/unist": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz", - "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==", - "dev": true + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz", + "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==", + "dev": true, + "license": "MIT" }, "node_modules/@typescript-eslint/scope-manager": { "version": "7.9.0", @@ -3553,10 +3576,11 @@ } }, "node_modules/astro-eslint-parser/node_modules/eslint-scope": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", - "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz", + "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -3569,10 +3593,11 @@ } }, "node_modules/astro-eslint-parser/node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -3581,14 +3606,15 @@ } }, "node_modules/astro-eslint-parser/node_modules/espree": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", - "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.12.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.0.0" + "eslint-visitor-keys": "^4.2.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4511,10 +4537,11 @@ } }, "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.3" }, @@ -5215,10 +5242,11 @@ } }, "node_modules/eslint-plugin-astro/node_modules/globals": { - "version": "15.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.8.0.tgz", - "integrity": "sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw==", + "version": "15.14.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz", + "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -5635,10 +5663,11 @@ } }, "node_modules/estree-util-visit/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/estree-walker": { "version": "3.0.3", @@ -5678,6 +5707,13 @@ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "dev": true }, + "node_modules/fast-content-type-parse": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.0.tgz", + "integrity": "sha512-fCqg/6Sps8tqk8p+kqyKqYfOF0VjPNYrqpLiqNl0RBKmD80B080AJWVV6EkSkscjToNExcXg1+Mfzftrx6+iSA==", + "dev": true, + "license": "MIT" + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -6400,10 +6436,11 @@ } }, "node_modules/hast-util-to-html/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/hast-util-to-jsx-runtime": { "version": "2.3.2", @@ -6744,12 +6781,16 @@ } }, "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, + "license": "MIT", "dependencies": { - "hasown": "^2.0.0" + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8132,16 +8173,18 @@ } }, "node_modules/mdast-util-mdx-expression/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/mdast-util-mdx-expression/node_modules/mdast-util-from-markdown": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.1.tgz", - "integrity": "sha512-aJEUyzZ6TzlsX2s5B4Of7lN7EQtAxvtradMMglCQDyaTFgse6CmtmdJ15ElnVRlCg1vpNyVtbem0PWzlNieZsA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz", + "integrity": "sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", @@ -8175,9 +8218,9 @@ } }, "node_modules/mdast-util-mdx-expression/node_modules/micromark": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.0.tgz", - "integrity": "sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.1.tgz", + "integrity": "sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==", "dev": true, "funding": [ { @@ -8189,6 +8232,7 @@ "url": "https://opencollective.com/unified" } ], + "license": "MIT", "dependencies": { "@types/debug": "^4.0.0", "debug": "^4.0.0", @@ -8244,10 +8288,11 @@ } }, "node_modules/mdast-util-mdx-jsx/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/mdast-util-mdx-jsx/node_modules/character-entities-legacy": { "version": "3.0.0", @@ -8314,10 +8359,11 @@ } }, "node_modules/mdast-util-mdx-jsx/node_modules/mdast-util-from-markdown": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.1.tgz", - "integrity": "sha512-aJEUyzZ6TzlsX2s5B4Of7lN7EQtAxvtradMMglCQDyaTFgse6CmtmdJ15ElnVRlCg1vpNyVtbem0PWzlNieZsA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz", + "integrity": "sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", @@ -8351,9 +8397,9 @@ } }, "node_modules/mdast-util-mdx-jsx/node_modules/micromark": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.0.tgz", - "integrity": "sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.1.tgz", + "integrity": "sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==", "dev": true, "funding": [ { @@ -8365,6 +8411,7 @@ "url": "https://opencollective.com/unified" } ], + "license": "MIT", "dependencies": { "@types/debug": "^4.0.0", "debug": "^4.0.0", @@ -8386,13 +8433,13 @@ } }, "node_modules/mdast-util-mdx-jsx/node_modules/parse-entities": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.1.tgz", - "integrity": "sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-4.0.2.tgz", + "integrity": "sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw==", "dev": true, + "license": "MIT", "dependencies": { "@types/unist": "^2.0.0", - "character-entities": "^2.0.0", "character-entities-legacy": "^3.0.0", "character-reference-invalid": "^2.0.0", "decode-named-character-reference": "^1.0.0", @@ -8406,10 +8453,11 @@ } }, "node_modules/mdast-util-mdx-jsx/node_modules/parse-entities/node_modules/@types/unist": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz", - "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==", - "dev": true + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.11.tgz", + "integrity": "sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==", + "dev": true, + "license": "MIT" }, "node_modules/mdast-util-mdx/node_modules/@types/mdast": { "version": "4.0.4", @@ -8421,16 +8469,18 @@ } }, "node_modules/mdast-util-mdx/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/mdast-util-mdx/node_modules/mdast-util-from-markdown": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.1.tgz", - "integrity": "sha512-aJEUyzZ6TzlsX2s5B4Of7lN7EQtAxvtradMMglCQDyaTFgse6CmtmdJ15ElnVRlCg1vpNyVtbem0PWzlNieZsA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz", + "integrity": "sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", @@ -8464,9 +8514,9 @@ } }, "node_modules/mdast-util-mdx/node_modules/micromark": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.0.tgz", - "integrity": "sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.1.tgz", + "integrity": "sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==", "dev": true, "funding": [ { @@ -8478,6 +8528,7 @@ "url": "https://opencollective.com/unified" } ], + "license": "MIT", "dependencies": { "@types/debug": "^4.0.0", "debug": "^4.0.0", @@ -8526,16 +8577,18 @@ } }, "node_modules/mdast-util-mdxjs-esm/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/mdast-util-mdxjs-esm/node_modules/mdast-util-from-markdown": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.1.tgz", - "integrity": "sha512-aJEUyzZ6TzlsX2s5B4Of7lN7EQtAxvtradMMglCQDyaTFgse6CmtmdJ15ElnVRlCg1vpNyVtbem0PWzlNieZsA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz", + "integrity": "sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", @@ -8569,9 +8622,9 @@ } }, "node_modules/mdast-util-mdxjs-esm/node_modules/micromark": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.0.tgz", - "integrity": "sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.1.tgz", + "integrity": "sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==", "dev": true, "funding": [ { @@ -8583,6 +8636,7 @@ "url": "https://opencollective.com/unified" } ], + "license": "MIT", "dependencies": { "@types/debug": "^4.0.0", "debug": "^4.0.0", @@ -8685,10 +8739,11 @@ } }, "node_modules/mdast-util-to-markdown/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/mdast-util-to-markdown/node_modules/mdast-util-to-string": { "version": "4.0.0", @@ -9296,10 +9351,11 @@ } }, "node_modules/micromark-util-events-to-acorn/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/micromark-util-html-tag-name": { "version": "2.0.0", @@ -9554,9 +9610,9 @@ } }, "node_modules/msw/node_modules/type-fest": { - "version": "4.30.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.30.0.tgz", - "integrity": "sha512-G6zXWS1dLj6eagy6sVhOMQiLtJdxQBHIA9Z6HFUNLOlr6MFOgzV8wvmidtPONfPtEUv0uZsy77XJNzTAfwPDaA==", + "version": "4.31.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.31.0.tgz", + "integrity": "sha512-yCxltHW07Nkhv/1F6wWBr8kz+5BGMfP+RbRSYFnegVb0qV/UMT0G0ElBloPVerqn4M2ZV80Ir1FtCcYv1cT6vQ==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -10922,16 +10978,18 @@ } }, "node_modules/remark-parse/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/remark-parse/node_modules/mdast-util-from-markdown": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.1.tgz", - "integrity": "sha512-aJEUyzZ6TzlsX2s5B4Of7lN7EQtAxvtradMMglCQDyaTFgse6CmtmdJ15ElnVRlCg1vpNyVtbem0PWzlNieZsA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.2.tgz", + "integrity": "sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==", "dev": true, + "license": "MIT", "dependencies": { "@types/mdast": "^4.0.0", "@types/unist": "^3.0.0", @@ -10965,9 +11023,9 @@ } }, "node_modules/remark-parse/node_modules/micromark": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.0.tgz", - "integrity": "sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.1.tgz", + "integrity": "sha512-eBPdkcoCNvYcxQOAKAlceo5SNdzZWfF+FcSupREAzdAh9rRmE239CEQAiTwIgblwnoM8zzj35sZ5ZwvSEOF6Kw==", "dev": true, "funding": [ { @@ -10979,6 +11037,7 @@ "url": "https://opencollective.com/unified" } ], + "license": "MIT", "dependencies": { "@types/debug": "^4.0.0", "debug": "^4.0.0", @@ -11082,18 +11141,22 @@ "license": "MIT" }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, + "license": "MIT", "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -11871,10 +11934,11 @@ } }, "node_modules/synckit": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz", - "integrity": "sha512-7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.9.2.tgz", + "integrity": "sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==", "dev": true, + "license": "MIT", "dependencies": { "@pkgr/core": "^0.1.0", "tslib": "^2.6.2" @@ -12267,10 +12331,11 @@ } }, "node_modules/unified-engine/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unified-engine/node_modules/brace-expansion": { "version": "2.0.1", @@ -12317,10 +12382,11 @@ } }, "node_modules/unified/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unist-util-find-after": { "version": "5.0.0", @@ -12356,10 +12422,11 @@ } }, "node_modules/unist-util-inspect/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unist-util-is": { "version": "6.0.0", @@ -12375,10 +12442,11 @@ } }, "node_modules/unist-util-is/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unist-util-modify-children": { "version": "4.0.0", @@ -12427,16 +12495,18 @@ } }, "node_modules/unist-util-position-from-estree/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unist-util-position/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unist-util-remove-position": { "version": "5.0.0", @@ -12453,10 +12523,11 @@ } }, "node_modules/unist-util-remove-position/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unist-util-stringify-position": { "version": "4.0.0", @@ -12472,10 +12543,11 @@ } }, "node_modules/unist-util-stringify-position/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unist-util-visit": { "version": "5.0.0", @@ -12526,16 +12598,18 @@ } }, "node_modules/unist-util-visit-parents/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/unist-util-visit/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/universal-user-agent": { "version": "6.0.1", @@ -12675,10 +12749,11 @@ } }, "node_modules/vfile-message/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/vfile-reporter": { "version": "8.1.0", @@ -12701,10 +12776,11 @@ } }, "node_modules/vfile-reporter/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -12713,10 +12789,11 @@ } }, "node_modules/vfile-reporter/node_modules/emoji-regex": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", - "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", - "dev": true + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz", + "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", + "dev": true, + "license": "MIT" }, "node_modules/vfile-reporter/node_modules/string-width": { "version": "6.1.0", @@ -12791,18 +12868,20 @@ } }, "node_modules/vfile/node_modules/@types/unist": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz", - "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==", - "dev": true + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", + "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", + "dev": true, + "license": "MIT" }, "node_modules/vite": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.5.tgz", - "integrity": "sha512-akD5IAH/ID5imgue2DYhzsEwCi0/4VKY31uhMLEYJwPP4TiUp8pL5PIK+Wo7H8qT8JY9i+pVfPydcFPYD1EL7g==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.6.tgz", + "integrity": "sha512-NSjmUuckPmDU18bHz7QZ+bTYhRR0iA72cs2QAxCqDpafJ0S6qetco0LB3WW2OxlMHS0JmAv+yZ/R3uPmMyGTjQ==", "dev": true, + "license": "MIT", "dependencies": { - "esbuild": "0.24.0", + "esbuild": "^0.24.2", "postcss": "^8.4.49", "rollup": "^4.23.0" }, @@ -12966,9 +13045,9 @@ } }, "node_modules/vite/node_modules/@esbuild/aix-ppc64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz", - "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz", + "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==", "cpu": [ "ppc64" ], @@ -12983,9 +13062,9 @@ } }, "node_modules/vite/node_modules/@esbuild/android-arm": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz", - "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz", + "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==", "cpu": [ "arm" ], @@ -13000,9 +13079,9 @@ } }, "node_modules/vite/node_modules/@esbuild/android-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz", - "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz", + "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==", "cpu": [ "arm64" ], @@ -13017,9 +13096,9 @@ } }, "node_modules/vite/node_modules/@esbuild/android-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz", - "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz", + "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==", "cpu": [ "x64" ], @@ -13034,9 +13113,9 @@ } }, "node_modules/vite/node_modules/@esbuild/darwin-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz", - "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz", + "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==", "cpu": [ "arm64" ], @@ -13051,9 +13130,9 @@ } }, "node_modules/vite/node_modules/@esbuild/darwin-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz", - "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz", + "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==", "cpu": [ "x64" ], @@ -13068,9 +13147,9 @@ } }, "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz", - "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz", + "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==", "cpu": [ "arm64" ], @@ -13085,9 +13164,9 @@ } }, "node_modules/vite/node_modules/@esbuild/freebsd-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz", - "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz", + "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==", "cpu": [ "x64" ], @@ -13102,9 +13181,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-arm": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz", - "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz", + "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==", "cpu": [ "arm" ], @@ -13119,9 +13198,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz", - "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz", + "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==", "cpu": [ "arm64" ], @@ -13136,9 +13215,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-ia32": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz", - "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz", + "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==", "cpu": [ "ia32" ], @@ -13153,9 +13232,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-loong64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz", - "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz", + "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==", "cpu": [ "loong64" ], @@ -13170,9 +13249,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-mips64el": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz", - "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz", + "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==", "cpu": [ "mips64el" ], @@ -13187,9 +13266,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-ppc64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz", - "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz", + "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==", "cpu": [ "ppc64" ], @@ -13204,9 +13283,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-riscv64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz", - "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz", + "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==", "cpu": [ "riscv64" ], @@ -13221,9 +13300,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-s390x": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz", - "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz", + "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==", "cpu": [ "s390x" ], @@ -13238,9 +13317,9 @@ } }, "node_modules/vite/node_modules/@esbuild/linux-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz", - "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz", + "integrity": "sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==", "cpu": [ "x64" ], @@ -13255,9 +13334,9 @@ } }, "node_modules/vite/node_modules/@esbuild/netbsd-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz", - "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz", + "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==", "cpu": [ "x64" ], @@ -13272,9 +13351,9 @@ } }, "node_modules/vite/node_modules/@esbuild/openbsd-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz", - "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz", + "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==", "cpu": [ "x64" ], @@ -13289,9 +13368,9 @@ } }, "node_modules/vite/node_modules/@esbuild/sunos-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz", - "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz", + "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==", "cpu": [ "x64" ], @@ -13306,9 +13385,9 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-arm64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz", - "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz", + "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==", "cpu": [ "arm64" ], @@ -13323,9 +13402,9 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-ia32": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz", - "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz", + "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==", "cpu": [ "ia32" ], @@ -13340,9 +13419,9 @@ } }, "node_modules/vite/node_modules/@esbuild/win32-x64": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz", - "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz", + "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==", "cpu": [ "x64" ], @@ -13357,9 +13436,9 @@ } }, "node_modules/vite/node_modules/esbuild": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz", - "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==", + "version": "0.24.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.2.tgz", + "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -13370,30 +13449,31 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.24.0", - "@esbuild/android-arm": "0.24.0", - "@esbuild/android-arm64": "0.24.0", - "@esbuild/android-x64": "0.24.0", - "@esbuild/darwin-arm64": "0.24.0", - "@esbuild/darwin-x64": "0.24.0", - "@esbuild/freebsd-arm64": "0.24.0", - "@esbuild/freebsd-x64": "0.24.0", - "@esbuild/linux-arm": "0.24.0", - "@esbuild/linux-arm64": "0.24.0", - "@esbuild/linux-ia32": "0.24.0", - "@esbuild/linux-loong64": "0.24.0", - "@esbuild/linux-mips64el": "0.24.0", - "@esbuild/linux-ppc64": "0.24.0", - "@esbuild/linux-riscv64": "0.24.0", - "@esbuild/linux-s390x": "0.24.0", - "@esbuild/linux-x64": "0.24.0", - "@esbuild/netbsd-x64": "0.24.0", - "@esbuild/openbsd-arm64": "0.24.0", - "@esbuild/openbsd-x64": "0.24.0", - "@esbuild/sunos-x64": "0.24.0", - "@esbuild/win32-arm64": "0.24.0", - "@esbuild/win32-ia32": "0.24.0", - "@esbuild/win32-x64": "0.24.0" + "@esbuild/aix-ppc64": "0.24.2", + "@esbuild/android-arm": "0.24.2", + "@esbuild/android-arm64": "0.24.2", + "@esbuild/android-x64": "0.24.2", + "@esbuild/darwin-arm64": "0.24.2", + "@esbuild/darwin-x64": "0.24.2", + "@esbuild/freebsd-arm64": "0.24.2", + "@esbuild/freebsd-x64": "0.24.2", + "@esbuild/linux-arm": "0.24.2", + "@esbuild/linux-arm64": "0.24.2", + "@esbuild/linux-ia32": "0.24.2", + "@esbuild/linux-loong64": "0.24.2", + "@esbuild/linux-mips64el": "0.24.2", + "@esbuild/linux-ppc64": "0.24.2", + "@esbuild/linux-riscv64": "0.24.2", + "@esbuild/linux-s390x": "0.24.2", + "@esbuild/linux-x64": "0.24.2", + "@esbuild/netbsd-arm64": "0.24.2", + "@esbuild/netbsd-x64": "0.24.2", + "@esbuild/openbsd-arm64": "0.24.2", + "@esbuild/openbsd-x64": "0.24.2", + "@esbuild/sunos-x64": "0.24.2", + "@esbuild/win32-arm64": "0.24.2", + "@esbuild/win32-ia32": "0.24.2", + "@esbuild/win32-x64": "0.24.2" } }, "node_modules/vite/node_modules/fsevents": { @@ -13845,10 +13925,11 @@ } }, "node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", + "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, diff --git a/package.json b/package.json index 42c4e10e..5f70a76e 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "peerDependencies": { "ol": "*", "ol-mapbox-style": "*", - "react": "*" + "react": ">=19" }, "devDependencies": { "@astrojs/mdx": "^4.0.3", @@ -100,13 +100,25 @@ }, { "files": [ - "*.jsx" + "*.jsx", "*.js" ], "extends": [ "planet/react" ], "rules": { - "import/named": "off" + "import/named": "off", + "import/default": "off", + "import/no-unresolved": [ + "error", + { + "ignore": [ + "astro:content", + "astro/config", + "@astrojs/*", + "@octokit/rest" + ] + } + ] } }, { diff --git a/templates/control.js.mustache b/templates/control.js.mustache index fb064333..754a8527 100644 --- a/templates/control.js.mustache +++ b/templates/control.js.mustache @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {{importName}} from '{{importPath}}'; -import {createElement, forwardRef} from 'react'; +import {{importSpecifier}} from '{{importPath}}'; +import {createElement} from 'react'; -const {{constructorName}} = forwardRef((props, ref) => { - return createElement('{{elementType}}', {cls: {{importName}}, ref, ...props}); -}); - -export default {{constructorName}}; +export default function {{constructorName}}(props) { + return createElement('{{elementType}}', {cls: {{importName}}, ...props}); +} diff --git a/templates/interaction.js.mustache b/templates/interaction.js.mustache index fb064333..754a8527 100644 --- a/templates/interaction.js.mustache +++ b/templates/interaction.js.mustache @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {{importName}} from '{{importPath}}'; -import {createElement, forwardRef} from 'react'; +import {{importSpecifier}} from '{{importPath}}'; +import {createElement} from 'react'; -const {{constructorName}} = forwardRef((props, ref) => { - return createElement('{{elementType}}', {cls: {{importName}}, ref, ...props}); -}); - -export default {{constructorName}}; +export default function {{constructorName}}(props) { + return createElement('{{elementType}}', {cls: {{importName}}, ...props}); +} diff --git a/templates/layer.js.mustache b/templates/layer.js.mustache index 098bb285..4aad9e63 100644 --- a/templates/layer.js.mustache +++ b/templates/layer.js.mustache @@ -14,15 +14,13 @@ * limitations under the License. */ import {{importSpecifier}} from '{{importPath}}'; -import {createElement, forwardRef} from 'react'; +import {createElement} from 'react'; import propTypes from 'prop-types'; -const {{constructorName}} = forwardRef(({children, ...props}, ref) => { - return createElement('{{elementType}}', {cls: {{importName}}, ref, ...props}, children); -}); +export default function {{constructorName}}({children, ...props}) { + return createElement('{{elementType}}', {cls: {{importName}}, ...props}, children); +} {{constructorName}}.propTypes = { children: propTypes.node, }; - -export default {{constructorName}}; diff --git a/templates/source.js.mustache b/templates/source.js.mustache index fb064333..754a8527 100644 --- a/templates/source.js.mustache +++ b/templates/source.js.mustache @@ -13,11 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {{importName}} from '{{importPath}}'; -import {createElement, forwardRef} from 'react'; +import {{importSpecifier}} from '{{importPath}}'; +import {createElement} from 'react'; -const {{constructorName}} = forwardRef((props, ref) => { - return createElement('{{elementType}}', {cls: {{importName}}, ref, ...props}); -}); - -export default {{constructorName}}; +export default function {{constructorName}}(props) { + return createElement('{{elementType}}', {cls: {{importName}}, ...props}); +}