X-Git-Url: https://git.openstreetmap.org./nominatim-ui.git/blobdiff_plain/5144a02438a0a29d7694060934b0f140bb13060e..a82c578374260ba3450fbd475da5739b9d92a4ce:/build.sh?ds=sidebyside

diff --git a/build.sh b/build.sh
index 219175b..973ccbd 100755
--- a/build.sh
+++ b/build.sh
@@ -1,39 +1,69 @@
 #!/bin/bash
 
 mkdir -p dist/assets/
-rsync --quiet --recursive src/assets/css/ dist/assets/css/
+rsync --quiet --recursive src/assets/css/    dist/assets/css/
 rsync --quiet --recursive src/assets/images/ dist/assets/images/
 
 mkdir -p dist/assets/js/
-cat src/assets/js/base.js src/assets/js/detailpage.js src/assets/js/searchpage.js > dist/assets/js/nominatim-ui.js
+cat src/assets/js/base.js       \
+    src/assets/js/detailpage.js \
+    src/assets/js/searchpage.js \
+    src/assets/js/deletable.js  \
+    src/assets/js/polygons.js   \
+    src/assets/js/controller.js > dist/assets/js/nominatim-ui.js
 
-rsync --quiet --recursive src/vendor/js/* dist/assets/js/
-rsync --quiet --recursive node_modules/jquery/dist/jquery.min.js dist/assets/js/
-rsync --quiet --recursive node_modules/leaflet/dist/leaflet.js dist/assets/js/
-rsync --quiet --recursive node_modules/leaflet/dist/leaflet.js.map dist/assets/js/
-rsync --quiet --recursive node_modules/leaflet/dist/leaflet.css dist/assets/css/
-rsync --quiet --recursive node_modules/leaflet/dist/images/ dist/assets/css/images/
+rsync --quiet node_modules/jquery/dist/jquery.min.js   dist/assets/js/
+rsync --quiet node_modules/leaflet/dist/leaflet.js     dist/assets/js/
+rsync --quiet node_modules/leaflet/dist/leaflet.js.map dist/assets/js/
+rsync --quiet node_modules/leaflet/dist/leaflet.css    dist/assets/css/
+rsync --quiet node_modules/leaflet/dist/images/*       dist/assets/css/images/
 
-rsync --quiet --recursive node_modules/leaflet-minimap/dist/Control.MiniMap.min.js dist/assets/js/
-rsync --quiet --recursive node_modules/leaflet-minimap/dist/Control.MiniMap.min.css dist/assets/css/
-rsync --quiet --recursive node_modules/leaflet-minimap/dist/images/ dist/assets/css/images/
+rsync --quiet node_modules/leaflet-minimap/dist/Control.MiniMap.min.js  dist/assets/js/
+rsync --quiet node_modules/leaflet-minimap/dist/Control.MiniMap.min.css dist/assets/css/
+rsync --quiet node_modules/leaflet-minimap/dist/images/*                dist/assets/css/images/
 
-rsync --quiet --recursive node_modules/bootstrap/dist/js/bootstrap.min.js dist/assets/js/
-rsync --quiet --recursive node_modules/bootstrap/dist/css/bootstrap.min.css dist/assets/css/
-rsync --quiet --recursive node_modules/bootstrap/dist/css/bootstrap-theme.min.css dist/assets/css/
+rsync --quiet node_modules/bootstrap/dist/js/bootstrap.bundle.min.js* dist/assets/js/
+rsync --quiet node_modules/bootstrap/dist/css/bootstrap.min.css       dist/assets/css/
 
-rsync --quiet --recursive node_modules/handlebars/dist/handlebars.min.js dist/assets/js/
-rsync --quiet --recursive node_modules/@ungap/url-search-params/min.js dist/assets/js/url-search-params.js
-# rsync --quiet --recursive src/vendor/css/* dist/assets/css/
-# rsync --quiet --recursive src/vendor/images/* dist/assets/images/
-rsync --quiet --recursive src/templates dist/
+rsync --quiet node_modules/handlebars/dist/handlebars.min.js dist/assets/js/
+rsync --quiet node_modules/@ungap/url-search-params/min.js   dist/assets/js/url-search-params.js
 
 rsync --quiet src/*.js dist/
 
 
-cat src/layout.html | perl -pe'use File::Slurper qw(read_text); s/\@include\((.+?)\)/read_text($1)/eg' > /tmp/included.html
+{
+  cat src/layout.html | grep -v '</body>' | grep -v '</html>'
+  echo '<script id="searchpage-template" type="text/x-handlebars-template">'
+  cat src/templates/searchpage.hbs
+  echo '</script>'
+
+  echo '<script id="reversepage-template" type="text/x-handlebars-template">'
+  cat src/templates/reversepage.hbs
+  echo '</script>'
+
+  echo '<script id="detailspage-template" type="text/x-handlebars-template">'
+  cat src/templates/detailspage.hbs
+  echo '</script>'
+
+  echo '<script id="detailspage-index-template" type="text/x-handlebars-template">'
+  cat src/templates/detailspage-index.hbs
+  echo '</script>'
+
+  echo '<script id="deletable-template" type="text/x-handlebars-template">'
+  cat src/templates/deletable.hbs
+  echo '</script>'
+
+  echo '<script id="polygons-template" type="text/x-handlebars-template">'
+  cat src/templates/polygons.hbs
+  echo '</script>'
+
+  echo '</body>'
+  echo '</html>'
+} > dist/search.html
+
+cp dist/search.html dist/reverse.html
+cp dist/search.html dist/details.html
+cp dist/search.html dist/deletable.html
+cp dist/search.html dist/polygons.html
 
-cat /tmp/included.html | perl -pe's/BODYID/search-page/g' > dist/search.html
-cat /tmp/included.html | perl -pe's/BODYID/reverse-page/g' > dist/reverse.html
-cat /tmp/included.html | perl -pe's/BODYID/details-page/g' > dist/details.html
 cp src/index.html dist/