merge dev branch

LICENSE.txt

@@ -2,7 +2,7 @@ Open Source Initiative OSI - The MIT License
 
 http://www.opensource.org/licenses/mit-license.php
 
-Copyright (c) 2011 unscriptable.com / John Hann
+Copyright (c) 2012 Brian Cavalier and John Hann
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -1,7 +1,7 @@
 curl (cujo resource loader)
 =====================
 
-version 0.5.4
+version 0.6
 
 See the [wiki](https://github.com/cujojs/curl/wiki) for information about using curl.js with jQuery.
 
@@ -19,8 +19,28 @@ Helpful link for updating submodules:
 What's New?
 =======
 
+* 0.6
+	* works with underscore fork at [amdjs](https://github.com/amdjs/underscore)
+	* tested and works with dojo 1.7.1 (using curl/shim/dojo16 as a preload)
+	* allows normal, non-AMD js files to return values to AMD modules (!exports
+	  option)
+	* unwrapped CommonJS Modules/1.1 compatibility (experimental)
+	* non-AMD module loading via moduleLoader config property
+	* updated to latest AMD plugin specifications
+	* preloads config array to ensure shims (or other modules) are loaded
+	  first
+	* package-specific configurations
+	* avoids circular dependencies when using cjsm modules
+	* folder reorganization. shims were moved into their own folder
+	* many bugs fixed, including #21, #22, #28, #34, #36, #39, #40
 * 0.5.4
+	* jQuery 1.7 support!!!
 	* curl.js indicates to jQuery that it is a jQuery-aware AMD loader (#31)
+	* AMD/CJSM Hybrid format (see Manual Conversion section of this
+	  page: http://requirejs.org/docs/commonjs.html)
+	* Now supports node's module.exports = x; export model
+	* bug fixes:
+		* multiple .next() calls now pass variables correctly
 	* curl.js now ignores blank or falsy module ids for better compatibility
 	  wth yepnope and has! (#32)
 * 0.5.3
@@ -57,10 +77,9 @@ What's New?
 
 TODO:
 
-* configuration options per package
-* finish i18n plugin (eta: September)
-* create dojo 1.6 tests
-* document plugin configuration options and how to use plugins
+* finish i18n plugin!
+* create dojo 1.7 shim, if necessary
+* document plugin configuration options and how to use each plugin
 * notes about using JSONP (it works for objects, arrays, functions, numbers
   and strings! use ?callback=define)
 
@@ -143,7 +162,7 @@ Promises-based API for executing callbacks.
 * ['dep1', 'dep2', 'dep3']: Module names or plugin-prefixed resource files
 * callback: Function to receive modules or resources
 * errorback: Function to call if an exception occurred while loading
-* For full CommonJS Promises/A compliance, use [when.js](https://github.com/briancavalier/when.js)
+* For full CommonJS Promises/A compliance, use [when.js](https://github.com/cujojs/when)
     * `when(curl(['dep1']).then(callback);`
 
 ---------
@@ -735,9 +754,9 @@ out of cujo.js.  Our goal is to make the advanced concepts in cujo.js more
 palatable by breaking them down into easier-to-grok chunks.  Other cujo.js
 libs include:
 
-* [canhaz](https://github.com/briancavalier/canhaz): a project and code bootstrapping tool that will save you tons of typing.
-* [wire](https://github.com/briancavalier/wire): A light, fast, flexible Javascript IOC container
-* [when.js](https://github.com/briancavalier/when.js): A small, fast Promises/A compliant promises implementation
+* [canhaz](https://github.com/cujojs/canhaz): a project and code bootstrapping tool that will save you tons of typing.
+* [wire](https://github.com/cujojs/wire): A light, fast, flexible Javascript IOC container
+* [when.js](https://github.com/cujojs/when): A small, fast Promises/A compliant promises implementation
 * [cram](https://github.com/cujojs/cram): a javascript compressor, concatenator, and optimizer meant to be used with curl.js
 
 Kudos

bin/make-all.sh

@@ -4,6 +4,6 @@
 
 # make other versions of curl
 ./make.sh ../dist/curl-with-js-and-domReady/curl.js ../src/curl.js ../src/curl/domReady.js ../src/curl/plugin/js.js ../src/curl/plugin/domReady.js
-./make.sh ../dist/curl-for-dojo1.6/curl.js ../src/curl.js ../src/curl/domReady.js ../src/curl/dojo16Compat.js ../src/curl/plugin/domReady.js
-./make.sh ../dist/curl-kitchen-sink/curl.js ../src/curl.js ../src/curl/domReady.js ../src/curl/dojo16Compat.js ../src/curl/plugin/js.js ../src/curl/plugin/text.js ../src/curl/plugin/async.js ../src/curl/plugin/css.js ../src/curl/plugin/domReady.js
+./make.sh ../dist/curl-for-dojo1.6/curl.js ../src/curl.js ../src/curl/domReady.js ../src/curl/shim/dojo16.js ../src/curl/plugin/domReady.js
+./make.sh ../dist/curl-kitchen-sink/curl.js ../src/curl.js ../src/curl/domReady.js ../src/curl/shim/dojo16.js ../src/curl/plugin/js.js ../src/curl/plugin/text.js ../src/curl/plugin/async.js ../src/curl/plugin/css.js ../src/curl/plugin/link.js ../src/curl/plugin/domReady.js ../src/curl/loader/cjsm11.js
 ./make.sh ../dist/curl-for-jQuery/curl.js ../src/curl.js  ../src/curl/domReady.js ../src/curl/plugin/js.js ../src/curl/plugin/link.js ../src/curl/plugin/domReady.js

bin/make.sh

@@ -6,6 +6,8 @@ tmpfile=$(mktemp -t cram.XXXXXX)
 # use all of the remaining parameters as files to be concatenated
 shift
 
+echo "making $out"
+
 # concatenate all of the files to a temp file
 cat $@ | sed -e "s:\/\*==::g" -e "s:==\*\/::g" > "$tmpfile"
 

dist/README.md

@@ -3,22 +3,25 @@ Distribution Files
 
 These are the "compiled" versions of curl.js.
 
-Use curl/curl.js if you are only loading AMD-formatted javascript modules and
-AMD loader plugins.
+Use curl/curl.js if you are only loading AMD-formatted javascript modules.
 
 Use curl-with-js-and-domReady/curl.js if you wish to use non-AMD javascript
 files and don't have an alternative domReady implementation handy.
 
-Use curl-for-jQuery for a version of curl that has the js!, domReady!, and
-link! plugins.  This is an adequate configuration for many simple jQuery
-projects (and some sophisticated ones, too).
+Use curl-for-jQuery1.7 for a version of curl that has instructions for
+jQuery 1.7 to register as an AMD module and has the js! and link! plugins
+built in.  This is an adequate configuration for many simple jQuery projects
+(and some sophisticated ones, too).
+
+curl-for-dojo1.6 has the domReady! plugin built in as well as some
+compatibility shims for dojo 1.6 (which isn't officially AMD-ready).
 
 You can build your own custom version of curl.js by using the `make.sh` script
 in the /bin/ folder.  You must run it from the /bin/ folder.  Syntax:
 
 	./make.sh destination/curl.js ../src/curl.js [files to concat into curl.js]
 
-The following files can be concatenated into curl.js:
+The following files can be concatenated into curl.js using make.sh:
 
 * ../src/curl/plugin/js.js (the js! plugin)
 * ../src/curl/plugin/text.js (the text! plugin)
@@ -27,7 +30,9 @@ The following files can be concatenated into curl.js:
 * ../src/curl/plugin/link.js (the link! plugin)
 * ../src/curl/plugin/domReady.js (the domReady plugin)
 * ../src/curl/domReady.js (the domReady module)
-* ../src/curl/dojo16Compat.js (the dojo 1.6 compatibility shim / module)
+* ../src/curl/shim/dojo16.js (the dojo 1.6 compatibility shim / module)
+* ../src/curl/shim/underscore.js (the underscore compatibility shim / module)
+* ../src/curl/loader/cjsm11.js (the CommonJS Modules/1.1 compatibility shim / module)
 * Any named AMD module (does not support anonymous modules, yet!)
 * Any non-AMD javascript file
 
@@ -36,4 +41,4 @@ For example, to make a version of curl with the js! and text! plugins built-in:
 	./make.sh destination/curl.js ../src/curl.js ../src/curl/plugin/js.js ../src/curl/plugin/text.js
 
 Note: you will need a fairly recent version of `curl` (the unix utility, not
-curl.js) to run `make.sh`.  Version 7.18 or later is fine.
+curl.js!) to run `make.sh`.  Version 7.18 or later is fine.