@adonisjs/inertia 1.0.0-12 → 1.0.0-14

package/build/{chunk-RTJXBXWZ.js → chunk-NVJNYWGW.js}

@@ -1,13 +1,101 @@
+// src/server_renderer.ts
+var styleFileRE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\?)/;
+var ServerRenderer = class {
+  constructor(config, vite) {
+    this.config = config;
+    this.vite = vite;
+  }
+  /**
+   * If the module is a style module
+   */
+  #isStyle(mod) {
+    if (styleFileRE.test(mod.url) || mod.id && /\?vue&type=style/.test(mod.id)) {
+      return true;
+    }
+    return false;
+  }
+  /**
+   * Collect CSS files from the module graph recursively
+   */
+  #collectCss(mod, styleUrls, visitedModules, importer) {
+    if (!mod.url)
+      return;
+    if (visitedModules.has(mod.url))
+      return;
+    visitedModules.add(mod.url);
+    if (this.#isStyle(mod) && (!importer || !this.#isStyle(importer))) {
+      if (mod.url.startsWith("/")) {
+        styleUrls.add(mod.url);
+      } else if (mod.url.startsWith("\0")) {
+        styleUrls.add(`/@id/__x00__${mod.url.substring(1)}`);
+      } else {
+        styleUrls.add(`/@id/${mod.url}`);
+      }
+    }
+    mod.importedModules.forEach((dep) => this.#collectCss(dep, styleUrls, visitedModules, mod));
+  }
+  /**
+   * Generate the preload tag for a CSS file
+   */
+  #getPreloadTag(href) {
+    return `<link rel="stylesheet" href="${href}" />`;
+  }
+  /**
+   * Find a page module from the entrypoint module
+   *
+   * The implementation is dumb, we are just looking for the first module
+   * imported by the entrypoint module that matches the regex
+   */
+  #findPageModule(entryMod, pageObject) {
+    const pattern = `${pageObject.component.replace(/\//g, "\\/")}.(tsx|vue|svelte|jsx|ts|js)$`;
+    const regex = new RegExp(pattern);
+    return [...entryMod?.ssrImportedModules || []].find((dep) => regex.test(dep.url));
+  }
+  /**
+   * Render the page on the server
+   *
+   * On development, we use the Vite Runtime API
+   * On production, we just import and use the SSR bundle generated by Vite
+   */
+  async render(pageObject) {
+    let render;
+    let preloadTags = [];
+    if (this.vite) {
+      const devServer = this.vite.getDevServer();
+      const runtime = await this.vite.createRuntime();
+      render = await runtime.executeEntrypoint(this.config.ssr.entrypoint);
+      const entryMod = devServer.moduleGraph.getModuleById(this.config.entrypoint);
+      const pageMod = this.#findPageModule(entryMod, pageObject);
+      if (pageMod)
+        await runtime.executeUrl(pageMod.url);
+      const preloadUrls = /* @__PURE__ */ new Set();
+      const visitedModules = /* @__PURE__ */ new Set();
+      if (pageMod)
+        this.#collectCss(pageMod, preloadUrls, visitedModules);
+      if (entryMod)
+        this.#collectCss(entryMod, preloadUrls, visitedModules);
+      preloadTags = Array.from(preloadUrls).map(this.#getPreloadTag);
+    } else {
+      render = await import(this.config.ssr.bundle);
+    }
+    const result = await render.default(pageObject);
+    const head = preloadTags.concat(result.head);
+    return { head, body: result.body };
+  }
+};
+
 // src/inertia.ts
 var kLazySymbol = Symbol("lazy");
 var Inertia = class {
-  constructor(ctx, config, viteRuntime) {
+  constructor(ctx, config, vite) {
     this.ctx = ctx;
     this.config = config;
-    this.viteRuntime = viteRuntime;
+    this.vite = vite;
     this.#sharedData = config.sharedData;
+    this.#serverRenderer = new ServerRenderer(config, vite);
   }
   #sharedData = {};
+  #serverRenderer;
   /**
    * Check if a value is a lazy prop
    */
@@ -71,21 +159,12 @@ var Inertia = class {
   }
   /**
    * Render the page on the server
-   *
-   * On development, we use the Vite Runtime API
-   * On production, we just import and use the SSR bundle generated by Vite
    */
   async #renderOnServer(pageObject, viewProps) {
-    let render;
-    if (this.viteRuntime) {
-      render = await this.viteRuntime.executeEntrypoint(this.config.ssr.entrypoint);
-    } else {
-      render = await import(this.config.ssr.bundle);
-    }
-    const result = await render.default(pageObject);
+    const { head, body } = await this.#serverRenderer.render(pageObject);
     return this.ctx.view.render(this.config.rootView, {
       ...viewProps,
-      page: { ssrHead: result.head, ssrBody: result.body, ...pageObject }
+      page: { ssrHead: head, ssrBody: body, ...pageObject }
     });
   }
   /**
@@ -137,12 +216,11 @@ var Inertia = class {
 var InertiaMiddleware = class {
   constructor(config, vite) {
     this.config = config;
-    this.#runtime = vite?.getRuntime();
+    this.vite = vite;
   }
-  #runtime;
   async handle(ctx, next) {
     const { response, request } = ctx;
-    ctx.inertia = new Inertia(ctx, this.config, this.#runtime);
+    ctx.inertia = new Inertia(ctx, this.config, this.vite);
     await next();
     const isInertiaRequest = !!request.header("x-inertia");
     if (!isInertiaRequest)

package/build/index.js

@@ -225,20 +225,76 @@ var VersionCache = class {
   }
 };
 
+// src/files_detector.ts
+import { locatePath } from "locate-path";
+var FilesDetector = class {
+  constructor(app) {
+    this.app = app;
+  }
+  /**
+   * Try to locate the entrypoint file based
+   * on the conventional locations
+   */
+  async detectEntrypoint(defaultPath) {
+    const possiblesLocations = [
+      "./resources/app.ts",
+      "./resources/app.tsx",
+      "./resources/application/app.ts",
+      "./resources/application/app.tsx",
+      "./resources/app.jsx",
+      "./resources/app.js",
+      "./resources/application/app.jsx",
+      "./resources/application/app.js"
+    ];
+    const path = await locatePath(possiblesLocations, { cwd: this.app.appRoot });
+    return this.app.makePath(path || defaultPath);
+  }
+  /**
+   * Try to locate the SSR entrypoint file based
+   * on the conventional locations
+   */
+  async detectSsrEntrypoint(defaultPath) {
+    const possiblesLocations = [
+      "./resources/ssr.ts",
+      "./resources/ssr.tsx",
+      "./resources/application/ssr.ts",
+      "./resources/application/ssr.tsx",
+      "./resources/ssr.jsx",
+      "./resources/ssr.js",
+      "./resources/application/ssr.jsx",
+      "./resources/application/ssr.js"
+    ];
+    const path = await locatePath(possiblesLocations, { cwd: this.app.appRoot });
+    return this.app.makePath(path || defaultPath);
+  }
+  /**
+   * Try to locate the SSR bundle file based
+   * on the conventional locations
+   */
+  async detectSsrBundle(defaultPath) {
+    const possiblesLocations = ["./ssr/ssr.js", "./ssr/ssr.mjs"];
+    const path = await locatePath(possiblesLocations, { cwd: this.app.appRoot });
+    return this.app.makePath(path || defaultPath);
+  }
+};
+
 // src/define_config.ts
+import { slash } from "@poppinss/utils";
 function defineConfig(config) {
   return configProvider.create(async (app) => {
+    const detector = new FilesDetector(app);
     const versionCache = new VersionCache(app.appRoot, config.assetsVersion);
     await versionCache.computeVersion();
     return {
+      versionCache,
       rootView: config.rootView ?? "root",
       sharedData: config.sharedData || {},
-      versionCache,
+      entrypoint: slash(config.entrypoint ?? await detector.detectEntrypoint("resources/app.ts")),
       ssr: {
         enabled: config.ssr?.enabled ?? false,
         pages: config.ssr?.pages,
-        entrypoint: config.ssr?.entrypoint ?? app.makePath("resources/ssr.ts"),
-        bundle: config.ssr?.bundle ?? app.makePath("ssr/ssr.js")
+        entrypoint: config.ssr?.entrypoint ?? await detector.detectSsrEntrypoint("resources/ssr.ts"),
+        bundle: config.ssr?.bundle ?? await detector.detectSsrBundle("ssr/ssr.js")
       }
     };
   });

package/build/providers/inertia_provider.d.ts

@@ -19,7 +19,13 @@ declare class InertiaProvider {
      * Registers edge plugin when edge is installed
      */
     protected registerEdgePlugin(): Promise<void>;
+    /**
+     * Register inertia middleware
+     */
     register(): Promise<void>;
+    /**
+     * Register edge plugin and brisk route macro
+     */
     boot(): Promise<void>;
 }
 

package/build/providers/inertia_provider.js

@@ -1,11 +1,11 @@
 import {
   InertiaMiddleware
-} from "../chunk-RTJXBXWZ.js";
+} from "../chunk-NVJNYWGW.js";
 
 // providers/inertia_provider.ts
 import { configProvider } from "@adonisjs/core";
-import { RuntimeException } from "@poppinss/utils";
 import { BriskRoute } from "@adonisjs/core/http";
+import { RuntimeException } from "@poppinss/utils";
 var InertiaProvider = class {
   constructor(app) {
     this.app = app;
@@ -20,6 +20,9 @@ var InertiaProvider = class {
     const { edgePluginInertia } = await import("../src/plugins/edge/plugin.js");
     edgeExports.default.use(edgePluginInertia());
   }
+  /**
+   * Register inertia middleware
+   */
   async register() {
     this.app.container.singleton(InertiaMiddleware, async () => {
       const inertiaConfigProvider = this.app.config.get("inertia");
@@ -33,6 +36,9 @@ var InertiaProvider = class {
       return new InertiaMiddleware(config, vite);
     });
   }
+  /**
+   * Register edge plugin and brisk route macro
+   */
   async boot() {
     await this.registerEdgePlugin();
     BriskRoute.macro("renderInertia", function(template, props, viewProps) {

package/build/react/app.tsx.stub

@@ -5,6 +5,7 @@ import './css/app.css';
 
 import { createRoot } from 'react-dom/client';
 import { createInertiaApp } from '@inertiajs/react';
+import { resolvePageComponent } from '@adonisjs/inertia/helpers'
 
 const appName = import.meta.env.VITE_APP_NAME || 'AdonisJS'
 
@@ -14,8 +15,10 @@ createInertiaApp({
   title: (title) => {{ '`${title} - ${appName}`' }},
 
   resolve: (name) => {
-    const pages = import.meta.glob('./pages/**/*.tsx', { eager: true })
-    {{ 'return pages[`./pages/${name}.tsx`]' }}
+    return resolvePageComponent(
+      {{ '`./pages/${name}.tsx`' }},
+      import.meta.glob<DefineComponent>('./pages/**/*.tsx'),
+    )
   },
 
   setup({ el, App, props }) {

package/build/react/root.edge.stub

@@ -11,7 +11,7 @@
   <title inertia>AdonisJS x Inertia x React</title>
 
   @viteReactRefresh()
-  @vite(['resources/app.tsx'])
+  {{ "@vite(['resources/app.tsx', `resources/pages/${page.component}.tsx`])" }}
   @inertiaHead()
 </head>
 

package/build/solid/app.tsx.stub

@@ -5,6 +5,7 @@ import './css/app.css'
 
 import { render } from 'solid-js/web'
 import { createInertiaApp } from 'inertia-adapter-solid'
+import { resolvePageComponent } from '@adonisjs/inertia/helpers'
 
 const appName = import.meta.env.VITE_APP_NAME || 'AdonisJS'
 
@@ -13,9 +14,11 @@ createInertiaApp({
 
   title: (title) => {{ '`${title} - ${appName}`' }},
 
-  resolve(name) {
-    const pages = import.meta.glob('./pages/**/*.tsx', { eager: true })
-    {{ 'return pages[`./pages/${name}.tsx`]' }}
+  resolve: (name) => {
+    return resolvePageComponent(
+      {{ '`./pages/${name}.tsx`' }},
+      import.meta.glob<DefineComponent>('./pages/**/*.tsx'),
+    )
   },
 
   setup({ el, App, props }) {

package/build/solid/root.edge.stub

@@ -10,7 +10,7 @@
 
   <title inertia>AdonisJS x Inertia x SolidJS</title>
 
-  @vite(['resources/app.tsx'])
+  {{ "@vite(['resources/app.tsx', `resources/pages/${page.component}.tsx`])" }}
   @inertiaHead()
 </head>
 

package/build/src/inertia_middleware.d.ts

@@ -1,7 +1,6 @@
 import { Vite } from '@adonisjs/vite';
 import { HttpContext } from '@adonisjs/core/http';
 import { NextFn } from '@adonisjs/core/types/http';
-import { ViteRuntime } from 'vite/runtime';
 import { ResolvedConfig, Data, PageProps, PageObject, MaybePromise } from './types.js';
 
 /**
@@ -15,8 +14,8 @@ declare class Inertia {
     #private;
     protected ctx: HttpContext;
     protected config: ResolvedConfig;
-    protected viteRuntime?: ViteRuntime | undefined;
-    constructor(ctx: HttpContext, config: ResolvedConfig, viteRuntime?: ViteRuntime | undefined);
+    protected vite?: Vite | undefined;
+    constructor(ctx: HttpContext, config: ResolvedConfig, vite?: Vite | undefined);
     /**
      * Share data for the current request.
      * This data will override any shared data defined in the config.
@@ -59,9 +58,9 @@ declare module '@adonisjs/core/http' {
  * set appropriate headers/status
  */
 declare class InertiaMiddleware {
-    #private;
     protected config: ResolvedConfig;
-    constructor(config: ResolvedConfig, vite?: Vite);
+    protected vite?: Vite | undefined;
+    constructor(config: ResolvedConfig, vite?: Vite | undefined);
     handle(ctx: HttpContext, next: NextFn): Promise<void>;
 }
 

package/build/src/inertia_middleware.js

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

package/build/src/types.d.ts

@@ -47,6 +47,10 @@ interface InertiaConfig {
      * @default root (resources/views/root.edge)
      */
     rootView?: string;
+    /**
+     * Path to your client-side entrypoint file.
+     */
+    entrypoint?: string;
     /**
      * The version of your assets. Every client request will be checked against this version.
      * If the version is not the same, the client will do a full reload.
@@ -85,6 +89,7 @@ interface ResolvedConfig {
     rootView: string;
     versionCache: VersionCache;
     sharedData: SharedData;
+    entrypoint: string;
     ssr: {
         enabled: boolean;
         entrypoint: string;

package/build/vue/app.ts.stub

@@ -6,6 +6,7 @@ import './css/app.css';
 import { createApp, h } from 'vue'
 import type { DefineComponent } from 'vue'
 import { createInertiaApp } from '@inertiajs/vue3'
+import { resolvePageComponent } from '@adonisjs/inertia/helpers'
 
 const appName = import.meta.env.VITE_APP_NAME || 'AdonisJS'
 
@@ -15,8 +16,10 @@ createInertiaApp({
   title: (title) => {{ '`${title} - ${appName}`' }},
 
   resolve: (name) => {
-    const pages = import.meta.glob<DefineComponent>('./pages/**/*.vue', { eager: true })
-    {{ 'return pages[`./pages/${name}.vue`]' }}
+    return resolvePageComponent(
+      {{ '`./pages/${name}.vue`' }},
+      import.meta.glob<DefineComponent>('./pages/**/*.vue'),
+    )
   },
 
   setup({ el, App, props, plugin }) {

package/build/vue/root.edge.stub

@@ -10,7 +10,7 @@
 
   <title inertia>AdonisJS x Inertia x VueJS</title>
 
-  @vite(['resources/app.ts'])
+  {{ "@vite(['resources/app.ts', `resources/pages/${page.component}.vue`])" }}
   @inertiaHead()
 </head>
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/inertia",
   "description": "Official Inertia.js adapter for AdonisJS",
-  "version": "1.0.0-12",
+  "version": "1.0.0-14",
   "engines": {
     "node": ">=18.16.0"
   },
@@ -44,7 +44,7 @@
     "@adonisjs/prettier-config": "^1.2.2",
     "@adonisjs/session": "7.1.1",
     "@adonisjs/tsconfig": "^1.2.2",
-    "@adonisjs/vite": "^3.0.0-4",
+    "@adonisjs/vite": "^3.0.0-6",
     "@japa/api-client": "^2.0.2",
     "@japa/assert": "2.1.0",
     "@japa/expect-type": "^2.0.1",
@@ -78,12 +78,13 @@
     "crc-32": "^1.2.2",
     "edge-error": "^4.0.1",
     "html-entities": "^2.4.0",
+    "locate-path": "^7.2.0",
     "qs": "^6.11.2"
   },
   "peerDependencies": {
     "@adonisjs/core": "^6.2.0",
     "@adonisjs/session": "^7.0.0",
-    "@adonisjs/vite": "^3.0.0-4",
+    "@adonisjs/vite": "^3.0.0-6",
     "@japa/api-client": "^2.0.0",
     "edge.js": "^6.0.0"
   },