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

Commit 300b200

Browse files
committed
separate out url, remove promises
1 parent 4edeee8 commit 300b200

File tree

7 files changed

+74
-636
lines changed

7 files changed

+74
-636
lines changed

Gruntfile.js

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ module.exports = function (grunt) {
2525
'src/polyfill-wrapper-start.js',
2626
'src/loader.js',
2727
'src/dynamic-only.js',
28-
'src/system.js',
29-
'src/polyfill-wrapper-end.js'
30-
],
31-
'dist/<%= pkg.name %>-prod-sans-promises.src.js': [
32-
'src/polyfill-wrapper-start.js',
33-
'src/loader.js',
34-
'src/dynamic-only.js',
28+
'src/url.js',
3529
'src/system.js',
3630
'src/polyfill-wrapper-end.js'
3731
],
@@ -41,15 +35,7 @@ module.exports = function (grunt) {
4135
'src/loader.js',
4236
'src/declarative.js',
4337
'src/transpiler.js',
44-
'src/system.js',
45-
'src/module-tag.js',
46-
'src/polyfill-wrapper-end.js'
47-
],
48-
'dist/<%= pkg.name %>-sans-promises.src.js': [
49-
'src/polyfill-wrapper-start.js',
50-
'src/loader.js',
51-
'src/declarative.js',
52-
'src/transpiler.js',
38+
'src/url.js',
5339
'src/system.js',
5440
'src/module-tag.js',
5541
'src/polyfill-wrapper-end.js'
@@ -72,20 +58,12 @@ module.exports = function (grunt) {
7258
src: 'dist/<%= pkg.name %>.src.js',
7359
dest: 'dist/<%= pkg.name %>.js'
7460
},
75-
distSansPromises: {
76-
src: 'dist/<%= pkg.name %>-sans-promises.src.js',
77-
dest: 'dist/<%= pkg.name %>-sans-promises.js'
78-
},
7961
prodDist: {
8062
options: {
8163
banner: '<%= meta.banner %>\n'
8264
},
8365
src: 'dist/<%= pkg.name %>-prod.src.js',
8466
dest: 'dist/<%= pkg.name %>-prod.js'
85-
},
86-
prodDistSansPromises: {
87-
src: 'dist/<%= pkg.name %>-prod-sans-promises.src.js',
88-
dest: 'dist/<%= pkg.name %>-prod-sans-promises.js'
8967
}
9068
}
9169
});

karma.conf.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ module.exports = function(config) {
3939

4040
[!options.ie8 ? (!options['babel'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/babel-core/browser.js') : ''],
4141

42-
'dist/es6-module-loader' + (options.polyfill ? '' : '-sans-promises') + '.src.js',
42+
[options.polyfill ? 'node_modules/when/es6-shim/Promise' : ''],
43+
'dist/es6-module-loader.src.js',
4344

4445
'test/_browser.js',
4546
'test/browser-script-type-module.js',

lib/index-babel.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
require('when');
2+
var System = require('../dist/es6-module-loader.src');
3+
4+
System.transpiler = 'babel';
5+
6+
try {
7+
System.paths['babel'] = require.resolve('babel-core/browser.js');
8+
}
9+
catch(e) {}
10+
11+
module.exports = {
12+
Loader: global.LoaderPolyfill,
13+
System: System
14+
};

lib/index-traceur.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
require('when');
2+
var System = require('../dist/es6-module-loader.src');
3+
4+
System.transpiler = 'traceur';
5+
try {
6+
System.paths['traceur'] = require.resolve('traceur/bin/traceur.js');
7+
}
8+
catch(e) {}
9+
10+
module.exports = {
11+
Loader: global.LoaderPolyfill,
12+
System: System
13+
};

0 commit comments

Comments
 (0)