Merge branch 'develop'

Author: sajjadmrx

src/analytics.ts

@@ -86,10 +86,11 @@ const Analytics = (() => {
 	}
 
 	function sendMeasurementEvent(payload: any): void {
-		if (import.meta.env.DEV) {
+		if ((import.meta.env.DEV as unknown as string) === "development") {
 			console.log('in dev mode, skipping analytics:', payload)
 			return
 		}
+
 		const url = `https://www.google-analytics.com/mp/collect?measurement_id=${GA_MEASUREMENT_ID}&api_secret=${GA_API_SECRET}`
 
 		fetch(url, {

src/layouts/search/search.tsx

@@ -2,9 +2,9 @@ import { CiSearch } from 'react-icons/ci'
 import { BookmarkProvider } from '../../context/bookmark.context'
 import { useTheme } from '../../context/theme.context'
 import { BookmarksComponent } from './bookmarks/bookmarks'
+import Browser from 'webextension-polyfill'
 
 export function SearchLayout() {
-	const GOOGLE_URL = 'https://www.google.com/search?q='
 	const { theme, themeUtils } = useTheme()
 
 	const getSearchBoxBackground = () => {
@@ -33,7 +33,7 @@ export function SearchLayout() {
 		e.preventDefault()
 		const query = (e.target as HTMLFormElement).search.value
 		if (query.trim()) {
-			window.location.href = GOOGLE_URL + encodeURIComponent(query)
+			Browser.search.query({ text: query })
 		}
 	}
 

src/manifest.json

@@ -11,7 +11,7 @@
 		"48": "icons/icon48.png",
 		"128": "icons/icon128.png"
 	},
-	"permissions": ["storage"],
+	"permissions": ["storage","search"],
 	"chrome_url_overrides": {
 		"newtab": "src/index.html"
 	},