Merge branch 'fix-979-module.exports' of github.com:arian/requirejs i…

…nto arian-fix-979-module.exports
cocus-es · Jan 4, 2014 · bb13c3a · bb13c3a
2 parents 80a9ee8 + fef207e
commit bb13c3a
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 1 deletion.
diff --git a/require.js b/require.js
@@ -590,7 +590,7 @@ var requirejs, require, define;
                                       getOwn(config.config, mod.map.id);
                             return  c || {};
                         },
-                        exports: defined[mod.map.id]
+                        exports: handlers.exports(mod)
                     });
                 }
             }

diff --git a/tests/all.js b/tests/all.js
@@ -19,6 +19,8 @@ doh.registerUrl("skipDataMain", "../dataMain/skipDataMain/skipDataMain.html");
 doh.registerUrl("dataMainIndex", "../dataMain/dataMainIndex/dataMainIndex.html");
 doh.registerUrl("dataMainBaseUrl", "../dataMain/baseUrl/dataMainBaseUrl.html");
 
+doh.registerUrl("moduleExports", "../commonjs/tests/modules/1.0/moduleExports/program.html");
+
 if (hasToString) {
     doh.registerUrl("anonSimple", "../anon/anonSimple.html");
     doh.registerUrl("cjsSpace", "../cjsSpace/cjsSpace.html");

diff --git a/tests/commonjs/tests/modules/1.0/moduleExports/program.html b/tests/commonjs/tests/modules/1.0/moduleExports/program.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Program Runner</title>
+    <script src="../../../../../../require.js"></script>
+    <script>
+        require({
+            baseUrl: './',
+            paths: {
+                system: '../system',
+                test: '../test'
+            }
+        }, ['program']);
+    </script>
+</head>
+<body>
+    <h1>Program Runner</h1>
+    <p>Check console for results.</p>
+</body>
+</html>
diff --git a/tests/commonjs/tests/modules/1.0/moduleExports/program.js b/tests/commonjs/tests/modules/1.0/moduleExports/program.js
@@ -0,0 +1,5 @@
+define(["module", "exports", "test"], function(module, exports, test) {
+test.assert(module.exports === exports, 'exports equals module.exports');
+test.print('DONE', 'info');
+
+});
diff --git a/tests/commonjs/tests/modules/1.0/moduleExports/test.js b/tests/commonjs/tests/modules/1.0/moduleExports/test.js
@@ -0,0 +1,18 @@
+define(["require", "exports", "module", "system"], function(require, exports, module) {
+
+exports.print = typeof print !== "undefined" ? print : function () {
+    var system = require("system");
+    var stdio = system.stdio;
+    stdio.print.apply(stdio, arguments);
+};
+
+exports.assert = function (guard, message) {
+    if (guard) {
+        exports.print('PASS ' + message, 'pass');
+    } else {
+        exports.print('FAIL ' + message, 'fail');
+    }
+};
+
+
+});