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

Commit

Permalink
Merge pull request #847 from laurentgoudet/laurent-rollup-upgrade
Browse files Browse the repository at this point in the history 
Upgrade Rollup to ^0.58.2
  • Loading branch information
@guybedford
guybedford committed May 3, 2018
2 parents 225727e + 729898f commit cae14f9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
12 changes: 8 additions & 4 deletions lib/rollup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ exports.rollupTree = function(loader, tree, entryPoints, traceOpts, compileOpts,
return Promise.all(Object.keys(optimizationGraphExternals).map(function(entryPoint) {
var externals = optimizationGraphExternals[entryPoint];
var loadList = [];
var entryPointLoad;

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

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

var generateOptions = {
format: 'es',
sourceMap: !!compileOpts.sourceMaps,
exports: defaultExport ? 'default' : 'named',
dest: 'output.js' // workaround for rollup/rollup#1015
Expand All @@ -276,20 +278,22 @@ exports.rollupTree = function(loader, tree, entryPoints, traceOpts, compileOpts,
if (generateOptions.format == 'global')
generateOptions.format = 'iife';
if (generateOptions.format == 'esm')
generateOptions.format = 'es6';
generateOptions.format = 'es';

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

if (compileOpts.globalName)
generateOptions.moduleName = compileOpts.globalName;
generateOptions.name = compileOpts.globalName;

if (compileOpts.globalDeps)
generateOptions.globals = compileOpts.globalDeps;
}

var output = bundle.generate(generateOptions);
return bundle.generate(generateOptions);
})
.then(function(output) {

// convert sources list into paths
if (output.map) {
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "systemjs-builder",
"version": "0.16.12",
"version": "0.16.12-rollup-ugprade",
"description": "SystemJS Build Tool",
"main": "index.js",
"dependencies": {
Expand All @@ -16,7 +16,7 @@
"es6-template-strings": "^2.0.0",
"glob": "^7.0.3",
"mkdirp": "^0.5.1",
"rollup": "^0.36.3",
"rollup": "^0.58.2",
"source-map": "^0.5.3",
"systemjs": "^0.19.46",
"traceur": "0.0.105",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/sourcemaps-expectations/babel.tree.multi.json
View file
Original file line number Diff line number Diff line change
@@ -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"}
{"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"}
2 changes: 1 addition & 1 deletion test/fixtures/sourcemaps-expectations/traceur.tree.multi.json
View file
Original file line number Diff line number Diff line change
@@ -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"}
{"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 comments on commit cae14f9

Please sign in to comment.