Skip to content

Commit e6d9d88

Browse files
marcovdbbrandonroberts
authored andcommittedDec 8, 2017
fix(utils): Update vanilla JS require loader to be fully ES5 (#98)
1 parent 615d86a commit e6d9d88

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎spec/utils.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ describe('Utils', function() {
5858

5959
it('should return an asynchronous require loadChildren statement with vanilla javascript', function() {
6060
var result = [
61-
'loadChildren: () => new Promise(function (resolve, reject) {',
61+
'loadChildren: function () { return new Promise(function (resolve, reject) {',
6262
' require.ensure([], function (require) {',
6363
' resolve(' + getRequireString(path, name) + ');',
6464
' }, function () {',
6565
' reject({ loadChunkError: true });',
6666
' }, \'name\');',
67-
'})'
67+
'})}'
6868
];
6969
getRequireLoader('path', 'name', 'name', true, true).should.eql(result.join(''));
7070
});

‎src/utils.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ module.exports.getRequireLoader = function(filePath, chunkName, moduleName, inli
2121
var requireString = module.exports.getRequireString(filePath, moduleName);
2222

2323
var result = [
24-
'loadChildren: () => new Promise(function (resolve, reject) {',
24+
'loadChildren: '+ (isJs ? 'function () { return' : '() =>') + ' new Promise(function (resolve, reject) {',
2525
' ' + (isJs ? 'require' : '(require as any)') + '.ensure([], function (' + (isJs ? 'require' : 'require: any') + ') {',
2626
' resolve(' + requireString + ');',
2727
' }, function () {',
2828
' reject({ loadChunkError: true });',
2929
' }' + module.exports.getChunkName('require', chunkName) + ');',
30-
'})'
30+
'})' + (isJs ? '}' : '')
3131
];
3232

3333
return inline ? result.join('') : result.join('\n');

0 commit comments

Comments
 (0)