Skip to content

Commit

Permalink
Update bower.json to use one JS file #812
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Jan 17, 2015
1 parent 06629e7 commit b4c0349
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
14 changes: 2 additions & 12 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,8 @@
"assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
"assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
"assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
"assets/javascripts/bootstrap/affix.js",
"assets/javascripts/bootstrap/alert.js",
"assets/javascripts/bootstrap/button.js",
"assets/javascripts/bootstrap/carousel.js",
"assets/javascripts/bootstrap/collapse.js",
"assets/javascripts/bootstrap/dropdown.js",
"assets/javascripts/bootstrap/tab.js",
"assets/javascripts/bootstrap/transition.js",
"assets/javascripts/bootstrap/scrollspy.js",
"assets/javascripts/bootstrap/modal.js",
"assets/javascripts/bootstrap/tooltip.js",
"assets/javascripts/bootstrap/popover.js"
"assets/fonts/bootstrap/glyphicons-halflings-regular.woff2",
"assets/javascripts/bootstrap.js"
],
"keywords": [
"twbs",
Expand Down
5 changes: 1 addition & 4 deletions tasks/bower.rake
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ namespace :bower do
require 'bootstrap-sass'
Dir.chdir Bootstrap.gem_path do
spec = JSON.parse(File.read 'bower.json')
js_paths = File.read(File.join Bootstrap.javascripts_path, 'bootstrap-sprockets.js').lines.map do |line|
line.strip if line.sub!(%r(//\s*=\s*require\s*(?:./)?(.*)\s*), 'assets/javascripts/\1.js')
end.compact

spec['main'] =
find_files.(File.join(Bootstrap.stylesheets_path, '_bootstrap.scss')) +
find_files.(Bootstrap.fonts_path) +
js_paths
%w(assets/javascripts/bootstrap.js)

spec['version'] = Bootstrap::VERSION[0..-3]

Expand Down

0 comments on commit b4c0349

Please sign in to comment.