diff --git a/packages/relay-experimental/preloadQuery.js b/packages/relay-experimental/preloadQuery.js index fc1200a877f1e..86b859c28914a 100644 --- a/packages/relay-experimental/preloadQuery.js +++ b/packages/relay-experimental/preloadQuery.js @@ -12,15 +12,15 @@ 'use strict'; const ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -const RelayReplaySubject = require('relay-runtime/util/RelayReplaySubject'); -const getRequestIdentifier = require('relay-runtime/util/getRequestIdentifier'); const invariant = require('invariant'); const { Environment, Observable, + ReplaySubject, createOperationDescriptor, + getRequestIdentifier, } = require('relay-runtime'); import type { @@ -52,7 +52,7 @@ type PendingQueryEntry = fetchKey: ?string | ?number, fetchPolicy: PreloadFetchPolicy, kind: 'network', - subject: RelayReplaySubject, + subject: ReplaySubject, subscription: Subscription, |}> | $ReadOnly<{| @@ -157,7 +157,7 @@ function preloadQueryDeduped( variables, ); const source = network.execute(params, variables, {}, null, logRequestInfo); - const subject = new RelayReplaySubject(); + const subject = new ReplaySubject(); nextQueryEntry = { cacheKey, fetchKey, diff --git a/packages/relay-runtime/index.js b/packages/relay-runtime/index.js index bee8c372b22f1..b473c1d0d89b9 100644 --- a/packages/relay-runtime/index.js +++ b/packages/relay-runtime/index.js @@ -33,6 +33,7 @@ const RelayOperationTracker = require('./store/RelayOperationTracker'); const RelayProfiler = require('./util/RelayProfiler'); const RelayQueryResponseCache = require('./network/RelayQueryResponseCache'); const RelayRecordSource = require('./store/RelayRecordSource'); +const RelayReplaySubject = require('./util/RelayReplaySubject'); const RelayStoreUtils = require('./store/RelayStoreUtils'); const ViewerPattern = require('./store/ViewerPattern'); @@ -47,6 +48,7 @@ const fetchQueryInternal = require('./query/fetchQueryInternal'); const getFragmentIdentifier = require('./util/getFragmentIdentifier'); const getFragmentSpecIdentifier = require('./util/getFragmentSpecIdentifier'); const getRelayHandleKey = require('./util/getRelayHandleKey'); +const getRequestIdentifier = require('./util/getRequestIdentifier'); const isPromise = require('./util/isPromise'); const isRelayModernEnvironment = require('./store/isRelayModernEnvironment'); const isScalarAndEqual = require('./util/isScalarAndEqual'); @@ -218,6 +220,7 @@ module.exports = { QueryResponseCache: RelayQueryResponseCache, RecordSource: RelayRecordSource, Record: RelayModernRecord, + ReplaySubject: RelayReplaySubject, Store: RelayModernStore, areEqualSelectors: RelayModernSelector.areEqualSelectors, @@ -238,6 +241,7 @@ module.exports = { getPluralSelector: RelayModernSelector.getPluralSelector, getRefetchableFragment: RelayModernGraphQLTag.getRefetchableFragment, getRequest: RelayModernGraphQLTag.getRequest, + getRequestIdentifier: getRequestIdentifier, getSelector: RelayModernSelector.getSelector, getSelectorsFromObject: RelayModernSelector.getSelectorsFromObject, getSingularSelector: RelayModernSelector.getSingularSelector,