sproutcore 1.4.5-java → 1.5.0-java

data/.rspec

@@ -0,0 +1 @@
+--colour

data/CHANGELOG

@@ -1,3 +1,128 @@
+*SproutCore 1.5.0 (April 19, 2011)*
+
+* Fixed description for init, docs and gen tasks
+* Fix for proxy: DELETE method requests can contain body
+* Fixes to CSS @import/sc_require
+* Better 'port in use' error message for sc-server
+
+
+*SproutCore 1.5.0.rc.2 (April 11, 2011)*
+
+* Fixed a compatibility issue with Windows environments
+
+
+*SproutCore 1.5.0.rc.1 (April 1, 2011)*
+
+* Made it possible to share index.html across multiple languages vs. duplicating it for each.
+* Fixed spriting support related regressions
+* sc-build speed improvements
+* Added support for @debug statements which allow you to mark blocks of code only for debugging purposes.
+* Introduce some new safe-guards for the parallelization of minification
+* Refactored how Chance is invoked by the buildtools
+* Made Chance minify the CSS
+* Added verbose logging about the whitelisting feature
+* Fixed bugs with the modular loading feature of sproutcore that caused the modules not to refresh during development
+* Refactored the spriting support of Chance
+* Added a first-draft of a Chance unit test runner, similar to the existing rake test runner, but based on file output not method output
+* Added support for rmagick, allowing us to preprocess jpegs and gifs in addition to pngs
+* Fixed the -r --include-required build flags when used in conjunction with the --build-targets flag in the buildtools which caused missing building and minifying of targets
+* Prevented the buildtools from generating CSS files unnecessarily
+* Updated unit tests
+* Bug fixes throughout
+
+
+*SproutCore 1.5.0.pre.5 (March 16, 2011)*
+
+* Fixes Ruby 1.8 support
+* Fixes UTF-8 encoding issues
+* Improves speed of unit tests
+* Slice JPEGs and GIFs with Chance
+
+
+*SproutCore 1.5.0.pre.4.1 (March 1, 2011)*
+
+* Fix bug in SC.TemplateCollectionView that was causing Todos demo not to work
+in Firefox.
+* Added default CSS for HTML-based projects.
+
+
+*SproutCore 1.5.0.pre.4 (February 28, 2011)*
+
+* We are beginning to move API that we don't believe will be ready before 1.5
+release into the `experimental` framework. If your apps rely on code that is
+migrated to experimental, please make sure you include it as a dependency. For
+more, please see frameworks/experimental/README.md.
+* Support for extending classes after they've been created with the
+reopen()/enhance() combo. For more, see: [this
+discussion](http://groups.google.com/group/sproutcore-dev/browse_thread/thread/d65ad54d6fddef5d)
+	* This change may break existing code if you call sc_super() in your mixins.
+	If your app throws exceptions after updating, please see [this post](http://groups.google.com/group/sproutcore-dev/browse_thread/thread/cc6a97e6133cb8cc).
+* Added SC.TemplateView and Handlebars. These allow you to specify the content
+of your views using templates.
+	* {{#view}} helper allows you to define child views
+	* {{#bind}} helper allows you to render a property, and automatically update DOM if that
+	property ever changes.
+	* {{#collection}} helpers allows you to render a simple collection of items
+	using templates
+	* SC.TextFieldSupport and SC.CheckboxSupport mixins for SC.TemplateViews
+	that wrap <input> elements.
+* Split SC.View into units of functionality. SC.View remains functionally the
+same, but you can now use SC.CoreView, a light-weight subset of SC.View.
+* SC.ImageView will use a <canvas> tag on platforms that support it, which
+improves performance significantly.
+* SC.SegmentedView now creates an overflow menu if there are too many segments
+to display.
+	* Class names for SC.SegmentedView have been cleaned up. You may need to
+	update your CSS if you were theming SC.SegmentedView.
+* You can now observe the contents of enumerables using the special `@each`
+key.
+* Dependent keys can accept property paths. For example, you can say
+.property('foo.bar'), and it will be invalidated if the `bar` property of
+`foo` changes.
+* Deprecated SC.viewportOffset(). Please use SC.offset() instead, which is
+more explicit about what it returns.
+* SC.browser now detects Android devices.
+* SC.device.orientation now works reliably on desktop, iOS, and Android 2.1
+and above.
+* Experimental support for gyroscope information, if provided by the browser.
+* Unit tests for runtime, desktop, foundation, core_foundation, and datastore
+are all passing.
+
+
+*SproutCore 1.5.0.pre.3 (February 3, 2011)*
+
+* More fixes to Ruby 1.8/1.9 compat
+
+
+*SproutCore 1.5.0.pre.2 (February 2, 2011)*
+
+* Minor code cleanup
+* Fixed Ruby 1.8 issues
+
+
+*SproutCore 1.5.0.pre.1 (February 1, 2011)*
+
+* Integrated Chance
+* UTF-8 encoding fixes
+* Improved minification and packing
+* Add HTML5 application cache manifest configuration options and also disable in debug by default
+* Deferred loading
+* Fixes for css media query minifications
+* Added .manifest and .htm into the default acceptable files
+* Add --yui_minification flag to switch between closure compiler and yui compressor for minification
+* Set PreferredLanguage earlier
+* Changes to be able to build multiple languages
+
+
+*SproutCore 1.4.5 (January 25, 2011)*
+
+*Got Specs running again*
+*Updated Copyrights*
+*Added RSpec task back into Rakefile*
+*Fixed issue with :combine_javascripts => false crashing*
+*Corrected references to the old sproutit repo*
+
+
 *SproutCore 1.4.4 (November 12, 2010)*
 
 * Support for custom mime-types
@@ -27,3 +152,4 @@
 *SproutCore 1.4.1 (September 21, 2010)*
 
 * Fixed string escaping issue in call to YUI Compressor [PDW]
+

data/README.txt

@@ -39,6 +39,31 @@ This gem includes both the Abbot build tools and a copy of the SproutCore
 JavaScript framework.  You can use built-in commands to create, develop, 
 build, and deploy SproutCore-based applications.
 
+== USING ABBOT FROM SOURCE:
+
+These steps will allow the use of a development release of abbot rather than an installed gem.
+
+  1. Inside a empty project folder create a file named 'Gemfile' (no extension)
+
+    Modify the file so that it contains:
+      source "http://rubygems.org"
+      gem "sproutcore", :git => "git://github.com/sproutcore/abbot.git"
+      # if you want to use a version of abbot already checked out into your system rather than the remote repository
+      # gem "sproutcore", :path => "/path/to/abbot"
+
+  2. Install Abbot and its dependencies by running these commands
+
+    $ sudo gem install bundler
+    $ bundle install --binstubs
+
+    This will install the Ruby 'bundler' gem (if it is not already), then add a 'bin' directory to your project containing executables like "sc-server".
+    The bundle install command will take care of locating, installing and linking to either the remote git or locally installed version of abbot and dependencies.
+
+  3. Init the Sproutcore project and start the server
+
+    $ bin/sc-init .
+    $ bin/sc-server
+
 == KNOWN LIMITATIONS:
 
 * Currently does not support sites using relative-links.  You must specify

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 4
-:patch: 5
+:minor: 5
+:patch: 0

data/bin/sc-build

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-build from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-build from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-build-number

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-build-number from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-build-number from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-docs

@@ -8,7 +8,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-docs from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-docs from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-gen

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-gen from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-gen from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-init

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-init from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-init from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-manifest

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-manifest from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-manifest from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sc-server

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sc-server from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sc-server from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/bin/sproutcore

@@ -7,7 +7,7 @@
 # ===========================================================================
 
 if caller.empty?
-  puts "FATAL: You need to invoke sproutcore from an installed gem or through bundler. For more information, please visit http://github.com/sproutcore/abbot/wiki/Using-Abbot-1.4-From-Source"
+  puts "FATAL: You need to invoke sproutcore from an installed gem or through bundler. For more information, please view the README 'Using Abbot From Source'."
   exit
 end
 

data/lib/Buildfile

@@ -31,7 +31,7 @@ mode :all do
       :pages      => :app, # used for static pages with your site
       :frameworks => :framework,
       :themes     => :theme,
-      :bundles    => :framework
+      :modules    => :module
     },
 
     # Allows the target to have other targets nested inside of it.  Override
@@ -71,7 +71,7 @@ mode :all do
 
     # name a framework to use as the theme.  will be included in required
     # frameworks automatically if found.
-    :theme  => 'sproutcore/standard_theme',
+    :theme  => 'sproutcore/ace',
 
     # use default bootstrap framework
     :bootstrap_inline => 'sproutcore/bootstrap:javascript',
@@ -79,6 +79,7 @@ mode :all do
     # In design mode, load the designer
     :design_required => ['sproutcore/designer'],
 
+    # packs all JavaScript and CSS into one file for reduced HTTP requests
     :use_packed => true,
 
 		# If set to true, the specified framework, if loaded via the SC.loadBundle
@@ -96,8 +97,13 @@ mode :all do
     :hide_body_overflow => true,
 
     # A hash of additional MIME types, i.e. { '.m4a' => 'audio/mp4a-latm' }
-    :mime_types => {}
-
+    :mime_types => {},
+    
+    # Whether to generate an app.manifest file for HTML5 application caching
+    :html5_manifest => false,
+    # Which networks/URLs to allow if HTML5 application caching is turned on
+    :html5_manifest_networks => []
+    
 end
 
 
@@ -137,7 +143,10 @@ mode :debug do
 
     # Do not pack javascripts in development mode, we want each file to
     # load independently.
-    :use_packed => false
+    :use_packed => false,
+    
+    # Turn off HTML5 application caching by default in debug mode
+    :html5_manifest => false
 end
 
 

data/lib/buildtasks/build.rake

@@ -17,13 +17,20 @@ namespace :build do
 
   desc "builds a single css files"
   build_task :css do |task, env|
-    if env[:dst_path] =~ %r{en/current/menu_item_view.css}
-      SC.profile("PROFILE_CSS") do
-        SC::Builder::Stylesheet.build env[:entry], env[:dst_path]
-      end
-    else
-      SC::Builder::Stylesheet.build env[:entry], env[:dst_path]
-    end
+    SC::Builder::Stylesheet.build env[:entry], env[:dst_path]
+  end
+
+  desc "builds an image file"
+  build_task :image do |task, env|
+    # by default, just copy images
+    require 'fileutils'
+    FileUtils.mkdir_p(File.dirname(env[:dst_path]))
+    FileUtils.cp_r(env[:src_path], env[:dst_path])
+  end
+
+  desc "converts a Handlebars file to JavaScript"
+  build_task :handlebars do |task, env|
+    SC::Builder::Handlebars.build env[:entry], env[:dst_path]
   end
 
   desc "builds a single sass file"
@@ -61,6 +68,21 @@ namespace :build do
     SC::Builder::Combine.build env[:entry], env[:dst_path]
   end
   
+  desc "adds all the css and image files in the target to chance and lets it run on a per-target basis"
+  build_task :chance do |task, env|
+    SC::Builder::Chance.build env[:entry], env[:dst_path]
+  end
+
+  desc "extracts a file from the Chance entries"
+  build_task :chance_file do |task, env|
+    SC::Builder::ChanceFile.build env[:entry], env[:dst_path]
+  end
+  
+  desc "wraps the entry into a string for prefetched modules"
+  build_task :string_wrap do |task, env|
+    SC::Builder::StringWrapper.build env[:entry], env[:dst_path]
+  end
+
   namespace :minify do
     
     desc "Minifies a CSS file by invoking CSSmin"
@@ -77,7 +99,6 @@ namespace :build do
     build_task :inline_javascript do |task, env|
       SC::Builder::Minify.build env[:entry], env[:dst_path], :inline_javascript
     end
-    
   end
   
   desc "builds a unit test"
@@ -89,15 +110,10 @@ namespace :build do
   build_task :test_index do |task, env|
     SC::Builder::TestIndex.build env[:entry], env[:dst_path]
   end
-  
-  desc "builds the bundle_loaded.js file for a framework"
-  build_task :bundle_loaded do |task, env|
-    SC::Builder::BundleLoaded.build env[:entry], env[:dst_path]
-  end
-  
-  desc "builds the bundle_info.js file for a required framework"
-  build_task :bundle_info do |task, env|
-    SC::Builder::BundleInfo.build env[:entry], env[:dst_path]
+
+  desc "builds the module_info.js file for a required framework"
+  build_task :module_info do |task, env|
+    SC::Builder::ModuleInfo.build env[:entry], env[:dst_path]
   end
   
 end

data/lib/buildtasks/manifest.rake

@@ -5,6 +5,7 @@
 
 # Tasks invoked while building Manifest objects.  You can override these
 # tasks in your buildfiles.
+
 namespace :manifest do
 
   desc "Invoked just before a manifest object is built to setup standard properties"
@@ -44,28 +45,88 @@ namespace :manifest do
   desc "Actually builds a manifest.  This will catalog all entries and then filter them"
   task :build => %w(catalog hide_buildfiles localize prepare_build_tasks:all)
 
-  desc "first step in building a manifest, this adds a simple copy file entry for every file in the source"
+  desc "Builds a manifest, this adds a copy file entry for every whitelisted file in the source"
   task :catalog do |t, env|
     target   = env[:target]
     manifest = env[:manifest]
 
     source_root = target[:source_root]
 
-    SC.profile("PROFILE_CATALOG") do
-      Dir["#{source_root}/**/*"].each do |path|
-        next unless File.file?(path)
-        next if target.target_directory?(path)
+    whitelist = nil
+
+    # Find and parse the BuildWhitelist json file
+    # Right now, the build whitelist is read for every target, can we optimize this?
+    Dir.glob("#{Dir.pwd}/Whitelist").each do |path|
+      next unless File.file?(path)
+
+      contents = File.read(path)
+      parser = JSON.parser.new(contents)
+      whitelist = parser.parse
+    end
+
+    if whitelist
+      acceptableFilesForTarget = whitelist["#{target[:target_name]}"]
+
+      # Always accept these files
+      defaultAcceptableFiles = [
+        '.manifest',
+        '.htm',
+        '.html',
+        '.rhtml',
+        '.png',
+        '.jpg',
+        '.jpeg',
+        '.gif'
+      ]
+
+      if acceptableFilesForTarget.kind_of?(Array)
+        acceptableFilesForTarget += defaultAcceptableFiles
+
+      # I make an assumption that if the type of acceptableFilesForTarget is String,
+      # then the user wants to match that across any file, so make it an array to accomodate
+      elsif acceptableFilesForTarget.kind_of?(String)
+        acceptableFilesForTarget = [acceptableFilesForTarget] + defaultAcceptableFiles
+
+      else
+        #WhiteList isn't defined, don't include anything
+        acceptableFilesForTarget = defaultAcceptableFiles
+      end
+    else
+      acceptableFilesForTarget = [".*"]
+    end
+
+    number_rejected_entries = 0
 
+    Dir.glob("#{source_root}/**/*").each do |path|
+      next unless File.file?(path)
+      next if target.target_directory?(path)
+
+      valid = false
+
+      acceptableFilesForTarget.each do |acceptableFile|
+        if path =~ Regexp.new(acceptableFile) then
+          valid = true
+          break
+        end
+      end
+
+      if valid
         # cut source root out to make filename.  make sure path separators are /
         filename = path.sub /^#{Regexp.escape source_root}\//, ''
         filename = filename.split(::File::SEPARATOR).join('/')
         manifest.add_entry filename, :original => true # entry:prepare will fill in the rest
+      else
+        number_rejected_entries += 1
       end
     end
+
+      if number_rejected_entries > 0
+        SC.logger.warn "The Whitelist file rejected #{number_rejected_entries} file(s) from #{target[:target_name]}"
+      end
   end
 
   desc "hides structural files that do not belong in build include Buildfiles and debug or fixtures if turned off"
-  task :hide_buildfiles => :catalog do |task, env|
+  task :hide_buildfiles => [:catalog] do |task, env|
     manifest = env[:manifest]
 
     # these directories are to be excluded unless CONFIG.load_"dirname" = true
@@ -127,7 +188,7 @@ namespace :manifest do
           end
 
         # if this is a preferred_language, hide unless we've seen one
-        elsif entry[:language] == preferred_language
+        elsif entry[:language].to_s == preferred_language.to_s
           if seen[entry[:filename]]
             entry.hide!
           else
@@ -150,7 +211,7 @@ namespace :manifest do
   namespace :prepare_build_tasks do
 
     desc "main entrypoint for preparing all build tasks.  This should invoke all needed tasks"
-    task :all => %w(css javascript bundle_info bundle_loaded sass scss less combine minify html strings tests packed) 
+    task :all => %w(css handlebars javascript module_info sass less combine string_wrap minify string_wrap html strings tests packed)
 
     desc "executes prerequisites needed before one of the subtasks can be invoked.  All subtasks that have this as a prereq"
     task :setup => %w(manifest:catalog manifest:hide_buildfiles manifest:localize)
@@ -206,7 +267,7 @@ namespace :manifest do
       end
     end
     task :javascript => :tests # IMPORTANT! to avoid JS including unit tests.
-    # task :html       => :tests # IMPORTANT! to avoid HTML including tests
+    # task :html       => :tests # IMPORTANT! to avoid HTML including tests 
 
     desc "scans for javascript files, annotates them and prepares combined entries for each output target"
     task :javascript => :setup do |task, env|
@@ -231,118 +292,313 @@ namespace :manifest do
           :entry_type => :javascript
         entry.discover_build_directives!
       end
-
     end
 
     desc "scans for css files, creates a transform and annotates them"
     task :css => :setup do |task, env|
       manifest = env[:manifest]
+      config = env[:target].config
 
       # select all original entries with with ext of css
       entries = manifest.entries.select do |e|
-        e.original? && e[:ext] == 'css'
+        e.original? && ['css', 'scss'].include?(e[:ext])
       end
 
       # add transform & tag with build directives.
       entries.each do |entry|
+        filename = entry[:filename]
+
+        # We want it to appear as CSS
+        filename.gsub! /\.scss$/, '.css'
+
         entry = manifest.add_transform entry,
-          :filename   => ['source', entry[:filename]].join('/'),
+          :filename   => ['source', filename].join('/'),
           :build_path => File.join(manifest[:build_root], 'source', entry[:filename]),
           :url => [manifest[:url_root], 'source', entry[:filename]].join("/"),
           :build_task => 'build:css',
           :resource   => 'stylesheet',
-          :entry_type => :css
+          :entry_type => :css,
+          :ext => 'css',
+          :from_scss => (entry[:ext] == 'scss')   # for testing
         entry.discover_build_directives!
       end
     end
 
-    desc "adds a bundle_info.js entry for each dynamic_required target"
-    task :bundle_info => %w(setup) do |task, env|
+    desc "scans for image files, creates a transform and annotates them"
+    task :images => :setup do |task, env|
+      manifest = env[:manifest]
+      config = env[:target].config
+
+      # select all original entries with with ext of png, jpg, jpeg or gif
+      entries = manifest.entries.select do |e|
+        e.original? && ['png', 'jpg', 'jpeg', 'gif'].include?(e[:ext])
+      end
+
+      # add transform & tag with build directives.
+      entries.each do |entry|
+        entry = manifest.add_transform entry,
+          :filename   => ['source', entry[:filename]].join('/'),
+          :build_path => File.join(manifest[:build_root], 'source', entry[:filename]),
+          :url => [manifest[:url_root], 'source', entry[:filename]].join("/"),
+          :build_task => 'build:image',
+          :entry_type => :image
+      end
+
+    end
+
+    desc "scans for Handlebars templates and converts them to JavaScript"
+    task :handlebars => %w(setup) do |task, env|
+      manifest = env[:manifest]
+
+      entries = manifest.entries.select do |e|
+        e[:ext] == 'handlebars'
+      end
+
+      entries.each do |entry|
+        entry = manifest.add_transform entry,
+          :filename => ['source', entry[:filename]].join('/'),
+          :build_path => File.join(manifest[:build_root], 'source', entry[:filename].ext('js')),
+          :url => [manifest[:url_root], 'source', entry[:filename]].join("/"),
+          :build_task => 'build:handlebars',
+          :resource   => 'javascript',
+          :entry_type => :javascript
+      end
+    end
+
+    desc "adds a module_info.js entry for all deferred and prefetched modules"
+    task :module_info => %w(setup) do |task, env|
       target   = env[:target]
       manifest = env[:manifest]
       config   = CONFIG
 
-      # Populate bundle_info for all dynamic_required frameworks.
-      # Add :debug_dynamic_required and :test_dynamic_required depending on
+      # Populate module_info for all deferred_modules frameworks.
+      # Add :debug_required and :test_required depending on
       # the build mode.
       debug = config[:load_debug]
       test = config[:load_tests]
 
-      targets = target.dynamic_required_targets({ :debug => debug, :test => test, :theme => true })
+      # find all of the modules required by this target
+      targets = target.modules({ :debug => debug, :test => test, :theme => true })
+
       unless targets.size == 0
-        source_entries = []
-        targets.each do |t|
-          t.manifest_for(manifest.variation).build!.entries.each do |e|
-            source_entries << e
+
+        source_paths = []
+
+        targets.each do |target|
+          m = target.manifest_for(manifest.variation)
+          m.build!
+
+          m.entries.each do |entry|
+            # The entry may have been built directly; we need to make sure it was
+            # staged because we check staging_path
+            entry.stage!
+            case entry[:entry_type]
+            when :css
+              source_paths << entry[:staging_path]
+            when :javascript
+              source_paths << entry[:staging_path]
+            end
           end
         end
-        manifest.add_entry 'bundle_info.js',
+
+        manifest.add_entry 'module_info.js',
           :dynamic        => true, # required to get correct timestamp for cacheable_url
-          :build_task     => 'build:bundle_info',
+          :build_task     => 'build:module_info',
           :resource       => 'javascript',
           :entry_type     => :javascript,
           :composite      => true,
-          :source_entries => source_entries,
           :target         => target,
           :targets        => targets,
           :variation      => manifest.variation,
           :debug          => debug,
           :test           => test,
-          :theme          => true
+          :theme          => true,
+          :source_paths   => source_paths
       end
     end
-    task :bundle_info => :tests # IMPORTANT! to avoid JS including unit tests.
 
-    desc "adds a bundle_loaded.js entry if the target is a framework"
-    task :bundle_loaded => %w(setup) do |task, env|
-      target   = env[:target]
+    task :module_info => :tests # IMPORTANT! to avoid JS including unit tests.
+
+    desc "generates combined entries for CSS"
+    task :chance => %w(setup images javascript module_info css sass less) do |task, env|
+      config = CONFIG
       manifest = env[:manifest]
 
-      if target[:target_type] == :framework
-        manifest.add_entry 'bundle_loaded.js',
-          :build_task  => 'build:bundle_loaded',
-          :resource    => 'javascript',
-          :entry_type  => :javascript,
-          :composite   => true, # does not have a source
-          :source_entries => [],
-          :target      => target
+      sprited = CONFIG[:use_sprites]
+      minify = CONFIG[:minify_css]
+
+      # the image files will be shared between all css_entries-- that is,
+      # all instances of Chance created
+      global_chance_entries = []
+
+      # For each "resource" a separate css entry will be created.
+      css_entries = {}
+
+      manifest.entries.each do |entry|
+        # Chance needs to know about image files so it can embed as data URIs in the
+        # CSS. For this reason, if Chance is enabled, we need to send entries for image
+        # files to the 'build:chance' buildtask.
+        is_chance_file = ['.png', '.jpg', '.jpeg', '.gif'].include?(File.extname(entry[:filename]))
+
+        next if entry[:resource].nil? and not is_chance_file
+
+        if is_chance_file
+          global_chance_entries << entry
+        elsif entry[:entry_type] == :css
+          (css_entries[entry[:resource]] ||= []) << entry
+          entry.hide! if config[:combine_stylesheets]
+        end
+
+      end
+
+      chance_instances = []
+      all_chance_entries = []
+      timestamps = []
+
+      # We need a collection of source paths for our mhtml and JS files to
+      # check mtimes against.
+      source_paths = []
+
+      # build combined CSS entry
+      css_entries.each do |resource_name, entries|
+        # Send image files to the build task if Chance is being used
+        entries.concat global_chance_entries
+
+        # We create the Chance Instance now, even though we don't run the whole thing.
+        # This could incur a performance penalty to build manifests, but it is the only 
+        # way to know what sprties, etc. need to be put into the manifest.
+        #
+        # Still, Chance has to get created sometime.
+        chance = Chance::Instance.new({ :theme => CONFIG[:css_theme], :minify => CONFIG[:minify_css] })
+
+        timestamp = 0
+        has_2x_entries = false
+        entries.each do |entry|
+          timestamp = [entry.timestamp, timestamp].max
+
+          # unfortunately, we have to stage the source entries NOW.
+          src_path = entry.stage![:staging_path]
+          next unless File.exist?(src_path)
+
+          Chance.add_file src_path
+          # Also remove source/ from the filename for sc_require and @import
+          chance.map_file(entry.filename.sub(/^source\//, ''), src_path)
+
+          has_2x_entries = true if src_path.include?("@2x")
+        end
+
+        timestamps << timestamp
+        chance_instances << chance
+
+
+        # ADD A 2X version
+        # Because the @2x file is not a _real_ composite entry, and as such has
+        # no true source entries (because we don't want to stage them as that
+        # adversely impacts performance), we need to give a set of source paths
+        # for the entry to compare mtimes with to know if it needs to update.
+        entry_source_paths = entries.map {|e| e[:source_path] }
+
+        add_chance_file = lambda {|entry_name, chance_file|
+          manifest.add_entry entry_name,
+            :variation       => manifest.variation,
+            :build_task      => 'build:chance_file',
+            :entry_type      => :css,
+            :combined        => true,
+
+            :source_entries  => entries,
+            :ordered_entries => SC::Helpers::EntrySorter.sort(entries),
+
+            :chance_file     => chance_file,
+            :chance_instance => chance,
+
+            # For cache-busting, we must support timestamped urls, but the entry
+            # will be unable to calculate the timestamp for this on its own. So, we
+            # must supply the calculated timestamp.
+            :timestamp       => timestamp,
+
+            :source_paths => entry_source_paths,
+            :resource_name => resource_name,
+
+            # So that modules, etc. can figure out what resource it belongs to
+            :resource => resource_name,
+
+            # Chance does minification on its own
+            :minify => minify,
+
+            # So that it can easily be recognized as an @2x entry.
+            :x2 => entry_name.include?("@2x")
+        }
+
+
+        chance_file = "chance" + (sprited ? "-sprited" : "") + ".css"
+
+        add_chance_file.call(resource_name + ".css", chance_file)
+
+        # We only want to add the 2x version if there is a need for it.
+        # NOTE: the HTML builder will need to pick the normal version if it
+        # cannot find the @2x version.
+        if has_2x_entries
+          chance_2x_file = "chance" + (sprited ? "-sprited" : "") + "@2x.css"
+          add_chance_file.call(resource_name + "@2x.css", chance_2x_file)
+        end
+
+        if sprited
+          chance.sprite_names.each {|name|
+            add_chance_file.call(resource_name + "-" + name, name);
+          }
+
+          chance.sprite_names({:x2 => true}).each {|name|
+            add_chance_file.call(resource_name + "-" + name, name);
+          }
+        end
+
+        # We also have a set of all source paths for the chance task. We need
+        # to keep it up-to-date so that the MHTML and JS tasks can compare mtimes
+        # with the entries.
+        source_paths += entry_source_paths
+        all_chance_entries += entries
+      end
+
+      if chance_instances.length > 0
+        manifest.add_entry "__sc_chance.js",
+          :build_task       => 'build:chance_file',
+          :chance_instances   => chance_instances,
+          :entry_type       => :javascript,
+          :resource         => "javascript",
+          :chance_file      => "chance.js",
+          :timestamp        => timestamps.max,
+          :source_paths     => source_paths,
+          :source_entries   => all_chance_entries
+
+        manifest.add_entry "__sc_chance_mhtml.txt",
+          :build_task       => 'build:chance_file',
+          :chance_instances   => chance_instances,
+          :entry_type       => :mhtml,
+          :chance_file      => "chance-mhtml.txt",
+          :timestamp        => timestamps.max,
+          :source_paths     => source_paths,
+          :source_entries   => all_chance_entries
       end
 
     end
-    task :bundle_loaded => :tests # IMPORTANT! to avoid JS including unit tests.
 
-    desc "generates combined entries for javascript and css"
-    task :combine => %w(setup css javascript bundle_info bundle_loaded sass scss less) do |task, env|
+    desc "generates combined entries for javascript"
+    task :combine => %w(setup chance javascript module_info) do |task, env|
+      config = env[:target].config
       manifest = env[:manifest]
       config   = CONFIG
 
-      # sort entries...
-      css_entries = {}
       javascript_entries = {}
+
       manifest.entries.each do |entry|
         # we can only combine entries with a resource property.
         next if entry[:resource].nil?
 
-        # look for CSS or JS type entries
-        case entry[:entry_type]
-        when :css
-          (css_entries[entry[:resource]] ||= []) << entry
-        when :javascript
+        if entry[:entry_type] == :javascript
           (javascript_entries[entry[:resource]] ||= []) << entry
         end
       end
 
-      # build combined CSS entry
-      css_entries.each do |resource_name, entries|
-        manifest.add_composite resource_name.ext('css'),
-          :build_task      => 'build:combine',
-          :source_entries  => entries,
-          :hide_entries    => config[:combine_stylesheets],
-          :ordered_entries => SC::Helpers::EntrySorter.sort(entries),
-          :entry_type      => :css,
-          :combined        => true
-      end
-
       # build combined JS entry
       javascript_entries.each do |resource_name, entries|
         resource_name = resource_name.ext('js')
@@ -356,7 +612,24 @@ namespace :manifest do
           :entry_type      => :javascript,
           :combined        => true
       end
+    end
 
+    desc "Wraps the javascript.js file into a string if the target is a prefetched module"
+    task :string_wrap => %w(setup css javascript module_info sass less combine minify) do |task, env|
+      manifest = env[:manifest]
+      target   = env[:target]
+
+      next unless target[:target_type] == :module
+
+      entry = manifest.entry_for "javascript.js"
+
+      next if not entry
+      transform = manifest.add_composite 'javascript-strings.js',
+        :build_task     => 'build:string_wrap',
+        :entry_type     => :javascript,
+        :hide_entries   => false,
+        :source_entries => [entry],
+        :packed         => entry.packed? # carry forward
     end
 
     desc "adds a packed entry including javascript.js from required targets"
@@ -364,11 +637,11 @@ namespace :manifest do
       target   = env[:target]
       manifest = env[:manifest]
 
-      # don't add packed entries for apps.
-      if target[:target_type] != :app
+      # Only include a packed entry _if_ it is an app.
+      if target[:target_type] == :app
         # Handle JavaScript version.  get all required targets and find their
         # javascript.js.  Build packed js from that.
-        targets = target.expand_required_targets + [target]
+        targets = target.expand_required_targets({ :theme => true }) + [target]
         entries = targets.map do |target|
           m = target.manifest_for(manifest.variation).build!
 
@@ -391,6 +664,7 @@ namespace :manifest do
 
       end
     end
+
     task :minify => :packed # IMPORTANT: don't want minified version
 
     desc "adds a packed entry including stylesheet.css from required targets"
@@ -398,37 +672,45 @@ namespace :manifest do
       target   = env[:target]
       manifest = env[:manifest]
 
-      # don't add packed entries for apps.
-      if target[:target_type] != :app
-        # Handle CSS version.  get all required targets and find their
-        # stylesheet.css.  Build packed css from that.
-        targets = target.expand_required_targets + [target]
-        entries = targets.map do |target|
-          m = target.manifest_for(manifest.variation).build!
+      # packed entries only for apps now.
+      if target[:target_type] == :app
 
-          # need to find the version that is not minified
-          entry = m.entry_for('stylesheet.css')
-          entry = entry.source_entry while entry && entry.minified?
-          entry
-        end
+        %w(stylesheet stylesheet@2x).each {|resource|
 
-        entries.compact!
-        manifest.add_composite 'stylesheet-packed.css',
-          :build_task        => 'build:combine',
-          :source_entries    => entries,
-          :hide_entries      => false,
-          :entry_type        => :css,
-          :combined          => true,
-          :ordered_entries   => entries, # orderd by load order
-          :targets           => targets,
-          :packed            => true
+          # Handle CSS version.  get all required targets and find their
+          # stylesheet.css.  Build packed css from that.
+          targets = target.expand_required_targets({ :theme => true }) + [target]
+          entries = targets.map do |target|
+            m = target.manifest_for(manifest.variation).build!
 
+            # need to find the version that is not minified
+            entry = m.entry_for(resource + ".css")
+            entry = entry.source_entry while entry && entry.minified?
+            entry
+          end
+
+          entries.compact!
+
+          next if entries.length == 0
+          manifest.add_composite resource + '-packed.css',
+            :build_task        => 'build:combine',
+            :source_entries    => entries,
+            :hide_entries      => false,
+            :entry_type        => :css,
+            :combined          => true,
+            :ordered_entries   => entries, # ordered by load order
+            :targets           => targets,
+            :packed            => true
+
+        }
       end
+
     end
+
     task :minify => :packed # IMPORTANT: don't want minified version
 
-    #Create builder tasks for sass, scss (sass v3) and less in a DRY way
-    [:sass, :scss, :less].each do |csscompiler|
+    #Create builder tasks for sass and less in a DRY way
+    [:sass, :less].each do |csscompiler|
       desc sprintf("create a builder task for all %s files to create css files", csscompiler.to_s)
       task csscompiler => :setup do |task, env|
         manifest = env[:manifest]
@@ -491,7 +773,6 @@ namespace :manifest do
           end
           (entries_by_resource[entry[:resource]] ||= []) << entry
         end
-
       end
 
       # even if no resource was found for the index.html, add one anyway if
@@ -545,12 +826,11 @@ namespace :manifest do
             is_hidden = true if (rep_cnt>=2) && !is_pref_lang
           end
         end
-
       end
     end
 
     desc "creates transform entries for all css and Js entries to minify them if needed"
-    task :minify => %w(setup javascript bundle_info bundle_loaded css combine sass scss less) do |task, env|
+    task :minify => %w(setup javascript module_info css combine sass less) do |task, env|
       manifest = env[:manifest]
       config   = CONFIG
 
@@ -563,13 +843,17 @@ namespace :manifest do
       manifest.entries.dup.each do |entry|
         case entry[:entry_type]
         when :css
-          if minify_css
-            manifest.add_transform entry,
-              :build_task => 'build:minify:css',
-              :entry_type => :css,
-              :minified   => true,
-              :packed     => entry.packed? # carry forward
-          end
+          # NOTE: CSS MINIFICATION USING YUI MINIFIER IS CURRENTLY NOT WORKING.
+          # But, since Chance is minifying it, we can disable this code path
+          # for the moment. We'll need to add it back and fix YUI if we end up
+          # supporting disabling Chance.
+          # if minify_css
+          #   manifest.add_transform entry,
+          #     :build_task => 'build:minify:css',
+          #     :entry_type => :css,
+          #     :minified   => true,
+          #     :packed     => entry.packed? # carry forward
+          # end
 
         when :javascript
           if minify_javascript
@@ -580,13 +864,11 @@ namespace :manifest do
               :packed     => entry.packed? # carry forward
           end
         end
-
       end
-
     end
 
     desc "adds a loc strings entry that generates a yaml file server-side functions can use"
-    task :strings => %w(setup javascript bundle_info bundle_loaded) do |task, env|
+    task :strings => %w(setup javascript module_info) do |task, env|
       manifest = env[:manifest]
 
       # find the lproj/strings.js file...
@@ -607,9 +889,5 @@ namespace :manifest do
     desc "..."
     task :image => :setup do
     end
-
-
   end
-
-
 end