Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit cbc58c1

Browse files
JiaLiPassionmhevery
JiaLiPassion
authored and
mhevery
committed
fix(rxjs): fix #863, fix asap scheduler issue, add testcases (#848)
* fix(rxjs): fix asap scheduler issue, add testcases * patch defer, add cases for concat/defer * add testcases: from/forkJoin * add cases: fromEvent/fromPromise/interval * add merge/never/of/range/throw/timer/zip * add audit~delay * staging changes * fix test cases * add notification test * add merge/map/collections * add remained cases * patch multicast * use _subscriber setter instead of patching Observable constructor * refactor * update gulpfiles * check proto null * add null check if operators are not loaded * remove not necessary karma settings
1 parent 02cd40e commit cbc58c1

49 files changed

Lines changed: 4057 additions & 198 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎gulpfile.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,14 @@ function generateScript(inFile, outFile, minify, callback) {
2929
+ '*\n'
3030
+ '* Use of this source code is governed by an MIT-style license that can be\n'
3131
+ '* found in the LICENSE file at https://angular.io/license\n'
32-
+ '*/'
32+
+ '*/',
33+
globals: {
34+
'rxjs/Observable': 'Rx',
35+
'rxjs/Subscriber': 'Rx',
36+
'rxjs/Subscription': 'Rx',
37+
'rxjs/scheduler/asap': 'Rx.Scheduler',
38+
'rxjs/symbol/rxSubscriber': 'Rx.Symbol'
39+
}
3340
}))
3441
.pipe(rename(outFile)),
3542
];

‎karma-base.conf.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ module.exports = function (config) {
1313
'node_modules/systemjs/dist/system-polyfills.js',
1414
'node_modules/systemjs/dist/system.src.js',
1515
'node_modules/whatwg-fetch/fetch.js',
16-
{pattern: 'node_modules/rxjs/bundles/Rx.js', watched: true, served: true, included: false},
16+
{pattern: 'node_modules/rxjs/**/**/*.js', included: false, watched: false },
17+
{pattern: 'node_modules/rxjs/**/**/*.js.map', included: false, watched: false },
18+
{pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false },
19+
{pattern: 'node_modules/rxjs/**/*.js.map', included: false, watched: false },
1720
{pattern: 'test/assets/**/*.*', watched: true, served: true, included: false},
1821
{pattern: 'build/**/*.js.map', watched: true, served: true, included: false},
1922
{pattern: 'build/**/*.js', watched: true, served: true, included: false}

‎karma-dist.conf.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@ module.exports = function (config) {
1818
config.files.push('dist/sync-test.js');
1919
config.files.push('dist/task-tracking.js');
2020
config.files.push('dist/wtf.js');
21-
config.files.push('node_modules/rxjs/bundles/Rx.js');
22-
config.files.push('dist/zone-patch-rxjs.js');
2321
config.files.push('build/test/main.js');
2422
};

0 commit comments

Comments
 (0)