Skip to content

Commit a83a852

Browse files
authored
Merge pull request #224 from atom-ide-community/fix-rxjs
2 parents 86e0d95 + 0e87456 commit a83a852

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

dist/debugger/RemoteDebuggerCommandService.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/debugger/utils.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/debugger/RemoteDebuggerCommandService.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type {ConnectableObservable} from 'rxjs';
1+
import type {ConnectableObservable} from 'rxjs-compat/bundles/rxjs-compat.umd.min.js';
22

33
import http from 'http';
44
import net from 'net';
5-
import {Observable, Subject} from 'rxjs';
5+
import {Observable, Subject} from 'rxjs-compat/bundles/rxjs-compat.umd.min.js';
66
import {getLogger} from 'log4js';
77
import {sleep} from '@atom-ide-community/nuclide-commons/promise';
88

lib/debugger/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {observeAddedHostnames} from '@atom-ide-community/nuclide-commons-atom/pr
1111
import nuclideUri from '@atom-ide-community/nuclide-commons/nuclideUri';
1212
import {fastDebounce} from '@atom-ide-community/nuclide-commons/observable';
1313
import UniversalDisposable from '@atom-ide-community/nuclide-commons/UniversalDisposable';
14-
import {Observable} from 'rxjs';
14+
import {Observable} from 'rxjs-compat/bundles/rxjs-compat.umd.min.js';
1515
import {track} from '@atom-ide-community/nuclide-commons/analytics';
1616
import * as RemoteDebuggerCommandServiceLocal from './RemoteDebuggerCommandService';
1717
import nullthrows from 'nullthrows';

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
"react": "16.6.3",
5555
"reflect-metadata": "0.1.12",
5656
"rxjs": "5.5.9",
57+
"rxjs-compat": "6.3.3",
5758
"semver": "5.5.0",
5859
"tmp": "0.0.29",
5960
"tree-kill": "1.1.0",

0 commit comments

Comments
 (0)