diff --git a/package.json b/package.json index 3a579b6094..f8ff2b18b4 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "dependencies": { "core-js": "^2.4.1", "reflect-metadata": "^0.1.3", - "rxjs": "6.0.0-beta.0", + "rxjs": "6.0.0-beta.4", "tslib": "^1.7.1", "zone.js": "^0.8.12" }, diff --git a/packages/benchpress/package.json b/packages/benchpress/package.json index 036aa596c8..c1c8b8d900 100644 --- a/packages/benchpress/package.json +++ b/packages/benchpress/package.json @@ -8,7 +8,7 @@ "dependencies": { "@angular/core": "^2.0.0-rc.7", "reflect-metadata": "^0.1.2", - "rxjs": "^5.6.0-forward-compat.0 || ^6.0.0-beta.0", + "rxjs": "^6.0.0-beta.4", "jpm": "1.1.4", "firefox-profile": "0.4.0", "selenium-webdriver": "^2.53.3" diff --git a/packages/common/package.json b/packages/common/package.json index 4dadae705f..3bbc548029 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -17,7 +17,7 @@ }, "locales": "locales", "peerDependencies": { - "rxjs": "^5.6.0-forward-compat.0 || ^6.0.0-beta.0", + "rxjs": "^6.0.0-beta.4", "@angular/core": "0.0.0-PLACEHOLDER" }, "repository": { diff --git a/packages/core/package.json b/packages/core/package.json index ea64cdb77a..f9849cc158 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^5.6.0-forward-compat.0 || ^6.0.0-beta.0", + "rxjs": "^6.0.0-beta.4", "zone.js": "^0.8.4" }, "repository": { diff --git a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json index 9a2bfbbfa7..d52f46bee1 100644 --- a/packages/core/test/bundling/hello_world/bundle.golden_symbols.json +++ b/packages/core/test/bundling/hello_world/bundle.golden_symbols.json @@ -1,28 +1,43 @@ [ { - "name": "Action" + "name": "AnonymousSubject" }, { - "name": "AnimationFrameAction" - }, - { - "name": "AsapAction" - }, - { - "name": "AsyncAction" - }, - { - "name": "AsyncScheduler" + "name": "ArgumentOutOfRangeError" }, { "name": "CLEAN_PROMISE" }, + { + "name": "ConnectableSubscriber" + }, + { + "name": "Context" + }, + { + "name": "CountedSubject" + }, + { + "name": "DelayMessage" + }, + { + "name": "EMPTY$1" + }, { "name": "EMPTY$2" }, { "name": "EMPTY_RENDERER_TYPE_ID" }, + { + "name": "EmptyError" + }, + { + "name": "GroupDurationSubscriber" + }, + { + "name": "GroupedObservable" + }, { "name": "HelloWorld" }, @@ -30,7 +45,10 @@ "name": "INeedToExistEvenThoughIAmNotNeeded" }, { - "name": "Immediate" + "name": "InnerRefCountSubscription" + }, + { + "name": "InnerSubscriber" }, { "name": "NG_HOST_SYMBOL" @@ -38,20 +56,62 @@ { "name": "NG_PROJECT_AS_ATTR_NAME" }, + { + "name": "NONE" + }, + { + "name": "Notification" + }, + { + "name": "ObjectUnsubscribedError" + }, { "name": "Observable" }, + { + "name": "ObserveOnMessage" + }, + { + "name": "ObserveOnSubscriber" + }, + { + "name": "OuterSubscriber" + }, { "name": "QueueAction" }, { "name": "ROOT_DIRECTIVE_INDICES" }, + { + "name": "RefCountOperator$1" + }, + { + "name": "RefCountSubscriber$1" + }, + { + "name": "ReplayEvent" + }, { "name": "SafeSubscriber" }, { - "name": "Scheduler" + "name": "SequenceEqualCompareToSubscriber" + }, + { + "name": "StaticArrayIterator" + }, + { + "name": "StaticIterator" + }, + { + "name": "Subject" + }, + { + "name": "SubjectSubscriber" + }, + { + "name": "SubjectSubscription" }, { "name": "Subscriber" @@ -59,6 +119,12 @@ { "name": "Subscription" }, + { + "name": "SubscriptionDelaySubscriber" + }, + { + "name": "TimeInterval" + }, { "name": "UNDEFINED_RENDERER_TYPE_ID" }, @@ -66,37 +132,10 @@ "name": "UnsubscriptionError" }, { - "name": "__extends$1" + "name": "ZipBufferIterator" }, { - "name": "__extends$10" - }, - { - "name": "__extends$11" - }, - { - "name": "__extends$12" - }, - { - "name": "__extends$13" - }, - { - "name": "__extends$14" - }, - { - "name": "__extends$17" - }, - { - "name": "__extends$18" - }, - { - "name": "__extends$19" - }, - { - "name": "__extends$2" - }, - { - "name": "__extends$20" + "name": "__extends" }, { "name": "_enable_super_gross_mode_that_will_cause_bad_things" @@ -152,12 +191,48 @@ { "name": "detectChangesInternal" }, + { + "name": "dispatch" + }, + { + "name": "dispatchBufferClose" + }, + { + "name": "dispatchBufferCreation" + }, + { + "name": "dispatchBufferTimeSpanOnly" + }, + { + "name": "dispatchNext$2" + }, + { + "name": "dispatchNext$3" + }, + { + "name": "dispatchNotification" + }, + { + "name": "dispatchWindowClose" + }, + { + "name": "dispatchWindowCreation" + }, + { + "name": "dispatchWindowTimeSpanOnly" + }, { "name": "domRendererFactory3" }, { "name": "empty" }, + { + "name": "empty$1" + }, + { + "name": "emptyScheduled" + }, { "name": "enterView" }, @@ -173,12 +248,18 @@ { "name": "executeInitHooks" }, + { + "name": "extendStatics" + }, { "name": "firstTemplatePass" }, { "name": "flattenUnsubscriptionErrors" }, + { + "name": "fromArray" + }, { "name": "getDirectiveInstance" }, @@ -206,6 +287,9 @@ { "name": "isArray" }, + { + "name": "isArrayLike" + }, { "name": "isFunction" }, @@ -215,24 +299,42 @@ { "name": "isProceduralRenderer" }, + { + "name": "isPromise" + }, + { + "name": "isScheduler" + }, + { + "name": "isTrustedSubscriber" + }, + { + "name": "iterator" + }, { "name": "leaveView" }, { "name": "locateHostElement" }, - { - "name": "nextHandle" - }, { "name": "noop" }, { "name": "observable" }, + { + "name": "of" + }, { "name": "pipeFromArray" }, + { + "name": "queue" + }, + { + "name": "refCount" + }, { "name": "refreshChildComponents" }, @@ -255,10 +357,10 @@ "name": "resolveRendererType2" }, { - "name": "runIfPresent" + "name": "rxSubscriber" }, { - "name": "rxSubscriber" + "name": "scalar" }, { "name": "setHostBindings" @@ -270,11 +372,29 @@ "name": "stringify$1" }, { - "name": "tasksByHandle" + "name": "subscribeTo" + }, + { + "name": "subscribeToArray" + }, + { + "name": "subscribeToIterable" + }, + { + "name": "subscribeToObservable" + }, + { + "name": "subscribeToPromise" + }, + { + "name": "subscribeToResult" }, { "name": "text" }, + { + "name": "throwError" + }, { "name": "toSubscriber" }, diff --git a/packages/core/test/bundling/injection/bundle.golden_symbols.json b/packages/core/test/bundling/injection/bundle.golden_symbols.json index 43bca0bd43..16aea100fe 100644 --- a/packages/core/test/bundling/injection/bundle.golden_symbols.json +++ b/packages/core/test/bundling/injection/bundle.golden_symbols.json @@ -3,34 +3,46 @@ "name": "APP_ROOT" }, { - "name": "Action" + "name": "AnonymousSubject" }, { - "name": "AnimationFrameAction" - }, - { - "name": "AsapAction" - }, - { - "name": "AsyncAction" - }, - { - "name": "AsyncScheduler" + "name": "ArgumentOutOfRangeError" }, { "name": "CIRCULAR$1" }, + { + "name": "ConnectableSubscriber" + }, + { + "name": "Context" + }, + { + "name": "CountedSubject" + }, + { + "name": "DelayMessage" + }, + { + "name": "EMPTY$1" + }, { "name": "EMPTY_ARRAY$1" }, + { + "name": "EmptyError" + }, { "name": "GET_PROPERTY_NAME$1" }, { - "name": "INJECTOR$1" + "name": "GroupDurationSubscriber" }, { - "name": "Immediate" + "name": "GroupedObservable" + }, + { + "name": "INJECTOR$1" }, { "name": "Inject" @@ -38,21 +50,45 @@ { "name": "InjectionToken" }, + { + "name": "InnerRefCountSubscription" + }, + { + "name": "InnerSubscriber" + }, + { + "name": "NONE" + }, { "name": "NOT_YET" }, { "name": "NULL_INJECTOR$1" }, + { + "name": "Notification" + }, { "name": "NullInjector" }, + { + "name": "ObjectUnsubscribedError" + }, { "name": "Observable" }, + { + "name": "ObserveOnMessage" + }, + { + "name": "ObserveOnSubscriber" + }, { "name": "Optional" }, + { + "name": "OuterSubscriber" + }, { "name": "PARAMETERS" }, @@ -63,10 +99,16 @@ "name": "R3Injector" }, { - "name": "SafeSubscriber" + "name": "RefCountOperator$1" }, { - "name": "Scheduler" + "name": "RefCountSubscriber$1" + }, + { + "name": "ReplayEvent" + }, + { + "name": "SafeSubscriber" }, { "name": "ScopedService" @@ -74,59 +116,56 @@ { "name": "Self" }, + { + "name": "SequenceEqualCompareToSubscriber" + }, { "name": "SkipSelf" }, + { + "name": "StaticArrayIterator" + }, + { + "name": "StaticIterator" + }, + { + "name": "Subject" + }, + { + "name": "SubjectSubscriber" + }, + { + "name": "SubjectSubscription" + }, { "name": "Subscriber" }, { "name": "Subscription" }, + { + "name": "SubscriptionDelaySubscriber" + }, { "name": "THROW_IF_NOT_FOUND" }, + { + "name": "TimeInterval" + }, { "name": "USE_VALUE$1" }, { "name": "UnsubscriptionError" }, + { + "name": "ZipBufferIterator" + }, { "name": "_THROW_IF_NOT_FOUND" }, { - "name": "__extends$1" - }, - { - "name": "__extends$10" - }, - { - "name": "__extends$11" - }, - { - "name": "__extends$12" - }, - { - "name": "__extends$13" - }, - { - "name": "__extends$14" - }, - { - "name": "__extends$17" - }, - { - "name": "__extends$18" - }, - { - "name": "__extends$19" - }, - { - "name": "__extends$2" - }, - { - "name": "__extends$20" + "name": "__extends" }, { "name": "__read" @@ -158,18 +197,60 @@ { "name": "defineInjector" }, + { + "name": "dispatch" + }, + { + "name": "dispatchBufferClose" + }, + { + "name": "dispatchBufferCreation" + }, + { + "name": "dispatchBufferTimeSpanOnly" + }, + { + "name": "dispatchNext$2" + }, + { + "name": "dispatchNext$3" + }, + { + "name": "dispatchNotification" + }, + { + "name": "dispatchWindowClose" + }, + { + "name": "dispatchWindowCreation" + }, + { + "name": "dispatchWindowTimeSpanOnly" + }, { "name": "empty" }, + { + "name": "empty$1" + }, + { + "name": "emptyScheduled" + }, { "name": "errorObject" }, + { + "name": "extendStatics" + }, { "name": "flattenUnsubscriptionErrors" }, { "name": "forwardRef" }, + { + "name": "fromArray" + }, { "name": "getClosureSafeProperty$1" }, @@ -203,6 +284,9 @@ { "name": "isArray" }, + { + "name": "isArrayLike" + }, { "name": "isExistingProvider" }, @@ -215,12 +299,24 @@ { "name": "isObject" }, + { + "name": "isPromise" + }, + { + "name": "isScheduler" + }, + { + "name": "isTrustedSubscriber" + }, { "name": "isTypeProvider" }, { "name": "isValueProvider" }, + { + "name": "iterator" + }, { "name": "makeMetadataCtor" }, @@ -230,29 +326,35 @@ { "name": "makeRecord" }, - { - "name": "nextHandle" - }, { "name": "noop" }, { "name": "observable" }, + { + "name": "of" + }, { "name": "pipeFromArray" }, { "name": "providerToRecord" }, + { + "name": "queue" + }, + { + "name": "refCount" + }, { "name": "resolveForwardRef" }, { - "name": "runIfPresent" + "name": "rxSubscriber" }, { - "name": "rxSubscriber" + "name": "scalar" }, { "name": "setCurrentInjector" @@ -261,7 +363,25 @@ "name": "stringify" }, { - "name": "tasksByHandle" + "name": "subscribeTo" + }, + { + "name": "subscribeToArray" + }, + { + "name": "subscribeToIterable" + }, + { + "name": "subscribeToObservable" + }, + { + "name": "subscribeToPromise" + }, + { + "name": "subscribeToResult" + }, + { + "name": "throwError" }, { "name": "toSubscriber" diff --git a/packages/elements/package.json b/packages/elements/package.json index 36ea7d809a..c146337c87 100644 --- a/packages/elements/package.json +++ b/packages/elements/package.json @@ -18,7 +18,7 @@ "peerDependencies": { "@angular/core": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER", - "rxjs": "^5.6.0-forward-compat.0 || ^6.0.0-beta.0" + "rxjs": "^6.0.0-beta.4" }, "repository": { "type": "git", diff --git a/packages/forms/package.json b/packages/forms/package.json index e8043fca2b..4e68a0d2c7 100644 --- a/packages/forms/package.json +++ b/packages/forms/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^5.6.0-forward-compat.0 || ^6.0.0-beta.0", + "rxjs": "^6.0.0-beta.4", "@angular/core": "0.0.0-PLACEHOLDER", "@angular/common": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER" diff --git a/packages/http/package.json b/packages/http/package.json index 699dd7cac0..2f2b27c863 100644 --- a/packages/http/package.json +++ b/packages/http/package.json @@ -16,7 +16,7 @@ "tslib": "^1.9.0" }, "peerDependencies": { - "rxjs": "^5.6.0-forward-compat.0 || ^6.0.0-beta.0", + "rxjs": "^6.0.0-beta.4", "@angular/core": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER" }, diff --git a/packages/router/package.json b/packages/router/package.json index 81a3bd240b..1ac77585e6 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -31,7 +31,7 @@ "@angular/core": "0.0.0-PLACEHOLDER", "@angular/common": "0.0.0-PLACEHOLDER", "@angular/platform-browser": "0.0.0-PLACEHOLDER", - "rxjs": "^5.6.0-forward-compat.0 || ^6.0.0-beta.0" + "rxjs": "^6.0.0-beta.4" }, "ng-update": { "packageGroup": "NG_UPDATE_PACKAGE_GROUP" diff --git a/tools/postinstall-patches.js b/tools/postinstall-patches.js index 1d9cf96c2f..f406a97d52 100644 --- a/tools/postinstall-patches.js +++ b/tools/postinstall-patches.js @@ -27,9 +27,4 @@ sed('-i', '(\'response\' in xhr)', '(\'response\' in (xhr as any))', 'node_modules/rxjs/src/observable/dom/AjaxObservable.ts'); */ -// fixes rxjs bazel build: https://github.com/ReactiveX/rxjs/pull/3454 -sed('-i', /^ srcs = glob.*/, - 'srcs = glob(["*.ts", "**/*.ts"], exclude = ["internal/Rx.ts", "internal-compatibility/**", "internal/patching/**", "umd.ts"]),', - 'node_modules/rxjs/src/BUILD.bazel'); - log('===== finished running the postinstall-patches.js script ====='); diff --git a/yarn.lock b/yarn.lock index 718d8dae9c..f26e3f91ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5083,9 +5083,9 @@ rollup@0.47.4: version "0.47.4" resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.47.4.tgz#e3a55de83a78221d232ce29619a8d68189ae845e" -rxjs@6.0.0-beta.0: - version "6.0.0-beta.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-beta.0.tgz#cf241936be39d8279ed0b2be4bf417777301f65a" +rxjs@6.0.0-beta.4: + version "6.0.0-beta.4" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-beta.4.tgz#6506fde30f0f0ca1c94eb948629ac4aa73c0b0c8" dependencies: tslib "^1.9.0"