Skip to content

Commit

Permalink
fix(deps): upgrade rxjs to v7 (#80)
Browse files Browse the repository at this point in the history
  • Loading branch information
bjoerge committed Jan 4, 2023
1 parent 70bc038 commit 594b4e7
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 27 deletions.
19 changes: 8 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@sanity/eventsource": "^4.0.0",
"get-it": "^7.0.2",
"make-error": "^1.3.6",
"rxjs": "^6.6.7"
"rxjs": "^7.0.0"
},
"devDependencies": {
"@babel/cli": "^7.20.7",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/assetsClient.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {map, filter} from '../util/observable'
import queryString from '../http/queryString'
import * as validators from '../validators'
import {filter, map} from 'rxjs/operators'

function AssetsClient(client) {
this.client = client
Expand Down
2 changes: 1 addition & 1 deletion src/data/dataMethods.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {map, filter} from '../util/observable'
import * as validators from '../validators'
import getSelection from '../util/getSelection'
import encodeQueryString from './encodeQueryString'
import Transaction from './transaction'
import Patch from './patch'
import listen from './listen'
import {filter, map} from 'rxjs/operators'

const excludeFalsey = (param, defValue) => {
const value = typeof param === 'undefined' ? defValue : param
Expand Down
2 changes: 1 addition & 1 deletion src/data/listen.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {Observable} from '../util/observable'
import polyfilledEventSource from '@sanity/eventsource'
import pick from '../util/pick'
import defaults from '../util/defaults'
import encodeQueryString from './encodeQueryString'
import {Observable} from 'rxjs'

// Limit is 16K for a _request_, eg including headers. Have to account for an
// unknown range of headers, but an average EventSource request from Chrome seems
Expand Down
2 changes: 1 addition & 1 deletion src/http/request.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* eslint-disable no-empty-function, no-process-env */
import getIt from 'get-it'
import {observable, jsonRequest, jsonResponse, progress} from 'get-it/middleware'
import {Observable} from '../util/observable'
import {ClientError, ServerError} from './errors'
import envMiddleware from './nodeMiddleware'
import {Observable} from 'rxjs'

const httpError = {
onResponse: (res) => {
Expand Down
7 changes: 3 additions & 4 deletions src/sanityClient.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {Observable, map, filter} from './util/observable'
import Patch from './data/patch'
import Transaction from './data/transaction'
import dataMethods from './data/dataMethods'
Expand All @@ -11,8 +10,8 @@ import httpRequest from './http/request'
import getRequestOptions from './http/requestOptions'
import {defaultConfig, initConfig} from './config'
import * as validate from './validators'

const toPromise = (observable) => observable.toPromise()
import {lastValueFrom, Observable} from 'rxjs'
import {filter, map} from 'rxjs/operators'

function SanityClient(config = defaultConfig) {
if (!(this instanceof SanityClient)) {
Expand Down Expand Up @@ -111,7 +110,7 @@ Object.assign(SanityClient.prototype, {
map((event) => event.body)
)

return this.isPromiseAPI() ? toPromise(observable) : observable
return this.isPromiseAPI() ? lastValueFrom(observable) : observable
},
})

Expand Down
7 changes: 0 additions & 7 deletions src/util/observable.js

This file was deleted.

0 comments on commit 594b4e7

Please sign in to comment.