-
Notifications
You must be signed in to change notification settings - Fork 29
fix(geo-map): load the leaflet engine client-side only #156
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
2f0286c
fix(geo-map): load the leaflet engine client-side only
okisdev 6195ef3
chore: refresh registry artifacts
okisdev 5b5835a
fix(geo-map): keep leaflet out of the shared adapter and pin SSR safe…
okisdev c9e6c7b
chore: format the ssr regression test
okisdev 660ea3d
test: point the spatial suite mock at the leaflet adapter
okisdev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,14 @@ | ||
| /** | ||
| * Adapter: UI and utility re-exports for copy-standalone portability. | ||
| * | ||
| * This file must stay free of leaflet: the facade imports it, and leaflet | ||
| * reads `window` at module scope. Map primitives live in `_leaflet-adapter`, | ||
| * which only client-only modules may import. | ||
| * | ||
| * When copying this component to another project, update these imports | ||
| * to match your project's paths: | ||
| * | ||
| * cn → Your Tailwind merge utility (e.g., "@/lib/utils", "~/lib/cn") | ||
| * Leaflet → map primitives from react-leaflet | ||
| * cn → Your Tailwind merge utility (e.g., "@/lib/utils", "~/lib/cn") | ||
| */ | ||
|
|
||
| export { cn } from "@/lib/utils"; | ||
| export { | ||
| CircleMarker, | ||
| MapContainer, | ||
| Marker, | ||
| Polyline, | ||
| Popup, | ||
| TileLayer, | ||
| Tooltip, | ||
| ZoomControl, | ||
| useMap, | ||
| useMapEvents, | ||
| } from "react-leaflet"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /** | ||
| * Adapter: react-leaflet re-exports for copy-standalone portability. | ||
| * | ||
| * Leaflet reads `window` at module scope, so only modules that already live | ||
| * behind the client-only boundary (the engine and its overlays) may import | ||
| * from this file. The facade stays on `_adapter` and must never depend on it. | ||
| * | ||
| * When copying this component to another project, update these imports | ||
| * to match your project's paths: | ||
| * | ||
| * Leaflet → map primitives from react-leaflet | ||
| */ | ||
|
|
||
| export { | ||
| CircleMarker, | ||
| MapContainer, | ||
| Marker, | ||
| Polyline, | ||
| Popup, | ||
| TileLayer, | ||
| Tooltip, | ||
| ZoomControl, | ||
| useMap, | ||
| useMapEvents, | ||
| } from "react-leaflet"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import { describe, expect, it } from "vitest"; | ||
|
|
||
| describe("geo-map SSR safety", () => { | ||
| it("imports the facade without evaluating leaflet", async () => { | ||
| expect(globalThis.window).toBeUndefined(); | ||
| await expect( | ||
| import("@/components/tool-ui/geo-map"), | ||
| ).resolves.toHaveProperty("GeoMap"); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.