From 9e8b523f7e05ebbdfff7f249c0c97ebe712a78ac Mon Sep 17 00:00:00 2001 From: Matt Strom Date: Tue, 6 Sep 2022 15:27:16 -0700 Subject: [PATCH] fix(AP-1778): confirm only on browsers --- package.json | 2 +- packages/nextjs/package.json | 3 ++- packages/nextjs/src/client.adapter.ts | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 9ff00f0..b11a277 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "start": "npm-run-all --parallel start:*", "start:next": "lerna run dev --scope=@evolv/nextjs-demo", "start:react": "lerna run start --scope=@evolv/react-demo", - "start:watch": "lerna run watch --scope @evolv/nextjs --scope @evolv/react", + "start:watch": "lerna run --parallel --stream watch --scope @evolv/nextjs --scope @evolv/react", "clean": "lerna run clean", "test": "lerna run test" }, diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json index a79765e..7abd44a 100644 --- a/packages/nextjs/package.json +++ b/packages/nextjs/package.json @@ -8,7 +8,8 @@ "scripts": { "clean": "del dist **/*.tsbuildinfo", "prebuild": "npm run clean", - "build": "tsc --build tsconfig.json" + "build": "tsc --build tsconfig.json", + "watch": "tsc --build tsconfig.json --watch" }, "files": [ "dist" diff --git a/packages/nextjs/src/client.adapter.ts b/packages/nextjs/src/client.adapter.ts index 9ebc8ec..ba51a11 100644 --- a/packages/nextjs/src/client.adapter.ts +++ b/packages/nextjs/src/client.adapter.ts @@ -14,8 +14,12 @@ export class ClientAdapter { return this._evolvState; } + get isBrowser() { + return typeof window !== 'undefined'; + } + get isServer() { - return typeof window === 'undefined'; + return !this.isBrowser; } public subscribers: Record = {}; @@ -27,7 +31,7 @@ export class ClientAdapter { this._evolvState = hydratedState ?? {}; this._client = new EvolvClient({ - autoConfirm: true, + autoConfirm: this.isBrowser, analytics: true, clientName: 'react-sdk', ...options