@adonisjs/inertia 4.1.1 → 5.0.0-next.0

package/build/commands/commands.json

@@ -1 +1 @@
-{"commands":[{"commandName":"make:page","description":"Create a new Inertia page component","help":"","namespace":"make","aliases":[],"flags":[{"name":"vue","flagName":"vue","required":false,"type":"boolean","description":"Create a Vue page component"},{"name":"react","flagName":"react","required":false,"type":"boolean","description":"Create a React page component"}],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the page component","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make_page.js"}],"version":1}
+{"commands":[{"commandName":"make:page","description":"Create a new Inertia page component","help":"","namespace":"make","aliases":[],"flags":[{"name":"vue","flagName":"vue","required":false,"type":"boolean","description":"Create a Vue page component"},{"name":"react","flagName":"react","required":false,"type":"boolean","description":"Create a React page component"},{"name":"contentsFrom","flagName":"contents-from","required":false,"type":"string","description":"Use the contents of the given file as the generated output"},{"name":"force","flagName":"force","required":false,"type":"boolean","description":"Forcefully overwrite existing files","alias":"f"}],"args":[{"name":"name","argumentName":"name","required":true,"description":"Name of the page component","type":"string"}],"options":{"allowUnknownFlags":true},"filePath":"make_page.js"}],"version":1}

package/build/commands/make_page.d.ts

@@ -8,6 +8,15 @@ export default class MakePage extends BaseCommand {
     name: string;
     vue: boolean;
     react: boolean;
+    /**
+     * Read the contents from this file (if the flag exists) and use
+     * it as the raw contents
+     */
+    contentsFrom: string;
+    /**
+     * Forcefully overwrite existing files
+     */
+    force: boolean;
     /**
      * Directory under which the inertia pages are stored
      */

package/build/commands/make_page.js

@@ -34,14 +34,21 @@ var MakePage = class extends BaseCommand {
 	}
 	async run() {
 		const framework = await this.#resolveFramework();
-		await (await this.createCodemods()).makeUsingStub(stubsRoot, `make/page/${framework}.stub`, {
+		const codemods = await this.createCodemods();
+		codemods.overwriteExisting = this.force === true;
+		await codemods.makeUsingStub(stubsRoot, `make/page/${framework}.stub`, {
 			flags: this.parsed.flags,
 			pagesDir: this.pagesDir,
 			entity: this.app.generators.createEntity(this.name)
-		});
+		}, { contentsFromFile: this.contentsFrom });
 	}
 };
 __decorate([args.string({ description: "Name of the page component" })], MakePage.prototype, "name", void 0);
 __decorate([flags.boolean({ description: "Create a Vue page component" })], MakePage.prototype, "vue", void 0);
 __decorate([flags.boolean({ description: "Create a React page component" })], MakePage.prototype, "react", void 0);
+__decorate([flags.string({ description: "Use the contents of the given file as the generated output" })], MakePage.prototype, "contentsFrom", void 0);
+__decorate([flags.boolean({
+	description: "Forcefully overwrite existing files",
+	alias: "f"
+})], MakePage.prototype, "force", void 0);
 export { MakePage as default };

package/build/{define_config-Du2hAFGX.js → define_config-Dv9Dx2Yq.js}

@@ -49,7 +49,6 @@ function defineConfig(config) {
 		history: { encrypt: false },
 		ssr: {
 			enabled: false,
-			bundle: "ssr/ssr.js",
 			entrypoint: "inertia/ssr.tsx"
 		}
 	}, config);

package/build/factories/main.js

@@ -1,7 +1,7 @@
-import { n as ServerRenderer, r as Inertia } from "../inertia_manager-BGHA4cDP.js";
+import { n as ServerRenderer, r as Inertia } from "../inertia_manager-BdcjpKFf.js";
 import { t as InertiaHeaders } from "../headers-DafWEpBh.js";
 import "../debug-CBMTuPUm.js";
-import { t as defineConfig } from "../define_config-Du2hAFGX.js";
+import { t as defineConfig } from "../define_config-Dv9Dx2Yq.js";
 import "../index.js";
 import { HttpContextFactory } from "@adonisjs/core/factories/http";
 var InertiaFactory = class {

package/build/index.js

@@ -1,5 +1,5 @@
-import { i as symbols_exports, n as ServerRenderer, r as Inertia, t as InertiaManager } from "./inertia_manager-BGHA4cDP.js";
+import { i as symbols_exports, n as ServerRenderer, r as Inertia, t as InertiaManager } from "./inertia_manager-BdcjpKFf.js";
 import { t as InertiaHeaders } from "./headers-DafWEpBh.js";
 import "./debug-CBMTuPUm.js";
-import { n as indexPages, t as defineConfig } from "./define_config-Du2hAFGX.js";
+import { n as indexPages, t as defineConfig } from "./define_config-Dv9Dx2Yq.js";
 export { Inertia, InertiaHeaders, InertiaManager, ServerRenderer, defineConfig, indexPages, symbols_exports as symbols };

package/build/{inertia_manager-BGHA4cDP.js → inertia_manager-BdcjpKFf.js}

@@ -3,7 +3,6 @@ import { t as debug_default } from "./debug-CBMTuPUm.js";
 import "node:module";
 import { createHash } from "node:crypto";
 import { BaseSerializer } from "@adonisjs/core/transformers";
-import { pathToFileURL } from "node:url";
 var __defProp = Object.defineProperty;
 var __exportAll = (all, no_symbols) => {
 	let target = {};
@@ -43,6 +42,9 @@ function defer(fn, group = "default") {
 		merge() {
 			return merge(this);
 		},
+		deepMerge() {
+			return deepMerge(this);
+		},
 		[DEFERRED_PROP]: true
 	};
 }
@@ -85,6 +87,7 @@ function isOptionalProp(propValue) {
 	return OPTIONAL_PROP in propValue;
 }
 async function unpackPropValue(value, containerResolver) {
+	if (value === null) return null;
 	return inertiaSerializer.serialize(value, containerResolver);
 }
 async function buildStandardVisitProps(pageProps, containerResolver) {
@@ -113,11 +116,9 @@ async function buildStandardVisitProps(pageProps, containerResolver) {
 			if (isObject(value.value) && isDeferredProp(value.value)) {
 				deferredProps[value.value.group] = deferredProps[value.value.group] ?? [];
 				deferredProps[value.value.group].push(key);
-				unpackedValues.push({
-					key,
-					value: value.value.compute
-				});
-			} else unpackedValues.push({
+				continue;
+			}
+			unpackedValues.push({
 				key,
 				value: value.value
 			});
@@ -337,17 +338,18 @@ var Inertia = class {
 	async page(page, pageProps) {
 		const requestInfo = this.requestInfo();
 		const { props, mergeProps, deferredProps, deepMergeProps } = await this.#buildPageProps(page, requestInfo, pageProps);
-		return {
+		const pageObject = {
 			component: page,
 			url: this.ctx.request.url(true),
 			version: this.getVersion(),
-			clearHistory: this.#shouldClearHistory,
-			encryptHistory: this.#shouldEncryptHistory,
 			props,
 			deferredProps,
 			mergeProps,
 			deepMergeProps
 		};
+		if (this.#shouldClearHistory) pageObject.clearHistory = true;
+		if (this.#shouldEncryptHistory) pageObject.encryptHistory = true;
+		return pageObject;
 	}
 	async render(page, pageProps, viewProps) {
 		const requestInfo = this.requestInfo();
@@ -368,8 +370,6 @@ var Inertia = class {
 	}
 };
 var ServerRenderer = class {
-	#runtime;
-	#ssrEnvironment;
 	#config;
 	#vite;
 	constructor(config, vite) {
@@ -377,24 +377,8 @@ var ServerRenderer = class {
 		this.#vite = vite;
 	}
 	async render(pageObject) {
-		let render;
-		const devServer = this.#vite.getDevServer();
-		if (devServer) {
-			debug_default("creating SSR bundle using dev-server");
-			const currentSsrEnv = devServer.environments.ssr;
-			if (this.#ssrEnvironment !== currentSsrEnv) {
-				if (this.#runtime) await this.#runtime.close();
-				this.#runtime = void 0;
-				this.#ssrEnvironment = currentSsrEnv;
-			}
-			this.#runtime ??= await this.#vite.createModuleRunner();
-			this.#runtime.clearCache();
-			render = await this.#runtime.import(this.#config.ssr.entrypoint);
-		} else {
-			debug_default("creating SSR bundle using production build");
-			render = await import(pathToFileURL(this.#config.ssr.bundle).href);
-		}
-		const result = await render.default(pageObject);
+		debug_default("rendering page through SSR entrypoint %s", this.#config.ssr.entrypoint);
+		const result = await (await this.#vite.loadServerModule(this.#config.ssr.entrypoint)).default(pageObject);
 		debug_default("SSR bundle %o", result);
 		return {
 			head: result.head,

package/build/providers/inertia_provider.js

@@ -1,4 +1,4 @@
-import { t as InertiaManager } from "../inertia_manager-BGHA4cDP.js";
+import { t as InertiaManager } from "../inertia_manager-BdcjpKFf.js";
 import "../headers-DafWEpBh.js";
 import "../debug-CBMTuPUm.js";
 import { BriskRoute } from "@adonisjs/core/http";

package/build/src/client/react/context.d.ts

@@ -11,7 +11,7 @@ import type { TuyauRegistry } from '@tuyau/core/types';
 export declare function TuyauProvider<R extends TuyauRegistry>(props: {
     children: React.ReactNode;
     client: Tuyau<R>;
-}): import("react/jsx-runtime").JSX.Element;
+}): React.JSX.Element;
 /**
  * Hook to access the Tuyau client from any component within a TuyauProvider.
  *

package/build/src/client/react/form.d.ts

@@ -27,7 +27,7 @@ export type FormProps<Route extends keyof Routes = keyof Routes> = FormRouteProp
  * for Inertia form submission when using route-based navigation.
  * Falls back to standard InertiaForm when action is provided directly.
  */
-declare function FormInner<Route extends keyof Routes>(props: FormProps<Route>, ref?: React.ForwardedRef<React.ElementRef<typeof InertiaForm>>): import("react/jsx-runtime").JSX.Element;
+declare function FormInner<Route extends keyof Routes>(props: FormProps<Route>, ref?: React.ForwardedRef<React.ElementRef<typeof InertiaForm>>): React.JSX.Element;
 /**
  * Type-safe Form component for Inertia.js form submissions.
  *

package/build/src/client/react/link.d.ts

@@ -30,7 +30,7 @@ export type LinkProps<Route extends keyof Routes = keyof Routes> = LinkRouteProp
  * @param props - Link properties including route and parameters, or direct href
  * @param ref - Forward ref for the underlying InertiaLink component
  */
-declare function LinkInner<Route extends keyof Routes>(props: LinkProps<Route>, ref?: React.ForwardedRef<React.ElementRef<typeof InertiaLink>>): import("react/jsx-runtime").JSX.Element;
+declare function LinkInner<Route extends keyof Routes>(props: LinkProps<Route>, ref?: React.ForwardedRef<React.ElementRef<typeof InertiaLink>>): React.JSX.Element;
 /**
  * Type-safe Link component for Inertia.js navigation.
  *

package/build/src/define_config.d.ts

@@ -14,7 +14,7 @@ import type { InertiaConfig, InertiaConfigInput } from './types.js';
  *   rootView: 'layouts/app',
  *   ssr: {
  *     enabled: true,
- *     bundle: 'build/ssr/ssr.js'
+ *     entrypoint: 'inertia/ssr.tsx'
  *   }
  * })
  * ```

package/build/src/inertia_middleware.js

@@ -1,4 +1,4 @@
-import { t as InertiaManager } from "../inertia_manager-BGHA4cDP.js";
+import { t as InertiaManager } from "../inertia_manager-BdcjpKFf.js";
 import { t as InertiaHeaders } from "../headers-DafWEpBh.js";
 import { t as debug_default } from "../debug-CBMTuPUm.js";
 const MUTATION_METHODS = [

package/build/src/plugins/edge/plugin.js

@@ -1,5 +1,4 @@
 import { t as debug_default } from "../../../debug-CBMTuPUm.js";
-import { encode } from "html-entities";
 import { EdgeError } from "edge-error";
 function isSubsetOf(expression, expressions, errorCallback) {
 	if (!expressions.includes(expression.type)) errorCallback();
@@ -41,9 +40,9 @@ const edgePluginInertia = () => {
 		edge.global("inertia", (page = {}, attributes = {}) => {
 			if (page.ssrBody) return page.ssrBody;
 			const className = attributes?.class ? ` class="${attributes.class}"` : "";
-			const id = attributes?.id ? ` id="${attributes.id}"` : " id=\"app\"";
+			const id = attributes?.id || "app";
 			const tag = attributes?.as || "div";
-			return `<${tag}${id}${className} data-page="${encode(JSON.stringify(page))}"></${tag}>`;
+			return `<script data-page="${id}" type="application/json">${JSON.stringify(page).replace(/\//g, "\\/")}<\/script><${tag} id="${id}"${className}></${tag}>`;
 		});
 		edge.global("inertiaHead", (page) => {
 			const { ssrHead = [] } = page || {};

package/build/src/server_renderer.d.ts

@@ -3,8 +3,10 @@ import type { PageObject, InertiaConfig } from './types.js';
 /**
  * Server-side renderer for Inertia.js applications.
  *
- * Handles rendering Inertia pages on the server using either Vite's development
- * runtime API or production SSR bundles.
+ * Resolves the SSR entrypoint through `vite.loadServerModule` so the same
+ * code path works in dev (Vite module runner) and in production (pre-built
+ * SSR bundle on disk). The entry must be declared under `serverEntrypoints`
+ * on the AdonisJS Vite plugin so it gets bundled for production.
  *
  * @example
  * ```typescript
@@ -14,38 +16,12 @@ import type { PageObject, InertiaConfig } from './types.js';
  */
 export declare class ServerRenderer {
     #private;
-    /**
-     * Creates a new ServerRenderer instance.
-     *
-     * @param config - Inertia configuration object containing SSR settings
-     * @param vite - Vite instance for development mode rendering and asset management
-     *
-     * @example
-     * ```js
-     * const renderer = new ServerRenderer(config, vite)
-     * ```
-     */
     constructor(config: InertiaConfig, vite: Vite);
     /**
      * Renders an Inertia page on the server.
      *
-     * In development mode, uses Vite's Runtime API to execute the SSR entrypoint.
-     * In production mode, imports and uses the pre-built SSR bundle.
-     *
      * @param pageObject - The Inertia page object containing component, props, and metadata
      * @returns Promise resolving to an object with rendered head and body HTML
-     *
-     * @example
-     * ```js
-     * const pageObject = {
-     *   component: 'Home',
-     *   props: { user: { name: 'John' } },
-     *   url: '/dashboard',
-     *   version: '1.0.0'
-     * }
-     *
-     * const { head, body } = await renderer.render(pageObject)
-     * ```
      */
     render(pageObject: PageObject<any>): Promise<{
         head: string[];

package/build/src/types.d.ts

@@ -82,6 +82,8 @@ export type DeferProp<T extends UnPackedPageProps> = {
     compute: () => AsyncOrSync<T>;
     /** Creates a mergeable version of this deferred prop */
     merge(): MergeableProp<DeferProp<T>>;
+    /** Creates a deep-mergeable version of this deferred prop */
+    deepMerge(): MergeableProp<DeferProp<T>>;
     /** Brand symbol to identify this as a deferred prop */
     [DEFERRED_PROP]: true;
 };
@@ -258,15 +260,13 @@ export type InertiaConfig = {
          */
         pages?: string[] | ((ctx: HttpContext, page: string) => AsyncOrSync<boolean>);
         /**
-         * The entrypoint file to load in order to boot the frontend application on
-         * the server
+         * The entrypoint file that boots the frontend application on the server.
+         * Must also be declared under `serverEntrypoints` on the AdonisJS Vite
+         * plugin so it gets bundled for production. The value is passed to
+         * `vite.loadServerModule()` to evaluate the module in dev and import
+         * the bundle in production.
          */
         entrypoint: string;
-        /**
-         * The SSR bundle output to load during production. This bundle is created
-         * using Vite
-         */
-        bundle: string;
     };
 };
 /**

package/build/tests/helpers.d.ts

@@ -32,4 +32,30 @@ export declare function setupApp(providers?: ProviderNode[]): Promise<{
     app: ApplicationService;
     ignitor: import("@adonisjs/core").Ignitor;
 }>;
+/**
+ * Minimal, faithful DOM shim that implements just enough of
+ * `document.querySelector` for the real `@inertiajs/core` `getInitialPageFromDOM`
+ * helper to run against a server-rendered HTML string.
+ *
+ * It parses every `<script>...</script>` block out of the markup and matches
+ * the `script[attr="value"]...` selector the v3 client builds. The regex stops
+ * at the first *unescaped* `</script>`, which is exactly the boundary the
+ * browser's HTML parser uses — so an escaped `<\/script>` inside the JSON
+ * payload does not terminate the element early.
+ */
+export declare function createDocumentFrom(html: string): {
+    querySelector(selector: string): {
+        attributes: Record<string, string>;
+        textContent: string;
+    } | null;
+};
+/**
+ * Render a page object the way an application root view does, through the real
+ * `@inertia()` Edge global, then hand the resulting markup to the real v3
+ * client helper and return whatever it reconstructs.
+ */
+export declare function roundTripThroughClient(page: Record<string, any>, attributes?: Record<string, any>): Promise<{
+    html: string;
+    page: any;
+}>;
 export declare const setupFakeAdonisProject: () => Promise<void>;

package/build/tests/v3_client_contract.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/inertia",
   "description": "Official Inertia.js adapter for AdonisJS",
-  "version": "4.1.1",
+  "version": "5.0.0-next.0",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -17,7 +17,6 @@
     "./inertia_provider": "./build/providers/inertia_provider.js",
     "./plugins/edge": "./build/src/plugins/edge/plugin.js",
     "./plugins/api_client": "./build/src/plugins/japa/api_client.js",
-    "./vite": "./build/src/client/vite.js",
     "./helpers": "./build/src/client/helpers.js",
     "./react": "./build/src/client/react/index.js",
     "./vue": "./build/src/client/vue/index.js",
@@ -52,9 +51,9 @@
     "@adonisjs/prettier-config": "^1.4.5",
     "@adonisjs/session": "^8.0.0",
     "@adonisjs/tsconfig": "^2.0.0",
-    "@adonisjs/vite": "^5.1.0",
-    "@inertiajs/react": "^2.3.16",
-    "@inertiajs/vue3": "^2.3.16",
+    "@adonisjs/vite": "^6.0.0-next.0",
+    "@inertiajs/react": "^3.4.0",
+    "@inertiajs/vue3": "^3.4.0",
     "@japa/api-client": "^3.2.1",
     "@japa/assert": "4.2.0",
     "@japa/expect-type": "^2.0.4",
@@ -81,7 +80,7 @@
     "supertest": "^7.2.2",
     "tsdown": "^0.20.3",
     "typescript": "~5.9.3",
-    "vite": "^7.3.1",
+    "vite": "^8.0.0",
     "vue": "^3.5.29"
   },
   "dependencies": {
@@ -93,9 +92,9 @@
     "@adonisjs/assembler": "^8.0.0-next.29 || ^8.0.0",
     "@adonisjs/core": "^7.0.0-next.23 || ^7.0.0",
     "@adonisjs/session": "^8.0.0-next.2 || ^8.0.0",
-    "@adonisjs/vite": "^5.1.0-next.2 || ^5.1.0",
-    "@inertiajs/react": "^2.3.8",
-    "@inertiajs/vue3": "^2.3.8",
+    "@adonisjs/vite": "^6.0.0-next.0 || ^6.0.0",
+    "@inertiajs/react": "^3.4.0",
+    "@inertiajs/vue3": "^3.4.0",
     "@japa/api-client": "^3.1.1",
     "@japa/plugin-adonisjs": "^5.1.0-next.1 || ^5.1.0",
     "@tuyau/core": "^1.0.0-beta.10 || ^1.0.0",

package/build/src/client/vite.d.ts

@@ -1,65 +0,0 @@
-import type { PluginOption } from 'vite';
-/**
- * Configuration options for the Inertia Vite plugin
- */
-export type InertiaPluginOptions = {
-    /**
-     * Server-side rendering configuration
-     */
-    ssr?: {
-        /**
-         * Whether or not to enable server-side rendering
-         */
-        enabled: true;
-        /**
-         * The entrypoint for the server-side rendering
-         */
-        entrypoint: string;
-        /**
-         * The output directory for the server-side rendering bundle
-         */
-        output?: string;
-    } | {
-        enabled: false;
-        entrypoint?: string;
-        output?: string;
-    };
-};
-/**
- * Inertia plugin for Vite that is tailored for AdonisJS
- *
- * Configures Vite for Inertia.js development with proper build settings,
- * SSR support, and AdonisJS-specific optimizations.
- *
- * @param options - Configuration options for the plugin
- * @returns Vite plugin configuration object
- *
- * @example
- * ```js
- * // Basic configuration
- * import inertia from '@adonisjs/inertia/plugins/vite'
- *
- * export default defineConfig({
- *   plugins: [inertia()]
- * })
- * ```
- *
- * @example
- * ```js
- * // With SSR enabled
- * import inertia from '@adonisjs/inertia/plugins/vite'
- *
- * export default defineConfig({
- *   plugins: [
- *     inertia({
- *       ssr: {
- *         enabled: true,
- *         entrypoint: 'inertia/ssr.tsx',
- *         output: 'build/ssr'
- *       }
- *     })
- *   ]
- * })
- * ```
- */
-export default function inertia(options?: InertiaPluginOptions): PluginOption;

package/build/src/client/vite.js

@@ -1,21 +0,0 @@
-function inertia(options) {
-	return {
-		name: "vite-plugin-inertia",
-		config: (_, { command }) => {
-			if (command === "build") process.env.NODE_ENV = "production";
-			return {
-				builder: { buildApp: async (builder) => {
-					await builder.build(builder.environments.client);
-					if (options?.ssr?.enabled) await builder.build(builder.environments.ssr);
-				} },
-				build: { outDir: "build/public/assets" },
-				environments: { ...options?.ssr?.enabled && { ssr: { build: {
-					ssr: true,
-					outDir: options.ssr.output || "build/ssr",
-					rollupOptions: { input: options.ssr.entrypoint }
-				} } } }
-			};
-		}
-	};
-}
-export { inertia as default };