diff --git a/bower.json b/bower.json
index 4298beac..208b7b5e 100644
--- a/bower.json
+++ b/bower.json
@@ -34,6 +34,9 @@
"osmtogeojson": "^2.2.12",
"leaflet-fullHash": "https://raw.githubusercontent.com/KoGor/leaflet-fullHash/master/leaflet-fullHash.js"
},
+ "resolutions": {
+ "leaflet": "^1.0.1"
+ },
"overrides": {
"bootstrap": {
"main": [
diff --git a/frontend/gulpfile.js b/frontend/gulpfile.js
index f04139c0..32e94b68 100644
--- a/frontend/gulpfile.js
+++ b/frontend/gulpfile.js
@@ -17,6 +17,7 @@ var combine = require("stream-combiner");
var sourcemaps = require("gulp-sourcemaps");
var inject = require("gulp-inject");
var img64 = require("./gulpfile-img64");
+var path = require("path");
var files = [
"app/**/*.js",
@@ -36,7 +37,7 @@ gulp.task("clean", function() {
gulp.task("deps", function() {
return combine(
- gulp.src(mainBowerFiles({ paths: { bowerDirectory: '../bower_components', bowerJson: '../bower.json' } }), { base: process.cwd() + "/" }),
+ gulp.src(mainBowerFiles({ paths: { bowerDirectory: __dirname + '/../bower_components', bowerJson: __dirname + '/../bower.json' } }), { base: path.resolve(__dirname + "/..") + "/" }),
gulpIf([ "**/*.js", "**/*.css" ], combine(
gulpIf("**/*.js", combine(
newer("build/dependencies.js"),
@@ -105,7 +106,8 @@ gulp.task("all", [ "deps", "app" ], function() {
sourcemaps.init({ loadMaps: true }),
concat("all.css"),
sourcemaps.write("./sourcemaps")
- )
+ ),
+ gulp.src("deref.html")
),
gulp.dest("build")
);
@@ -115,8 +117,9 @@ gulp.task("index", [ "all" ], function() {
return combine(
gulp.src("index.html"),
img64(),
+ concat("build/index.html"),
inject(gulp.src([ "build/all.js", "build/all.css" ], { read: false }), { relative: true, removeTags: true }),
- gulp.dest("build")
+ gulp.dest(".")
);
});
diff --git a/frontend/index.html b/frontend/index.html
index 3ee542ed..8635a31f 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -36,6 +36,6 @@
-
+