Skip to content

Commit

Permalink
ensure semicolon between compact sources
Browse files Browse the repository at this point in the history
  • Loading branch information
guybedford committed May 14, 2018
1 parent 12eb4d6 commit 2acb378
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 36 deletions.
11 changes: 9 additions & 2 deletions src/Chunk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,10 @@ export default class Chunk {
for (const module of this.orderedModules) {
const source = module.render(renderOptions);
source.trim();
if (options.compact && source.lastLine().indexOf('//') !== -1) source.append('\n');
if (options.compact) {
if (source.lastLine().indexOf('//') !== -1) source.append('\n');
else if (source.lastChar() !== ';') source.append(';');
}
this.renderedModuleSources.push(source);

const namespace = module.getOrCreateNamespace();
Expand All @@ -826,7 +829,11 @@ export default class Chunk {

if (hoistedSource) magicString.prepend(hoistedSource + n + n);

this.renderedSource = options.compact ? magicString : magicString.trim();
if (options.compact) {
this.renderedSource = magicString;
} else {
this.renderedSource = magicString.trim();
}

this.renderedSourceLength = undefined;
this.renderedHash = undefined;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
define(['exports'],function(exports){'use strict';function fn () {
console.log('lib2 fn');
}function fn$1 () {
};function fn$1 () {
fn();
console.log('dep2 fn');
}exports.a=fn$1;});
};exports.a=fn$1;});
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
define(['./chunk-1e9855f7.js'],function(__chunk_1){'use strict';function fn () {
define(['./chunk-f4daa162.js'],function(__chunk_1){'use strict';function fn () {
console.log('dep1 fn');
}class Main1 {
};class Main1 {
constructor () {
fn();
__chunk_1.a();
}
}return Main1;});
};return Main1;});
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
define(['external','./chunk-1e9855f7.js'],function(external,__chunk_1){'use strict';function fn () {
define(['external','./chunk-f4daa162.js'],function(external,__chunk_1){'use strict';function fn () {
console.log('lib1 fn');
external.fn();
}function fn$1 () {
};function fn$1 () {
fn();
console.log('dep3 fn');
}class Main2 {
};class Main2 {
constructor () {
fn$1();
__chunk_1.a();
}
}return Main2;});
};return Main2;});
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';function fn () {
console.log('lib2 fn');
}function fn$1 () {
};function fn$1 () {
fn();
console.log('dep2 fn');
}exports.a=fn$1;
};exports.a=fn$1;
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';var __chunk_1=require('./chunk-992f09ca.js');function fn () {
'use strict';var __chunk_1=require('./chunk-f7718a2e.js');function fn () {
console.log('dep1 fn');
}class Main1 {
};class Main1 {
constructor () {
fn();
__chunk_1.a();
}
}module.exports=Main1;
};module.exports=Main1;
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use strict';var external=require('external'),__chunk_1=require('./chunk-992f09ca.js');function fn () {
'use strict';var external=require('external'),__chunk_1=require('./chunk-f7718a2e.js');function fn () {
console.log('lib1 fn');
external.fn();
}function fn$1 () {
};function fn$1 () {
fn();
console.log('dep3 fn');
}class Main2 {
};class Main2 {
constructor () {
fn$1();
__chunk_1.a();
}
}module.exports=Main2;
};module.exports=Main2;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function fn () {
console.log('lib2 fn');
}function fn$1 () {
};function fn$1 () {
fn();
console.log('dep2 fn');
}export{fn$1 as a};
};export{fn$1 as a};
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {a as fn}from'./chunk-5b60a9d9.js';function fn$1 () {
import {a as fn}from'./chunk-f92a9406.js';function fn$1 () {
console.log('dep1 fn');
}class Main1 {
};class Main1 {
constructor () {
fn$1();
fn();
}
}export default Main1;
};export default Main1;
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {fn}from'external';import {a as fn$1}from'./chunk-5b60a9d9.js';function fn$2 () {
import {fn}from'external';import {a as fn$1}from'./chunk-f92a9406.js';function fn$2 () {
console.log('lib1 fn');
fn();
}function fn$3 () {
};function fn$3 () {
fn$2();
console.log('dep3 fn');
}class Main2 {
};class Main2 {
constructor () {
fn$3();
fn$1();
}
}export default Main2;
};export default Main2;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
System.register([],function(exports,module){'use strict';return{execute:function(){exports('a',fn$1);function fn () {
console.log('lib2 fn');
}function fn$1 () {
};function fn$1 () {
fn();
console.log('dep2 fn');
}}}});
};}}});
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
System.register(['./chunk-ad0e6b97.js'],function(exports,module){'use strict';var fn;return{setters:[function(module){fn=module.a;}],execute:function(){function fn$1 () {
System.register(['./chunk-d9826910.js'],function(exports,module){'use strict';var fn;return{setters:[function(module){fn=module.a;}],execute:function(){function fn$1 () {
console.log('dep1 fn');
}class Main1 {
};class Main1 {
constructor () {
fn$1();
fn();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
System.register(['external','./chunk-ad0e6b97.js'],function(exports,module){'use strict';var fn,fn$1;return{setters:[function(module){fn=module.fn;},function(module){fn$1=module.a;}],execute:function(){function fn$2 () {
System.register(['external','./chunk-d9826910.js'],function(exports,module){'use strict';var fn,fn$1;return{setters:[function(module){fn=module.fn;},function(module){fn$1=module.a;}],execute:function(){function fn$2 () {
console.log('lib1 fn');
fn();
}function fn$3 () {
};function fn$3 () {
fn$2();
console.log('dep3 fn');
}class Main2 {
};class Main2 {
constructor () {
fn$3();
fn$1();
Expand Down

0 comments on commit 2acb378

Please sign in to comment.