Skip to content

support ember-render-helpers v1 #700

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.

Sign up for GitHub

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

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

support ember-render-helpers v1 #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a6aa889
support ember-render-helpers v1
jelhan Dec 3, 2024
125a6cf
drop support for node < 18
jelhan Dec 3, 2024
53074e7
use compatible versions in ember try scenarios
jelhan Dec 3, 2024
0f0b469
ember-leaflet-marker-cluster supports old Leaflet version only until …
jelhan Dec 3, 2024
99024bd
use compatible ember-resolver version
jelhan Dec 3, 2024
36e1b9b
fix formatting issue
jelhan Dec 3, 2024
e42fc71
ember-compatibility-tools v2 required for Ember v6
jelhan Dec 3, 2024
77a15cd
ember-resolver v9 required for ember-lts v4.4 scenario
jelhan Dec 3, 2024
711f198
downgrade ember-resolver to 8.1.0
jelhan Dec 3, 2024
0909ada
skip beta and canary scenarios
jelhan Dec 3, 2024
c76ab3a
add Ember 4.12 and 5.12 scenarios in CI
jelhan Dec 3, 2024
94891c3
disable tests for Embroider and latest relase for now
jelhan Dec 3, 2024
7e8daac
Merge branch 'drop-node-less-than-18' into support-ember-render-helpe…
jelhan Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request: {}

env:
NODE_VERSION: 14
NODE_VERSION: 18

concurrency:
group: ci-${{ github.head_ref || github.ref }}
Expand Down Expand Up @@ -63,11 +63,13 @@ jobs:
- ember-lts-3.28-leaflet-0.7.7
- ember-lts-4.4
- ember-lts-4.8
- ember-release
- ember-beta
- ember-canary
- embroider-safe
- embroider-optimized
- ember-lts-4.12
- ember-lts-5.12
# - ember-release
# - ember-beta
# - ember-canary
# - embroider-safe
# - embroider-optimized

steps:
- uses: actions/checkout@v3
Expand Down
6 changes: 3 additions & 3 deletions addon/components/base-layer.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{{#each this.leafletDescriptorsProps as |prop|}}
{{#if (ember-leaflet-eq prop "location")}}
{{did-update (fn this.updateOption "location") this.location}}
{{did-update-helper (fn this.updateOption "location") this.location}}
{{else}}
{{did-update (fn this.updateOption prop) (get this.args prop)}}
{{did-update-helper (fn this.updateOption prop) (get this.args prop)}}
{{/if}}
{{/each}}

{{#each this.leafletStyleProperties as |prop|}}
{{did-update (fn this.updateStyleProperty prop) (get this.args prop)}}
{{did-update-helper (fn this.updateStyleProperty prop) (get this.args prop)}}
{{/each}}

<@node @didInsertParent={{this.didInsertParent}} @willDestroyParent={{this.willDestroyParent}} as |Node|>
Expand Down
4 changes: 2 additions & 2 deletions addon/components/div-overlay-layer.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{#if this.popupOpenDidChange}}
{{did-update this.popupOpenDidChange @popupOpen}}
{{did-update-helper this.popupOpenDidChange @popupOpen}}
{{/if}}

{{#each this.leafletDescriptorsProps as |prop|}}
{{did-update (fn this.updateOption prop) (get this.args prop)}}
{{did-update-helper (fn this.updateOption prop) (get this.args prop)}}
{{/each}}

<@node @didInsertParent={{this.didInsertParent}} @willDestroyParent={{this.willDestroyParent}}>
Expand Down
4 changes: 2 additions & 2 deletions addon/components/geojson-layer.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{#each this.leafletDescriptorsProps as |prop|}}
{{did-update (fn this.updateOption prop) (get this.args prop)}}
{{did-update-helper (fn this.updateOption prop) (get this.args prop)}}
{{/each}}

{{did-update this.didChangeGeojson @geoJSON}}
{{did-update-helper this.didChangeGeojson @geoJSON}}

<@node @didInsertParent={{this.didInsertParent}} @willDestroyParent={{this.willDestroyParent}} as |Node|>
{{#let (ember-leaflet-hash) as |components|}}
Expand Down
4 changes: 2 additions & 2 deletions addon/components/leaflet-map.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{#each this.leafletDescriptorsProps as |prop|}}
{{#if (ember-leaflet-eq prop "center")}}
{{did-update (fn this.updateOption "center") this.center}}
{{did-update-helper (fn this.updateOption "center") this.center}}
{{else}}
{{did-update (fn this.updateOption prop) (get this.args prop)}}
{{did-update-helper (fn this.updateOption prop) (get this.args prop)}}
{{/if}}
{{/each}}

Expand Down
Loading