Skip to content

Commit

Permalink
Use bower for external dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue committed Jul 14, 2013
1 parent 275f11c commit 984f386
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 42,885 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "vendor"
}
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@

/node_modules
/.sass-cache

/vendor/ember/
/vendor/handlebars/
/vendor/jquery/

7 changes: 7 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"dependencies": {
"ember": "~1.0.0-rc.6",
"handlebars": "~1.0.0",
"jquery": "~1.9.1"
}
}
6 changes: 3 additions & 3 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ files = [
QUNIT,
QUNIT_ADAPTER,
'vendor/loader.js',
'vendor/jquery.js',
'vendor/handlebars.js',
'vendor/ember.js',
'vendor/jquery/jquery.js',
'vendor/handlebars/handlebars.js',
'vendor/ember/ember.js',
'assets/templates.js',
'assets/app.js',
'tests/test_helper.js',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"grunt-usemin": "~0.1.12",
"grunt-contrib-uglify": "~0.2.2",
"grunt-rev": "~0.1.0",
"grunt-ember-templates": "~0.4.10",
"grunt-ember-templates": "0.4.9",
"string": "~1.4.0",
"karma": "~0.8.6",
"grunt-karma": "~0.4.5"
Expand Down
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<!-- for more details visit: https://github.com/yeoman/grunt-usemin -->

<!-- build:js(.) assets/vendor.min.js -->
<script src="/vendor/jquery.js"></script>
<script src="/vendor/handlebars.js"></script>
<script src="/vendor/ember.js"></script>
<script src="/vendor/jquery/jquery.js"></script>
<script src="/vendor/handlebars/handlebars.js"></script>
<script src="/vendor/ember/ember.js"></script>
<script src="/vendor/loader.js"></script>
<!-- endbuild -->

Expand Down
2 changes: 1 addition & 1 deletion tasks/options/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module.exports = {
}]
},
"vendor": {
src: ['vendor/loader.js', 'vendor/jquery-*.js', 'vendor/handlebars.js', 'vendor/**/*.js'],
src: ['vendor/**/*.js'],
dest: 'tmp/public/'
},
};
6 changes: 3 additions & 3 deletions tests/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<link rel="stylesheet" href="vendor/qunit.css" media="all">
<style>#ember-testing-container { position: absolute; background: white; bottom: 0; right: 0; width: 640px; height: 384px; overflow: auto; z-index: 9999; border: 1px solid #ccc; } #ember-testing { zoom: 50%; }</style>

<script src="/vendor/jquery.js"></script>
<script src="/vendor/handlebars.js"></script>
<script src="/vendor/ember.js"></script>
<script src="/vendor/jquery/jquery.js"></script>
<script src="/vendor/handlebars/handlebars.js"></script>
<script src="/vendor/ember/ember.js"></script>
<script src="/vendor/loader.js"></script>

<script src="/assets/app.js"></script>
Expand Down
Loading

0 comments on commit 984f386

Please sign in to comment.