bug fix to remove module name if requireCall === require

README.md

@@ -99,6 +99,7 @@ define("my-components", ["components/package1/index", "components/package1/index
 In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).
 
 ## Release History
+* 0.0.8 - Fixed a bug that added the module name to require() calls
 * 0.0.7 - Added support for requireCall option
 * 0.0.6 - expand the full package name
 * 0.0.5 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-requirejs-bundle",
   "description": "A Grunt plugin to bundle one or more AMD packages into a single define statement. This means you can just require the bundle and get all the packages loaded via requirejs.",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "homepage": "https://github.com/cajones/grunt-requirejs-bundle",
   "author": {
     "name": "Chris Jones",

tasks/requirejs_bundle.js

@@ -33,12 +33,13 @@ module.exports = function(grunt) {
 
         this.files.forEach(function (file) {
             var baseUrl  = options.baseUrl,
+                hasModuleName = options.moduleName && /^define$/i.test(options.requireCall),
                 moduleList = file.src.filter(isDirectory)
                                      .map(enumerateInstalledPackages)
                                      .map(expandFullPackagePath(baseUrl))
                                      .reduce(buildAMDModuleDefinition, ''),
-                moduleNameDeclaration = options.moduleName ? '"'+ options.moduleName +'", ' : '',
-                defineStatement = options.requireCall + '(' + moduleNameDeclaration +'['+ moduleList+ ']);',
+                moduleNameDeclaration = hasModuleName ? '"'+ options.moduleName +'", ' : '',
+                defineStatement = options.requireCall + '(' + moduleNameDeclaration + '['+ moduleList+ ']);',
                 amdContent = options.autoGeneratedMessage + '\r\n' + defineStatement;
 
             grunt.file.write(file.dest, amdContent);

test/expected/components.js

@@ -1,2 +1,2 @@
 /* This file has been automatically-generated by the grunt task requirejs-bundle; any changes to this file could be lost */
-require("components", ["components/adapt-plugin1/js/index", "components/adapt-plugin2/js/main"]);
+require(["components/adapt-plugin1/js/index", "components/adapt-plugin2/js/main"]);