@adonisjs/inertia 1.0.0-28 → 1.0.0-29

package/build/{chunk-HE2EUUPI.js → chunk-QKSM72AR.js}

@@ -109,12 +109,18 @@ var Inertia = class {
     }
     return isSsrEnabledForPage;
   }
+  /**
+   * Resolve the root view
+   */
+  #resolveRootView() {
+    return typeof this.config.rootView === "function" ? this.config.rootView(this.ctx) : this.config.rootView;
+  }
   /**
    * Render the page on the server
    */
   async #renderOnServer(pageObject, viewProps) {
     const { head, body } = await this.#serverRenderer.render(pageObject);
-    return this.ctx.view.render(this.config.rootView, {
+    return this.ctx.view.render(this.#resolveRootView(), {
       ...viewProps,
       page: { ssrHead: head, ssrBody: body, ...pageObject }
     });
@@ -136,7 +142,7 @@ var Inertia = class {
       const shouldRenderOnServer = await this.#shouldRenderOnServer(component);
       if (shouldRenderOnServer)
         return this.#renderOnServer(pageObject, viewProps);
-      return this.ctx.view.render(this.config.rootView, { ...viewProps, page: pageObject });
+      return this.ctx.view.render(this.#resolveRootView(), { ...viewProps, page: pageObject });
     }
     this.ctx.response.header("x-inertia", "true");
     return pageObject;

package/build/index.d.ts

@@ -1,6 +1,6 @@
 import Configure from '@adonisjs/core/commands/configure';
 import { ConfigProvider } from '@adonisjs/core/types';
-import { I as InertiaConfig, R as ResolvedConfig } from './types-CyeRFf-Q.js';
+import { S as SharedData, I as InertiaConfig, R as ResolvedConfig } from './types-fb05P61I.js';
 import '@adonisjs/core/http';
 import '@tuyau/utils/types';
 import '@adonisjs/vite';
@@ -13,7 +13,7 @@ declare function configure(command: Configure): Promise<void>;
 /**
  * Define the Inertia configuration
  */
-declare function defineConfig(config: InertiaConfig): ConfigProvider<ResolvedConfig>;
+declare function defineConfig<T extends SharedData>(config: InertiaConfig<T>): ConfigProvider<ResolvedConfig<T>>;
 
 declare const stubsRoot: string;
 

package/build/index.js

@@ -84,15 +84,10 @@ async function defineExampleRoute(command, codemods) {
   if (!routesFile) {
     return command.logger.warning("Unable to find the routes file");
   }
-  const isAlreadyDefined = routesFile.getText().includes("/inertia");
-  if (isAlreadyDefined) {
-    command.logger.warning("/inertia route is already defined. Skipping");
-    return;
-  }
   const action = command.logger.action("update start/routes.ts file");
   try {
     routesFile?.addStatements((writer) => {
-      writer.writeLine(`router.on('/inertia').renderInertia('home', { version: 6 })`);
+      writer.writeLine(`router.on('/').renderInertia('home', { version: 6 })`);
     });
     await tsMorph?.save();
     action.succeeded();
@@ -105,6 +100,7 @@ async function configure(command) {
   let adapter = command.parsedFlags.adapter;
   let ssr = command.parsedFlags.ssr;
   let shouldInstallPackages = command.parsedFlags.install;
+  let shouldSkipExampleRoute = command.parsedFlags["skip-example-route"];
   if (adapter === void 0) {
     adapter = await command.prompt.choice(
       "Select the Inertia adapter you want to use",
@@ -163,7 +159,9 @@ async function configure(command) {
   await codemods.registerVitePlugin(adonisjsPluginCall, [
     { isNamed: false, module: "@adonisjs/vite/client", identifier: "adonisjs" }
   ]);
-  await defineExampleRoute(command, codemods);
+  if (shouldSkipExampleRoute !== true) {
+    await defineExampleRoute(command, codemods);
+  }
   const pkgToInstall = adapterInfo.dependencies;
   if (ssr && adapterInfo.ssrDependencies) {
     pkgToInstall.push(...adapterInfo.ssrDependencies);
@@ -182,6 +180,7 @@ async function configure(command) {
 }
 
 // src/define_config.ts
+import { slash } from "@poppinss/utils";
 import { configProvider } from "@adonisjs/core";
 
 // src/version_cache.ts
@@ -284,7 +283,6 @@ var FilesDetector = class {
 };
 
 // src/define_config.ts
-import { slash } from "@poppinss/utils";
 function defineConfig(config) {
   return configProvider.create(async (app) => {
     const detector = new FilesDetector(app);

package/build/providers/inertia_provider.js

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

package/build/src/inertia_middleware.d.ts

@@ -1,7 +1,8 @@
 import { Vite } from '@adonisjs/vite';
 import { HttpContext } from '@adonisjs/core/http';
 import { NextFn } from '@adonisjs/core/types/http';
-import { a as Inertia, R as ResolvedConfig } from '../types-CyeRFf-Q.js';
+import { a as Inertia, R as ResolvedConfig } from '../types-fb05P61I.js';
+import '@adonisjs/core/types';
 import '@tuyau/utils/types';
 
 /**

package/build/src/inertia_middleware.js

@@ -1,6 +1,6 @@
 import {
   InertiaMiddleware
-} from "../chunk-HE2EUUPI.js";
+} from "../chunk-QKSM72AR.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 { P as PageProps } from '../../../types-CyeRFf-Q.js';
+import { P as PageProps } from '../../../types-fb05P61I.js';
 import '@adonisjs/core/http';
 import '@tuyau/utils/types';
 import '@adonisjs/vite';

package/build/src/types.d.ts

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

package/build/{types-CyeRFf-Q.d.ts → types-fb05P61I.d.ts}

@@ -1,3 +1,4 @@
+import { ConfigProvider } from '@adonisjs/core/types';
 import { HttpContext } from '@adonisjs/core/http';
 import { Simplify, Serialize } from '@tuyau/utils/types';
 import { Vite } from '@adonisjs/vite';
@@ -85,12 +86,12 @@ type SharedData = Record<string, Data | SharedDatumFactory>;
  * Allowed values for the assets version
  */
 type AssetsVersion = string | number | undefined;
-interface InertiaConfig {
+interface InertiaConfig<T extends SharedData = SharedData> {
     /**
      * Path to the Edge view that will be used as the root view for Inertia responses.
      * @default root (resources/views/inertia_layout.edge)
      */
-    rootView?: string;
+    rootView?: string | ((ctx: HttpContext) => string);
     /**
      * Path to your client-side entrypoint file.
      */
@@ -103,7 +104,7 @@ interface InertiaConfig {
     /**
      * Data that should be shared with all rendered pages
      */
-    sharedData?: SharedData;
+    sharedData?: T;
     /**
      * Options to configure SSR
      */
@@ -129,10 +130,10 @@ interface InertiaConfig {
 /**
  * Resolved inertia configuration
  */
-interface ResolvedConfig {
-    rootView: string;
+interface ResolvedConfig<T extends SharedData = SharedData> {
+    rootView: string | ((ctx: HttpContext) => string);
     versionCache: VersionCache;
-    sharedData: SharedData;
+    sharedData: T;
     ssr: {
         enabled: boolean;
         entrypoint: string;
@@ -158,10 +159,25 @@ type InferProps<T> = {
 } & {
     [K in keyof T as IsLazyProp<T[K]> extends true ? never : K]: T[K];
 };
+type ReturnsTypesSharedData<T extends SharedData> = {} extends T ? {} : {
+    [K in keyof T]: T[K] extends (...args: any[]) => MaybePromise<infer U> ? U : T[K];
+};
+/**
+ * Infer shared data types from the config provider
+ */
+type InferSharedProps<T extends ConfigProvider<ResolvedConfig>> = ReturnsTypesSharedData<Awaited<ReturnType<T['resolver']>>['sharedData']>;
+/**
+ * The shared props inferred from the user config user-land.
+ * Should be module augmented by the user
+ */
+interface SharedProps {
+}
 /**
  * Helper for infering the page props from a Controller method that returns
  * inertia.render
  *
+ * InferPageProps will also include the shared props
+ *
  * ```ts
  * // Your Adonis Controller
  * class MyController {
@@ -175,7 +191,7 @@ type InferProps<T> = {
  * }
  * ```
  */
-type InferPageProps<Controller, Method extends keyof Controller> = Controller[Method] extends (...args: any[]) => any ? Simplify<Serialize<InferProps<Exclude<Awaited<ReturnType<Controller[Method]>>, string>['props']>>> : never;
+type InferPageProps<Controller, Method extends keyof Controller> = Controller[Method] extends (...args: any[]) => any ? Simplify<Serialize<InferProps<Exclude<Awaited<ReturnType<Controller[Method]>>, string>['props']> & SharedProps>> : never;
 /**
  * Signature for the method in the SSR entrypoint file
  */
@@ -184,4 +200,4 @@ type RenderInertiaSsrApp = (page: PageObject) => Promise<{
     body: string;
 }>;
 
-export { type AssetsVersion as A, type Data as D, type InertiaConfig as I, type MaybePromise as M, type PageProps as P, type ResolvedConfig as R, type SharedDatumFactory as S, Inertia as a, type SharedData as b, type PageObject as c, type InferPageProps as d, type RenderInertiaSsrApp as e };
+export { type AssetsVersion as A, type Data as D, type InertiaConfig as I, type MaybePromise as M, type PageProps as P, type ResolvedConfig as R, type SharedData as S, Inertia as a, type SharedDatumFactory as b, type PageObject as c, type InferSharedProps as d, type SharedProps as e, type InferPageProps as f, type RenderInertiaSsrApp as g };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/inertia",
   "description": "Official Inertia.js adapter for AdonisJS",
-  "version": "1.0.0-28",
+  "version": "1.0.0-29",
   "engines": {
     "node": ">=20.6.0"
   },
@@ -38,7 +38,7 @@
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@adonisjs/assembler": "^7.5.2",
+    "@adonisjs/assembler": "^7.6.1",
     "@adonisjs/core": "6.8.0",
     "@adonisjs/eslint-config": "^1.3.0",
     "@adonisjs/prettier-config": "^1.3.0",
@@ -52,8 +52,8 @@
     "@japa/plugin-adonisjs": "^3.0.1",
     "@japa/runner": "3.1.4",
     "@japa/snapshot": "^2.0.5",
-    "@swc/core": "^1.5.7",
-    "@types/node": "^20.12.12",
+    "@swc/core": "^1.5.24",
+    "@types/node": "^20.12.13",
     "@types/qs": "^6.9.15",
     "@types/supertest": "^6.0.2",
     "@vavite/multibuild": "^4.1.1",
@@ -65,12 +65,12 @@
     "eslint": "^8.57.0",
     "get-port": "^7.1.0",
     "prettier": "^3.2.5",
-    "release-it": "^17.2.1",
+    "release-it": "^17.3.0",
     "supertest": "^7.0.0",
     "ts-node": "^10.9.2",
     "tsup": "^8.0.2",
     "typescript": "~5.4.5",
-    "vite": "^5.2.11"
+    "vite": "^5.2.12"
   },
   "dependencies": {
     "@poppinss/utils": "^6.7.3",