Add support for JS modules (+module for URLs handling) #1463
Conversation
This file contains 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
almet
commented
Dec 13, 2023
almet
commented
Dec 13, 2023
umap/templates/umap/map_init.html
Outdated
| <script type="text/javascript"> | ||
| let MAP = new L.U.Map("map", {{ map_settings|notag|safe }}) | ||
| <script defer type="text/javascript"> | ||
| window.addEventListener('load', (event) => { |
There was a problem hiding this comment.
Had to add this, otherwise the objects wouldn't be exported to window.
There was a problem hiding this comment.
As far as I understand:
deferwill not work for local script (i.e. without asrcattribute)- module type scripts are executed in defer mode, which means after the DOM is ready
I guess this explain why you needed the load event here. Maybe we could use DomContentLoaded instead ?
One other option to consider (but not for this PR I'd say), is to have a dedicated script (/map/xxxx/load.js), which could then make it work in defer mode, and could be an elegant way for other people to include a uMap map in their HTML ?
There was a problem hiding this comment.
Interesting, defer is not useful here then. DomContentLoaded seems the way (if it works), and will allow us to run the script without having to wait for other resources to be ready (images, etc).
almet
commented
Dec 13, 2023
almet
force-pushed
the
almet/js/client-routing
branch
4 times, most recently
from
146f040
to
e124b3f
Compare
almet
commented
Dec 15, 2023
almet
force-pushed
the
almet/js/client-routing
branch
3 times, most recently
from
f65b49c
to
c782a69
Compare
almet
changed the title
|
Great work, thanks!
About loading Leaflet twice, I guess the only way to prevent this is to make a full switch, and loading only the esm version. So that would mean either:
Given the later is more gradual and we use a lot of plugins we do not control, I'd be in favor of the second option. Thoughts ? |
|
WIP of plugin status:
|
|
This are the |
|
And here is the full list, including those expected/set by the plugins: |
Properties set by pluginsLeaflet.MarkerCluster
Leaflet.Editable
Leaflet.FormBuilder
Leaflet.Hash
Leaflet.Heat
Leaflet.Measurable
leaflet.path.drag
Leaflet.Photon
Leaflet.Toolbar
uMap
Leaflet.i18n
Properties from LeafletSo, with my understanding, I'm expecting that exposing the global (Weird, it seems that this is the second comment that is created when I click on preview then write again…) |
|
It is not that simple: a |
umap/static/umap/js/modules/urls.js
Outdated
| @@ -0,0 +1,29 @@ | |||
| import { Util } from './vendors.js' | |||
There was a problem hiding this comment.
I'm not fan of this import, as we lose the origin of the Util variable in the process.
I'd suggest, either:
- loading
Util(and such) frompath/to/leaflet.esm.jseverywhere - exposing namespace in vendors, not variables; so one would type
import L from './vendorsand then useL.Util, just like in classic mode
There was a problem hiding this comment.
Yep, I like the second one better, and I agree 👍
almet
force-pushed
the
almet/js/client-routing
branch
from
c782a69
to
05bf798
Compare
Also expose some vendorized libs as modules in `modules/vendors.js`
almet
force-pushed
the
almet/js/client-routing
branch
from
05bf798
to
a516d59
Compare
almet
force-pushed
the
almet/js/client-routing
branch
from
a516d59
to
7c697f7
Compare
almet
force-pushed
the
almet/js/client-routing
branch
from
db29170
to
4b34a7d
Compare
yohanboniface
approved these changes
Jan 8, 2024
davidbgk
reviewed
Jan 8, 2024
vinyll
reviewed
Jan 8, 2024
Set a umap-fragment web component for lists
|
It seems we need to better escape the settings ( |
almet
changed the title
almet
changed the title
almet
changed the title
|
To me we're ready to introduce these changes! |
|
🎉 💣 🚀 |
|
Maybe we need a release with just that change 😅 😇 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a test for how we could use JS modules in uMap.
Because modules are not used everywhere, we need to bind the loaded modules to
windowfr now. Also, the mocha test runner needs to be run inside a server, to avoid CORS limitations for local file systems.I'm not really sure it's the direction we should take, but I hope it could bring good discussions :-)