cargdev/angular
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(async): replace RxJS with RxNext

Browse Source 
Closes #3110
Closes #4201
This commit is contained in:
vsavkin
2015-09-11 15:38:09 -07:00
committed by Jeff Cross
parent 7b3161a229
commit 16bf335a4a
25 changed files with 61 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/broccoli/html-replace/SCRIPTS.html
View File

@ -5,14 +5,9 @@
<script src="Reflect.js" type="text/javascript"></script>
<script type="text/javascript">
var filename = '@@FILENAME_NO_EXT';
var parent = filename.split('/');
parent = parent.splice(0, parent.length-1).join('/');
System.config({
baseURL: '/',
defaultJSExtensions: true,
paths: {
'rx': parent + '/rx.js'
}
defaultJSExtensions: true
});
System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
</script>

7
tools/broccoli/html-replace/SCRIPTS_benchmarks.html
View File

@ -6,14 +6,9 @@
<script src="Reflect.js" type="text/javascript"></script>
<script type="text/javascript">
var filename = '@@FILENAME_NO_EXT';
var parent = filename.split('/');
parent = parent.splice(0, parent.length-1).join('/');
System.config({
baseURL: '/',
defaultJSExtensions: true,
paths: {
'rx': parent + '/rx.js'
}
defaultJSExtensions: true
});
System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
</script>

7
tools/broccoli/html-replace/SCRIPTS_benchmarks_external.html
View File

@ -7,14 +7,9 @@
<script src="Reflect.js" type="text/javascript"></script>
<script type="text/javascript">
var filename = '@@FILENAME_NO_EXT';
var parent = filename.split('/');
parent = parent.splice(0, parent.length-1).join('/');
System.config({
baseURL: '/',
defaultJSExtensions: true,
paths: {
'rx': parent + '/rx.js'
}
defaultJSExtensions: true
});
System.import(filename).then(function(m) { m.main(); }, console.error.bind(console));
</script>

7
tools/broccoli/trees/browser_tree.ts
View File

@ -84,6 +84,8 @@ module.exports = function makeBrowserTree(options, destinationPath) {
destDir: '/'
});
var rxJs = new Funnel('node_modules/@reactivex', {include: ['**/**'], destDir: '/@reactivex'});
var es5ModulesTree = new Funnel('modules', {
include: ['**/**'],
exclude: ['**/*.cjs', 'angular1_router/**', 'benchmarks/e2e_test/**'],
@ -139,7 +141,6 @@ module.exports = function makeBrowserTree(options, destinationPath) {
'node_modules/zone.js/dist/zone-microtask.js',
'node_modules/zone.js/dist/long-stack-trace-zone.js',
'node_modules/systemjs/dist/system.src.js',
'node_modules/rx/dist/rx.js',
'node_modules/base64-js/lib/b64.js',
'node_modules/reflect-metadata/Reflect.js',
'node_modules/es6-shim/es6-shim.js'
@ -208,8 +209,8 @@ module.exports = function makeBrowserTree(options, destinationPath) {
htmlTree = mergeTrees([htmlTree, scripts, polymer, react]);
es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree]);
es6Tree = mergeTrees([es6Tree, htmlTree, assetsTree]);
es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree, rxJs]);
es6Tree = mergeTrees([es6Tree, htmlTree, assetsTree, rxJs]);
var mergedTree = mergeTrees([stew.mv(es6Tree, '/es6'), stew.mv(es5Tree, '/es5')]);