[TASK] Use npm/yarn for JS libarys instead of bower

Author: xf-

.gitignore

@@ -1,3 +1,2 @@
-bower_components/
 node_modules/
 build/

.travis.yml

@@ -16,7 +16,6 @@ cache:
   yarn: true
   directories:
     - node_modules
-    - bower_components
 
 script: grunt
 

Gruntfile.js

@@ -3,7 +3,7 @@ module.exports = function (grunt) {
 
   grunt.loadTasks("tasks");
 
-  grunt.registerTask("default", ["bower-install-simple", "lint", "copy", "sass:dist", "postcss", "requirejs:default", "inlinedata", "cachebreaker", "inline", "htmlmin", "clean:release"]);
+  grunt.registerTask("default", ["lint", "copy", "sass:dist", "postcss", "requirejs:default", "inlinedata", "cachebreaker", "inline", "htmlmin", "clean:release"]);
   grunt.registerTask("lint", ["sasslint", "eslint"]);
-  grunt.registerTask("serve", ["bower-install-simple", "lint", "copy", "sass:dev", "postcss", "requirejs:dev", "inlinedata", "htmlmin", "browserSync", "watch"]);
+  grunt.registerTask("serve", ["lint", "copy", "sass:dev", "postcss", "requirejs:dev", "inlinedata", "htmlmin", "browserSync", "watch"]);
 };

README.md

@@ -11,7 +11,7 @@
 - Icon font with only needed icons
 - Upgrade to grunt v1.x (Tested with Node.js 4 LTS,6 LTS,7 Linux,OSX,W**)
   - Inline some css and js
-- Bower update all components
+- Remove bower in favour of npm/yarn
   - Load only german locale from 101 languages from moment.js
 - Right click open layermenu
 - Remove ruby dependency
@@ -33,7 +33,6 @@ https://regensburg.freifunk.net/netz/karte/
 # Dependencies
 
 - yarn
-- bower
 - grunt-cli
 
 # Installing dependencies

app.js

@@ -3,14 +3,14 @@
 require.config({
   baseUrl: "lib",
   paths: {
-    "leaflet": "../bower_components/leaflet/dist/leaflet",
-    "leaflet.label": "../bower_components/Leaflet.label/dist/leaflet.label",
-    "chroma-js": "../bower_components/chroma-js/chroma.min",
-    "moment": "../bower_components/moment",
-    "tablesort": "../bower_components/tablesort/src/tablesort",
-    "d3": "../bower_components/d3/d3.min",
-    "virtual-dom": "../bower_components/virtual-dom/dist/virtual-dom",
-    "rbush": "../bower_components/rbush/rbush",
+    "leaflet": "../node_modules/leaflet/dist/leaflet",
+    "leaflet.label": "../node_modules/leaflet-label/dist/leaflet.label",
+    "chroma-js": "../node_modules/chroma-js/chroma.min",
+    "moment": "../node_modules/moment",
+    "tablesort": "../node_modules/tablesort/src/tablesort",
+    "d3": "../node_modules/d3/d3.min",
+    "virtual-dom": "../node_modules/virtual-dom/dist/virtual-dom",
+    "rbush": "../node_modules/rbush/rbush",
     "helper": "utils/helper"
   },
   shim: {

bower.json

@@ -16,7 +16,6 @@
     "eslint": "^3.13.1",
     "eslint-config-defaults": "^9.0.0",
     "grunt": "^1.0.1",
-    "grunt-bower-install-simple": "^1.2.3",
     "grunt-browser-sync": "^2.2.0",
     "grunt-cache-breaker": "^2.0.1",
     "grunt-check-dependencies": "^1.0.0",
@@ -39,5 +38,18 @@
       "es6": true,
       "node": true
     }
+  },
+  "dependencies": {
+    "almond": "^0.3.3",
+    "chroma-js": "^1.2.1",
+    "d3": "3.5",
+    "leaflet": "https://github.com/davojta/Leaflet.git#v0.7.7.1",
+    "leaflet-label": "^0.2.1-0",
+    "moment": "^2.17.1",
+    "promise-polyfill": "^6.0.2",
+    "rbush": "1.4.3",
+    "requirejs": "^2.3.2",
+    "tablesort": "4.0.1",
+    "virtual-dom": "^2.1.1"
   }
 }

package.json

@@ -1 +1 @@
-../bower_components/leaflet/dist/leaflet.css
+../node_modules/leaflet/dist/leaflet.css

scss/_leaflet.scss

@@ -2,7 +2,7 @@ module.exports = function (grunt) {
   "use strict";
 
   grunt.config.merge({
-    bowerdir: "bower_components",
+    nodedir: "node_modules",
     copy: {
       html: {
         src: ["*.html"],
@@ -13,7 +13,7 @@ module.exports = function (grunt) {
       vendorjs: {
         src: ["promise-polyfill/promise.js"],
         expand: true,
-        cwd: "bower_components/",
+        cwd: "<%=nodedir%>/",
         dest: "build/vendor/"
       },
       config: {
@@ -99,24 +99,11 @@ module.exports = function (grunt) {
         ext: ".html"
       }
     },
-    "bower-install-simple": {
-      options: {
-        directory: "<%=bowerdir%>",
-        color: true,
-        interactive: false,
-        production: true
-      },
-      "prod": {
-        options: {
-          production: true
-        }
-      }
-    },
     requirejs: {
       default: {
         options: {
           baseUrl: "lib",
-          name: "../bower_components/almond/almond",
+          name: "../<%=nodedir%>/almond/almond",
           mainConfigFile: "app.js",
           include: "../app",
           out: "build/app.js",
@@ -126,7 +113,7 @@ module.exports = function (grunt) {
       dev: {
         options: {
           baseUrl: "lib",
-          name: "../bower_components/almond/almond",
+          name: "../<%=nodedir%>/almond/almond",
           mainConfigFile: "app.js",
           include: "../app",
           optimize: "none",
@@ -148,7 +135,6 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.loadNpmTasks("grunt-bower-install-simple");
   grunt.loadNpmTasks("grunt-contrib-copy");
   grunt.loadNpmTasks("grunt-contrib-requirejs");
   grunt.loadNpmTasks("grunt-sass");

tasks/build.js

@@ -5,13 +5,7 @@ module.exports = function (grunt) {
     checkDependencies: {
       options: {
         install: true
-      },
-      bower: {
-        options: {
-          packageManager: "bower"
-        }
-      },
-      npm: {}
+      }
     },
     sasslint: {
       options: {