Use npm for dependencies instead of bower

jtblin · jtblin · commit 6ef96ca2265c · 2016-06-18T12:50:32.000+10:00
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -4,7 +4,6 @@ languages:
   PHP: false
 exclude_paths:
 - "dist/*"
-- "bower_components/*"
 - "node_modules/*"
 - "gulpfile.js"
 - "examples/*"
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,2 @@
-bower_components/
 coverage/
 node_modules/
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .idea/
 node_modules/
 test/fixtures/shots/
-bower_components/
 coverage/
 examples/bundle.js
diff --git a/.jscsrc b/.jscsrc
@@ -71,7 +71,6 @@
   "disallowKeywords": [ "with" ],
 
   "excludeFiles": [
-    "bower_components/**",
     "node_modules/**",
     "dist/**",
     "coverage/**",
diff --git a/.jshintignore b/.jshintignore
@@ -1,4 +1,3 @@
-bower_components/
 node_modules/
 dist/
 tmp/
diff --git a/Dockerfile b/Dockerfile
@@ -3,5 +3,5 @@ WORKDIR /src
 ADD . ./
 RUN chown -R node:node /src
 USER node
-RUN npm install && npm install bower && ./node_modules/bower/bin/bower install
+RUN npm install
 CMD ["npm", "test"]
diff --git a/README.md b/README.md
@@ -26,10 +26,6 @@ there are numerous breaking changes in this version notably:
 * `$scope.$apply` is not called anymore on mouse hover functions calls
 * obviously all Chart.js breaking changes as well in how options are set, etc.
 
-### bower
-
-    bower install --save angular-chart.js
-
 ### npm
 
     npm install --save angular-chart.js
@@ -53,7 +49,7 @@ adding the dependencies for Angular and Chart.js first:
   ...
 </body>
   <script src="node_modules/angular/angular.min.js"></script>
-  <script src="node_modules/Chart.js/Chart.min.js"></script>
+  <script src="node_modules/chart.js/Chart.min.js"></script>
   <script src="node_modules/angular-chart.js/dist/angular-chart.min.js"></script>
 ```
 
diff --git a/bower.json b/bower.json
@@ -40,12 +40,5 @@
   "dependencies": {
     "angular": "1.x",
     "Chart.js": "2.x"
-  },
-  "devDependencies": {
-    "angular-bootstrap": "~0.11.0",
-    "angular-mocks": "~1.x",
-    "font-awesome": "~4.1.0",
-    "rainbow": "~1.1.9",
-    "requirejs": "~2.1.20"
   }
 }
diff --git a/examples/amd.html b/examples/amd.html
@@ -21,6 +21,6 @@
   </div>
 </div>
 
-<script data-main="amd" src="../bower_components/requirejs/require.js"></script>
+<script data-main="amd" src="../node_modules/requirejs/require.js"></script>
 </body>
 </html>
diff --git a/examples/amd.js b/examples/amd.js
@@ -3,8 +3,8 @@
 
   require.config({
     paths: {
-      angular: '../bower_components/angular/angular.min',
-      chart: '../bower_components/Chart.js/dist/Chart',
+      angular: '../node_modules/angular/angular.min',
+      chart: '../node_modules/chart.js/dist/Chart',
       'angular-chart': '../angular-chart'
     },
     shim: {
diff --git a/examples/charts.html b/examples/charts.html
@@ -3,8 +3,8 @@
 <head lang="en">
   <meta charset="UTF-8">
   <title>Charts</title>
-  <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
-  <link rel="stylesheet" href="../bower_components/rainbow/themes/github.css">
+  <link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css">
+  <link rel="stylesheet" href="../node_modules/Rainbow/themes/github.css">
   <link href="bootstrap.css" rel="stylesheet">
   <link href="app.css" rel="stylesheet">
   <style>
@@ -115,18 +115,18 @@ <h3>Dependencies</h3>
       </ul>
       <h3>Files to download</h3>
       <p>
-        The easiest is to download with <strong>bower</strong>:
-        <pre>bower install angular-chart.js --save</pre>
-        Alternatively files can be <a href="https://github.com/jtblin/angular-chart.js">downloaded from Github</a> or via npm.
+        The easiest is to download with <strong>npm</strong>:
+        <pre>npm install angular-chart.js --save</pre>
+        Alternatively files can be <a href="https://github.com/jtblin/angular-chart.js">downloaded from Github</a> or via bower.
         See <a href="https://github.com/jtblin/angular-chart.js">readme</a> for more information.
       </p>
       <p>Whichever method you choose the good news is that the overall size is very small:
         &lt;5kb for all directives (~1kb with gzip compression!)</p>
       <h3>Installation</h3>
       <p>You need to include the dependencies in your page:</p>
-      <pre><code>&lt;script src=&quot;bower_components/angular-chart.js/dist/angular-chart.min.js&quot;&gt;&lt;/script&gt;
-&lt;script src="bower_components/Chart.js/Chart.min.js">&lt;/script&gt;
-&lt;script src="bower_components/angular-chart.js/dist/angular-chart.min.js">&lt;/script&gt;</code></pre>
+      <pre><code>&lt;script src=&quot;node_modules/angular-chart.js/dist/angular-chart.min.js&quot;&gt;&lt;/script&gt;
+&lt;script src="node_modules/chart.js/Chart.min.js">&lt;/script&gt;
+&lt;script src="node_modules/angular-chart.js/dist/angular-chart.min.js">&lt;/script&gt;</code></pre>
       <p>As soon as you've got all the files downloaded and included in your page you just need to declare
         a dependency on the <code>chart.js</code> <a href="http://docs.angularjs.org/guide/module">module</a>:<br>
       </p><pre><code>angular.module('myModule', ['chart.js']);</code></pre>
@@ -523,13 +523,13 @@ <h1>Reactive</h1>
     </div>
   </footer>
 
-  <script src="../bower_components/angular/angular.min.js"></script>
-  <script src="../bower_components/Chart.js/dist/Chart.min.js"></script>
-  <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-  <script src="../bower_components/rainbow/js/rainbow.min.js"></script>
-  <script src="../bower_components/rainbow/js/language/generic.js"></script>
-  <script src="../bower_components/rainbow/js/language/html.js"></script>
-  <script src="../bower_components/rainbow/js/language/javascript.js"></script>
+  <script src="../node_modules/angular/angular.min.js"></script>
+  <script src="../node_modules/chart.js/dist/Chart.min.js"></script>
+  <script src="../node_modules/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+  <script src="../node_modules/Rainbow/js/rainbow.min.js"></script>
+  <script src="../node_modules/Rainbow/js/language/generic.js"></script>
+  <script src="../node_modules/Rainbow/js/language/html.js"></script>
+  <script src="../node_modules/Rainbow/js/language/javascript.js"></script>
   <script src="../angular-chart.js"></script>
   <script src="smoothscroll.min.js"></script>
   <script src="app.js"></script>
diff --git a/examples/charts.template.html b/examples/charts.template.html
@@ -3,8 +3,8 @@
 <head lang="en">
   <meta charset="UTF-8">
   <title>Charts</title>
-  <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
-  <link rel="stylesheet" href="../bower_components/rainbow/themes/github.css">
+  <link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css">
+  <link rel="stylesheet" href="../node_modules/Rainbow/themes/github.css">
   <link href="bootstrap.css" rel="stylesheet">
   <link href="app.css" rel="stylesheet">
   <style>
@@ -115,18 +115,18 @@ <h3>Dependencies</h3>
       </ul>
       <h3>Files to download</h3>
       <p>
-        The easiest is to download with <strong>bower</strong>:
-        <pre>bower install angular-chart.js --save</pre>
-        Alternatively files can be <a href="https://github.com/jtblin/angular-chart.js">downloaded from Github</a> or via npm.
+        The easiest is to download with <strong>npm</strong>:
+        <pre>npm install angular-chart.js --save</pre>
+        Alternatively files can be <a href="https://github.com/jtblin/angular-chart.js">downloaded from Github</a> or via bower.
         See <a href="https://github.com/jtblin/angular-chart.js">readme</a> for more information.
       </p>
       <p>Whichever method you choose the good news is that the overall size is very small:
         &lt;5kb for all directives (~1kb with gzip compression!)</p>
       <h3>Installation</h3>
       <p>You need to include the dependencies in your page:</p>
-      <pre><code>&lt;script src=&quot;bower_components/angular-chart.js/dist/angular-chart.min.js&quot;&gt;&lt;/script&gt;
-&lt;script src="bower_components/Chart.js/Chart.min.js">&lt;/script&gt;
-&lt;script src="bower_components/angular-chart.js/dist/angular-chart.min.js">&lt;/script&gt;</code></pre>
+      <pre><code>&lt;script src=&quot;node_modules/angular-chart.js/dist/angular-chart.min.js&quot;&gt;&lt;/script&gt;
+&lt;script src="node_modules/chart.js/Chart.min.js">&lt;/script&gt;
+&lt;script src="node_modules/angular-chart.js/dist/angular-chart.min.js">&lt;/script&gt;</code></pre>
       <p>As soon as you've got all the files downloaded and included in your page you just need to declare
         a dependency on the <code>chart.js</code> <a href="http://docs.angularjs.org/guide/module">module</a>:<br>
       </p><pre><code>angular.module('myModule', ['chart.js']);</code></pre>
@@ -523,13 +523,13 @@ <h1>Reactive</h1>
     </div>
   </footer>
 
-  <script src="../bower_components/angular/angular.min.js"></script>
-  <script src="../bower_components/Chart.js/dist/Chart.min.js"></script>
-  <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-  <script src="../bower_components/rainbow/js/rainbow.min.js"></script>
-  <script src="../bower_components/rainbow/js/language/generic.js"></script>
-  <script src="../bower_components/rainbow/js/language/html.js"></script>
-  <script src="../bower_components/rainbow/js/language/javascript.js"></script>
+  <script src="../node_modules/angular/angular.min.js"></script>
+  <script src="../node_modules/chart.js/dist/Chart.min.js"></script>
+  <script src="../node_modules/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+  <script src="../node_modules/Rainbow/js/rainbow.min.js"></script>
+  <script src="../node_modules/Rainbow/js/language/generic.js"></script>
+  <script src="../node_modules/Rainbow/js/language/html.js"></script>
+  <script src="../node_modules/Rainbow/js/language/javascript.js"></script>
   <script src="../angular-chart.js"></script>
   <script src="smoothscroll.min.js"></script>
   <script src="app.js"></script>
diff --git a/examples/stacked-bars.html b/examples/stacked-bars.html
@@ -22,9 +22,9 @@
   </div>
 </div>
 
-<script src="../bower_components/angular/angular.js"></script>
-<script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-<script src="../bower_components/Chart.js/dist/Chart.js"></script>
+<script src="../node_modules/angular/angular.js"></script>
+<script src="../node_modules/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+<script src="../node_modules/chart.js/dist/Chart.js"></script>
 <script src="../angular-chart.js"></script>
 <script src="app.js"></script>
 </body>
diff --git a/examples/tables.html b/examples/tables.html
@@ -36,9 +36,9 @@
   </div>
 </div>
 
-<script src="../bower_components/angular/angular.min.js"></script>
-<script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-<script src="../bower_components/Chart.js/dist/Chart.min.js"></script>
+<script src="../node_modules/angular/angular.min.js"></script>
+<script src="../node_modules/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+<script src="../node_modules/chart.js/dist/Chart.min.js"></script>
 <script src="../angular-chart.js"></script>
 <script src="app.js"></script>
 </body>
diff --git a/examples/tabs.html b/examples/tabs.html
@@ -24,9 +24,9 @@
   </div>
 </div>
 
-<script src="../bower_components/angular/angular.js"></script>
-<script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-<script src="../bower_components/Chart.js/dist/Chart.min.js"></script>
+<script src="../node_modules/angular/angular.js"></script>
+<script src="../node_modules/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+<script src="../node_modules/chart.js/dist/Chart.min.js"></script>
 <script src="../angular-chart.js"></script>
 <script src="app.js"></script>
 </body>
diff --git a/examples/ticks.html b/examples/ticks.html
@@ -21,9 +21,9 @@
   </div>
 </div>
 
-<script src="../bower_components/angular/angular.min.js"></script>
-<script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-<script src="../bower_components/Chart.js/dist/Chart.min.js"></script>
+<script src="../node_modules/angular/angular.min.js"></script>
+<script src="../node_modules/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+<script src="../node_modules/chart.js/dist/Chart.min.js"></script>
 <script src="../angular-chart.js"></script>
 <script src="app.js"></script>
 </body>
diff --git a/package.json b/package.json
@@ -20,10 +20,14 @@
   },
   "license": "BSD-2-Clause",
   "devDependencies": {
+    "Rainbow": "git+https://github.com/ccampbell/rainbow.git",
+    "angular-bootstrap": "^0.12.2",
+    "angular-mocks": "^1.5.7",
     "chai": "^3.4.1",
     "chai-string": "^1.2.0",
     "codeclimate-test-reporter": "^0.3.1",
     "cp": "^0.2.0",
+    "font-awesome": "^4.6.3",
     "gm": "^1.22.0",
     "gulp": "^3.9.0",
     "gulp-bump": "^1.0.0",
@@ -48,6 +52,7 @@
     "mkdirp": "^0.5.0",
     "mocha": "^2.1.0",
     "mocha-phantomjs-istanbul": "^0.0.2",
+    "requirejs": "^2.2.0",
     "sinon": "^1.12.2",
     "sinon-chai": "^2.7.0",
     "testatic": "^0.1.0",
diff --git a/test/fixtures/29-tabs.html b/test/fixtures/29-tabs.html
@@ -24,9 +24,9 @@
   </div>
 </div>
 
-<script src="../../bower_components/angular/angular.js"></script>
-<script src="../../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-<script src="../../bower_components/Chart.js/dist/Chart.min.js"></script>
+<script src="../../node_modules/angular/angular.js"></script>
+<script src="../../node_modules/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+<script src="../../node_modules/chart.js/dist/Chart.min.js"></script>
 <script src="../../angular-chart.js"></script>
 <script src="29-tabs.js"></script>
 </body>
diff --git a/test/fixtures/51-pie-update-colours.html b/test/fixtures/51-pie-update-colours.html
@@ -27,8 +27,8 @@ <h1>Charts</h1>
     </section>
   </div>
 
-  <script src="../../bower_components/angular/angular.min.js"></script>
-  <script src="../../bower_components/Chart.js/dist/Chart.min.js"></script>
+  <script src="../../node_modules/angular/angular.min.js"></script>
+  <script src="../../node_modules/chart.js/dist/Chart.min.js"></script>
   <script src="../../angular-chart.js"></script>
   <script src="51-pie-update-colours.js"></script>
 </body>
diff --git a/test/fixtures/54-not-enough-colours.html b/test/fixtures/54-not-enough-colours.html
@@ -28,8 +28,8 @@ <h1>Charts</h1>
     </section>
   </div>
 
-  <script src="../../bower_components/angular/angular.min.js"></script>
-  <script src="../../bower_components/Chart.js/dist/Chart.min.js"></script>
+  <script src="../../node_modules/angular/angular.min.js"></script>
+  <script src="../../node_modules/chart.js/dist/Chart.min.js"></script>
   <script src="../../angular-chart.js"></script>
   <script src="54-not-enough-colours.js"></script>
 </body>
diff --git a/test/fixtures/57-hex-colours.html b/test/fixtures/57-hex-colours.html
@@ -27,8 +27,8 @@ <h1>Charts</h1>
     </section>
   </div>
 
-  <script src="../../bower_components/angular/angular.min.js"></script>
-  <script src="../../bower_components/Chart.js/dist/Chart.min.js"></script>
+  <script src="../../node_modules/angular/angular.min.js"></script>
+  <script src="../../node_modules/chart.js/dist/Chart.min.js"></script>
   <script src="../../angular-chart.js"></script>
   <script src="57-hex-colours.js"></script>
 </body>
diff --git a/test/fixtures/charts.html b/test/fixtures/charts.html
@@ -69,8 +69,8 @@ <h1>Charts</h1>
     </section>
   </div>
 
-  <script src="../../bower_components/angular/angular.min.js"></script>
-  <script src="../../bower_components/Chart.js/dist/Chart.min.js"></script>
+  <script src="../../node_modules/angular/angular.min.js"></script>
+  <script src="../../node_modules/chart.js/dist/Chart.min.js"></script>
   <script src="../../angular-chart.js"></script>
   <script src="charts.js"></script>
 </body>
diff --git a/test/fixtures/configure-line-chart.html b/test/fixtures/configure-line-chart.html
@@ -25,8 +25,8 @@ <h1>Charts</h1>
     </section>
   </div>
 
-  <script src="../../bower_components/angular/angular.min.js"></script>
-  <script src="../../bower_components/Chart.js/dist/Chart.min.js"></script>
+  <script src="../../node_modules/angular/angular.min.js"></script>
+  <script src="../../node_modules/chart.js/dist/Chart.min.js"></script>
   <script src="../../angular-chart.js"></script>
   <script src="configure-line-chart.js"></script>
 </body>
diff --git a/test/fixtures/custom-directive.html b/test/fixtures/custom-directive.html
@@ -24,8 +24,8 @@ <h1>Charts</h1>
     </section>
   </div>
 
-  <script src="../../bower_components/angular/angular.min.js"></script>
-  <script src="../../bower_components/Chart.js/dist/Chart.min.js"></script>
+  <script src="../../node_modules/angular/angular.min.js"></script>
+  <script src="../../node_modules/chart.js/dist/Chart.min.js"></script>
   <script src="../../angular-chart.js"></script>
   <script src="custom-directive.js"></script>
 </body>
diff --git a/test/index.html b/test/index.html
@@ -6,16 +6,16 @@
 </head>
 <body ng-app="chart.js">
 <div id="mocha"></div>
-<script src="../bower_components/angular/angular.min.js"></script>
-<script src="../bower_components/Chart.js/dist/Chart.min.js"></script>
+<script src="../node_modules/angular/angular.min.js"></script>
+<script src="../node_modules/chart.js/dist/Chart.min.js"></script>
 <script src="../angular-chart.js"></script>
 <script src="../node_modules/mocha/mocha.js"></script>
 <script src="../node_modules/chai/chai.js"></script>
 <script src="../node_modules/chai-string/chai-string.js"></script>
 <script src="../node_modules/sinon/pkg/sinon.js"></script>
 <script src="../node_modules/sinon-chai/lib/sinon-chai.js"></script>
 <script>mocha.setup('bdd')</script>
-<script src="../bower_components/angular-mocks/angular-mocks.js"></script>
+<script src="../node_modules/angular-mocks/angular-mocks.js"></script>
 <script src="../test/fixtures/coverage.js"></script>
 <script src="../test/test.unit.js"></script>
 <script>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-bower_components/`
`2`	`1`	`coverage/`
`3`	`2`	`node_modules/`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-bower_components/`
`2`	`1`	`node_modules/`
`3`	`2`	`dist/`
`4`	`3`	`tmp/`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,5 @@`
`40`	`40`	`"dependencies": {`
`41`	`41`	`"angular": "1.x",`
`42`	`42`	`"Chart.js": "2.x"`
`43`		`- },`
`44`		`- "devDependencies": {`
`45`		`- "angular-bootstrap": "~0.11.0",`
`46`		`- "angular-mocks": "~1.x",`
`47`		`- "font-awesome": "~4.1.0",`
`48`		`- "rainbow": "~1.1.9",`
`49`		`- "requirejs": "~2.1.20"`
`50`	`43`	`}`
`51`	`44`	`}`