diff --git a/package-lock.json b/package-lock.json index 6801eef67..739437926 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8737,11 +8737,6 @@ "@types/node": "*" } }, - "node_modules/@types/zen-observable": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.3.tgz", - "integrity": "sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==" - }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "5.62.0", "dev": true, @@ -31808,8 +31803,7 @@ "isomorphic-fetch": "^3.0.0", "js-cookie": "^3.0.5", "js-sha256": "^0.9.0", - "lodash": "^4.17.21", - "zen-observable-ts": "^1.1.0" + "lodash": "^4.17.21" }, "devDependencies": { "@apollo/client": "^3.6.6", @@ -33227,15 +33221,6 @@ "node": ">=10" } }, - "packages/faustwp-core/node_modules/zen-observable-ts": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz", - "integrity": "sha512-1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA==", - "dependencies": { - "@types/zen-observable": "0.8.3", - "zen-observable": "0.8.15" - } - }, "packages/next": { "name": "@faustjs/next", "version": "0.15.13", diff --git a/packages/faustwp-core/package.json b/packages/faustwp-core/package.json index 7f7af10c4..5efc54808 100644 --- a/packages/faustwp-core/package.json +++ b/packages/faustwp-core/package.json @@ -41,8 +41,7 @@ "isomorphic-fetch": "^3.0.0", "js-cookie": "^3.0.5", "js-sha256": "^0.9.0", - "lodash": "^4.17.21", - "zen-observable-ts": "^1.1.0" + "lodash": "^4.17.21" }, "scripts": { "dev": "concurrently \"npm:watch-*\" --prefix-colors \"auto\"", diff --git a/packages/faustwp-core/src/apollo/errorLoggingLink.ts b/packages/faustwp-core/src/apollo/errorLoggingLink.ts index 07bcce33e..be052ce60 100644 --- a/packages/faustwp-core/src/apollo/errorLoggingLink.ts +++ b/packages/faustwp-core/src/apollo/errorLoggingLink.ts @@ -3,9 +3,9 @@ import { FetchResult, NextLink, Operation, + Observable, ServerError, } from '@apollo/client'; -import { Observable } from 'zen-observable-ts'; import { errorLog } from '../utils/log.js'; /** diff --git a/packages/faustwp-core/src/client.ts b/packages/faustwp-core/src/client.ts index d63ecade0..7b8f2ce04 100644 --- a/packages/faustwp-core/src/client.ts +++ b/packages/faustwp-core/src/client.ts @@ -45,6 +45,11 @@ export function createApolloClient(authenticated = false) { typePolicies: { RootQuery: { queryType: true, + fields: { + viewer: { + merge: true, + }, + }, }, RootMutation: { mutationType: true,