Fixes #382, allow using optimizer as JS object in rhino (and xpcshell)

Author: jrburke

.gitignore

@@ -81,3 +81,5 @@ build/tests/transform/results
 env/xpcshell
 tests/node/node_modules
 tests/node/embedded/node_modules
+tests/rhino/main-built.js
+tests/xpcshell/main-built.js

build/jslib/x.js

@@ -374,6 +374,15 @@ var requirejs, require, define, xpcUtil;
         setBaseUrl(location.href);
         createRjsApi();
         return;
+    } else if ((env === 'rhino' || env === 'xpconnect') &&
+            //User sets up requirejsAsLib variable to indicate it is loaded
+            //via load() to be used as a library.
+            typeof requirejsAsLib !== 'undefined' && requirejsAsLib) {
+        //This script is loaded via rhino's load() method, expose the
+        //API and get out.
+        setBaseUrl(fileName);
+        createRjsApi();
+        return;
     }
 
     if (commandOption === 'o') {

tests/rhino/a.js

@@ -0,0 +1,4 @@
+define({
+  name: 'a'
+});
+

tests/rhino/build.js

@@ -0,0 +1,13 @@
+var requirejsAsLib = true;
+load('../../r.js');
+
+requirejs.optimize({
+    name: 'main',
+    out: 'main-built.js',
+    optimize: 'none'
+}, function (results) {
+    print(results);
+}, function (err) {
+    print('GOT ERROR: ' + err);
+});
+

tests/rhino/build.sh

@@ -0,0 +1,3 @@
+set -e
+
+java -classpath ../../lib/rhino/js.jar:../../lib/closure.compiler.jar org.mozilla.javascript.tools.shell.Main build.js

tests/rhino/main.js

@@ -0,0 +1,6 @@
+define(['a'], function (a) {
+    return {
+        name: 'main',
+        a: a
+    };
+});

tests/rhino/run.js

@@ -0,0 +1,8 @@
+var requirejsAsLib = true;
+load('../../r.js');
+
+requirejs(['main'], function (main) {
+    print('main\'s name is: ' + main.name);
+    print('a\'s name is: ' + main.a.name);
+});
+

tests/rhino/run.sh

@@ -0,0 +1,3 @@
+set -e
+
+java -classpath ../../lib/rhino/js.jar:../../lib/closure.compiler.jar org.mozilla.javascript.tools.shell.Main run.js

tests/xpcshell/a.js

@@ -0,0 +1,4 @@
+define({
+  name: 'a'
+});
+

tests/xpcshell/build.js

@@ -0,0 +1,13 @@
+var requirejsAsLib = true;
+load('../../r.js');
+
+requirejs.optimize({
+    name: 'main',
+    out: 'main-built.js',
+    optimize: 'none'
+}, function (results) {
+    print(results);
+}, function (err) {
+    print('GOT ERROR: ' + err);
+});
+

tests/xpcshell/build.sh

@@ -0,0 +1,3 @@
+set -e
+
+../../env/xpcshell/xpcshell build.js

tests/xpcshell/main.js

@@ -0,0 +1,6 @@
+define(['a'], function (a) {
+    return {
+        name: 'main',
+        a: a
+    };
+});

tests/xpcshell/run.js

@@ -0,0 +1,8 @@
+var requirejsAsLib = true;
+load('../../r.js');
+
+requirejs(['main'], function (main) {
+    print('main\'s name is: ' + main.name);
+    print('a\'s name is: ' + main.a.name);
+});
+

tests/xpcshell/run.sh

@@ -0,0 +1,3 @@
+set -e
+
+../../env/xpcshell/xpcshell run.js