Skip to content
This repository was archived by the owner on Oct 9, 2020. It is now read-only.

Commit cae14f9

Browse files
guybedfordguybedford
authored
Merge pull request #847 from laurentgoudet/laurent-rollup-upgrade
Upgrade Rollup to ^0.58.2
2 parents 225727e + 729898f commit cae14f9

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

‎lib/rollup.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ exports.rollupTree = function(loader, tree, entryPoints, traceOpts, compileOpts,
211211
return Promise.all(Object.keys(optimizationGraphExternals).map(function(entryPoint) {
212212
var externals = optimizationGraphExternals[entryPoint];
213213
var loadList = [];
214+
var entryPointLoad;
214215

215216
// if all externals are outside the tree then this really is a full tree rollup
216217
// also @node/x requires mean we do need sfx core (pending a better output of these)
@@ -255,7 +256,7 @@ exports.rollupTree = function(loader, tree, entryPoints, traceOpts, compileOpts,
255256
onwarn: function(message) {}
256257
})
257258
.then(function(bundle) {
258-
var entryPointLoad = tree[entryPoint];
259+
entryPointLoad = tree[entryPoint];
259260

260261
var defaultExport = compileOpts.defaultExport;
261262
if (entryPointLoad.metadata.format == 'register')
@@ -265,6 +266,7 @@ exports.rollupTree = function(loader, tree, entryPoints, traceOpts, compileOpts,
265266
defaultExport = true;
266267

267268
var generateOptions = {
269+
format: 'es',
268270
sourceMap: !!compileOpts.sourceMaps,
269271
exports: defaultExport ? 'default' : 'named',
270272
dest: 'output.js' // workaround for rollup/rollup#1015
@@ -276,20 +278,22 @@ exports.rollupTree = function(loader, tree, entryPoints, traceOpts, compileOpts,
276278
if (generateOptions.format == 'global')
277279
generateOptions.format = 'iife';
278280
if (generateOptions.format == 'esm')
279-
generateOptions.format = 'es6';
281+
generateOptions.format = 'es';
280282

281283
if ((generateOptions.format == 'iife' || generateOptions.format == 'umd') &&
282284
!compileOpts.globalName)
283285
throw new Error('The globalName option must be set for full-tree rollup global and UMD builds.');
284286

285287
if (compileOpts.globalName)
286-
generateOptions.moduleName = compileOpts.globalName;
288+
generateOptions.name = compileOpts.globalName;
287289

288290
if (compileOpts.globalDeps)
289291
generateOptions.globals = compileOpts.globalDeps;
290292
}
291293

292-
var output = bundle.generate(generateOptions);
294+
return bundle.generate(generateOptions);
295+
})
296+
.then(function(output) {
293297

294298
// convert sources list into paths
295299
if (output.map) {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "systemjs-builder",
3-
"version": "0.16.12",
3+
"version": "0.16.12-rollup-ugprade",
44
"description": "SystemJS Build Tool",
55
"main": "index.js",
66
"dependencies": {
@@ -16,7 +16,7 @@
1616
"es6-template-strings": "^2.0.0",
1717
"glob": "^7.0.3",
1818
"mkdirp": "^0.5.1",
19-
"rollup": "^0.36.3",
19+
"rollup": "^0.58.2",
2020
"source-map": "^0.5.3",
2121
"systemjs": "^0.19.46",
2222
"traceur": "0.0.105",

‎test/fixtures/sourcemaps-expectations/babel.tree.multi.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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","require","exports","cjs","env","jquery","myjquery","test","module","a","b","c","is","text"],"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,kCAAQ,aAAR,EAAuB,uBAAvB,EAAgD,6BAAhD;AAAA,UAAgF,UAASO,CAAT,EAAYC,CAAZ,EAAeC,CAAf,EAAkB;AAChG,WAAO,EAAEC,IAAI,KAAN,EAAaC,MAAMF,CAAnB,EAAP;AACD,GAFD,wBAAQ,aAAR,cAAuB,uBAAvB,cAAgD,6BAAhD;AAAA;;;;MCAI,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;;;;;;;;;ACF9CH,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"}
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","require","exports","cjs","env","jquery","myjquery","test","module","a","b","c","is","text"],"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,kCAAQ,aAAR,EAAuB,uBAAvB,EAAgD,6BAAhD;AAAA,UAAgF,UAASO,CAAT,EAAYC,CAAZ,EAAeC,CAAf,EAAkB;AAChG,WAAO,EAAEC,IAAI,KAAN,EAAaC,MAAMF,CAAnB,EAAP;AACD,GAFD,wBAAQ,aAAR,cAAuB,uBAAvB,cAAgD,6BAAhD;AAAA;;;;MCAI,OAEO;;;;AAFP,cAAQ,EAAR;;AACJ,YAAM,aAAN,GAAsB,YAAW;AAAC;AAAE,OAApC;AACW,kBAAY,MAAA,aAAA,CAAA,KAAA,EAAA,EAAK,WAAU,KAAf,EAAA,CAAZ;;;;;;;;;ACFXH,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"}

‎test/fixtures/sourcemaps-expectations/traceur.tree.multi.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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","require","exports","cjs","env","jquery","myjquery","test","module","a","b","c","is","text"],"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,kCAAQ,aAAR,EAAuB,uBAAvB,EAAgD,6BAAhD;AAAA,UAAgF,UAASO,CAAT,EAAYC,CAAZ,EAAeC,CAAf,EAAkB;AAChG,WAAO,EAAEC,IAAI,KAAN,EAAaC,MAAMF,CAAnB,EAAP;AACD,GAFD,wBAAQ,aAAR,cAAuB,uBAAvB,cAAgD,6BAAhD;AAAA;;;;MCAI,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;;;;;;;;;ACF9CH,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"}
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","require","exports","cjs","env","jquery","myjquery","test","module","a","b","c","is","text"],"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,kCAAQ,aAAR,EAAuB,uBAAvB,EAAgD,6BAAhD;AAAA,UAAgF,UAASO,CAAT,EAAYC,CAAZ,EAAeC,CAAf,EAAkB;AAChG,WAAO,EAAEC,IAAI,KAAN,EAAaC,MAAMF,CAAnB,EAAP;AACD,GAFD,wBAAQ,aAAR,cAAuB,uBAAvB,cAAgD,6BAAhD;AAAA;;;;MCAI,OAEO;;;;AAFP,cAAQ,EAAR;;AACJ,YAAM,aAAN,GAAsB,YAAW;AAAC;AAAE,OAApC;AACW,kBAAY,MAAA,aAAA,CAAA,KAAA,EAAA,EAAK,WAAU,KAAf,EAAA,CAAZ;;;;;;;;;ACFXH,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"}

0 commit comments

Comments
 (0)