Fix undefined window.Routes assignment

kiwilan · Mar 17, 2024 · 381d7e3 · 381d7e3
1 parent d7728bc
commit 381d7e3
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/lib/global.d.ts b/lib/global.d.ts
@@ -5,6 +5,6 @@ declare global {
 }
 
 // @ts-expect-error - Routes is defined in the global scope
-window.Routes = window.Routes || {}
+window?.Routes = window?.Routes || {}
 
 export {}
diff --git a/lib/package.json b/lib/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@kiwilan/typescriptable-laravel",
   "type": "module",
-  "version": "2.4.25",
+  "version": "2.4.26",
   "description": "Add some helpers for your Inertia app with TypeScript.",
   "author": "Ewilan Rivière <ewilan.riviere@gmail.com>",
   "license": "MIT",

diff --git a/lib/routes.ts b/lib/routes.ts
@@ -280,8 +280,8 @@ declare global {
 
 if (typeof window !== 'undefined') {
   // eslint-disable-next-line valid-typeof
-  if (typeof window !== undefined && typeof window.Routes !== undefined)
-    window.Routes = Routes
+  if (typeof window !== undefined && typeof window?.Routes !== undefined)
+    window?.Routes = Routes
 }
 
 export { Routes }
diff --git a/lib/src/composables/useLazy.ts b/lib/src/composables/useLazy.ts
@@ -4,7 +4,7 @@ import { ref } from 'vue'
  * Lazy load images
  */
 export function useLazy(loadingColor?: string) {
-  let url = window.location.href
+  let url = window?.location.href
   const baseURL = url.split('/')
   baseURL.pop()
   url = baseURL.join('/')

diff --git a/lib/src/composables/usePagination.ts b/lib/src/composables/usePagination.ts
@@ -15,7 +15,7 @@ export function usePagination(models: App.Paginate) {
   const nextPage = ref<string>()
 
   function getQuery() {
-    const query = new URLSearchParams(window.location.search)
+    const query = new URLSearchParams(window?.location.search)
     query.delete('page')
 
     return query.toString()
@@ -112,7 +112,7 @@ export function usePagination(models: App.Paginate) {
   paginate()
 
   function convertUrl(queryName: string, queryValue: number | string) {
-    let currentUrl = window.location.href
+    let currentUrl = window?.location.href
     if (currentUrl.includes(`${queryName}=`))
       currentUrl = currentUrl.replace(/page=\d+/, `${queryName}=${queryValue}`)
     else if (currentUrl.includes('?'))

diff --git a/lib/src/composables/useQuery.ts b/lib/src/composables/useQuery.ts
@@ -28,7 +28,7 @@ export function useQuery<T>(propQuery: App.Paginate<T>, prop: string = 'query')
    * Set the sort value to the query.
    */
   function initializeSort() {
-    const query = new URLSearchParams(window.location.search)
+    const query = new URLSearchParams(window?.location.search)
     const querySort = query.get('sort')
     if (querySort)
       sort.value = querySort

diff --git a/lib/src/methods/LaravelRouter.ts b/lib/src/methods/LaravelRouter.ts
@@ -7,8 +7,8 @@ export class LaravelRouter {
 
   public static create(routes?: RoutesType): LaravelRouter {
     // eslint-disable-next-line valid-typeof
-    if (!routes && typeof window !== undefined && typeof window.Routes !== undefined)
-      routes = window.Routes
+    if (!routes && typeof window !== undefined && typeof window?.Routes !== undefined)
+      routes = window?.Routes
 
     return new LaravelRouter(routes as Record<App.Route.Name, App.Route.Link>)
   }
@@ -50,7 +50,7 @@ export class LaravelRouter {
   }
 
   public getCurrentUrl(): string {
-    return window.location.pathname
+    return window?.location.pathname
   }
 
   public matchRoute(route: App.Route.Link, parts: string[], partsRoute: string[]): App.Route.Link | undefined {

diff --git a/src/Typed/Route/TypeRouteListTs.php b/src/Typed/Route/TypeRouteListTs.php
@@ -55,8 +55,8 @@ interface Window {
         }
 
         if (typeof window !== 'undefined') {
-          if (typeof window !== undefined && typeof window.Routes !== undefined)
-            window.Routes = Routes
+          if (typeof window !== undefined && typeof window?.Routes !== undefined)
+            window?.Routes = Routes
         }
 
         export { Routes }