summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnike Arni <aarni@thoughtworks.com>2016-12-28 16:16:56 -0200
committerAnike Arni <aarni@thoughtworks.com>2016-12-28 16:16:56 -0200
commitb0eef380feab59153fbaa9b11084bd4def91ec5b (patch)
treecd48c9798036001c38452b3f484f2f50d7764b60
parentd83a6d27b7f92752a91a8d733353a38714e44951 (diff)
Move foundation from bower to npm and package them with webpack
-rw-r--r--web-ui/app/index.html3
-rw-r--r--web-ui/app/js/index.js3
-rw-r--r--web-ui/bower.json1
-rw-r--r--web-ui/config/package.sh3
-rw-r--r--web-ui/package.json1
5 files changed, 4 insertions, 7 deletions
diff --git a/web-ui/app/index.html b/web-ui/app/index.html
index b1b77b3a..65951a54 100644
--- a/web-ui/app/index.html
+++ b/web-ui/app/index.html
@@ -100,9 +100,6 @@
<script src="assets/bower_components/jquery-file-upload/js/jquery.fileupload.js"></script>
<script src="assets/bower_components/handlebars/handlebars.min.js"></script>
<script src="assets/bower_components/typeahead.js/dist/typeahead.bundle.min.js"></script>
-<script src="assets/bower_components/foundation/js/foundation.js" ></script>
-<script src="assets/bower_components/foundation/js/foundation/foundation.reveal.js" ></script>
-<script src="assets/bower_components/foundation/js/foundation/foundation.offcanvas.js"></script>
<script src="assets/bower_components/iframe-resizer/js/iframeResizer.min.js"></script>
<script src="assets/js/bundle.js"></script>
<!--usemin_end-->
diff --git a/web-ui/app/js/index.js b/web-ui/app/js/index.js
index 8ec2eeab..724643c5 100644
--- a/web-ui/app/js/index.js
+++ b/web-ui/app/js/index.js
@@ -1,3 +1,6 @@
+import 'foundation-sites';
+import 'foundation-sites/js/foundation.reveal.js';
+import 'foundation-sites/js/foundation.offcanvas.js';
import 'js/foundation/initialize_foundation';
import 'js/lib/highlightRegex';
import 'js/monkey_patching/all';
diff --git a/web-ui/bower.json b/web-ui/bower.json
index 4b7bdfb9..2a2b57e0 100644
--- a/web-ui/bower.json
+++ b/web-ui/bower.json
@@ -6,7 +6,6 @@
"flight": "1.3.0",
"requirejs": "~2.1.15",
"lodash": "2.4.1",
- "foundation": "~5.4.7",
"i18next": "~3.3.1",
"i18next-xhr-backend": "~0.6.0",
"i18next-browser-languagedetector": "~0.3.0",
diff --git a/web-ui/config/package.sh b/web-ui/config/package.sh
index 946b7f62..4eb11929 100644
--- a/web-ui/config/package.sh
+++ b/web-ui/config/package.sh
@@ -38,9 +38,6 @@ app/bower_components/jquery-ui/jquery-ui.js \
app/bower_components/jquery-file-upload/js/jquery.fileupload.js \
app/bower_components/handlebars/handlebars.js \
app/bower_components/typeahead.js/dist/typeahead.bundle.js \
-app/bower_components/foundation/js/foundation.js \
-app/bower_components/foundation/js/foundation/foundation.reveal.js \
-app/bower_components/foundation/js/foundation/foundation.offcanvas.js \
app/bower_components/iframe-resizer/js/iframeResizer.js \
app/js/1.bundle.js \
app/js/bundle.js > dist/app.js
diff --git a/web-ui/package.json b/web-ui/package.json
index 3dab5f80..267841f2 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -13,6 +13,7 @@
"dompurify": "^0.8.4",
"flightjs": "^1.5.1",
"font-awesome": "^4.7.0",
+ "foundation-sites": "^6.3.0",
"handlebars": "^4.0.5",
"he": "^1.1.0",
"html-minifier": "2.1.6",