merge master

.travis.yml

@@ -10,6 +10,7 @@ install:
   - docker-compose exec web bash -l -c "sleep 10"
   - docker-compose exec web bash -l -c "bundle install"
   - docker-compose exec web bash -l -c "rake db:setup || rake db:migrate"
+  - docker-compose run web yarn --ignore-engines --ignore-scripts --modules-folder ./public/lib
 
 script:
   - sed -ri "s/REPO_TOKEN/$REPO_TOKEN/" .coveralls.yml

.yarnrc

@@ -0,0 +1,3 @@
+--install.modules-folder "./public/lib"
+ignore-engines true
+ignore-scripts true

Dockerfile

@@ -24,7 +24,7 @@ RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A170311380
 RUN /bin/bash -l -c ". /etc/profile.d/rvm.sh && rvm install 2.4.4 && rvm use 2.4.4 --default"
 
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - && apt-get install -y npm
-RUN npm install -g bower
+RUN npm install -g yarn
 
 
 # Install bundle of gems
@@ -44,3 +44,4 @@ COPY Gemfile.lock /app/Gemfile.lock
 COPY start.sh /app/start.sh
 
 CMD [ "bash", "-l", "start.sh" ]
+

package.json

@@ -0,0 +1,57 @@
+{
+  "name": "mapknitter",
+  "version": "1.0.0",
+  "files": [
+    "https://gist.githubusercontent.com/jywarren/770e5018c7fea09e3044b1297bd99dc0/raw/6de6259a766f473559a10a29c4a5ccf23b2a0dea/Google.js"
+  ],
+  "dependencies": {
+    "@mapbox/togeojson": "0.16.0",
+    "@mapbox/corslite": "0.0.7",
+    "@mapbox/sexagesimal": "1.0.0",
+    "@mapbox/polyline": "0.2.0",
+    "Leaflet.EasyButton": "CliffCloud/Leaflet.EasyButton#1.0.0",
+    "blueimp-canvas-to-blob": "blueimp/JavaScript-Canvas-to-Blob#>=2.1.1",
+    "blueimp-file-upload": "blueimp/jQuery-File-Upload#~9.8.1",
+    "blueimp-load-image": "blueimp/JavaScript-Load-Image#>=1.13.0",
+    "blueimp-tmpl": "blueimp/JavaScript-Templates#2.5.4",
+    "bootstrap": "twbs/bootstrap#~3.2.0",
+    "bootstrap-slider": "seiyria/bootstrap-slider#~4.4.0",
+    "cartagen": "jywarren/cartagen#*",
+    "exif-js": "jseidelin/exif-js#*",
+    "font-awesome": "FortAwesome/Font-Awesome#~4.2.0",
+    "fontawesome": "FortAwesome/Font-Awesome#~4.2.0",
+    "glfx-js": "jywarren/glfx.js#*",
+    "image-sequencer": "publiclab/image-sequencer#~1.4.0",
+    "jquery": "jquery/jquery-dist#^2.1.3",
+    "jquery-bridget": "desandro/jquery-bridget#*",
+    "jquery-ui": "components/jqueryui#~1.11",
+    "jquery-ujs": "rails/jquery-ujs#~1.0.3",
+    "junction": "theleagueof/junction#*",
+    "leaflet": "Leaflet/Leaflet#^1.0.0",
+    "leaflet-dist": "vperron/leaflet-dist#0.7.x",
+    "leaflet-distortableimage": "publiclab/Leaflet.DistortableImage#^0.2.0",
+    "leaflet-draw": "Leaflet/Leaflet.draw#0.2.4",
+    "leaflet-easybutton": "CliffCloud/Leaflet.EasyButton#1.0.0",
+    "leaflet-environmental-layers": "publiclab/leaflet-environmental-layers#~1.1.2",
+    "leaflet-illustrate": "manleyjster/Leaflet.Illustrate#31d7daa42fb140c063c4a9d9ccf13a279bb1b8d7",
+    "leaflet-omnivore": "mapbox/leaflet-omnivore#~0.3.2",
+    "leaflet-providers": "leaflet-extras/leaflet-providers#1.0.6",
+    "leaflet-spin": "makinacorpus/Leaflet.Spin#1.1.0",
+    "leaflet-toolbar": "Leaflet/Leaflet.Toolbar#~0.3.0",
+    "modalbox": "okonet/modalbox#*",
+    "modernizr": "Modernizr/Modernizr#*",
+    "ol2": "openlayers/ol2#release-2.13.1",
+    "prototypejs-bower": "plynchnlm/prototypejs-bower#1.7.2",
+    "scriptaculous": "madrobby/scriptaculous#1.9.0",
+    "seiyria-bootstrap-slider": "seiyria/bootstrap-slider#~4.4.0",
+    "sparklines": "mariusGundersen/sparkline#~1.0.0",
+    "spin.js": "fgnass/spin.js#^2.3.1",
+    "webgl-distort": "jywarren/webgl-distort#*"
+  },
+  "engines": {
+    "yarn": ">= 1.0.0"
+  },
+  "scripts": {
+    "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'public/lib', 'junction') } catch (e) { }\""
+  }
+}

start.sh

@@ -3,7 +3,7 @@
 pidfile=/app/tmp/pids/server.pid
 
 bundle check || bundle install
-bower install --allow-root
+yarn --ignore-engines --ignore-scripts --modules-folder ./public/lib
 
 if [ -f $pidfile ] ; then
 	>&2 echo 'Server PID file already exists. Removing it...';