From ef330e885db2ffbc68db50668a79dc75da256c92 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Fri, 24 Aug 2018 08:55:47 +0200
Subject: [PATCH] Switched to Babel for mix. Now we should support older
Browsers
---
.gitlab-ci.yml | 2 +-
config/tileserver.php | 2 +-
resources/views/map.blade.php | 1 -
webpack.mix.js | 4 ++--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 575659b..9b34e92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ update(maps.metager.de):
- cd ~/.MetaGerMaps
- composer install
- npm install
- - npm run dev
+ - npm run prod
- cp ~/.env .
- chmod -R 777 storage
- chmod -R 777 bootstrap/cache
diff --git a/config/tileserver.php b/config/tileserver.php
index 66bc355..1a6cc8a 100644
--- a/config/tileserver.php
+++ b/config/tileserver.php
@@ -1,6 +1,6 @@
<?php
return [
- 'TILESERVER_HOST'=> 'localhost',
+ 'TILESERVER_HOST'=> 'maps.metager.de',
'TILESERVER_PORT'=> 63825
];
\ No newline at end of file
diff --git a/resources/views/map.blade.php b/resources/views/map.blade.php
index 753f909..dd5e9b0 100644
--- a/resources/views/map.blade.php
+++ b/resources/views/map.blade.php
@@ -296,7 +296,6 @@
}
</script>
<script src="{{ mix('/js/modules.js') }}" type="text/javascript" defer></script>
- <script src="{{ mix('/js/ol.js') }}" type="module" defer></script>
<script src="{{ mix('js/map.js') }}" type="text/javascript" defer></script>
</body>
</html>
diff --git a/webpack.mix.js b/webpack.mix.js
index 4d05771..aa6e490 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -13,9 +13,9 @@ let mix = require("laravel-mix");
mix
.js("resources/assets/js/modules.js", "public/js")
- .scripts(["resources/assets/js/ol.js"], "public/js/ol.js")
- .scripts(
+ .babel(
[
+ "resources/assets/js/ol.js",
"resources/assets/js/md5.js",
"resources/assets/js/jquery.min.js",
"resources/assets/js/jquery-ui.min.js",
--
GitLab