Merge branch 'main' into 1.x

Author: timacdonald

src/index.ts

@@ -204,7 +204,7 @@ function resolveLaravelPlugin(pluginConfig: Required<PluginConfig>): LaravelPlug
 
                 const isAddressInfo = (x: string|AddressInfo|null|undefined): x is AddressInfo => typeof x === 'object'
                 if (isAddressInfo(address)) {
-                    viteDevServerUrl = resolveDevServerUrl(address, server.config, userConfig)
+                    viteDevServerUrl = userConfig.server?.origin ? userConfig.server.origin as DevServerUrl : resolveDevServerUrl(address, server.config, userConfig)
                     fs.writeFileSync(pluginConfig.hotFile, viteDevServerUrl)
 
                     setTimeout(() => {

src/inertia-helpers/index.ts

@@ -1,9 +1,13 @@
-export async function resolvePageComponent<T>(path: string, pages: Record<string, Promise<T> | (() => Promise<T>)>): Promise<T> {
-    const page = pages[path]
+export async function resolvePageComponent<T>(path: string|string[], pages: Record<string, Promise<T> | (() => Promise<T>)>): Promise<T> {
+    for (const p of (Array.isArray(path) ? path : [path])) {
+        const page = pages[p]
 
-    if (typeof page === 'undefined') {
-        throw new Error(`Page not found: ${path}`)
+        if (typeof page === 'undefined') {
+            continue
+        }
+
+        return typeof page === 'function' ? page() : page
     }
 
-    return typeof page === 'function' ? page() : page
+    throw new Error(`Page not found: ${path}`)
 }

tests/index.test.ts

@@ -376,4 +376,9 @@ describe('inertia-helpers', () => {
         const file = await resolvePageComponent<{ default: string }>(path, import.meta.glob('./__data__/*.ts', { eager: true }))
         expect(file.default).toBe('Dummy File')
     })
+
+    it('accepts array of paths', async () => {
+        const file = await resolvePageComponent<{ default: string }>(['missing-page', path], import.meta.glob('./__data__/*.ts', { eager: true }), path)
+        expect(file.default).toBe('Dummy File')
+    })
 })