From 9002311059d1de5b868de92abec0c2ca4b1f0f9b Mon Sep 17 00:00:00 2001
From: goenning <me@goenning.net>
Date: Fri, 29 Dec 2023 09:38:24 -0300
Subject: [PATCH] - Rename `apiPath` to `apiUrl`

---
 packages/react/CHANGELOG.md  |  8 ++++++++
 packages/react/package.json  |  2 +-
 packages/react/src/index.tsx |  2 +-
 packages/shared.ts           | 10 ++++------
 packages/web/CHANGELOG.md    |  4 ++++
 packages/web/package.json    |  2 +-
 packages/web/src/index.ts    |  2 +-
 7 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
index ca00764..a76f0e8 100644
--- a/packages/react/CHANGELOG.md
+++ b/packages/react/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.3.3
+
+- Rename `apiPath` to `apiUrl`
+
+## 0.3.2
+
+- Fix error when running on chrome
+
 ## 0.3.1
 
 - Support for custom API path
diff --git a/packages/react/package.json b/packages/react/package.json
index 20c12db..90aff10 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aptabase/react",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "type": "module",
   "description": "React SDK for Aptabase: Open Source, Privacy-First and Simple Analytics for Mobile, Desktop and Web Apps",
   "main": "./dist/index.cjs",
diff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsx
index 9e89aa2..e22dccb 100644
--- a/packages/react/src/index.tsx
+++ b/packages/react/src/index.tsx
@@ -19,7 +19,7 @@ type ContextProps = {
 function init(appKey: string, options?: AptabaseOptions) {
   if (!validateAppKey(appKey)) return;
 
-  _apiUrl = getApiUrl(appKey, options);
+  _apiUrl = options?.apiUrl ?? getApiUrl(appKey, options);
   _appKey = appKey;
   _options = options;
 }
diff --git a/packages/shared.ts b/packages/shared.ts
index 3255b6c..af1b3b3 100644
--- a/packages/shared.ts
+++ b/packages/shared.ts
@@ -1,7 +1,7 @@
 const defaultLocale = getBrowserLocale();
 const defaultIsDebug = getIsDebug();
 const isInBrowser = typeof window !== 'undefined' && typeof window.fetch !== 'undefined';
-const isInBrowserExtension = typeof chrome !== 'undefined' && !!chrome.runtime.id;
+const isInBrowserExtension = typeof chrome !== 'undefined' && !!chrome.runtime?.id;
 
 let _sessionId = newSessionId();
 let _lastTouched = new Date();
@@ -17,7 +17,7 @@ export type AptabaseOptions = {
   // Custom host for self-hosted Aptabase.
   host?: string;
   // Custom path for API endpoint. Useful when using reverse proxy.
-  apiPath?: string;
+  apiUrl?: string;
   // Defines the app version.
   appVersion?: string;
   // Defines whether the app is running on debug mode.
@@ -55,8 +55,6 @@ export function validateAppKey(appKey: string): boolean {
 }
 
 export function getApiUrl(appKey: string, options?: AptabaseOptions): string | undefined {
-  const apiPath = options?.apiPath ?? '/api/v0/event';
-
   const region = appKey.split('-')[1];
   if (region === 'SH') {
     if (!options?.host) {
@@ -64,11 +62,11 @@ export function getApiUrl(appKey: string, options?: AptabaseOptions): string | u
       return;
     }
 
-    return `${options.host}${apiPath}`;
+    return `${options.host}/api/v0/event`;
   }
 
   const host = options?.host ?? _hosts[region];
-  return `${host}${apiPath}`;
+  return `${host}/api/v0/event`;
 }
 
 export async function sendEvent(opts: {
diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md
index f1736be..d2c29ab 100644
--- a/packages/web/CHANGELOG.md
+++ b/packages/web/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.2
+
+- Fix error when running on chrome
+
 ## 0.4.1
 
 - Support for custom API path
diff --git a/packages/web/package.json b/packages/web/package.json
index f71695e..26e9de5 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aptabase/web",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "type": "module",
   "description": "JavaScript SDK for Aptabase: Open Source, Privacy-First and Simple Analytics for Mobile, Desktop and Web Apps",
   "main": "./dist/index.cjs",
diff --git a/packages/web/src/index.ts b/packages/web/src/index.ts
index bf672a2..e2f29cd 100644
--- a/packages/web/src/index.ts
+++ b/packages/web/src/index.ts
@@ -13,7 +13,7 @@ export { type AptabaseOptions };
 export function init(appKey: string, options?: AptabaseOptions) {
   if (!validateAppKey(appKey)) return;
 
-  _apiUrl = getApiUrl(appKey, options);
+  _apiUrl = options?.apiUrl ?? getApiUrl(appKey, options);
   _appKey = appKey;
   _options = options;
 }