From 04ff0ff81abfc5a709be3120096000a28fe21bfd Mon Sep 17 00:00:00 2001 From: Chuck Carpenter Date: Thu, 25 Jul 2024 17:15:11 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9E=96=20React:=20Remove=20extra=20pro=20spe?= =?UTF-8?q?cific=20setup=20(#2929)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ➖ React: Remove extra pro specific setup * ⬆ Update package deps for vitest --- packages/pro-js/package.json | 2 +- packages/react/package.json | 3 +- packages/react/src/index.tsx | 30 +- packages/react/test/index.test.tsx | 2 +- pnpm-lock.yaml | 16727 +++++++++++++++------------ 5 files changed, 9342 insertions(+), 7422 deletions(-) diff --git a/packages/pro-js/package.json b/packages/pro-js/package.json index 8e00bf04d..8b3a7b478 100644 --- a/packages/pro-js/package.json +++ b/packages/pro-js/package.json @@ -25,7 +25,7 @@ "test:dev": "vitest" }, "devDependencies": { - "@vitest/ui": "^1.6.0", + "@vitest/ui": "^2.0.4", "fake-indexeddb": "^6.0.0", "jsdom": "^24.1.0", "vite": "^5.3.2", diff --git a/packages/react/package.json b/packages/react/package.json index dc9da1392..e72556ab8 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -30,7 +30,6 @@ "test:dev": "vitest" }, "dependencies": { - "@shepherdpro/pro-js": "workspace:*", "shepherd.js": "workspace:*" }, "devDependencies": { @@ -38,7 +37,7 @@ "@testing-library/react": "^16.0.0", "@types/react": "^18.3.3", "@vitejs/plugin-react": "^4.2.1", - "@vitest/ui": "^1.6.0", + "@vitest/ui": "^2.0.4", "happy-dom": "^14.11.0", "typescript": "^5.4.5", "vite": "^5.3.2", diff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsx index 10ca5ce3c..ec9c88a63 100644 --- a/packages/react/src/index.tsx +++ b/packages/react/src/index.tsx @@ -1,17 +1,8 @@ import { createContext, FC, useContext, type ReactNode } from 'react'; - import Shepherd from 'shepherd.js'; -import ShepherdPro from '@shepherdpro/pro-js'; - -interface ShepherdProviderProps { - apiKey?: string; - apiPath?: string; - properties?: Record; - children?: ReactNode; -} interface ShepherdContextType { - Shepherd: typeof ShepherdPro | typeof Shepherd; + Shepherd: typeof Shepherd; } const ShepherdJourneyContext = createContext( @@ -32,22 +23,13 @@ export const useShepherd = () => { return ShepherdInsance; }; -export const ShepherdJourneyProvider: FC = ({ - apiKey, - apiPath, - properties, +export const ShepherdJourneyProvider = ({ children -}: ShepherdProviderProps) => { - let JourneyLibrary = Shepherd; - if (typeof window !== 'undefined') { - if (apiKey) { - JourneyLibrary = ShepherdPro; - ShepherdPro.init(apiKey, apiPath, properties); - } - } - +}: { + children?: ReactNode; +}) => { return ( - + {children} ); diff --git a/packages/react/test/index.test.tsx b/packages/react/test/index.test.tsx index 978517c5b..b24332ce7 100644 --- a/packages/react/test/index.test.tsx +++ b/packages/react/test/index.test.tsx @@ -58,7 +58,7 @@ describe('', () => { ); }; const TestApp = () => ( - +