Merge branch 'uselib'

jrburke · jrburke · commit 9002016d2a5c · 2012-01-18T11:31:04.000-08:00
diff --git a/build/jslib/parse.js b/build/jslib/parse.js
@@ -401,7 +401,7 @@ define(['uglifyjs/index'], function (uglify) {
         //This is a litle bit inefficient, it ends up with two uglifyjs parser
         //calls. Can revisit later, but trying to build out larger functional
         //pieces first.
-        var dependencies = parse.getAnonDeps(fileName, fileContents),
+        var dependencies = [],
             astRoot = parser.parse(fileContents);
 
         parse.recurse(astRoot, function (callName, config, name, deps) {
diff --git a/build/jslib/x.js b/build/jslib/x.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 1.0.4 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license r.js 1.0.4+ 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,9 +20,10 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib,
-        version = '1.0.4',
+        version = '1.0.4+',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
+        useLibLoaded = {},
         //Used by jslib/rhino/args.js
         rhinoArgs = args,
         readFile = typeof readFileFunc !== 'undefined' ? readFileFunc : null;
@@ -190,6 +191,28 @@ var requirejs, require, define;
             }, ['build', 'logger'], runBuild);
         };
 
+        requirejs.tools = {
+            useLib: function (contextName, callback) {
+                if (!callback) {
+                    callback = contextName;
+                    contextName = 'uselib';
+                }
+
+                if (!useLibLoaded[contextName]) {
+                    loadLib();
+                    useLibLoaded[contextName] = true;
+                }
+
+                var req = requirejs({
+                    context: contextName
+                });
+                
+                req(['build'], function () {
+                    callback(req);
+                });
+            }
+        };
+        
         requirejs.define = define;
 
         module.exports = requirejs;
diff --git a/build/tests/tools/uselib/a.js b/build/tests/tools/uselib/a.js
@@ -0,0 +1,3 @@
+define(['b', 'c', 'd/e'], function (b, c, e) {
+    
+});
diff --git a/build/tests/tools/uselib/b.js b/build/tests/tools/uselib/b.js
@@ -0,0 +1,6 @@
+define(function(require) {
+    var a = require('a'),
+        c = require('c'),
+        e = require('d/e');
+    return function() {};
+});
diff --git a/build/tests/tools/uselib/parseDeps.js b/build/tests/tools/uselib/parseDeps.js
@@ -0,0 +1,32 @@
+'use strict';
+/*jslint nomen: false */
+/*global require, __dirname, console */
+
+var requirejs = require('../../../../r.js'),
+    fs = require('fs'),
+    path = require('path'),
+    jsRegExp = /\.js$/,
+    dir = __dirname,
+    thisName = path.basename(__filename);
+
+function onLib(require) {
+    require(['parse'], function (parse) {
+        var deps = {};
+
+        fs.readdirSync(dir).filter(function (name) {
+            //Do not include this file in the output.
+            return name !== thisName && jsRegExp.test(name);
+        }).forEach(function (name) {
+            var fileName = path.join(dir, name),
+                contents = fs.readFileSync(fileName, 'utf8');
+            deps[path.basename(name, '.js')] = parse.findDependencies(fileName,
+                                                                      contents);
+        });
+        
+        console.log(JSON.stringify(deps, null, '  '));
+    });
+}
+
+//Do it twice, just to make sure it all holds together on multiple passes.
+requirejs.tools.useLib(onLib);
+requirejs.tools.useLib(onLib);
diff --git a/dist/r-edge.js b/dist/r-edge.js
@@ -1,5 +1,5 @@
 /**
- * @license r.js 1.0.4 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ * @license r.js 1.0.4+ 20120106 9:40pm 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,9 +20,10 @@ var requirejs, require, define;
 
     var fileName, env, fs, vm, path, exec, rhinoContext, dir, nodeRequire,
         nodeDefine, exists, reqMain, loadedOptimizedLib,
-        version = '1.0.4',
+        version = '1.0.4+ 20120106 9:40pm',
         jsSuffixRegExp = /\.js$/,
         commandOption = '',
+        useLibLoaded = {},
         //Used by jslib/rhino/args.js
         rhinoArgs = args,
         readFile = typeof readFileFunc !== 'undefined' ? readFileFunc : null;
@@ -6872,7 +6873,7 @@ define('parse', ['uglifyjs/index'], function (uglify) {
         //This is a litle bit inefficient, it ends up with two uglifyjs parser
         //calls. Can revisit later, but trying to build out larger functional
         //pieces first.
-        var dependencies = parse.getAnonDeps(fileName, fileContents),
+        var dependencies = [],
             astRoot = parser.parse(fileContents);
 
         parse.recurse(astRoot, function (callName, config, name, deps) {
@@ -9181,6 +9182,28 @@ function (lang,   logger,   file,          parse,    optimize,   pragma,
             }, ['build', 'logger'], runBuild);
         };
 
+        requirejs.tools = {
+            useLib: function (contextName, callback) {
+                if (!callback) {
+                    callback = contextName;
+                    contextName = 'uselib';
+                }
+
+                if (!useLibLoaded[contextName]) {
+                    loadLib();
+                    useLibLoaded[contextName] = true;
+                }
+
+                var req = requirejs({
+                    context: contextName
+                });
+                
+                req(['build'], function () {
+                    callback(req);
+                });
+            }
+        };
+        
         requirejs.define = define;
 
         module.exports = requirejs;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+define(['b', 'c', 'd/e'], function (b, c, e) {`
	`2`	`+`
	`3`	`+});`