Merge pull request #232 from BrandonRoehl/master

Change the rake to serve up the distiled variants of JS

Rakefile

@@ -11,7 +11,8 @@ namespace :assets do
   desc 'Update Foundation for Sites assets'
   task update: :clean do
     sh 'bower install'
-    sh 'cp -R bower_components/foundation-sites/js/* vendor/assets/js/'
+    sh 'cp -R bower_components/foundation-sites/dist/js/plugins/* vendor/assets/js/'
+    sh 'rm -f vendor/assets/js/*.min.*'
     sh 'cp -R bower_components/foundation-sites/scss/* vendor/assets/scss/'
     sh 'cp -R bower_components/foundation-sites/scss/settings/_settings.scss lib/generators/foundation/templates'
     sh 'cp -R bower_components/motion-ui/src/* vendor/assets/scss/motion-ui'
@@ -20,14 +21,12 @@ namespace :assets do
 
     js_files = Dir['vendor/assets/js/*.js'].sort
     # Move foundation.core.js to beginning of js_files
-    js_files.insert(0, js_files.delete(js_files.find { |file| file[/foundation.core.js/] }))
+    util_file_regex = /foundation\.util*/
+    js_files = js_files.find_all { |file| file =~ util_file_regex } + js_files.reject { |file| file =~ util_file_regex }
+    js_files.insert(0, js_files.delete(js_files.find { |file| file =~ /foundation\.core\.js/ }))
     manifest = js_files.map { |file| "//= require #{File.basename(file)}" }.join("\n")
     File.write('vendor/assets/js/foundation.js', manifest)
 
-    Dir['vendor/assets/js/*.js'].each do |file|
-      sh "mv #{file} #{file}.es6"
-    end
-
     puts "\n*********************\n** ASSETS UPDATED! **\n*********************\n"
   end
 

lib/foundation/rails/version.rb

@@ -1,5 +1,5 @@
 module Foundation
   module Rails
-    VERSION = "6.4.1.0"
+    VERSION = "6.4.1.1"
   end
 end