Use dependencies via bower instead of vendor files

It makes updating libraries more easily.
billysbilling · Nov 17, 2014 · 337bbfc · 337bbfc
1 parent 0418e25
commit 337bbfc
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 62,200 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 before_script:
   - gem install compass --no-ri --no-rdoc
-  - npm install -g grunt-cli
+  - npm install -g grunt-cli bower
   - npm install
+  - bower install
   - node tests/server.js &
-script: phantomjs tests/cli-runner.js
+script: phantomjs tests/cli-runner.js
diff --git a/README.md b/README.md
@@ -180,8 +180,9 @@ To be able to build and test you need to have the following installed:
 
 - [Node.js](http://nodejs.org/)
 - The NPM package `grunt-cli` (can be installed via `npm install -g grunt-cli`, [see more here](http://gruntjs.com/getting-started))
+- The NPM package `bower` (can be installed via `npm install -g bower`, [see more here](http://bower.io/#getting-started))
 
-Run `npm install` from the project directory to install dependencies.
+Run `bower install` and `npm install` from the project directory to install dependencies.
 
 ### Building
 

diff --git a/bower.json b/bower.json
@@ -23,5 +23,11 @@
     "src",
     "tests",
     "vendor"
-  ]
+  ],
+  "devDependencies": {
+    "ember": "~1.7.0",
+    "handlebars": "~1.0.0",
+    "jquery": "~1.9.0",
+    "qunit": "1.11.0"
+  }
 }
diff --git a/tests/index.html b/tests/index.html
@@ -3,19 +3,19 @@
 <head>
     <meta charset="utf-8">
     <title>Ember Animated Outlet Test Suite</title>
-    <link rel="stylesheet" href="/vendor/qunit-1.11.0.css">
+    <link rel="stylesheet" href="/bower_components/qunit/qunit/qunit.css">
     <link rel="stylesheet" href="/dist/ember-animated-outlet.css">
 </head>
 <body>
 
 <div id="qunit"></div>
 <div id="qunit-fixture"></div>
 
-<script src="/vendor/qunit-1.11.0.js"></script>
+<script src="/bower_components/qunit/qunit/qunit.js"></script>
 
-<script src="/vendor/jquery-1.9.0.js"></script>
-<script src="/vendor/handlebars-1.3.0.js"></script>
-<script src="/vendor/ember-1.7.0-beta.5.js"></script>
+<script src="/bower_components/jquery/jquery.js"></script>
+<script src="/bower_components/handlebars/handlebars.js"></script>
+<script src="/bower_components/ember/ember.js"></script>
 
 <script src="/dist/ember-animated-outlet.js"></script>
 

diff --git a/tests/server.js b/tests/server.js
@@ -6,7 +6,7 @@ var app = express();
 
 app.use('/dist', express.static(__dirname + '/../dist'));
 app.use('/tests', express.static(__dirname + '/../tests'));
-app.use('/vendor', express.static(__dirname + '/../vendor'));
+app.use('/bower_components', express.static(__dirname + '/../bower_components'));
 
 app.get('/', function(req, res, callback) {
     childProcess.exec('grunt', function(err, output) {
@@ -22,4 +22,4 @@ app.get('/', function(req, res, callback) {
     });
 });
 
-app.listen(7846);
+app.listen(7846);