Skip to content

Commit

Permalink
Fix build error re: glify.js include (publiclab#7157)
Browse files Browse the repository at this point in the history
* Change script path in map dependancies to match with LEL publiclab#6978

* change #1

* change #2

* update to original task

* Bump leaflet-environmental-layers from 2.0.6 to 2.1.7

Bumps [leaflet-environmental-layers](https://github.com/publiclab/leaflet-environmental-layers) from 2.0.6 to 2.1.7.
- [Release notes](https://github.com/publiclab/leaflet-environmental-layers/releases)
- [Commits](https://github.com/publiclab/leaflet-environmental-layers/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump leaflet-environmental-layers from 2.0.6 to 2.1.7

* Update dependency path

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Bear Kruz <16524769+bearkruz@users.noreply.github.com>
  • Loading branch information
3 people authored and Tlazypanda committed Jan 14, 2020
1 parent 531ab7a commit 33bcec4
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 19 deletions.
2 changes: 1 addition & 1 deletion app/views/layouts/_header.html.erb
Expand Up @@ -183,7 +183,7 @@

<%= render partial: "layouts/signupLoginModal" %>

<script type="text/javascript" src="/lib/leaflet-environmental-layers/example/lib/glify.js"></script>
<script type="text/javascript" src="/lib/leaflet-environmental-layers/lib/glify.js"></script>


<style>
Expand Down
4 changes: 2 additions & 2 deletions app/views/map/_mapDependencies.html.erb
Expand Up @@ -17,5 +17,5 @@
<%= javascript_include_tag('https://cdnjs.cloudflare.com/ajax/libs/OverlappingMarkerSpiderfier-Leaflet/0.2.6/oms.min.js') %>
<%= javascript_include_tag('/lib/leaflet-environmental-layers/example/lib/glify.js') %>

<%= javascript_include_tag('/lib/leaflet-environmental-layers/lib/glify.js') %>
<%= javascript_include_tag('/lib/leaflet-environmental-layers/lib/leaflet-fullUrlHash.js') %>
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -42,7 +42,7 @@
"junction": "theleagueof/junction#*",
"leaflet": "^1.6.0",
"leaflet-blurred-location": "^1.5.1",
"leaflet-environmental-layers": "^2.0.6",
"leaflet-environmental-layers": "^2.1.7",
"leaflet-hash": "^0.2.1",
"leaflet-spin": "1.1.0",
"leaflet.fullscreen": "1.6.0",
Expand Down
36 changes: 21 additions & 15 deletions yarn.lock
Expand Up @@ -454,16 +454,7 @@ blueimp-canvas-to-blob@>=2.0.5:
resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.17.0.tgz#d796e72aa1fd37f9471e0396e64d323956564a23"
integrity sha512-LcuVZZtKtE4yUrLb0IQA7ndMm19gooDTrzvjjkvmQ1MhkFlSzTw+8Ftp+/ckfGeP2UDQvDsPyy8mIT69itAqbg==

blueimp-file-upload@^9.28.0:
version "9.34.0"
resolved "https://registry.yarnpkg.com/blueimp-file-upload/-/blueimp-file-upload-9.34.0.tgz#1a57744f262f7c86d575ddb1b3d98f0bdd06feea"
integrity sha512-dXacFmyv6p0n+l5+u1ssYhSpCJdYabl7BZTw5WvB6ygY2ksTB3SdD6huafryEO5DH+XuspHDL6+IJ3m14Va+FQ==
optionalDependencies:
blueimp-canvas-to-blob "3.5.0"
blueimp-load-image "2.12.2"
blueimp-tmpl "3.6.0"

blueimp-file-upload@blueimp/jQuery-File-Upload#^9.22.1:
blueimp-file-upload@^9.28.0, blueimp-file-upload@blueimp/jQuery-File-Upload#^9.22.1:
version "9.34.0"
resolved "https://codeload.github.com/blueimp/jQuery-File-Upload/tar.gz/bb52d3493d725175fcf5554da034a317aaaea0e2"
optionalDependencies:
Expand Down Expand Up @@ -3531,6 +3522,15 @@ leaflet-blurred-location@^1.2.5, leaflet-blurred-location@^1.5.1:
jquery "^3.2.1"
leaflet "^1.3.3"

"leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location#main":
version "1.5.1"
uid "550b8ac78144b32e0e01a0dba242a09009f155c8"
resolved "git://github.com/publiclab/leaflet-blurred-location#550b8ac78144b32e0e01a0dba242a09009f155c8"
dependencies:
haversine-distance "^1.1.4"
jquery "^3.2.1"
leaflet "^1.3.3"

"leaflet-blurred-location@git://github.com/publiclab/leaflet-blurred-location.git#main":
version "1.5.1"
resolved "git://github.com/publiclab/leaflet-blurred-location.git#550b8ac78144b32e0e01a0dba242a09009f155c8"
Expand All @@ -3539,15 +3539,16 @@ leaflet-blurred-location@^1.2.5, leaflet-blurred-location@^1.5.1:
jquery "^3.2.1"
leaflet "^1.3.3"

leaflet-environmental-layers@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/leaflet-environmental-layers/-/leaflet-environmental-layers-2.0.6.tgz#51c96cc7f6927e9826c14fa6fa0614965676c1bc"
integrity sha512-grNaIVqyG/8X4QN5XhILs1ra+8Md0Pk2UezsaaCHDbl+9UsEvGJ96mSg50UgXRd2mbzTzUYB/5KXHlFHBPcvwg==
leaflet-environmental-layers@^2.1.7:
version "2.1.7"
resolved "https://registry.yarnpkg.com/leaflet-environmental-layers/-/leaflet-environmental-layers-2.1.7.tgz#3d866404929db76b34b68d87460a6f5584bebccc"
integrity sha512-/lNjVMVZQBAydTWnTScWpDIx/1iPBlYp3MKI9sSKnU973Zj72du4VG7BPdlYxC6aPkKa3pHhWYNmk72E69SCSw==
dependencies:
jquery "^3.3.1"
leaflet "^1.3.1"
leaflet-blurred-location "git://github.com/publiclab/leaflet-blurred-location#main"
leaflet-blurred-location "git://github.com/publiclab/leaflet-blurred-location.git#main"
leaflet-fullhash "github:sagarpreet-chadha/leaflet-fullHash"
leaflet-google-places-autocomplete "0.0.8"
leaflet-heatmap "1.0.0"
leaflet-providers "^1.1.17"
leaflet-spin "1.1.0"
Expand All @@ -3558,6 +3559,11 @@ leaflet-environmental-layers@^2.0.6:
version "1.0.0"
resolved "https://codeload.github.com/sagarpreet-chadha/leaflet-fullHash/tar.gz/6c547255ef7842281c6af3d6b879a2e994e1c54d"

leaflet-google-places-autocomplete@0.0.8:
version "0.0.8"
resolved "https://registry.yarnpkg.com/leaflet-google-places-autocomplete/-/leaflet-google-places-autocomplete-0.0.8.tgz#dbcf5d1833d011bef3f266bb4357b79e3bf81d70"
integrity sha1-289dGDPQEb7z8ma7Q1e3njv4HXA=

leaflet-hash@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/leaflet-hash/-/leaflet-hash-0.2.1.tgz#c36c718347c5243033b57cb4baea26119d82c701"
Expand Down

0 comments on commit 33bcec4

Please sign in to comment.