Make sure define.amd is there for builds. Closes requirejs#35. Snapshot included.

jrburke · jrburke · commit 04425f6d104a · 2011-11-08T21:19:37.000-08:00
diff --git a/build/jslib/requirePatch.js b/build/jslib/requirePatch.js
@@ -112,6 +112,8 @@ function (file,           pragma,   parse) {
             return oldDef.apply(require, arguments);
         };
 
+        define.amd = oldDef.amd;
+
         //Add some utilities for plugins
         require._readFile = file.readFile;
         require._fileExists = function (path) {
diff --git a/build/jslib/x.js b/build/jslib/x.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 1.0.1 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license r.js 1.0.1+ Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details
  */
@@ -20,7 +20,7 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib,
-        version = '1.0.1',
+        version = '1.0.1+',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
         //Used by jslib/rhino/args.js
diff --git a/build/tests/lib/plugins/converter.js b/build/tests/lib/plugins/converter.js
@@ -1,9 +1,11 @@
-define(['util'], function (util) {
+if (typeof define === 'function' && define.amd) {
+    define(['util'], function (util) {
 
-    return {
-        version: '2',
-        convert: function (text) {
-            return util(text);
-        }
-    };
-});
+        return {
+            version: '2',
+            convert: function (text) {
+                return util(text);
+            }
+        };
+    });
+}
diff --git a/build/tests/parse.js b/build/tests/parse.js
@@ -51,6 +51,7 @@ define(['parse'], function (parse) {
                     good6 = 'function baz(){ var foo = { bar: function() { define("one", function(){ var two = require("two"); }); } };}',
                     good7 = "(function (factory){\nif(typeof define === 'function' && define.amd){\ndefine(['dep'], factory);\n}else{\nfactory(this.dep);\n}\n}(function(dep){\n}));",
                     good8 = "(function (factory){\nif(typeof define === 'function' && define.amd){\ndefine('some/name', ['dep1', 'dep2'], factory);\n}else{\nfactory(this.dep);\n}\n}(function(dep){\n}));",
+                    good9 = "define(function (require) {\n//Dependencies with no usable return value.\nrequire('plugin!some/value');\n});",
                     emptyAnon1 = "define(function(){ return 'foo'; });";
 
                 t.is('define("one",["two","three"]);', parse("good1", "good1", good1));
@@ -61,6 +62,7 @@ define(['parse'], function (parse) {
                 t.is('define("one",["two"]);', parse("good6", "good6", good6));
                 t.is('define("good7",["dep"]);', parse("good7", "good7", good7));
                 t.is('define("some/name",["dep1","dep2"]);', parse("good8", "good8", good8));
+                t.is('define("good9",["require","plugin!some/value"]);', parse("good9", "good9", good9));
                 t.is('define("foo",[]);', parse("nested1", "nested1", nested1));
                 t.is('define("one",["me"]);', parse("bad1", "bad1", bad1));
                 t.is(null, parse("bad2", "bad2", bad2));
@@ -70,6 +72,7 @@ define(['parse'], function (parse) {
                 t.is(['require', 'foo'], parse.getAnonDeps("goodAnon1", goodAnon1));
                 t.is(['require', 'exports', 'module', 'bar'], parse.getAnonDeps("goodAnon2", goodAnon2));
                 t.is(['require', 'exports', 'module'], parse.getAnonDeps("goodAnon3", goodAnon3));
+                t.is(['require', 'plugin!some/value'], parse.getAnonDeps("good9", good9));
                 t.is(0, parse.getAnonDeps("emptyAnon1", emptyAnon1).length);
             }
         ]
diff --git a/dist/r-20111108.js b/dist/r-20111108.js
