split types out (#30)

tsotimus · Feb 2, 2024 · c3d6bc1 · c3d6bc1
1 parent fe218cd
commit c3d6bc1
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 26 deletions.
diff --git a/apps/example-react/src/App.tsx b/apps/example-react/src/App.tsx
@@ -6,13 +6,13 @@ import {
   useVitePostHog,
   useFeatureFlagEnabled,
 } from "vite-plugin-posthog/react";
-import { useConsent } from "react-posthog-consent/vite";
+// import { useConsent } from "react-posthog-consent/vite";
 
 function App() {
   const [count, setCount] = useState(0);
   const posthog = useVitePostHog();
   const showWelcomeMessage = useFeatureFlagEnabled("welcome-msg");
-  const { reset } = useConsent();
+  // const { reset } = useConsent();
 
   const handleClick = () => {
     posthog?.capture("count incremented");
@@ -40,7 +40,7 @@ function App() {
       <p className="read-the-docs">
         Click on the Vite and React logos to learn more
       </p>
-      <button onClick={reset}>Custom Reset</button>
+      <button onClick={() => console.log("reset")}>Custom Reset</button>
       <button onClick={() => posthog?.reset()}>Reset</button>
     </>
   );

diff --git a/apps/example-react/vite.config.ts b/apps/example-react/vite.config.ts
@@ -1,6 +1,6 @@
 import { defineConfig, loadEnv } from "vite";
 import react from "@vitejs/plugin-react";
-import { VitePostHog } from "vite-plugin-posthog";
+import { vitePostHog } from "vite-plugin-posthog";
 
 // https://vitejs.dev/config/
 export default ({ mode }) => {
@@ -11,7 +11,7 @@ export default ({ mode }) => {
   return defineConfig({
     plugins: [
       react(),
-      VitePostHog({
+      vitePostHog({
         apiKey: process.env.VITE_POSTHOG_KEY,
         hostUrl: "https://eu.posthog.com",
         isDevModeOn: true,

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/vite-plugin-posthog/package.json b/packages/vite-plugin-posthog/package.json
@@ -18,8 +18,8 @@
     "scripts": {
         "build": "rollup -c"
     },
-    "types": "dist/core/types.d.ts",
-    "typings": "dist/core/types.d.ts",
+    "types": "dist/core/index.d.ts",
+    "typings": "dist/core/index.d.ts",
     "exports": {
         ".": {
             "import": "./dist/core/index.js"

diff --git a/packages/vite-plugin-posthog/rollup.config.mjs b/packages/vite-plugin-posthog/rollup.config.mjs
@@ -13,7 +13,7 @@ const config = defineConfig([
     plugins: [
       typescript({
         outDir: "dist/core",
-        include: ["src/core/**/*", "src/types.ts"],
+        include: ["src/core/**/*"],
       }),
       nodeResolve(),
     ],
@@ -27,7 +27,7 @@ const config = defineConfig([
     plugins: [
       typescript({
         outDir: "dist/react",
-        include: ["src/react/**/*", "src/types.ts"],
+        include: ["src/react/**/*"],
       }),
       nodeResolve(),
     ],

diff --git a/packages/vite-plugin-posthog/src/core/construct.ts b/packages/vite-plugin-posthog/src/core/construct.ts
@@ -1,4 +1,4 @@
-import { PostHogInitConfig } from "../types";
+import { PostHogInitConfig } from "./types";
 
 const BASE_SCRIPT = `!function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures getActiveMatchingSurveys getSurveys onSessionId".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);`;
 

diff --git a/packages/vite-plugin-posthog/src/core/index.ts b/packages/vite-plugin-posthog/src/core/index.ts
@@ -1,8 +1,7 @@
 import { HtmlTagDescriptor, Plugin } from "vite";
 import { constructScript } from "./construct";
-import { VitePostHogOptions, PostHogInitConfig } from "../types";
-
-export { VitePostHogOptions, PostHog } from "../types";
+import { VitePostHogOptions, PostHogInitConfig } from "./types";
+export { VitePostHogOptions } from "./types";
 
 /**
  * Vite plugin for Posthog, add this into your vite.config.ts

diff --git a/packages/vite-plugin-posthog/src/types.ts → ...ges/vite-plugin-posthog/src/core/types.ts b/packages/vite-plugin-posthog/src/types.ts → ...ges/vite-plugin-posthog/src/core/types.ts
@@ -1,4 +1,4 @@
-import posthogJs, { PostHogConfig, Survey, JsonType } from "posthog-js";
+import { PostHogConfig } from "posthog-js";
 
 type PostHogConfigOptions = Omit<PostHogConfig, "api_host">;
 export type PostHogInitConfig = Partial<PostHogConfigOptions> & {
@@ -13,9 +13,3 @@ export type VitePostHogOptions = {
   isDevModeOn?: boolean;
   config?: VitePostHogOptionsConfig;
 };
-
-export type PostHog = typeof posthogJs;
-export { Survey, JsonType };
-export type EventMetaData = {
-  [x: string]: any;
-};
diff --git a/packages/vite-plugin-posthog/src/react/components/PageTrack.tsx b/packages/vite-plugin-posthog/src/react/components/PageTrack.tsx
@@ -1,6 +1,6 @@
 import React, { PropsWithChildren, useEffect } from "react";
 import { useVitePostHog } from "../hooks/useVitePostHog";
-import { EventMetaData } from "../../types";
+import { EventMetaData } from "../types";
 
 interface PageTrackProps {
   uniquePageTitle: string;

diff --git a/packages/vite-plugin-posthog/src/react/components/PostHogFeature.tsx b/packages/vite-plugin-posthog/src/react/components/PostHogFeature.tsx
@@ -10,7 +10,7 @@ import React, {
   ReactNode,
   HTMLProps,
 } from "react";
-import { PostHog } from "../../types";
+import { PostHog } from "../types";
 
 export type PostHogFeatureProps = HTMLProps<HTMLDivElement> & {
   flag: string;

diff --git a/packages/vite-plugin-posthog/src/react/global.d.ts b/packages/vite-plugin-posthog/src/react/global.d.ts
@@ -1,4 +1,4 @@
-import { PostHog } from "../types";
+import { PostHog } from "./types";
 
 declare global {
   interface Window {

diff --git a/packages/vite-plugin-posthog/src/react/hooks/useFeatureFlagPayload.ts b/packages/vite-plugin-posthog/src/react/hooks/useFeatureFlagPayload.ts
@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { useVitePostHog } from "./useVitePostHog";
-import { JsonType } from "../../types";
+import { JsonType } from "../types";
 
 /**
  * A hook that returns the payload of a feature flag.

diff --git a/packages/vite-plugin-posthog/src/react/hooks/useGetActiveMatchingSurvey.ts b/packages/vite-plugin-posthog/src/react/hooks/useGetActiveMatchingSurvey.ts
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useState } from "react";
 import { useVitePostHog } from "./useVitePostHog";
-import { EventMetaData, Survey } from "../../types";
+import { EventMetaData, Survey } from "../types";
 
 type SurveyState = {
   currentSurvey: Survey | null;

diff --git a/packages/vite-plugin-posthog/src/react/hooks/useVitePostHog.ts b/packages/vite-plugin-posthog/src/react/hooks/useVitePostHog.ts
@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { PostHog } from "../../types";
+import { PostHog } from "../types";
 
 export const useVitePostHog = (): PostHog | null => {
   return useMemo(() => {

diff --git a/packages/vite-plugin-posthog/src/react/index.ts b/packages/vite-plugin-posthog/src/react/index.ts
@@ -1,2 +1,3 @@
 export * from "./hooks";
 export * from "./components";
+export * from "./types";
diff --git a/packages/vite-plugin-posthog/src/react/types.ts b/packages/vite-plugin-posthog/src/react/types.ts
@@ -0,0 +1,7 @@
+import posthogJs, { Survey, JsonType } from "posthog-js";
+
+export type PostHog = typeof posthogJs;
+export { Survey, JsonType };
+export type EventMetaData = {
+  [x: string]: any;
+};