diff --git a/package.json b/package.json index 4745260..a1c5b4f 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "dependencies": { "babel-core": "^6.9.0", - "babel-plugin-transform-cjs-system-wrapper": "^0.2.1", + "babel-plugin-transform-cjs-system-wrapper": "^0.3.0", "babel-plugin-transform-es2015-modules-systemjs": "^6.6.5", "babel-plugin-transform-global-system-wrapper": "0.0.1", "babel-plugin-transform-system-register": "0.0.1", diff --git a/test/fixtures/sourcemaps-expectations/babel.tree.multi.json b/test/fixtures/sourcemaps-expectations/babel.tree.multi.json index d213650..7bf59db 100644 --- a/test/fixtures/sourcemaps-expectations/babel.tree.multi.json +++ b/test/fixtures/sourcemaps-expectations/babel.tree.multi.json @@ -1 +1 @@ -{"version":3,"sources":["test/fixtures/test-tree/third.js","test/fixtures/test-tree/cjs.js","test/fixtures/test-tree/second.js","test/fixtures/test-tree/jquery.js","test/fixtures/test-tree/global.js","test/fixtures/test-tree/text.txt","test/fixtures/test-tree/amd.js","test/fixtures/test-tree/unknown","test/fixtures/test-tree/file.json","test/fixtures/test-tree/first.js"],"names":["System","register","$__export","setters","execute","__moduleName","console","log","__filename","eval","exports","cjs","env","jquery","myjquery","test","module"],"mappings":";AAAAA,OAAOC,QAAP,aAAgB,CAAC,aAAD,CAAhB,EAAiC,UAASC,SAAT,gBAAoB;AACnD,SAAO;AACLC,aAAS,CAAC,YAAW,CAAE,CAAd,CADJ;AAELC,aAAS,YAAW;AAClBF,gBAAU,MAAV,EAAkB,SAAlB;AACAA,gBAAU,IAAV,EAAgB,GAAhB;AACAA,gBAAU,MAAV,EAAkBG,YAAlB;AACD;AANI,GAAP;AAQD,CATD;;;;;;;;ACAAC,UAAQC,GAAR,CAAYC,UAAZ;;AAEA,GAAC,sBAAkB;AACjB,QAAI,qBAAkB,WAAlB,IAAiCC,KAAK,gBAAL,KAA0B,WAA/D,EACEC,QAAQC,GAAR,GAAc,IAAd;;AAEF,QAAI,KAAJ,EACE,WAAQ,SAAS,YAAjB;AACH,GAND;;AAQAD,UAAQE,GAAR;;;;;;MCRW,CAAC;;;;AAAD,OAAC,GAAG,CAAC;;;;;;;;;;QCFZC;AAAJ,QAAIA,SAAS,EAAb;0BAAIA;;;;;;;;;;;ACAJ;AACA;;AAEA,SAAKC,QAAL,CAAcC,IAAd,GAAqB,QAArB;;;;;;;;;;;;;;;;ACHAC,SAAON,OAAP,GAAiB,mBAAjB;;;;;ACAA,KAAK,AAAC,CAAC,QAAO,CAAG,EAAC,aAAY,CAAE,wBAAsB,CAAE,8BAA4B,CAAC,CAAL,UAAS,CAAA,CAAG,CAAA,CAAA,CAAG,CAAA,CAAA,CAAG;AAChG,OAAO;AAAE,KAAC,CAAG,MAAI;AAAG,OAAG,CAAG,EAAA;AAAA,EAAE,CAAC;AAC/B,CAFyG,CAEvG;AACF;;;;;MCHI,AAAK,OAEE,AAAS;;;yBAFhB;AAAK,cAAG,AAAE,AACd;;AAAK,YAAC,AAAa,gBAAG,YAAW,AAAC;AAAC;AAAC,AAAC,AAC1B;AAAS,kBAAG,6BAAK,AAAS,WAAC,AAAK,AAAG;;;;;;;;;;ACF9CM,SAAON,OAAP,GAAiB,EAAC,QAAO,MAAR,EAAjB;;;;;;eCOW,CAAC,EAED,CAAC;;;oBAPH,CAAC;;uBAGF,IAAI;;;AAED,OAAC,GAAG,IAAI;;;;AAER,OAAC,GAAG,CAAC;;;;AAChB,OAAC,CAAC","file":"output.js"} \ No newline at end of file +{"version":3,"sources":["test/fixtures/test-tree/third.js","test/fixtures/test-tree/cjs.js","test/fixtures/test-tree/second.js","test/fixtures/test-tree/jquery.js","test/fixtures/test-tree/global.js","test/fixtures/test-tree/text.txt","test/fixtures/test-tree/amd.js","test/fixtures/test-tree/unknown","test/fixtures/test-tree/file.json","test/fixtures/test-tree/first.js"],"names":["System","register","$__export","setters","execute","__moduleName","console","log","__filename","require","exports","cjs","env","jquery","myjquery","test","module"],"mappings":";AAAAA,OAAOC,QAAP,aAAgB,CAAC,aAAD,CAAhB,EAAiC,UAASC,SAAT,gBAAoB;AACnD,SAAO;AACLC,aAAS,CAAC,YAAW,CAAE,CAAd,CADJ;AAELC,aAAS,YAAW;AAClBF,gBAAU,MAAV,EAAkB,SAAlB;AACAA,gBAAU,IAAV,EAAgB,GAAhB;AACAA,gBAAU,MAAV,EAAkBG,YAAlB;AACD;AANI,GAAP;AAQD,CATD;;;;;;;ACAAC,UAAQC,GAAR,CAAYC,UAAZ;;AAEA,GAAC,UAASC,OAAT,EAAkB;AACjB,QAAI,OAAOA,OAAP,IAAkB,WAAtB,EACEC,QAAQC,GAAR,GAAc,IAAd;;AAEF,QAAI,KAAJ,EACEF,QAAQ,SAAS,YAAjB;AACH,GAND,EAMGA,UANH;;AAQAC,UAAQE,GAAR;;;;;MCRW,CAAC;;;;AAAD,OAAC,GAAG,CAAC;;;;;;;;;;QCFZC;AAAJ,QAAIA,SAAS,EAAb;0BAAIA;;;;;;;;;;;ACAJ;AACA;;AAEA,SAAKC,QAAL,CAAcC,IAAd,GAAqB,QAArB;;;;;;;;;;;;;;;ACHAC,SAAON,OAAP,GAAiB,mBAAjB;;;;ACAA,KAAK,AAAC,CAAC,QAAO,CAAG,EAAC,aAAY,CAAE,wBAAsB,CAAE,8BAA4B,CAAC,CAAL,UAAS,CAAA,CAAG,CAAA,CAAA,CAAG,CAAA,CAAA,CAAG;AAChG,OAAO;AAAE,KAAC,CAAG,MAAI;AAAG,OAAG,CAAG,EAAA;AAAA,EAAE,CAAC;AAC/B,CAFyG,CAEvG;AACF;;;;;MCHI,AAAK,OAEE,AAAS;;;yBAFhB;AAAK,cAAG,AAAE,AACd;;AAAK,YAAC,AAAa,gBAAG,YAAW,AAAC;AAAC;AAAC,AAAC,AAC1B;AAAS,kBAAG,6BAAK,AAAS,WAAC,AAAK,AAAG;;;;;;;;;ACF9CM,SAAON,OAAP,GAAiB,EAAC,QAAO,MAAR,EAAjB;;;;;eCOW,CAAC,EAED,CAAC;;;oBAPH,CAAC;;uBAGF,IAAI;;;AAED,OAAC,GAAG,IAAI;;;;AAER,OAAC,GAAG,CAAC;;;;AAChB,OAAC,CAAC","file":"output.js"} diff --git a/test/fixtures/sourcemaps-expectations/traceur.tree.multi.json b/test/fixtures/sourcemaps-expectations/traceur.tree.multi.json index e113908..6fd8111 100644 --- a/test/fixtures/sourcemaps-expectations/traceur.tree.multi.json +++ b/test/fixtures/sourcemaps-expectations/traceur.tree.multi.json @@ -1 +1 @@ -{"version":3,"sources":["test/fixtures/test-tree/third.js","test/fixtures/test-tree/cjs.js","test/fixtures/test-tree/second.js","test/fixtures/test-tree/jquery.js","test/fixtures/test-tree/global.js","test/fixtures/test-tree/text.txt","test/fixtures/test-tree/amd.js","test/fixtures/test-tree/unknown","test/fixtures/test-tree/file.json","test/fixtures/test-tree/first.js"],"names":["System","register","$__export","setters","execute","__moduleName","console","log","__filename","eval","exports","cjs","env","jquery","myjquery","test","module"],"mappings":";AAAAA,OAAOC,QAAP,aAAgB,CAAC,aAAD,CAAhB,EAAiC,UAASC,SAAT,gBAAoB;AACnD,SAAO;AACLC,aAAS,CAAC,YAAW,CAAE,CAAd,CADJ;AAELC,aAAS,YAAW;AAClBF,gBAAU,MAAV,EAAkB,SAAlB;AACAA,gBAAU,IAAV,EAAgB,GAAhB;AACAA,gBAAU,MAAV,EAAkBG,YAAlB;AACD;AANI,GAAP;AAQD,CATD;;;;;;;;ACAAC,UAAQC,GAAR,CAAYC,UAAZ;;AAEA,GAAC,sBAAkB;AACjB,QAAI,qBAAkB,WAAlB,IAAiCC,KAAK,gBAAL,KAA0B,WAA/D,EACEC,QAAQC,GAAR,GAAc,IAAd;;AAEF,QAAI,KAAJ,EACE,WAAQ,SAAS,YAAjB;AACH,GAND;;AAQAD,UAAQE,GAAR;;;ACVA,KAAK,SAAS,AAAC,yCACc,UAAS,SAAQ;;;AAD9C,OAAO;AACD,UAAM,GADZ,SAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG,GAAC,CACe;AACzB,UAAM;QAAG,EAAA;AAFf,cAAQ,AAAC,QAAqC,CAAA;IAEf;EAC3B,CAAA;AAAM,CAAC,CAAC;AAAZ;;;;;QCHIC;AAAJ,QAAIA,SAAS,EAAb;0BAAIA;;;;;;;;;;;ACAJ;AACA;;AAEA,SAAKC,QAAL,CAAcC,IAAd,GAAqB,QAArB;;;;;;;;;;;;;;;;ACHAC,SAAON,OAAP,GAAiB,mBAAjB;;;;;ACAA,KAAK,AAAC,CAAC,QAAO,CAAG,EAAC,aAAY,CAAE,wBAAsB,CAAE,8BAA4B,CAAC,CAAL,UAAS,CAAA,CAAG,CAAA,CAAA,CAAG,CAAA,CAAA,CAAG;AAChG,OAAO;AAAE,KAAC,CAAG,MAAI;AAAG,OAAG,CAAG,EAAA;AAAA,EAAE,CAAC;AAC/B,CAFyG,CAEvG;AACF;;;;;MCHI,AAAK,OAEE,AAAS;;;yBAFhB;AAAK,cAAG,AAAE,AACd;;AAAK,YAAC,AAAa,gBAAG,YAAW,AAAC;AAAC;AAAC,AAAC,AAC1B;AAAS,kBAAG,6BAAK,AAAS,WAAC,AAAK,AAAG;;;;;;;;;;ACF9CM,SAAON,OAAP,GAAiB,EAAC,QAAO,MAAR,EAAjB;;;ACAA,KAAK,SAAS,AAAC,4GACc,UAAS,SAAQ;;;;;;AAD9C,OAAO;AACD,UAAM,GADZ,SAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG;AAAf,QAAoB,KAAG,EAAkB,CAAC;IAElC,CAFR,UAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG;AAAf,WAAoB,KAAG,KAAkB,CAAC;IAElC,CADuB;AACzB,UAAM;QAKG,KAAG;AAPlB,cAAQ,AAAC,QAAqC,CAAA;QAS/B,EAAA;AATf,cAAQ,AAAC,QAAqC,CAAA;AAU9C,MAAA,CAAC;IAR8B;EAC3B,CAAA;AAAM,CAAC,CAAC;AAOX","file":"output.js"} \ No newline at end of file +{"version":3,"sources":["test/fixtures/test-tree/third.js","test/fixtures/test-tree/cjs.js","test/fixtures/test-tree/second.js","test/fixtures/test-tree/jquery.js","test/fixtures/test-tree/global.js","test/fixtures/test-tree/text.txt","test/fixtures/test-tree/amd.js","test/fixtures/test-tree/unknown","test/fixtures/test-tree/file.json","test/fixtures/test-tree/first.js"],"names":["System","register","$__export","setters","execute","__moduleName","console","log","__filename","require","exports","cjs","env","jquery","myjquery","test","module"],"mappings":";AAAAA,OAAOC,QAAP,aAAgB,CAAC,aAAD,CAAhB,EAAiC,UAASC,SAAT,gBAAoB;AACnD,SAAO;AACLC,aAAS,CAAC,YAAW,CAAE,CAAd,CADJ;AAELC,aAAS,YAAW;AAClBF,gBAAU,MAAV,EAAkB,SAAlB;AACAA,gBAAU,IAAV,EAAgB,GAAhB;AACAA,gBAAU,MAAV,EAAkBG,YAAlB;AACD;AANI,GAAP;AAQD,CATD;;;;;;;ACAAC,UAAQC,GAAR,CAAYC,UAAZ;;AAEA,GAAC,UAASC,OAAT,EAAkB;AACjB,QAAI,OAAOA,OAAP,IAAkB,WAAtB,EACEC,QAAQC,GAAR,GAAc,IAAd;;AAEF,QAAI,KAAJ,EACEF,QAAQ,SAAS,YAAjB;AACH,GAND,EAMGA,UANH;;AAQAC,UAAQE,GAAR;;ACVA,KAAK,SAAS,AAAC,yCACc,UAAS,SAAQ;;;AAD9C,OAAO;AACD,UAAM,GADZ,SAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG,GAAC,CACe;AACzB,UAAM;QAAG,EAAA;AAFf,cAAQ,AAAC,QAAqC,CAAA;IAEf;EAC3B,CAAA;AAAM,CAAC,CAAC;AAAZ;;;;;QCHIC;AAAJ,QAAIA,SAAS,EAAb;0BAAIA;;;;;;;;;;;ACAJ;AACA;;AAEA,SAAKC,QAAL,CAAcC,IAAd,GAAqB,QAArB;;;;;;;;;;;;;;;ACHAC,SAAON,OAAP,GAAiB,mBAAjB;;;;ACAA,KAAK,AAAC,CAAC,QAAO,CAAG,EAAC,aAAY,CAAE,wBAAsB,CAAE,8BAA4B,CAAC,CAAL,UAAS,CAAA,CAAG,CAAA,CAAA,CAAG,CAAA,CAAA,CAAG;AAChG,OAAO;AAAE,KAAC,CAAG,MAAI;AAAG,OAAG,CAAG,EAAA;AAAA,EAAE,CAAC;AAC/B,CAFyG,CAEvG;AACF;;;;;MCHI,AAAK,OAEE,AAAS;;;yBAFhB;AAAK,cAAG,AAAE,AACd;;AAAK,YAAC,AAAa,gBAAG,YAAW,AAAC;AAAC;AAAC,AAAC,AAC1B;AAAS,kBAAG,6BAAK,AAAS,WAAC,AAAK,AAAG;;;;;;;;;ACF9CM,SAAON,OAAP,GAAiB,EAAC,QAAO,MAAR,EAAjB;;ACAA,KAAK,SAAS,AAAC,4GACc,UAAS,SAAQ;;;;;;AAD9C,OAAO;AACD,UAAM,GADZ,SAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG;AAAf,QAAoB,KAAG,EAAkB,CAAC;IAElC,CAFR,UAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG,GAAC,CAAhB,UAAS,IAAG,CAAG;AAAf,WAAoB,KAAG,KAAkB,CAAC;IAElC,CADuB;AACzB,UAAM;QAKG,KAAG;AAPlB,cAAQ,AAAC,QAAqC,CAAA;QAS/B,EAAA;AATf,cAAQ,AAAC,QAAqC,CAAA;AAU9C,MAAA,CAAC;IAR8B;EAC3B,CAAA;AAAM,CAAC,CAAC;AAOX","file":"output.js"} diff --git a/test/fixtures/test-tree/cjs.js b/test/fixtures/test-tree/cjs.js index 2b895a8..0e3de0f 100644 --- a/test/fixtures/test-tree/cjs.js +++ b/test/fixtures/test-tree/cjs.js @@ -1,11 +1,11 @@ console.log(__filename); (function(require) { - if (typeof require != 'undefined' && eval('typeof require') == 'undefined') + if (typeof require != 'undefined') exports.cjs = true; if (false) require('some' + 'expression'); })(require); -exports.env = process.env.NODE_ENV; \ No newline at end of file +exports.env = process.env.NODE_ENV;