From e0649eb9bdf09372cfb351625c272532ba83c4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20M=C3=A9tais?= <gael.metais@gmail.com>
Date: Sun, 16 Aug 2015 13:22:12 +0200
Subject: [PATCH] Replace bower by npm (browserify)

---
 .bowerrc                                  |  3 ---
 .gitignore                                |  1 -
 bower.json                                | 13 -------------
 front/src/main.html                       | 18 +++++++++---------
 lib/server/controllers/frontController.js |  2 +-
 package.json                              | 10 +++++++++-
 6 files changed, 19 insertions(+), 28 deletions(-)
 delete mode 100644 .bowerrc
 delete mode 100644 bower.json

diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index 5e6701a..0000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "directory" : "bower_components"
-}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 6fe25bb..19cd53d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 node_modules
-bower_components
 .tmp
 .vagrant
 results/*
diff --git a/bower.json b/bower.json
deleted file mode 100644
index 47c8bd3..0000000
--- a/bower.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "yellowlabtools",
-  "dependencies": {
-    "angular": "1.4.4",
-    "angular-route": "1.4.4",
-    "angular-resource": "1.4.4",
-    "angular-sanitize": "1.4.4",
-    "angular-animate": "1.4.4",
-    "angular-local-storage": "0.2.2",
-    "angular-chart.js": "0.7.3",
-    "Chart.js": "1.0.2"
-  }
-}
diff --git a/front/src/main.html b/front/src/main.html
index 88ce064..790cb59 100644
--- a/front/src/main.html
+++ b/front/src/main.html
@@ -16,18 +16,18 @@
     <link rel="stylesheet" type="text/css" href="/css/screenshot.css">
     <link rel="stylesheet" type="text/css" href="/css/timeline.css">
     <link rel="stylesheet" type="text/css" href="/css/about.css">
-    <link rel="stylesheet" type="text/css" href="/bower_components/angular-chart.js/dist/angular-chart.css">
+    <link rel="stylesheet" type="text/css" href="/node_modules/angular-chart.js/dist/angular-chart.css">
     <!-- endbuild -->
 
     <!-- build:js /js/all.js -->
-    <script src="/bower_components/angular/angular.min.js"></script>
-    <script src="/bower_components/Chart.js/Chart.min.js"></script>
-    <script src="/bower_components/angular-route/angular-route.min.js"></script>
-    <script src="/bower_components/angular-resource/angular-resource.min.js"></script>
-    <script src="/bower_components/angular-sanitize/angular-sanitize.min.js"></script>
-    <script src="/bower_components/angular-animate/angular-animate.min.js"></script>
-    <script src="/bower_components/angular-local-storage/dist/angular-local-storage.min.js"></script>
-    <script src="/bower_components/angular-chart.js/dist/angular-chart.min.js"></script>
+    <script src="/node_modules/angular/angular.min.js"></script>
+    <script src="/node_modules/chart.js/Chart.min.js"></script>
+    <script src="/node_modules/angular-route/angular-route.min.js"></script>
+    <script src="/node_modules/angular-resource/angular-resource.min.js"></script>
+    <script src="/node_modules/angular-sanitize/angular-sanitize.min.js"></script>
+    <script src="/node_modules/angular-animate/angular-animate.min.js"></script>
+    <script src="/node_modules/angular-local-storage/dist/angular-local-storage.min.js"></script>
+    <script src="/node_modules/angular-chart.js/dist/angular-chart.min.js"></script>
     <script src="/js/app.js"></script>
     <script src="/js/controllers/indexCtrl.js"></script>
     <script src="/js/controllers/dashboardCtrl.js"></script>
diff --git a/lib/server/controllers/frontController.js b/lib/server/controllers/frontController.js
index 4d5f531..e0a3e73 100644
--- a/lib/server/controllers/frontController.js
+++ b/lib/server/controllers/frontController.js
@@ -20,7 +20,7 @@ var FrontController = function(app) {
     app.use('/img', express.static(path.join(__dirname, assetsPath, 'img'), { maxAge: cacheDuration }));
     app.use('/js', express.static(path.join(__dirname, assetsPath, 'js'), { maxAge: cacheDuration }));
     app.use('/views', express.static(path.join(__dirname, assetsPath, 'views'), { maxAge: cacheDuration }));
-    app.use('/bower_components', express.static(path.join(__dirname, '../../../bower_components'), { maxAge: cacheDuration }));
+    app.use('/node_modules', express.static(path.join(__dirname, '../../../node_modules'), { maxAge: cacheDuration }));
 };
 
 module.exports = FrontController;
\ No newline at end of file
diff --git a/package.json b/package.json
index 6829832..dbb003f 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "yellowlabtools",
   "version": "1.7.4",
   "description": "Online tool to audit a webpage for performance and front-end quality issues",
-  "license" : "GPL-2.0",
+  "license": "GPL-2.0",
   "author": {
     "name": "Gaël Métais",
     "email": "gael@gaelmetais.com",
@@ -17,8 +17,16 @@
   },
   "main": "./lib/index.js",
   "dependencies": {
+    "angular": "1.4.4",
+    "angular-animate": "1.4.4",
+    "angular-chart.js": "0.7.3",
+    "angular-local-storage": "0.2.2",
+    "angular-resource": "1.4.4",
+    "angular-route": "1.4.4",
+    "angular-sanitize": "1.4.4",
     "async": "1.4.2",
     "body-parser": "1.13.3",
+    "chart.js": "1.0.2",
     "clean-css": "3.3.9",
     "compression": "1.5.2",
     "cors": "2.7.1",