@adonisjs/inertia 2.1.1 → 2.1.3

package/build/{chunk-3SVIWNBM.js → chunk-DLEGZFQ5.js}

@@ -146,6 +146,15 @@ var Inertia = class {
     }
     return newProps;
   }
+  /**
+   * Resolve a single prop
+   */
+  async #resolveProp(key, value) {
+    if (value instanceof OptionalProp || value instanceof MergeProp || value instanceof DeferProp || value instanceof AlwaysProp) {
+      return [key, await value.callback()];
+    }
+    return [key, value];
+  }
   /**
    * Resolve a single prop by calling the callback or resolving the promise
    */
@@ -154,12 +163,10 @@ var Inertia = class {
       await Promise.all(
         Object.entries(props).map(async ([key, value]) => {
           if (typeof value === "function") {
-            return [key, await value(this.ctx)];
-          }
-          if (value instanceof OptionalProp || value instanceof MergeProp || value instanceof DeferProp || value instanceof AlwaysProp) {
-            return [key, await value.callback()];
+            const result = await value(this.ctx);
+            return this.#resolveProp(key, result);
           }
-          return [key, value];
+          return this.#resolveProp(key, value);
         })
       )
     );

package/build/config.stub

@@ -2,7 +2,7 @@
   exports({ to: app.configPath('inertia.ts') })
 }}}
 import { defineConfig } from '@adonisjs/inertia'
-import type { InferSharedProps } from '@adonisjs/inertia/types'
+import type { InferSharedProps, PageProps } from '@adonisjs/inertia/types'
 
 const inertiaConfig = defineConfig({
   /**
@@ -14,7 +14,7 @@ const inertiaConfig = defineConfig({
    * Data that should be shared with all rendered pages
    */
   sharedData: {
-    errors: (ctx) => ctx.session?.flashMessages.get('errors'),
+    errors: (ctx) => ctx.inertia.always(() => ctx.session?.flashMessages.get('errors')),
   },
 
   /**
@@ -29,5 +29,5 @@ const inertiaConfig = defineConfig({
 export default inertiaConfig
 
 declare module '@adonisjs/inertia/types' {
-  export interface SharedProps extends InferSharedProps<typeof inertiaConfig> {}
+  export interface SharedProps extends InferSharedProps<typeof inertiaConfig>, PageProps {}
 }

package/build/index.d.ts

@@ -1,6 +1,6 @@
 import Configure from '@adonisjs/core/commands/configure';
 import { ConfigProvider } from '@adonisjs/core/types';
-import { S as SharedData, I as InertiaConfig, R as ResolvedConfig } from './types-AyvioK68.js';
+import { S as SharedData, I as InertiaConfig, R as ResolvedConfig } from './types-D6QX_SeH.js';
 import '@adonisjs/core/http';
 import '@tuyau/utils/types';
 

package/build/providers/inertia_provider.js

@@ -1,6 +1,6 @@
 import {
   InertiaMiddleware
-} from "../chunk-3SVIWNBM.js";
+} from "../chunk-DLEGZFQ5.js";
 
 // providers/inertia_provider.ts
 import { configProvider } from "@adonisjs/core";

package/build/src/inertia_middleware.d.ts

@@ -1,7 +1,7 @@
 import { Vite } from '@adonisjs/vite';
 import { HttpContext } from '@adonisjs/core/http';
 import { NextFn } from '@adonisjs/core/types/http';
-import { R as ResolvedConfig, D as Data, P as PageObject, M as MaybePromise, O as OptionalProp, a as MergeProp, A as AlwaysProp, b as DeferProp } from '../types-AyvioK68.js';
+import { R as ResolvedConfig, D as Data, P as PageObject, M as MaybePromise, O as OptionalProp, a as MergeProp, A as AlwaysProp, b as DeferProp } from '../types-D6QX_SeH.js';
 import '@adonisjs/core/types';
 import '@tuyau/utils/types';
 

package/build/src/inertia_middleware.js

@@ -1,6 +1,6 @@
 import {
   InertiaMiddleware
-} from "../chunk-3SVIWNBM.js";
+} from "../chunk-DLEGZFQ5.js";
 export {
   InertiaMiddleware as default
 };

package/build/src/plugins/japa/api_client.d.ts

@@ -1,6 +1,6 @@
 import { PluginFn } from '@japa/runner/types';
 import { ApplicationService } from '@adonisjs/core/types';
-import { c as PageProps } from '../../../types-AyvioK68.js';
+import { c as PageProps } from '../../../types-D6QX_SeH.js';
 import '@adonisjs/core/http';
 import '@tuyau/utils/types';
 

package/build/src/types.d.ts

@@ -1,4 +1,4 @@
 import '@adonisjs/core/types';
 import '@adonisjs/core/http';
 import '@tuyau/utils/types';
-export { e as AssetsVersion, D as Data, I as InertiaConfig, h as InferPageProps, f as InferSharedProps, M as MaybePromise, P as PageObject, c as PageProps, i as RenderInertiaSsrApp, R as ResolvedConfig, S as SharedData, d as SharedDatumFactory, g as SharedProps } from '../types-AyvioK68.js';
+export { e as AssetsVersion, D as Data, I as InertiaConfig, h as InferPageProps, f as InferSharedProps, M as MaybePromise, P as PageObject, c as PageProps, i as RenderInertiaSsrApp, R as ResolvedConfig, S as SharedData, d as SharedDatumFactory, g as SharedProps } from '../types-D6QX_SeH.js';

package/build/svelte/app.ts.stub

@@ -8,6 +8,7 @@ import '../css/app.css';
 
 import { createInertiaApp } from '@inertiajs/svelte'
 import { resolvePageComponent } from '@adonisjs/inertia/helpers'
+import { hydrate, mount } from 'svelte'
 
 const appName = import.meta.env.VITE_APP_NAME || 'AdonisJS'
 
@@ -24,10 +25,10 @@ createInertiaApp({
   },
 
   setup({ el, App, props }) {
-    {{#if ssr}}
-    new App({ target: el, props, hydrate: true })
-    {{#else}}
-    new App({ target: el, props })
-    {{/if}}
+    if (el.dataset.serverRendered === 'true') {
+      hydrate(App, { target: el, props })
+    } else {
+      mount(App, { target: el, props })
+    }
   },
 })

package/build/svelte/ssr.ts.stub

@@ -3,6 +3,7 @@
 }}}
 
 import { createInertiaApp } from '@inertiajs/svelte'
+import { render as svelteRender } from 'svelte/server'
 
 export default function render(page: any) {
   return createInertiaApp({
@@ -10,6 +11,9 @@ export default function render(page: any) {
     resolve: (name) => {
       const pages = import.meta.glob('../pages/**/*.svelte', { eager: true })
       {{ 'return pages[`../pages/${name}.svelte`]' }}
-    }
+    },
+    setup({ el, App, props }) {
+      return svelteRender(App, { props })
+    },
   })
 }

package/build/{types-AyvioK68.d.ts → types-D6QX_SeH.d.ts}

@@ -196,9 +196,9 @@ type InferProps<T> = {
         callback: () => MaybePromise<infer U>;
     } ? U : T[K];
 };
-type ReturnsTypesSharedData<T extends SharedData> = {} extends T ? {} : {
+type ReturnsTypesSharedData<T extends SharedData> = {} extends T ? {} : InferProps<{
     [K in keyof T]: T[K] extends (...args: any[]) => MaybePromise<infer U> ? U : T[K];
-};
+}>;
 /**
  * Infer shared data types from the config provider
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/inertia",
   "description": "Official Inertia.js adapter for AdonisJS",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "engines": {
     "node": ">=20.6.0"
   },