Skip to content

Commit b0c3b86

Browse files
committed
Leaflet v2 alpha.1 and pnpm catalog
1 parent 9d07d31 commit b0c3b86

File tree

13 files changed

+706
-560
lines changed

13 files changed

+706
-560
lines changed

example/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
"start": "vite"
88
},
99
"dependencies": {
10-
"react": "^19.1.1",
11-
"react-dom": "^19.1.1",
10+
"react": "catalog:",
11+
"react-dom": "catalog:",
1212
"react-leaflet": "workspace:^"
1313
},
1414
"devDependencies": {
15-
"@types/react": "^19.1.9",
16-
"@types/react-dom": "^19.1.7",
17-
"@vitejs/plugin-react": "^4.7.0",
18-
"typescript": "^5.9.2",
19-
"vite": "^7.0.6"
15+
"@types/react": "catalog:",
16+
"@types/react-dom": "catalog:",
17+
"@vitejs/plugin-react": "^5.0.0",
18+
"typescript": "catalog:",
19+
"vite": "^7.1.2"
2020
}
2121
}

package.json

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,37 @@
44
"private": true,
55
"type": "module",
66
"packageManager": "[email protected]",
7+
"devEngines": {
8+
"runtime": {
9+
"name": "node",
10+
"version": "~24.5.0",
11+
"onFail": "download"
12+
}
13+
},
714
"scripts": {
815
"lint": "biome check --write ./example ./packages",
916
"lint:ci": "biome ci ./example ./packages",
1017
"test": "pnpm run -r test:unit",
1118
"build": "turbo run build:clean && pnpm run -r build:types && turbo run build:js"
1219
},
1320
"devDependencies": {
14-
"@biomejs/biome": "^2.1.3",
21+
"@biomejs/biome": "^2.2.0",
1522
"@skypack/package-check": "^0.2.2",
1623
"@swc/cli": "^0.7.8",
1724
"@swc/core": "^1.13.3",
1825
"@swc/jest": "^0.2.39",
19-
"@testing-library/react": "^16.1.0",
26+
"@testing-library/react": "^16.3.0",
2027
"@types/jest": "^30.0.0",
21-
"@types/leaflet": "^1.9.20",
22-
"@types/warning": "^3.0.0",
28+
"@types/leaflet": "catalog:",
29+
"@types/warning": "^3.0.3",
2330
"del-cli": "^6.0.0",
2431
"jest": "^30.0.5",
2532
"jest-environment-jsdom": "^30.0.5",
26-
"leaflet": "^1.9.3",
27-
"react": "^19.1.1",
28-
"react-dom": "^19.1.1",
29-
"turbo": "^2.5.5",
30-
"typescript": "^5.9.2"
33+
"leaflet": "catalog:",
34+
"react": "catalog:",
35+
"react-dom": "catalog:",
36+
"turbo": "^2.5.6",
37+
"typescript": "catalog:"
3138
},
3239
"jest": {
3340
"projects": [

packages/core/__tests__/events.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ describe('events', () => {
1313
}
1414
renderHook(() => useEventHandlers({ instance: layer }, handlers))
1515

16-
layer.fireEvent('click')
17-
layer.fireEvent('click')
18-
layer.fireEvent('dblclick')
16+
layer.fire('click')
17+
layer.fire('click')
18+
layer.fire('dblclick')
1919

2020
expect(handlers.click).toHaveBeenCalledTimes(2)
2121
expect(handlers.dblclick).toHaveBeenCalledTimes(1)
@@ -37,12 +37,12 @@ describe('events', () => {
3737
},
3838
},
3939
)
40-
layer.fireEvent('click')
41-
layer.fireEvent('dblclick')
40+
layer.fire('click')
41+
layer.fire('dblclick')
4242

4343
rerender({ handlers: { click: clickHandler, dblclick: dblclickHandler2 } })
44-
layer.fireEvent('click')
45-
layer.fireEvent('dblclick')
44+
layer.fire('click')
45+
layer.fire('dblclick')
4646

4747
expect(clickHandler).toHaveBeenCalledTimes(2)
4848
expect(dblclickHandler1).toHaveBeenCalledTimes(1)

packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
"prepublishOnly": "package-check"
4242
},
4343
"peerDependencies": {
44-
"leaflet": "^2.0.0-alpha",
44+
"leaflet": "catalog:",
4545
"react": "^19.0.0",
4646
"react-dom": "^19.0.0"
4747
},
4848
"devDependencies": {
49-
"@types/react": "^19.1.9",
50-
"@types/react-dom": "^19.1.7"
49+
"@types/react": "catalog:",
50+
"@types/react-dom": "catalog:"
5151
},
5252
"jest": {
5353
"extensionsToTreatAsEsm": [

packages/core/src/component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export function createDivOverlayComponent<
5555
[instance, isOpen, props.children],
5656
)
5757

58-
// @ts-ignore _contentNode missing in type definition
58+
// @ts-expect-error _contentNode missing in type definition
5959
const contentNode = instance._contentNode
6060
return contentNode ? createPortal(props.children, contentNode) : null
6161
}

packages/core/src/media-overlay.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export function updateMediaOverlay<
2929
overlay.setOpacity(props.opacity)
3030
}
3131
if (props.zIndex != null && props.zIndex !== prevProps.zIndex) {
32-
// @ts-ignore missing in definition but inherited from ImageOverlay
3332
overlay.setZIndex(props.zIndex)
3433
}
3534
}

packages/react-leaflet/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545
"@react-leaflet/core": "workspace:^"
4646
},
4747
"peerDependencies": {
48-
"leaflet": "^2.0.0-alpha",
48+
"leaflet": "catalog:",
4949
"react": "^19.0.0",
5050
"react-dom": "^19.0.0"
5151
},
5252
"devDependencies": {
5353
"@react-leaflet/test-environment": "workspace:*",
5454
"@types/geojson": "^7946.0.15",
55-
"@types/leaflet": "^1.9.20",
56-
"@types/react": "^19.1.9",
57-
"@types/react-dom": "^19.1.7"
55+
"@types/leaflet": "catalog:",
56+
"@types/react": "catalog:",
57+
"@types/react-dom": "catalog:"
5858
},
5959
"jest": {
6060
"extensionsToTreatAsEsm": [

packages/react-leaflet/src/LayersControl.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export interface ControlledLayerProps {
5454
name: string
5555
}
5656

57-
// @ts-ignore
57+
// @ts-expect-error
5858
export const LayersControl: ForwardRefExoticComponent<
5959
LayersControlProps & RefAttributes<Control.Layers>
6060
> & {

packages/react-leaflet/src/Pane.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function createPane(
6666
}
6767
if (props.style != null) {
6868
for (const key of Object.keys(props.style)) {
69-
// @ts-ignore
69+
// @ts-expect-error
7070
element.style[key] = props.style[key]
7171
}
7272
}
@@ -92,13 +92,13 @@ function PaneComponent(props: PaneProps, forwardedRef: Ref<PaneRef>) {
9292
const pane = context.map.getPane(paneName)
9393
pane?.remove?.()
9494

95-
// @ts-ignore map internals
95+
// @ts-expect-error map internals
9696
if (context.map._panes != null) {
97-
// @ts-ignore map internals
97+
// @ts-expect-error map internals
9898
context.map._panes = omitPane(context.map._panes, paneName)
99-
// @ts-ignore map internals
99+
// @ts-expect-error map internals
100100
context.map._paneRenderers = omitPane(
101-
// @ts-ignore map internals
101+
// @ts-expect-error map internals
102102
context.map._paneRenderers,
103103
paneName,
104104
)

packages/react-leaflet/src/Tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export const Tooltip = createOverlayComponent<LeafletTooltip, TooltipProps>(
6767
tooltipopen: onTooltipOpen,
6868
tooltipclose: onTooltipClose,
6969
})
70-
// @ts-ignore protected property
70+
// @ts-expect-error protected property
7171
if (container._map != null) {
7272
container.unbindTooltip()
7373
}

0 commit comments

Comments
 (0)