feat: updated to latest plausible tracker

Author: strootje

README.md

@@ -5,27 +5,19 @@
 
 Plausible provider for your [SolidJS](https://solidjs.com) app.
 
-All credit should go to [barbapapazes](https://github.com/barbapapazes) for
-updating the
+All credit should go to [barbapapazes](https://github.com/barbapapazes) for updating the
 [plausible-tracker](https://github.com/barbapapazes/plausible-tracker)
 
 ## Usage
 
-Add the `PlausibleProvider` to your app component:
+Add the `Plausible.Init` to your app component:
 
 ```tsx
 export default function App() {
-  return (
-    <Plausible.Provider value={{/* ... */}}>
-      <Plausible.AutoFileDownloadsTracking />
-      <Plausible.AutoOutboundTracking />
-      <Plausible.AutoPageviewTracking />
-    </Plausible.Provider>
-  );
+  return <Plausible.Init />;
 }
 ```
 
 ## License
 
-Licensed under the [MPL-2.0](LICENSE) license.<br/> Copyright &copy; 2024,
-Bastiaan Stroosnijder
+Licensed under the [MPL-2.0](LICENSE) license.<br/> Copyright &copy; 2024, Bastiaan Stroosnijder

deno.json

@@ -1,18 +1,29 @@
 {
   "name": "@strootje/solid-plausible",
-  "version": "0.2.12",
+  "version": "0.3.0",
   "license": "MPL-2.0",
   "exports": "./mod.ts",
+
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "jsxImportSource": "solid-js"
+  },
+
   "imports": {
-    "@barbapapazes/plausible-tracker": "npm:@barbapapazes/plausible-tracker@^0.5.6",
-    "@std/expect": "jsr:@std/expect@^1.0.16",
-    "solid-js": "npm:solid-js@^1.9.7"
+    "#/": "./",
+    "@plausible-analytics/tracker": "npm:@plausible-analytics/tracker@^0.4.4",
+    "@std/expect": "jsr:@std/expect@^1.0.18",
+    "solid-js": "npm:solid-js@^1.9.11"
+  },
+
+  "test": {
+    "include": [
+      "**/*.test.ts",
+      "**/*.test.tsx"
+    ]
   },
+
   "fmt": {
     "lineWidth": 120
-  },
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "jsxImportSource": "solid-js"
   }
 }

deno.lock

@@ -0,0 +1,7 @@
+import { Plausible } from "#/mod.ts";
+import { expect } from "@std/expect";
+
+Deno.test(function stuff_should_not_be_null() {
+  expect(Plausible.Init).not.toBeNull();
+  expect(Plausible.Track).not.toBeNull();
+});

mod.test.ts

@@ -1,111 +1,20 @@
-import {
-  createPlausibleTracker,
-  type EventName,
-  type EventOptions,
-  type Plausible as PlausibleType,
-  type PlausibleOptions,
-} from "@barbapapazes/plausible-tracker";
-import {
-  defaultFileTypes,
-  useAutoFileDownloadsTracking as _useAutoFileDownloadsTracking,
-  useAutoOutboundTracking as _useAutoOutboundTracking,
-  useAutoPageviews as _useAutoPageviews,
-} from "@barbapapazes/plausible-tracker/extensions";
-import { type Component, type Context, type ContextProviderComponent, createContext, onCleanup, useContext } from "solid-js";
+import { init, type PlausibleConfig, type PlausibleEventOptions, track } from "@plausible-analytics/tracker";
+import { onMount } from "solid-js";
 import { isServer } from "solid-js/web";
 
-const PlausibleContext: Context<Partial<PlausibleOptions> | undefined> = createContext<
-  Partial<PlausibleOptions>
->();
-
-let plausible: PlausibleType;
-const usePlausible = () => plausible ??= createPlausibleTracker(useContext(PlausibleContext));
-
-export const useTrackEvent = (
-  name: EventName,
-  opts?: Partial<EventOptions>,
-) => {
-  if (isServer) return;
-  usePlausible().trackEvent(name, opts);
-};
-
-export const useTrackPageview = (opts?: Partial<EventOptions>) => {
-  if (isServer) return;
-  usePlausible().trackPageview(opts);
-};
-
-export const useAutoFileDownloadsTracking = (
-  opts?: Partial<EventOptions>,
-  fileTypes: string[] = defaultFileTypes,
-) => {
-  if (isServer) return;
-  const { cleanup, install } = _useAutoFileDownloadsTracking(usePlausible(), {
-    fileTypes,
-  }, opts);
-
-  try {
-    install();
-  } finally {
-    onCleanup(cleanup);
-  }
-};
-
-export const useAutoOutboundTracking = (opts?: EventOptions) => {
-  if (isServer) return;
-  const { cleanup, install } = _useAutoOutboundTracking(usePlausible(), opts);
-
-  try {
-    install();
-  } finally {
-    onCleanup(cleanup);
-  }
-};
-
-export const useAutoPageviewTracking = (opts?: EventOptions) => {
-  if (isServer) return;
-  const { cleanup, install } = _useAutoPageviews(usePlausible(), opts);
-
-  try {
-    install();
-  } finally {
-    onCleanup(cleanup);
-  }
+type PlausibleTrackProps = {
+  eventName: string;
+  opts?: PlausibleEventOptions;
 };
 
-type PlausibleStruct = {
-  Provider: ContextProviderComponent<Partial<PlausibleOptions>>;
-  TrackEvent: Component<{ name: EventName } & Partial<EventOptions>>;
-  TrackPageview: Component<Partial<EventOptions>>;
-  AutoFileDownloadsTracking: Component<
-    { fileTypes: string[] } & Partial<EventOptions>
-  >;
-  AutoOutboundTracking: Component<Partial<EventOptions>>;
-  AutoPageviewTracking: Component<Partial<EventOptions>>;
-};
-export const Plausible: PlausibleStruct = {
-  Provider: PlausibleContext.Provider,
-  TrackEvent: (
-    { name, ...opts }: { name: EventName } & Partial<EventOptions>,
-  ) => {
-    useTrackEvent(name, opts);
+export const Plausible = {
+  Init: (props: PlausibleConfig) => {
+    onMount(() => !isServer && init(props));
     return null;
   },
-  TrackPageview: (opts?: Partial<EventOptions>) => {
-    useTrackPageview(opts);
-    return null;
-  },
-  AutoFileDownloadsTracking: (
-    { fileTypes, ...opts }: { fileTypes: string[] } & Partial<EventOptions>,
-  ) => {
-    useAutoFileDownloadsTracking(opts, fileTypes);
-    return null;
-  },
-  AutoOutboundTracking: (opts?: Partial<EventOptions>) => {
-    useAutoOutboundTracking(opts);
-    return null;
-  },
-  AutoPageviewTracking: (opts?: Partial<EventOptions>) => {
-    useAutoPageviewTracking(opts);
+
+  Track: (props: PlausibleTrackProps) => {
+    onMount(() => !isServer && track(props.eventName, props.opts ?? {}));
     return null;
   },
-};
+} as const;