diff --git a/require.js b/require.js index ff9e42471..21f7eda7c 100644 --- a/require.js +++ b/require.js @@ -1315,7 +1315,7 @@ var require; ret = defined[name]; } else { if (cjsModule && "exports" in cjsModule) { - ret = defined[name] = depModule.exports; + ret = defined[name] = cjsModule.exports; } else { if (name in defined && !usingExports) { req.onError(new Error(name + " has already been defined")); diff --git a/tests/exports/assign2.js b/tests/exports/assign2.js new file mode 100644 index 000000000..3921e0fa2 --- /dev/null +++ b/tests/exports/assign2.js @@ -0,0 +1,4 @@ +require.def(["module", "exports", "require"], + function (module, exports, require) { + module.exports = "assign2"; +}); diff --git a/tests/exports/exports-tests.js b/tests/exports/exports-tests.js index a4081cbc9..d55c2bb4a 100644 --- a/tests/exports/exports-tests.js +++ b/tests/exports/exports-tests.js @@ -1,8 +1,8 @@ require({ baseUrl: require.isBrowser ? "./" : "./exports/" }, - ["require", "vanilla", "funcSet", "assign"], - function(require, vanilla, funcSet, assign) { + ["require", "vanilla", "funcSet", "assign", "assign2"], + function(require, vanilla, funcSet, assign, assign2) { doh.register( "exports", [ @@ -10,6 +10,7 @@ require({ t.is("vanilla", vanilla.name); t.is("funcSet", funcSet); t.is("assign", assign); + t.is("assign2", assign2); } ] );