Update Leaflet plugins + Leaflet 1.0.3

This commit is contained in:
Norbert Renner 2017-02-11 20:50:53 +01:00
parent 743892bba4
commit ee91d055bc
2 changed files with 8 additions and 11 deletions

View file

@ -7,12 +7,12 @@
"bower_components" "bower_components"
], ],
"dependencies": { "dependencies": {
"leaflet": "^1.0.2", "leaflet": "^1.0.3",
"leaflet-plugins": "~2.0.0", "leaflet-plugins": "~3.0.0",
"leaflet-routing": "Turistforeningen/leaflet-routing#gh-pages", "leaflet-routing": "Turistforeningen/leaflet-routing#gh-pages",
"async": "~0.9.2", "async": "~0.9.2",
"d3": "~3.5.5", "d3": "~3.5.5",
"leaflet.draw": "~0.2.3", "leaflet.draw": "~0.4.9",
"bootstrap": "4.0.0-alpha.5", "bootstrap": "4.0.0-alpha.5",
"DataTables": "~1.10.5", "DataTables": "~1.10.5",
"leaflet.elevation": "MrMufflon/Leaflet.Elevation#master", "leaflet.elevation": "MrMufflon/Leaflet.Elevation#master",
@ -22,8 +22,8 @@
"seiyria-bootstrap-slider": "~4.8.1", "seiyria-bootstrap-slider": "~4.8.1",
"url-search-params": "~0.5.0", "url-search-params": "~0.5.0",
"Leaflet.RestoreView": "makinacorpus/Leaflet.RestoreView#master", "Leaflet.RestoreView": "makinacorpus/Leaflet.RestoreView#master",
"leaflet.locatecontrol": "^0.52.0", "leaflet.locatecontrol": "^0.60.0",
"font-awesome": "^4.6.3", "font-awesome": "^4.7.0",
"bootstrap-select": "hugdx/bootstrap-select#patch-1", "bootstrap-select": "hugdx/bootstrap-select#patch-1",
"leaflet-sidebar": "^0.1.9" "leaflet-sidebar": "^0.1.9"
}, },
@ -55,7 +55,8 @@
"main": [ "main": [
"dist/leaflet.draw-src.js", "dist/leaflet.draw-src.js",
"dist/leaflet.draw.css", "dist/leaflet.draw.css",
"dist/images/*.png" "dist/images/*.png",
"dist/images/*.svg"
], ],
"dependencies": null "dependencies": null
}, },
@ -98,9 +99,5 @@
"fonts/*" "fonts/*"
] ]
} }
},
"resolutions": {
"font-awesome": "^4.6.3",
"leaflet": "^1.0.2"
} }
} }

View file

@ -33,7 +33,7 @@ var paths = {
'js/index.js' 'js/index.js'
]), ]),
styles: mainBowerFiles('**/*.css').concat('css/*.css'), styles: mainBowerFiles('**/*.css').concat('css/*.css'),
images: mainBowerFiles('**/*.+(png|gif)'), images: mainBowerFiles('**/*.+(png|gif|svg)'),
fonts: mainBowerFiles('**/font-awesome/fonts/*'), fonts: mainBowerFiles('**/font-awesome/fonts/*'),
dest: 'dist', dest: 'dist',
destName: 'brouter-web' destName: 'brouter-web'