chore(package): switch from @reactivex/rxjs to rxjs

Author: felixfbecker

package.json

@@ -34,7 +34,6 @@
     "commitmsg": "validate-commit-msg"
   },
   "dependencies": {
-    "@reactivex/rxjs": "^5.3.0",
     "chai": "^4.0.1",
     "chai-as-promised": "^7.0.0",
     "chalk": "^2.2.0",
@@ -47,6 +46,7 @@
     "mz": "^2.6.0",
     "object-hash": "^1.1.8",
     "opentracing": "^0.14.0",
+    "rxjs": "^5.5.0",
     "semaphore-async-await": "^1.5.1",
     "string-similarity": "^1.1.0",
     "typescript": "2.4.2",

src/connection.ts

@@ -1,8 +1,8 @@
-import { Observable, Subscription, Symbol } from '@reactivex/rxjs'
 import { EventEmitter } from 'events'
 import { applyReducer, Operation } from 'fast-json-patch'
 import { camelCase, omit } from 'lodash'
 import { FORMAT_TEXT_MAP, SpanContext, Tracer } from 'opentracing'
+import { Observable, Subscription, Symbol } from 'rxjs'
 import { inspect } from 'util'
 import { ErrorCodes, Message, StreamMessageReader as VSCodeStreamMessageReader, StreamMessageWriter as VSCodeStreamMessageWriter } from 'vscode-jsonrpc'
 import { isNotificationMessage, isRequestMessage, isResponseMessage, NotificationMessage, RequestMessage, ResponseMessage } from 'vscode-jsonrpc/lib/messages'

src/fs.ts

@@ -1,7 +1,7 @@
-import { Observable } from '@reactivex/rxjs'
 import { Glob } from 'glob'
 import * as fs from 'mz/fs'
 import { Span } from 'opentracing'
+import { Observable } from 'rxjs'
 import Semaphore from 'semaphore-async-await'
 import { LanguageClient } from './lang-handler'
 import { InMemoryFileSystem } from './memfs'

src/lang-handler.ts

@@ -1,5 +1,5 @@
-import { Observable } from '@reactivex/rxjs'
 import { FORMAT_TEXT_MAP, Span } from 'opentracing'
+import { Observable } from 'rxjs'
 import { inspect } from 'util'
 import { isResponseMessage, Message, NotificationMessage, RequestMessage, ResponseMessage } from 'vscode-jsonrpc/lib/messages'
 import {

src/packages.ts

@@ -1,8 +1,8 @@
 
-import { Observable, Subscription } from '@reactivex/rxjs'
 import { EventEmitter } from 'events'
 import { Span } from 'opentracing'
 import * as path from 'path'
+import { Observable, Subscription } from 'rxjs'
 import * as url from 'url'
 import { Disposable } from './disposable'
 import { FileSystemUpdater } from './fs'

src/project-manager.ts

@@ -1,9 +1,9 @@
-import { Observable, Subscription } from '@reactivex/rxjs'
-import { SelectorMethodSignature } from '@reactivex/rxjs/dist/cjs/observable/FromEventObservable'
 import iterate from 'iterare'
 import { noop } from 'lodash'
 import { Span } from 'opentracing'
 import * as path from 'path'
+import { Observable, Subscription } from 'rxjs'
+import { SelectorMethodSignature } from 'rxjs/observable/FromEventObservable'
 import * as ts from 'typescript'
 import { Disposable } from './disposable'
 import { FileSystemUpdater } from './fs'

src/test/connection.test.ts

@@ -1,9 +1,9 @@
 
-import { Observable, Subject } from '@reactivex/rxjs'
 import * as assert from 'assert'
 import { EventEmitter } from 'events'
 import { Operation } from 'fast-json-patch'
 import { Span } from 'opentracing'
+import { Observable, Subject } from 'rxjs'
 import * as sinon from 'sinon'
 import { PassThrough } from 'stream'
 import { ErrorCodes } from 'vscode-jsonrpc'

src/test/fs-helpers.ts

@@ -1,4 +1,4 @@
-import { Observable } from '@reactivex/rxjs'
+import { Observable } from 'rxjs'
 import { FileSystem } from '../fs'
 import { observableFromIterable } from '../util'
 

src/test/tracing.test.ts

@@ -1,8 +1,8 @@
 
-import { Observable } from '@reactivex/rxjs'
 import * as chai from 'chai'
 import chaiAsPromised = require('chai-as-promised')
 import { Span } from 'opentracing'
+import { Observable } from 'rxjs'
 import * as sinon from 'sinon'
 import { traceObservable, tracePromise, traceSync } from '../tracing'
 chai.use(chaiAsPromised)

src/test/typescript-service-helpers.ts

@@ -1,8 +1,8 @@
-import { Observable } from '@reactivex/rxjs'
 import * as chai from 'chai'
 import chaiAsPromised = require('chai-as-promised')
 import { applyReducer, Operation } from 'fast-json-patch'
 import { IBeforeAndAfterContext, ISuiteCallbackContext, ITestCallbackContext } from 'mocha'
+import { Observable } from 'rxjs'
 import * as sinon from 'sinon'
 import * as ts from 'typescript'
 import { CompletionItemKind, CompletionList, DiagnosticSeverity, InsertTextFormat, TextDocumentIdentifier, TextDocumentItem, WorkspaceEdit } from 'vscode-languageserver'

src/tracing.ts

@@ -1,6 +1,6 @@
 
-import { Observable } from '@reactivex/rxjs'
 import { Span } from 'opentracing'
+import { Observable } from 'rxjs'
 
 /**
  * Traces a synchronous function by passing it a new child span.

src/typescript-service.ts

@@ -1,10 +1,10 @@
-import { Observable } from '@reactivex/rxjs'
 import { Operation } from 'fast-json-patch'
 import iterate from 'iterare'
 import { toPairs } from 'lodash'
 import { castArray, merge, omit } from 'lodash'
 import hashObject = require('object-hash')
 import { Span } from 'opentracing'
+import { Observable } from 'rxjs'
 import * as ts from 'typescript'
 import * as url from 'url'
 import {

src/util.ts

@@ -1,5 +1,5 @@
-import { Observable } from '@reactivex/rxjs'
 import { escapePathComponent } from 'fast-json-patch'
+import { Observable } from 'rxjs'
 import { compareTwoStrings } from 'string-similarity'
 import * as ts from 'typescript'
 import * as url from 'url'