diff --git a/package.json b/package.json index 17c36b9..7d03317 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "amdclean", - "version": "0.2.7", + "version": "0.3.0", "description": "A build tool that converts AMD code to standard JavaScript", "main": "./src/amdclean", "repository": { diff --git a/src/amdclean.js b/src/amdclean.js index af722f7..7e6ec71 100644 --- a/src/amdclean.js +++ b/src/amdclean.js @@ -1,4 +1,4 @@ -/*! amdclean - v0.2.7 - 2013-11-25 +/*! amdclean - v0.3.0 - 2013-11-25 * http://gregfranko.com/amdclean * Copyright (c) 2013 Greg Franko; Licensed MIT*/ @@ -416,6 +416,9 @@ if(currentName === 'exports') { hasExportsParam = true; } + if(currentName === '{}') { + currentName = 'module'; + } deps.push({ 'type': 'Identifier', 'name': currentName diff --git a/test/specs/convert.js b/test/specs/convert.js index 47d932c..f8e9b93 100644 --- a/test/specs/convert.js +++ b/test/specs/convert.js @@ -57,6 +57,14 @@ describe('amdclean specs', function() { expect(cleanedCode).toBe(standardJavaScript); }); + it('should support the plain simplified CJS wrapper', function() { + var AMDcode = "define('foo',['require','exports','module','bar'],function(require, exports){exports.bar = require('bar');});", + cleanedCode = amdclean.clean({ code: AMDcode, escodegen: { format: { compact: true } } }), + standardJavaScript = "var foo=function (require,exports,module,bar){exports.bar=bar;return exports;}({},{},{},bar);"; + + expect(cleanedCode).toBe(standardJavaScript); + }); + it('should support global modules', function() { var AMDcode = "define('foo', ['require', 'exports', './bar'], function(require, exports){exports.bar = require('./bar');});", cleanedCode = amdclean.clean({ globalModules: ['foo'], code: AMDcode, escodegen: { format: { compact: true } } }),