From 6316b2f0d9a0e19b34bcaf492eefd636c4c82f1a Mon Sep 17 00:00:00 2001
From: Julien Ripouteau <julien@ripouteau.com>
Date: Fri, 8 Mar 2024 01:05:09 +0100
Subject: [PATCH 1/6] refactor: move stubs to `inertia` directory

---
 configure.ts                    | 12 +++---
 src/define_config.ts            |  6 ++-
 src/files_detector.ts           | 14 +++---
 stubs/app.css.stub              |  2 +-
 stubs/config.stub               |  2 +-
 stubs/react/app.tsx.stub        |  8 ++--
 stubs/react/home.tsx.stub       |  2 +-
 stubs/react/root.edge.stub      |  2 +-
 stubs/react/ssr.tsx.stub        |  6 +--
 stubs/react/tsconfig.json.stub  | 16 ++-----
 stubs/solid/app.tsx.stub        |  8 ++--
 stubs/solid/home.tsx.stub       |  5 +--
 stubs/solid/root.edge.stub      |  2 +-
 stubs/solid/ssr.tsx.stub        |  6 +--
 stubs/solid/tsconfig.json.stub  | 20 +++------
 stubs/svelte/app.ts.stub        |  8 ++--
 stubs/svelte/home.svelte.stub   |  2 +-
 stubs/svelte/root.edge.stub     |  2 +-
 stubs/svelte/ssr.ts.stub        |  6 +--
 stubs/svelte/tsconfig.json.stub | 18 ++------
 stubs/vue/app.ts.stub           |  8 ++--
 stubs/vue/home.vue.stub         |  2 +-
 stubs/vue/root.edge.stub        |  2 +-
 stubs/vue/ssr.ts.stub           |  6 +--
 stubs/vue/tsconfig.json.stub    | 20 +++------
 tests/configure.spec.ts         | 76 ++++++++++++++++-----------------
 tests/define_config.spec.ts     |  4 +-
 27 files changed, 110 insertions(+), 155 deletions(-)

diff --git a/configure.ts b/configure.ts
index 79b0b69..080a49a 100644
--- a/configure.ts
+++ b/configure.ts
@@ -43,7 +43,7 @@ const ADAPTERS_INFO: {
       pluginCall: 'vue()',
       importDeclarations: [{ isNamed: false, module: '@vitejs/plugin-vue', identifier: 'vue' }],
     },
-    ssrEntrypoint: 'resources/ssr.ts',
+    ssrEntrypoint: 'inertia/app/ssr.ts',
   },
   react: {
     stubFolder: 'react',
@@ -61,7 +61,7 @@ const ADAPTERS_INFO: {
       pluginCall: 'react()',
       importDeclarations: [{ isNamed: false, module: '@vitejs/plugin-react', identifier: 'react' }],
     },
-    ssrEntrypoint: 'resources/ssr.tsx',
+    ssrEntrypoint: 'inertia/app/ssr.tsx',
   },
   svelte: {
     stubFolder: 'svelte',
@@ -79,7 +79,7 @@ const ADAPTERS_INFO: {
         { isNamed: true, module: '@sveltejs/vite-plugin-svelte', identifier: 'svelte' },
       ],
     },
-    ssrEntrypoint: 'resources/ssr.ts',
+    ssrEntrypoint: 'inertia/app/ssr.ts',
   },
   solid: {
     stubFolder: 'solid',
@@ -96,7 +96,7 @@ const ADAPTERS_INFO: {
       ssrPluginCall: 'solid({ ssr: true })',
       importDeclarations: [{ isNamed: false, module: 'vite-plugin-solid', identifier: 'solid' }],
     },
-    ssrEntrypoint: 'resources/ssr.tsx',
+    ssrEntrypoint: 'inertia/app/ssr.tsx',
   },
 }
 
@@ -214,7 +214,7 @@ export async function configure(command: Configure) {
    * Register the inertia plugin in vite config
    */
   const inertiaPluginCall = ssr
-    ? `inertia({ ssr: { enabled: true, entrypoint: 'resources/ssr.${appExt}' } })`
+    ? `inertia({ ssr: { enabled: true, entrypoint: 'inertia/app/ssr.${appExt}' } })`
     : `inertia({ ssr: { enabled: false } })`
 
   await codemods.registerVitePlugin(inertiaPluginCall, [
@@ -234,7 +234,7 @@ export async function configure(command: Configure) {
   /**
    * Register vite with adonisjs plugin
    */
-  const adonisjsPluginCall = `adonisjs({ entrypoints: ['resources/app.${appExt}'], reload: ['resources/views/**/*.edge'] })`
+  const adonisjsPluginCall = `adonisjs({ entrypoints: ['inertia/app/app.${appExt}'], reload: ['resources/views/**/*.edge'] })`
   await codemods.registerVitePlugin(adonisjsPluginCall, [
     { isNamed: false, module: '@adonisjs/vite/client', identifier: 'adonisjs' },
   ])
diff --git a/src/define_config.ts b/src/define_config.ts
index 45c885a..d938800 100644
--- a/src/define_config.ts
+++ b/src/define_config.ts
@@ -28,12 +28,14 @@ export function defineConfig(config: InertiaConfig): ConfigProvider<ResolvedConf
       versionCache,
       rootView: config.rootView ?? 'root',
       sharedData: config.sharedData || {},
-      entrypoint: slash(config.entrypoint ?? (await detector.detectEntrypoint('resources/app.ts'))),
+      entrypoint: slash(
+        config.entrypoint ?? (await detector.detectEntrypoint('inertia/app/app.ts'))
+      ),
       ssr: {
         enabled: config.ssr?.enabled ?? false,
         pages: config.ssr?.pages,
         entrypoint:
-          config.ssr?.entrypoint ?? (await detector.detectSsrEntrypoint('resources/ssr.ts')),
+          config.ssr?.entrypoint ?? (await detector.detectSsrEntrypoint('inertia/app/ssr.ts')),
 
         bundle: config.ssr?.bundle ?? (await detector.detectSsrBundle('ssr/ssr.js')),
       },
diff --git a/src/files_detector.ts b/src/files_detector.ts
index 0af16d7..b17f47f 100644
--- a/src/files_detector.ts
+++ b/src/files_detector.ts
@@ -19,14 +19,13 @@ export class FilesDetector {
    */
   async detectEntrypoint(defaultPath: string) {
     const possiblesLocations = [
+      './inertia/app/app.ts',
+      './inertia/app/app.tsx',
       './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',
+      './inertia/app/app.jsx',
     ]
 
     const path = await locatePath(possiblesLocations, { cwd: this.app.appRoot })
@@ -39,14 +38,13 @@ export class FilesDetector {
    */
   async detectSsrEntrypoint(defaultPath: string) {
     const possiblesLocations = [
+      './inertia/app/ssr.ts',
+      './inertia/app/ssr.tsx',
       './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',
+      './inertia/app/ssr.jsx',
     ]
 
     const path = await locatePath(possiblesLocations, { cwd: this.app.appRoot })
diff --git a/stubs/app.css.stub b/stubs/app.css.stub
index 840a018..c4e1e58 100644
--- a/stubs/app.css.stub
+++ b/stubs/app.css.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/css/app.css') })
+  exports({ to: app.makePath('inertia/css/app.css') })
 }}}
 @import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;500&display=swap');
 
diff --git a/stubs/config.stub b/stubs/config.stub
index 9dd07a5..d7920a9 100644
--- a/stubs/config.stub
+++ b/stubs/config.stub
@@ -13,7 +13,7 @@ export default defineConfig({
    * Data that should be shared with all rendered pages
    */
   sharedData: {
-    errors: (ctx) => ctx.session.flashMessages.get('errors'),
+    errors: (ctx) => ctx.session?.flashMessages.get('errors'),
   },
 
   /**
diff --git a/stubs/react/app.tsx.stub b/stubs/react/app.tsx.stub
index 33ac58a..a00c5b0 100644
--- a/stubs/react/app.tsx.stub
+++ b/stubs/react/app.tsx.stub
@@ -1,7 +1,7 @@
 {{{
-  exports({ to: app.makePath('resources/app.tsx') })
+  exports({ to: app.makePath('inertia/app/app.tsx') })
 }}}
-import './css/app.css';
+import '../css/app.css';
 
 {{#if ssr}}
 import { hydrateRoot } from 'react-dom/client'
@@ -20,8 +20,8 @@ createInertiaApp({
 
   resolve: (name) => {
     return resolvePageComponent(
-      {{ '`./pages/${name}.tsx`' }},
-      import.meta.glob('./pages/**/*.tsx'),
+      {{ '`../pages/${name}.tsx`' }},
+      import.meta.glob('../pages/**/*.tsx'),
     )
   },
 
diff --git a/stubs/react/home.tsx.stub b/stubs/react/home.tsx.stub
index 345270b..065d46e 100644
--- a/stubs/react/home.tsx.stub
+++ b/stubs/react/home.tsx.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/pages/home.tsx') })
+  exports({ to: app.makePath('inertia/pages/home.tsx') })
 }}}
 import { Head } from '@inertiajs/react'
 
diff --git a/stubs/react/root.edge.stub b/stubs/react/root.edge.stub
index 69ad119..51f1f60 100644
--- a/stubs/react/root.edge.stub
+++ b/stubs/react/root.edge.stub
@@ -12,7 +12,7 @@
 
   @viteReactRefresh()
   @inertiaHead()
-  {{ "@vite(['resources/app.tsx', `resources/pages/${page.component}.tsx`])" }}
+  {{ "@vite(['inertia/app/app.tsx', `inertia/pages/${page.component}.tsx`])" }}
 </head>
 
 <body>
diff --git a/stubs/react/ssr.tsx.stub b/stubs/react/ssr.tsx.stub
index d22392b..7adbe4a 100644
--- a/stubs/react/ssr.tsx.stub
+++ b/stubs/react/ssr.tsx.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/ssr.tsx') })
+  exports({ to: app.makePath('inertia/app/ssr.tsx') })
 }}}
 import ReactDOMServer from 'react-dom/server'
 import { createInertiaApp } from '@inertiajs/react'
@@ -9,8 +9,8 @@ export default function render(page: any) {
     page,
     render: ReactDOMServer.renderToString,
     resolve: (name) => {
-      const pages = import.meta.glob('./pages/**/*.tsx', { eager: true })
-      {{ 'return pages[`./pages/${name}.tsx`]' }}
+      const pages = import.meta.glob('../pages/**/*.tsx', { eager: true })
+      {{ 'return pages[`../pages/${name}.tsx`]' }}
     },
     setup: ({ App, props }) => <App {...props} />,
   })
diff --git a/stubs/react/tsconfig.json.stub b/stubs/react/tsconfig.json.stub
index e6ecf13..872babd 100644
--- a/stubs/react/tsconfig.json.stub
+++ b/stubs/react/tsconfig.json.stub
@@ -1,25 +1,15 @@
 {{{
-  exports({ to: app.makePath('resources/tsconfig.json') })
+  exports({ to: app.makePath('inertia/tsconfig.json') })
 }}}
 {
+  "extends": "@adonisjs/tsconfig/tsconfig.client.json",
   "compilerOptions": {
-    "target": "ESNext",
-    "jsx": "react-jsx",
-    "lib": ["DOM", "ESNext", "DOM.Iterable", "ES2020"],
-    "useDefineForClassFields": true,
     "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "Bundler",
+    "jsx": "react-jsx",
     "paths": {
-      "@/*": ["./*"],
       "~/*": ["../*"],
     },
-    "resolveJsonModule": true,
-    "types": ["vite/client"],
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
-    "skipLibCheck": true,
   },
   "include": ["./**/*.ts", "./**/*.tsx"],
 }
diff --git a/stubs/solid/app.tsx.stub b/stubs/solid/app.tsx.stub
index d4471ad..3854ace 100644
--- a/stubs/solid/app.tsx.stub
+++ b/stubs/solid/app.tsx.stub
@@ -1,7 +1,7 @@
 {{{
-  exports({ to: app.makePath('resources/app.tsx') })
+  exports({ to: app.makePath('inertia/app/app.tsx') })
 }}}
-import './css/app.css'
+import '../css/app.css'
 
 {{#if ssr}}
 import { hydrate } from 'solid-js/web';
@@ -20,8 +20,8 @@ createInertiaApp({
 
   resolve: (name) => {
     return resolvePageComponent(
-      {{ '`./pages/${name}.tsx`' }},
-      import.meta.glob('./pages/**/*.tsx'),
+      {{ '`../pages/${name}.tsx`' }},
+      import.meta.glob('../pages/**/*.tsx'),
     )
   },
 
diff --git a/stubs/solid/home.tsx.stub b/stubs/solid/home.tsx.stub
index f118de8..3a72152 100644
--- a/stubs/solid/home.tsx.stub
+++ b/stubs/solid/home.tsx.stub
@@ -1,13 +1,10 @@
 {{{
-  exports({ to: app.makePath('resources/pages/home.tsx') })
+  exports({ to: app.makePath('inertia/pages/home.tsx') })
 }}}
-import { Title } from '@solidjs/meta'
 
 export default function Home(props: { version: number }) {
   return (
     <>
-      <Title>Homepage</Title>
-
       <div class="container">
         <div class="title">AdonisJS {props.version} x Inertia x Solid.js</div>
 
diff --git a/stubs/solid/root.edge.stub b/stubs/solid/root.edge.stub
index 4287d3f..0929992 100644
--- a/stubs/solid/root.edge.stub
+++ b/stubs/solid/root.edge.stub
@@ -11,7 +11,7 @@
   <title inertia>AdonisJS x Inertia x SolidJS</title>
 
   @inertiaHead()
-  {{ "@vite(['resources/app.tsx', `resources/pages/${page.component}.tsx`])" }}
+  {{ "@vite(['inertia/app/app.tsx', `inertia/pages/${page.component}.tsx`])" }}
 </head>
 
 <body>
diff --git a/stubs/solid/ssr.tsx.stub b/stubs/solid/ssr.tsx.stub
index a4bdbed..5a6fc1b 100644
--- a/stubs/solid/ssr.tsx.stub
+++ b/stubs/solid/ssr.tsx.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/ssr.tsx') })
+  exports({ to: app.makePath('inertia/app/ssr.tsx') })
 }}}
 
 import { hydrate } from 'solid-js/web'
@@ -9,8 +9,8 @@ export default function render(page: any) {
   return createInertiaApp({
     page,
     resolve: (name) => {
-      const pages = import.meta.glob('./pages/**/*.tsx', { eager: true })
-      {{ 'return pages[`./pages/${name}.tsx`]' }}
+      const pages = import.meta.glob('../pages/**/*.tsx', { eager: true })
+      {{ 'return pages[`../pages/${name}.tsx`]' }}
     },
     setup({ el, App, props }) {
       hydrate(() => <App {...props} />, el)
diff --git a/stubs/solid/tsconfig.json.stub b/stubs/solid/tsconfig.json.stub
index 141bd8a..70b4969 100644
--- a/stubs/solid/tsconfig.json.stub
+++ b/stubs/solid/tsconfig.json.stub
@@ -1,26 +1,16 @@
 {{{
-  exports({ to: app.makePath('resources/tsconfig.json') })
+  exports({ to: app.makePath('inertia/tsconfig.json') })
 }}}
 {
+  "extends": "@adonisjs/tsconfig/tsconfig.client.json",
   "compilerOptions": {
-    "target": "ESNext",
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "lib": ["DOM", "ESNext", "DOM.Iterable", "ES2020"],
-    "useDefineForClassFields": true,
     "baseUrl": ".",
+    "jsx": "preserve",
     "module": "ESNext",
-    "moduleResolution": "Bundler",
+    "jsxImportSource": "solid-js",
     "paths": {
-      "@/*": ["./*"],
-      "~/*": ["../*"],
+      "~/*": ["./*"],
     },
-    "resolveJsonModule": true,
-    "types": ["vite/client"],
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
-    "skipLibCheck": true,
   },
   "include": ["./**/*.ts", "./**/*.tsx"],
 }
diff --git a/stubs/svelte/app.ts.stub b/stubs/svelte/app.ts.stub
index fa68765..4d29ee5 100644
--- a/stubs/svelte/app.ts.stub
+++ b/stubs/svelte/app.ts.stub
@@ -1,7 +1,7 @@
 {{{
-  exports({ to: app.makePath('resources/app.ts') })
+  exports({ to: app.makePath('inertia/app/app.ts') })
 }}}
-import './css/app.css';
+import '../css/app.css';
 
 import { createInertiaApp } from '@inertiajs/svelte'
 import { resolvePageComponent } from '@adonisjs/inertia/helpers'
@@ -15,8 +15,8 @@ createInertiaApp({
 
   resolve: (name) => {
     return resolvePageComponent(
-      {{ '`./pages/${name}.svelte`' }},
-      import.meta.glob('./pages/**/*.svelte'),
+      {{ '`../pages/${name}.svelte`' }},
+      import.meta.glob('../pages/**/*.svelte'),
     )
   },
 
diff --git a/stubs/svelte/home.svelte.stub b/stubs/svelte/home.svelte.stub
index 8891270..ba1ef6f 100644
--- a/stubs/svelte/home.svelte.stub
+++ b/stubs/svelte/home.svelte.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/pages/home.svelte') })
+  exports({ to: app.makePath('inertia/pages/home.svelte') })
 }}}
 <script>
 export let version
diff --git a/stubs/svelte/root.edge.stub b/stubs/svelte/root.edge.stub
index 2aba902..2cf9580 100644
--- a/stubs/svelte/root.edge.stub
+++ b/stubs/svelte/root.edge.stub
@@ -10,7 +10,7 @@
 
   <title inertia>AdonisJS x Inertia x Svelte</title>
 
-  {{ "@vite(['resources/app.ts', `resources/pages/${page.component}.svelte`])" }}
+  {{ "@vite(['inertia/app/app.ts', `inertia/pages/${page.component}.svelte`])" }}
   @inertiaHead()
 </head>
 
diff --git a/stubs/svelte/ssr.ts.stub b/stubs/svelte/ssr.ts.stub
index 0db5e57..5df80df 100644
--- a/stubs/svelte/ssr.ts.stub
+++ b/stubs/svelte/ssr.ts.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/ssr.ts') })
+  exports({ to: app.makePath('inertia/app/ssr.ts') })
 }}}
 
 import { createInertiaApp } from '@inertiajs/svelte'
@@ -8,8 +8,8 @@ export default function render(page: any) {
   return createInertiaApp({
     page,
     resolve: (name) => {
-      const pages = import.meta.glob('./pages/**/*.svelte', { eager: true })
-      {{ 'return pages[`./pages/${name}.svelte`]' }}
+      const pages = import.meta.glob('../pages/**/*.svelte', { eager: true })
+      {{ 'return pages[`../pages/${name}.svelte`]' }}
     }
   })
 }
diff --git a/stubs/svelte/tsconfig.json.stub b/stubs/svelte/tsconfig.json.stub
index 873c43d..c3102ee 100644
--- a/stubs/svelte/tsconfig.json.stub
+++ b/stubs/svelte/tsconfig.json.stub
@@ -1,26 +1,14 @@
 {{{
-  exports({ to: app.makePath('resources/tsconfig.json') })
+  exports({ to: app.makePath('inertia/tsconfig.json') })
 }}}
 {
+  "extends": "@adonisjs/tsconfig/tsconfig.client.json",
   "compilerOptions": {
-    "target": "ESNext",
-    "jsx": "preserve",
-    "jsxImportSource": "vue",
-    "lib": ["DOM", "ESNext", "DOM.Iterable", "ES2020"],
-    "useDefineForClassFields": true,
     "baseUrl": ".",
     "module": "ESNext",
-    "moduleResolution": "Bundler",
     "paths": {
-      "@/*": ["./*"],
-      "~/*": ["../*"],
+      "~/*": ["./*"],
     },
-    "resolveJsonModule": true,
-    "types": ["vite/client"],
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
-    "skipLibCheck": true,
   },
   "include": ["./**/*.ts", "./**/*.svelte"],
 }
diff --git a/stubs/vue/app.ts.stub b/stubs/vue/app.ts.stub
index 9d3450c..984144d 100644
--- a/stubs/vue/app.ts.stub
+++ b/stubs/vue/app.ts.stub
@@ -1,7 +1,7 @@
 {{{
-  exports({ to: app.makePath('resources/app.ts') })
+  exports({ to: app.makePath('inertia/app/app.ts') })
 }}}
-import './css/app.css';
+import '../css/app.css';
 
 {{#if ssr}}
 import { createSSRApp, h } from 'vue'
@@ -21,8 +21,8 @@ createInertiaApp({
 
   resolve: (name) => {
     return resolvePageComponent(
-      {{ '`./pages/${name}.vue`' }},
-      import.meta.glob<DefineComponent>('./pages/**/*.vue'),
+      {{ '`../pages/${name}.vue`' }},
+      import.meta.glob<DefineComponent>('../pages/**/*.vue'),
     )
   },
 
diff --git a/stubs/vue/home.vue.stub b/stubs/vue/home.vue.stub
index d2922ea..a944c19 100644
--- a/stubs/vue/home.vue.stub
+++ b/stubs/vue/home.vue.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/pages/home.vue') })
+  exports({ to: app.makePath('inertia/pages/home.vue') })
 }}}
 <script setup lang="ts">
 import { Head } from '@inertiajs/vue3'
diff --git a/stubs/vue/root.edge.stub b/stubs/vue/root.edge.stub
index 6845d42..04442f3 100644
--- a/stubs/vue/root.edge.stub
+++ b/stubs/vue/root.edge.stub
@@ -10,7 +10,7 @@
 
   <title inertia>AdonisJS x Inertia x VueJS</title>
 
-  {{ "@vite(['resources/app.ts', `resources/pages/${page.component}.vue`])" }}
+  {{ "@vite(['inertia/app.ts', `inertia/pages/${page.component}.vue`])" }}
   @inertiaHead()
 </head>
 
diff --git a/stubs/vue/ssr.ts.stub b/stubs/vue/ssr.ts.stub
index 260b3aa..86c7204 100644
--- a/stubs/vue/ssr.ts.stub
+++ b/stubs/vue/ssr.ts.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/ssr.ts') })
+  exports({ to: app.makePath('inertia/app/ssr.ts') })
 }}}
 
 import { createInertiaApp } from '@inertiajs/vue3'
@@ -11,8 +11,8 @@ export default function render(page: any) {
     page,
     render: renderToString,
     resolve: (name) => {
-      const pages = import.meta.glob<DefineComponent>('./pages/**/*.vue', { eager: true })
-      {{ 'return pages[`./pages/${name}.vue`]' }}
+      const pages = import.meta.glob<DefineComponent>('../pages/**/*.vue', { eager: true })
+      {{ 'return pages[`../pages/${name}.vue`]' }}
     },
 
     setup({ App, props, plugin }) {
diff --git a/stubs/vue/tsconfig.json.stub b/stubs/vue/tsconfig.json.stub
index 9157ced..61fc29a 100644
--- a/stubs/vue/tsconfig.json.stub
+++ b/stubs/vue/tsconfig.json.stub
@@ -1,26 +1,16 @@
 {{{
-  exports({ to: app.makePath('resources/tsconfig.json') })
+  exports({ to: app.makePath('inertia/tsconfig.json') })
 }}}
 {
+  "extends": "@adonisjs/tsconfig/tsconfig.client.json",
   "compilerOptions": {
-    "target": "ESNext",
-    "jsx": "preserve",
-    "jsxImportSource": "vue",
-    "lib": ["DOM", "ESNext", "DOM.Iterable", "ES2020"],
-    "useDefineForClassFields": true,
     "baseUrl": ".",
+    "jsx": "preserve",
     "module": "ESNext",
-    "moduleResolution": "Bundler",
+    "jsxImportSource": "vue",
     "paths": {
-      "@/*": ["./*"],
-      "~/*": ["../*"],
+      "~/*": ["./*"],
     },
-    "resolveJsonModule": true,
-    "types": ["vite/client"],
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "verbatimModuleSyntax": true,
-    "skipLibCheck": true,
   },
   "include": ["./**/*.ts", "./**/*.vue"],
 }
diff --git a/tests/configure.spec.ts b/tests/configure.spec.ts
index f733054..c58e201 100644
--- a/tests/configure.spec.ts
+++ b/tests/configure.spec.ts
@@ -110,11 +110,11 @@ test.group('Frameworks', (group) => {
     const command = await ace.create(Configure, ['../../index.js'])
     await command.exec()
 
-    await assert.fileExists('resources/app.ts')
+    await assert.fileExists('inertia/app/app.ts')
     await assert.fileExists('resources/views/root.edge')
-    await assert.fileExists('resources/tsconfig.json')
-    await assert.fileExists('resources/pages/home.vue')
-    await assert.fileContains('resources/app.ts', 'createApp')
+    await assert.fileExists('inertia/tsconfig.json')
+    await assert.fileExists('inertia/pages/home.vue')
+    await assert.fileContains('inertia/app/app.ts', 'createApp')
 
     const viteConfig = await fs.contents('vite.config.ts')
     assert.snapshot(viteConfig).matchInline(`
@@ -122,7 +122,7 @@ test.group('Frameworks', (group) => {
       import vue from '@vitejs/plugin-vue'
       import adonisjs from '@adonisjs/vite/client'
 
-      export default { plugins: [inertia({ ssr: { enabled: false } }), vue(), adonisjs({ entrypoints: ['resources/app.ts'], reload: ['resources/views/**/*.edge'] })] }
+      export default { plugins: [inertia({ ssr: { enabled: false } }), vue(), adonisjs({ entrypoints: ['inertia/app/app.ts'], reload: ['resources/views/**/*.edge'] })] }
       "
     `)
   })
@@ -137,11 +137,11 @@ test.group('Frameworks', (group) => {
     const command = await ace.create(Configure, ['../../index.js'])
     await command.exec()
 
-    await assert.fileExists('resources/app.tsx')
+    await assert.fileExists('inertia/app/app.tsx')
     await assert.fileExists('resources/views/root.edge')
-    await assert.fileExists('resources/tsconfig.json')
-    await assert.fileExists('resources/pages/home.tsx')
-    await assert.fileContains('resources/app.tsx', 'createRoot')
+    await assert.fileExists('inertia/tsconfig.json')
+    await assert.fileExists('inertia/pages/home.tsx')
+    await assert.fileContains('inertia/app/app.tsx', 'createRoot')
 
     const viteConfig = await fs.contents('vite.config.ts')
     assert.snapshot(viteConfig).matchInline(`
@@ -149,7 +149,7 @@ test.group('Frameworks', (group) => {
       import react from '@vitejs/plugin-react'
       import adonisjs from '@adonisjs/vite/client'
 
-      export default { plugins: [inertia({ ssr: { enabled: false } }), react(), adonisjs({ entrypoints: ['resources/app.tsx'], reload: ['resources/views/**/*.edge'] })] }
+      export default { plugins: [inertia({ ssr: { enabled: false } }), react(), adonisjs({ entrypoints: ['inertia/app/app.tsx'], reload: ['resources/views/**/*.edge'] })] }
       "
     `)
   })
@@ -164,11 +164,11 @@ test.group('Frameworks', (group) => {
     const command = await ace.create(Configure, ['../../index.js'])
     await command.exec()
 
-    await assert.fileExists('resources/app.tsx')
+    await assert.fileExists('inertia/app/app.tsx')
     await assert.fileExists('resources/views/root.edge')
-    await assert.fileExists('resources/tsconfig.json')
-    await assert.fileExists('resources/pages/home.tsx')
-    await assert.fileNotContains('resources/app.tsx', 'hydrateRoot')
+    await assert.fileExists('inertia/tsconfig.json')
+    await assert.fileExists('inertia/pages/home.tsx')
+    await assert.fileNotContains('inertia/app/app.tsx', 'hydrateRoot')
 
     const viteConfig = await fs.contents('vite.config.ts')
     assert.snapshot(viteConfig).matchInline(`
@@ -176,7 +176,7 @@ test.group('Frameworks', (group) => {
       import solid from 'vite-plugin-solid'
       import adonisjs from '@adonisjs/vite/client'
 
-      export default { plugins: [inertia({ ssr: { enabled: false } }), solid(), adonisjs({ entrypoints: ['resources/app.tsx'], reload: ['resources/views/**/*.edge'] })] }
+      export default { plugins: [inertia({ ssr: { enabled: false } }), solid(), adonisjs({ entrypoints: ['inertia/app/app.tsx'], reload: ['resources/views/**/*.edge'] })] }
       "
     `)
   })
@@ -191,11 +191,11 @@ test.group('Frameworks', (group) => {
     const command = await ace.create(Configure, ['../../index.js'])
     await command.exec()
 
-    await assert.fileExists('resources/app.ts')
+    await assert.fileExists('inertia/app/app.ts')
     await assert.fileExists('resources/views/root.edge')
-    await assert.fileExists('resources/tsconfig.json')
-    await assert.fileExists('resources/pages/home.svelte')
-    await assert.fileNotContains('resources/app.ts', 'hydrate')
+    await assert.fileExists('inertia/tsconfig.json')
+    await assert.fileExists('inertia/pages/home.svelte')
+    await assert.fileNotContains('inertia/app/app.ts', 'hydrate')
 
     const viteConfig = await fs.contents('vite.config.ts')
     assert.snapshot(viteConfig).matchInline(`
@@ -203,7 +203,7 @@ test.group('Frameworks', (group) => {
       import { svelte } from '@sveltejs/vite-plugin-svelte'
       import adonisjs from '@adonisjs/vite/client'
 
-      export default { plugins: [inertia({ ssr: { enabled: false } }), svelte(), adonisjs({ entrypoints: ['resources/app.ts'], reload: ['resources/views/**/*.edge'] })] }
+      export default { plugins: [inertia({ ssr: { enabled: false } }), svelte(), adonisjs({ entrypoints: ['inertia/app/app.ts'], reload: ['resources/views/**/*.edge'] })] }
       "
     `)
   })
@@ -226,7 +226,7 @@ test.group('Frameworks | SSR', (group) => {
     const command = await ace.create(Configure, ['../../index.js'])
     await command.exec()
 
-    await assert.fileExists('resources/ssr.ts')
+    await assert.fileExists('inertia/app/ssr.ts')
     await assert.fileContains('vite.config.ts', 'inertia({ ssr: { enabled: true')
     const inertiaConfig = await fs.contents('config/inertia.ts')
     assert.snapshot(inertiaConfig).matchInline(`
@@ -242,7 +242,7 @@ test.group('Frameworks | SSR', (group) => {
          * Data that should be shared with all rendered pages
          */
         sharedData: {
-          errors: (ctx) => ctx.session.flashMessages.get('errors'),
+          errors: (ctx) => ctx.session?.flashMessages.get('errors'),
         },
 
         /**
@@ -250,7 +250,7 @@ test.group('Frameworks | SSR', (group) => {
          */
         ssr: {
           enabled: true,
-          entrypoint: 'resources/ssr.ts'
+          entrypoint: 'inertia/app/ssr.ts'
         }
       })"
     `)
@@ -266,12 +266,12 @@ test.group('Frameworks | SSR', (group) => {
     const command = await ace.create(Configure, ['../../index.js'])
     await command.exec()
 
-    await assert.fileExists('resources/app.tsx')
+    await assert.fileExists('inertia/app/app.tsx')
     await assert.fileContains(
       'vite.config.ts',
-      `inertia({ ssr: { enabled: true, entrypoint: 'resources/ssr.tsx' } })`
+      `inertia({ ssr: { enabled: true, entrypoint: 'inertia/app/ssr.tsx' } })`
     )
-    await assert.fileContains('resources/app.tsx', 'hydrateRoot')
+    await assert.fileContains('inertia/app/app.tsx', 'hydrateRoot')
 
     const inertiaConfig = await fs.contents('config/inertia.ts')
 
@@ -288,7 +288,7 @@ test.group('Frameworks | SSR', (group) => {
          * Data that should be shared with all rendered pages
          */
         sharedData: {
-          errors: (ctx) => ctx.session.flashMessages.get('errors'),
+          errors: (ctx) => ctx.session?.flashMessages.get('errors'),
         },
 
         /**
@@ -296,7 +296,7 @@ test.group('Frameworks | SSR', (group) => {
          */
         ssr: {
           enabled: true,
-          entrypoint: 'resources/ssr.tsx'
+          entrypoint: 'inertia/app/ssr.tsx'
         }
       })"
     `)
@@ -311,14 +311,14 @@ test.group('Frameworks | SSR', (group) => {
 
     const command = await ace.create(Configure, ['../../index.js'])
     await command.exec()
-    await assert.fileExists('resources/app.tsx')
+    await assert.fileExists('inertia/app/app.tsx')
     await assert.fileContains(
       'vite.config.ts',
-      `inertia({ ssr: { enabled: true, entrypoint: 'resources/ssr.tsx' } })`
+      `inertia({ ssr: { enabled: true, entrypoint: 'inertia/app/ssr.tsx' } })`
     )
 
     await assert.fileContains('vite.config.ts', `solid({ ssr: true })`)
-    await assert.fileContains('resources/app.tsx', 'hydrate')
+    await assert.fileContains('inertia/app/app.tsx', 'hydrate')
 
     const inertiaConfig = await fs.contents('config/inertia.ts')
     assert.snapshot(inertiaConfig).matchInline(`
@@ -334,7 +334,7 @@ test.group('Frameworks | SSR', (group) => {
          * Data that should be shared with all rendered pages
          */
         sharedData: {
-          errors: (ctx) => ctx.session.flashMessages.get('errors'),
+          errors: (ctx) => ctx.session?.flashMessages.get('errors'),
         },
 
         /**
@@ -342,7 +342,7 @@ test.group('Frameworks | SSR', (group) => {
          */
         ssr: {
           enabled: true,
-          entrypoint: 'resources/ssr.tsx'
+          entrypoint: 'inertia/app/ssr.tsx'
         }
       })"
     `)
@@ -358,11 +358,11 @@ test.group('Frameworks | SSR', (group) => {
     const command = await ace.create(Configure, ['../../index.js'])
     await command.exec()
 
-    await assert.fileExists('resources/app.ts')
+    await assert.fileExists('inertia/app/app.ts')
     await assert.fileExists('resources/views/root.edge')
-    await assert.fileExists('resources/tsconfig.json')
-    await assert.fileExists('resources/pages/home.svelte')
-    await assert.fileContains('resources/app.ts', 'hydrate')
+    await assert.fileExists('inertia/tsconfig.json')
+    await assert.fileExists('inertia/pages/home.svelte')
+    await assert.fileContains('inertia/app/app.ts', 'hydrate')
 
     const viteConfig = await fs.contents('vite.config.ts')
     assert.snapshot(viteConfig).matchInline(`
@@ -370,7 +370,7 @@ test.group('Frameworks | SSR', (group) => {
       import { svelte } from '@sveltejs/vite-plugin-svelte'
       import adonisjs from '@adonisjs/vite/client'
 
-      export default { plugins: [inertia({ ssr: { enabled: true, entrypoint: 'resources/ssr.ts' } }), svelte({ compilerOptions: { hydratable: true } }), adonisjs({ entrypoints: ['resources/app.ts'], reload: ['resources/views/**/*.edge'] })] }
+      export default { plugins: [inertia({ ssr: { enabled: true, entrypoint: 'inertia/app/ssr.ts' } }), svelte({ compilerOptions: { hydratable: true } }), adonisjs({ entrypoints: ['inertia/app/app.ts'], reload: ['resources/views/**/*.edge'] })] }
       "
     `)
   })
diff --git a/tests/define_config.spec.ts b/tests/define_config.spec.ts
index f02d41b..09c4aeb 100644
--- a/tests/define_config.spec.ts
+++ b/tests/define_config.spec.ts
@@ -16,7 +16,7 @@ import { setupApp } from '../tests_helpers/index.js'
 
 test.group('Define Config', () => {
   test('detect entrypoint automatically - "{$self}"')
-    .with(['resources/application/app.tsx', 'resources/app.ts', 'resources/app.tsx'])
+    .with(['inertia/app/app.tsx', 'resources/app.ts', 'resources/app.tsx'])
     .run(async ({ assert, fs }, filePath) => {
       const { app } = await setupApp()
       const configProvider = defineConfig({})
@@ -40,7 +40,7 @@ test.group('Define Config', () => {
     })
 
   test('detect ssr entrypoint automatically - "{$self}"')
-    .with(['resources/application/ssr.tsx', 'resources/ssr.ts', 'resources/ssr.tsx'])
+    .with(['inertia/app/ssr.tsx', 'resources/ssr.ts', 'resources/ssr.tsx'])
     .run(async ({ assert, fs }, filePath) => {
       const { app } = await setupApp()
       const configProvider = defineConfig({})

From c3631eff310792401f3e6a890b75f6d0b1da88d2 Mon Sep 17 00:00:00 2001
From: Julien Ripouteau <julien@ripouteau.com>
Date: Fri, 8 Mar 2024 01:06:38 +0100
Subject: [PATCH 2/6] chore: move inertia middleware to server stack

---
 configure.ts            | 2 +-
 tests/configure.spec.ts | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ts b/configure.ts
index 080a49a..498ff8a 100644
--- a/configure.ts
+++ b/configure.ts
@@ -185,7 +185,7 @@ export async function configure(command: Configure) {
   /**
    * Add Inertia middleware
    */
-  await codemods.registerMiddleware('router', [
+  await codemods.registerMiddleware('server', [
     { path: '@adonisjs/inertia/inertia_middleware', position: 'after' },
   ])
 
diff --git a/tests/configure.spec.ts b/tests/configure.spec.ts
index c58e201..79b57b4 100644
--- a/tests/configure.spec.ts
+++ b/tests/configure.spec.ts
@@ -27,10 +27,9 @@ async function setupFakeAdonisproject(fs: FileSystem) {
 
       router.use([
         () => import('@adonisjs/core/bodyparser_middleware'),
-        () => import('@adonisjs/session/session_middleware'),
-        () => import('@adonisjs/shield/shield_middleware'),
-        () => import('@adonisjs/auth/initialize_auth_middleware'),
       ])
+
+      server.use([])
     `
     ),
   ])

From ec7b8cc6d148ebf153dc0fb9ad5c2f5a188fa752 Mon Sep 17 00:00:00 2001
From: Julien Ripouteau <julien@ripouteau.com>
Date: Fri, 8 Mar 2024 01:23:41 +0100
Subject: [PATCH 3/6] feat: add not_found and server_error components

---
 configure.ts                                 |  2 ++
 stubs/react/errors/not_found.tsx.stub        | 14 ++++++++++++++
 stubs/react/errors/server_error.tsx.stub     | 14 ++++++++++++++
 stubs/solid/errors/not_found.tsx.stub        | 14 ++++++++++++++
 stubs/solid/errors/server_error.tsx.stub     | 14 ++++++++++++++
 stubs/svelte/errors/not_found.svelte.stub    | 10 ++++++++++
 stubs/svelte/errors/server_error.svelte.stub | 14 ++++++++++++++
 stubs/vue/errors/not_found.vue.stub          | 10 ++++++++++
 stubs/vue/errors/server_error.vue.stub       | 14 ++++++++++++++
 tests/configure.spec.ts                      |  8 ++++++++
 10 files changed, 114 insertions(+)
 create mode 100644 stubs/react/errors/not_found.tsx.stub
 create mode 100644 stubs/react/errors/server_error.tsx.stub
 create mode 100644 stubs/solid/errors/not_found.tsx.stub
 create mode 100644 stubs/solid/errors/server_error.tsx.stub
 create mode 100644 stubs/svelte/errors/not_found.svelte.stub
 create mode 100644 stubs/svelte/errors/server_error.svelte.stub
 create mode 100644 stubs/vue/errors/not_found.vue.stub
 create mode 100644 stubs/vue/errors/server_error.vue.stub

diff --git a/configure.ts b/configure.ts
index 498ff8a..c47e9d4 100644
--- a/configure.ts
+++ b/configure.ts
@@ -205,6 +205,8 @@ export async function configure(command: Configure) {
   await codemods.makeUsingStub(stubsRoot, `${stubFolder}/tsconfig.json.stub`, {})
   await codemods.makeUsingStub(stubsRoot, `${stubFolder}/app.${appExt}.stub`, { ssr })
   await codemods.makeUsingStub(stubsRoot, `${stubFolder}/home.${compExt}.stub`, {})
+  await codemods.makeUsingStub(stubsRoot, `${stubFolder}/errors/not_found.${compExt}.stub`, {})
+  await codemods.makeUsingStub(stubsRoot, `${stubFolder}/errors/server_error.${compExt}.stub`, {})
 
   if (ssr) {
     await codemods.makeUsingStub(stubsRoot, `${stubFolder}/ssr.${appExt}.stub`, {})
diff --git a/stubs/react/errors/not_found.tsx.stub b/stubs/react/errors/not_found.tsx.stub
new file mode 100644
index 0000000..1ec6b89
--- /dev/null
+++ b/stubs/react/errors/not_found.tsx.stub
@@ -0,0 +1,14 @@
+{{{
+  exports({ to: app.makePath('inertia/pages/errors/not_found.tsx') })
+}}}
+export default function NotFound() {
+  return (
+    <>
+      <div className="container">
+        <div className="title">Page not found</div>
+
+        <span>This page does not exist.</span>
+      </div>
+    </>
+  )
+}
diff --git a/stubs/react/errors/server_error.tsx.stub b/stubs/react/errors/server_error.tsx.stub
new file mode 100644
index 0000000..919ded4
--- /dev/null
+++ b/stubs/react/errors/server_error.tsx.stub
@@ -0,0 +1,14 @@
+{{{
+  exports({ to: app.makePath('inertia/pages/errors/server_error.tsx') })
+}}}
+export default function ServerError(props: { error: any }) {
+  return (
+    <>
+      <div className="container">
+        <div className="title">Server Error</div>
+
+        <span>{props.error.message}</span>
+      </div>
+    </>
+  )
+}
diff --git a/stubs/solid/errors/not_found.tsx.stub b/stubs/solid/errors/not_found.tsx.stub
new file mode 100644
index 0000000..9792a32
--- /dev/null
+++ b/stubs/solid/errors/not_found.tsx.stub
@@ -0,0 +1,14 @@
+{{{
+  exports({ to: app.makePath('inertia/pages/errors/not_found.tsx') })
+}}}
+export default function NotFound() {
+  return (
+    <>
+      <div class="container">
+        <div class="title">Page not found</div>
+
+        <span>This page does not exist.</span>
+      </div>
+    </>
+  )
+}
diff --git a/stubs/solid/errors/server_error.tsx.stub b/stubs/solid/errors/server_error.tsx.stub
new file mode 100644
index 0000000..e35db7b
--- /dev/null
+++ b/stubs/solid/errors/server_error.tsx.stub
@@ -0,0 +1,14 @@
+{{{
+  exports({ to: app.makePath('inertia/pages/errors/server_error.tsx') })
+}}}
+export default function ServerError(props: { error: any }) {
+  return (
+    <>
+      <div class="container">
+        <div class="title">Server Error</div>
+
+        <span>{props.error.message}</span>
+      </div>
+    </>
+  )
+}
diff --git a/stubs/svelte/errors/not_found.svelte.stub b/stubs/svelte/errors/not_found.svelte.stub
new file mode 100644
index 0000000..2ec6975
--- /dev/null
+++ b/stubs/svelte/errors/not_found.svelte.stub
@@ -0,0 +1,10 @@
+{{{
+  exports({ to: app.makePath('inertia/pages/errors/not_found.svelte') })
+}}}
+<div>
+  <div class="container">
+    <div class="title">Page not found</div>
+
+    <span>This page does not exist.</span>
+  </div>
+</div>
diff --git a/stubs/svelte/errors/server_error.svelte.stub b/stubs/svelte/errors/server_error.svelte.stub
new file mode 100644
index 0000000..e194620
--- /dev/null
+++ b/stubs/svelte/errors/server_error.svelte.stub
@@ -0,0 +1,14 @@
+{{{
+  exports({ to: app.makePath('inertia/pages/errors/server_error.svelte') })
+}}}
+<script>
+export let error
+</script>
+
+<div>
+  <div class="container">
+    <div class="title">Server Error</div>
+
+    <span>{error.message}</span>
+  </div>
+</div>
diff --git a/stubs/vue/errors/not_found.vue.stub b/stubs/vue/errors/not_found.vue.stub
new file mode 100644
index 0000000..098f68c
--- /dev/null
+++ b/stubs/vue/errors/not_found.vue.stub
@@ -0,0 +1,10 @@
+{{{
+  exports({ to: app.makePath('inertia/pages/errors/not_found.vue') })
+}}}
+<template>
+  <div class="container">
+    <div class="title">Page not found</div>
+
+    <span>This page does not exist.</span>
+  </div>
+</template>
diff --git a/stubs/vue/errors/server_error.vue.stub b/stubs/vue/errors/server_error.vue.stub
new file mode 100644
index 0000000..d4e0e18
--- /dev/null
+++ b/stubs/vue/errors/server_error.vue.stub
@@ -0,0 +1,14 @@
+{{{
+  exports({ to: app.makePath('inertia/pages/errors/server_error.vue') })
+}}}
+<script setup lang="ts">
+defineProps<{ error: any }>();
+</script>
+
+<template>
+  <div class="container">
+    <div class="title">Server Error</div>
+
+    <span>\{\{ error.message \}\}</span>
+  </div>
+</template>
diff --git a/tests/configure.spec.ts b/tests/configure.spec.ts
index 79b57b4..4b1c9a9 100644
--- a/tests/configure.spec.ts
+++ b/tests/configure.spec.ts
@@ -113,6 +113,8 @@ test.group('Frameworks', (group) => {
     await assert.fileExists('resources/views/root.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.vue')
+    await assert.fileExists('inertia/pages/errors/not_found.vue')
+    await assert.fileExists('inertia/pages/errors/server_error.vue')
     await assert.fileContains('inertia/app/app.ts', 'createApp')
 
     const viteConfig = await fs.contents('vite.config.ts')
@@ -140,6 +142,8 @@ test.group('Frameworks', (group) => {
     await assert.fileExists('resources/views/root.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.tsx')
+    await assert.fileExists('inertia/pages/errors/not_found.tsx')
+    await assert.fileExists('inertia/pages/errors/server_error.tsx')
     await assert.fileContains('inertia/app/app.tsx', 'createRoot')
 
     const viteConfig = await fs.contents('vite.config.ts')
@@ -167,6 +171,8 @@ test.group('Frameworks', (group) => {
     await assert.fileExists('resources/views/root.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.tsx')
+    await assert.fileExists('inertia/pages/errors/not_found.tsx')
+    await assert.fileExists('inertia/pages/errors/server_error.tsx')
     await assert.fileNotContains('inertia/app/app.tsx', 'hydrateRoot')
 
     const viteConfig = await fs.contents('vite.config.ts')
@@ -194,6 +200,8 @@ test.group('Frameworks', (group) => {
     await assert.fileExists('resources/views/root.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.svelte')
+    await assert.fileExists('inertia/pages/errors/not_found.svelte')
+    await assert.fileExists('inertia/pages/errors/server_error.svelte')
     await assert.fileNotContains('inertia/app/app.ts', 'hydrate')
 
     const viteConfig = await fs.contents('vite.config.ts')

From 66b90da91e3747646c6ceef9b5ebef6d885487da Mon Sep 17 00:00:00 2001
From: Julien Ripouteau <julien@ripouteau.com>
Date: Fri, 8 Mar 2024 01:37:21 +0100
Subject: [PATCH 4/6] fix: entrypoint vue

---
 stubs/vue/root.edge.stub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stubs/vue/root.edge.stub b/stubs/vue/root.edge.stub
index 04442f3..9780345 100644
--- a/stubs/vue/root.edge.stub
+++ b/stubs/vue/root.edge.stub
@@ -10,7 +10,7 @@
 
   <title inertia>AdonisJS x Inertia x VueJS</title>
 
-  {{ "@vite(['inertia/app.ts', `inertia/pages/${page.component}.vue`])" }}
+  {{ "@vite(['inertia/app/app.ts', `inertia/pages/${page.component}.vue`])" }}
   @inertiaHead()
 </head>
 

From 291081a83871620fe603566a6a289621fca9d947 Mon Sep 17 00:00:00 2001
From: Julien Ripouteau <julien@ripouteau.com>
Date: Fri, 8 Mar 2024 12:09:12 +0100
Subject: [PATCH 5/6] refactor: move to inertia_layout.edge

---
 src/define_config.ts        |  2 +-
 src/types.ts                |  2 +-
 stubs/config.stub           |  2 +-
 stubs/react/root.edge.stub  |  2 +-
 stubs/solid/root.edge.stub  |  2 +-
 stubs/svelte/root.edge.stub |  2 +-
 stubs/vue/root.edge.stub    |  2 +-
 tests/configure.spec.ts     | 16 ++++++++--------
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/define_config.ts b/src/define_config.ts
index d938800..ef67b67 100644
--- a/src/define_config.ts
+++ b/src/define_config.ts
@@ -26,7 +26,7 @@ export function defineConfig(config: InertiaConfig): ConfigProvider<ResolvedConf
 
     return {
       versionCache,
-      rootView: config.rootView ?? 'root',
+      rootView: config.rootView ?? 'inertia_layout',
       sharedData: config.sharedData || {},
       entrypoint: slash(
         config.entrypoint ?? (await detector.detectEntrypoint('inertia/app/app.ts'))
diff --git a/src/types.ts b/src/types.ts
index 00969fb..9896f73 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -32,7 +32,7 @@ export type AssetsVersion = string | number | undefined
 export interface InertiaConfig {
   /**
    * Path to the Edge view that will be used as the root view for Inertia responses.
-   * @default root (resources/views/root.edge)
+   * @default root (resources/views/inertia_layout.edge)
    */
   rootView?: string
 
diff --git a/stubs/config.stub b/stubs/config.stub
index d7920a9..7c541b7 100644
--- a/stubs/config.stub
+++ b/stubs/config.stub
@@ -7,7 +7,7 @@ export default defineConfig({
   /**
    * Path to the Edge view that will be used as the root view for Inertia responses
    */
-  rootView: 'root',
+  rootView: 'inertia_layout',
 
   /**
    * Data that should be shared with all rendered pages
diff --git a/stubs/react/root.edge.stub b/stubs/react/root.edge.stub
index 51f1f60..0fa9693 100644
--- a/stubs/react/root.edge.stub
+++ b/stubs/react/root.edge.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/views/root.edge') })
+  exports({ to: app.makePath('resources/views/inertia_layout.edge') })
 }}}
 <!DOCTYPE html>
 <html>
diff --git a/stubs/solid/root.edge.stub b/stubs/solid/root.edge.stub
index 0929992..a1531ba 100644
--- a/stubs/solid/root.edge.stub
+++ b/stubs/solid/root.edge.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/views/root.edge') })
+  exports({ to: app.makePath('resources/views/inertia_layout.edge') })
 }}}
 <!DOCTYPE html>
 <html>
diff --git a/stubs/svelte/root.edge.stub b/stubs/svelte/root.edge.stub
index 2cf9580..ad381d5 100644
--- a/stubs/svelte/root.edge.stub
+++ b/stubs/svelte/root.edge.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/views/root.edge') })
+  exports({ to: app.makePath('resources/views/inertia_layout.edge') })
 }}}
 <!DOCTYPE html>
 <html>
diff --git a/stubs/vue/root.edge.stub b/stubs/vue/root.edge.stub
index 9780345..bf8613b 100644
--- a/stubs/vue/root.edge.stub
+++ b/stubs/vue/root.edge.stub
@@ -1,5 +1,5 @@
 {{{
-  exports({ to: app.makePath('resources/views/root.edge') })
+  exports({ to: app.makePath('resources/views/inertia_layout.edge') })
 }}}
 <!DOCTYPE html>
 <html>
diff --git a/tests/configure.spec.ts b/tests/configure.spec.ts
index 4b1c9a9..539fb1a 100644
--- a/tests/configure.spec.ts
+++ b/tests/configure.spec.ts
@@ -110,7 +110,7 @@ test.group('Frameworks', (group) => {
     await command.exec()
 
     await assert.fileExists('inertia/app/app.ts')
-    await assert.fileExists('resources/views/root.edge')
+    await assert.fileExists('resources/views/inertia_layout.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.vue')
     await assert.fileExists('inertia/pages/errors/not_found.vue')
@@ -139,7 +139,7 @@ test.group('Frameworks', (group) => {
     await command.exec()
 
     await assert.fileExists('inertia/app/app.tsx')
-    await assert.fileExists('resources/views/root.edge')
+    await assert.fileExists('resources/views/inertia_layout.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.tsx')
     await assert.fileExists('inertia/pages/errors/not_found.tsx')
@@ -168,7 +168,7 @@ test.group('Frameworks', (group) => {
     await command.exec()
 
     await assert.fileExists('inertia/app/app.tsx')
-    await assert.fileExists('resources/views/root.edge')
+    await assert.fileExists('resources/views/inertia_layout.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.tsx')
     await assert.fileExists('inertia/pages/errors/not_found.tsx')
@@ -197,7 +197,7 @@ test.group('Frameworks', (group) => {
     await command.exec()
 
     await assert.fileExists('inertia/app/app.ts')
-    await assert.fileExists('resources/views/root.edge')
+    await assert.fileExists('resources/views/inertia_layout.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.svelte')
     await assert.fileExists('inertia/pages/errors/not_found.svelte')
@@ -243,7 +243,7 @@ test.group('Frameworks | SSR', (group) => {
         /**
          * Path to the Edge view that will be used as the root view for Inertia responses
          */
-        rootView: 'root',
+        rootView: 'inertia_layout',
 
         /**
          * Data that should be shared with all rendered pages
@@ -289,7 +289,7 @@ test.group('Frameworks | SSR', (group) => {
         /**
          * Path to the Edge view that will be used as the root view for Inertia responses
          */
-        rootView: 'root',
+        rootView: 'inertia_layout',
 
         /**
          * Data that should be shared with all rendered pages
@@ -335,7 +335,7 @@ test.group('Frameworks | SSR', (group) => {
         /**
          * Path to the Edge view that will be used as the root view for Inertia responses
          */
-        rootView: 'root',
+        rootView: 'inertia_layout',
 
         /**
          * Data that should be shared with all rendered pages
@@ -366,7 +366,7 @@ test.group('Frameworks | SSR', (group) => {
     await command.exec()
 
     await assert.fileExists('inertia/app/app.ts')
-    await assert.fileExists('resources/views/root.edge')
+    await assert.fileExists('resources/views/inertia_layout.edge')
     await assert.fileExists('inertia/tsconfig.json')
     await assert.fileExists('inertia/pages/home.svelte')
     await assert.fileContains('inertia/app/app.ts', 'hydrate')

From 21c413bb621f55142aed6292cb8c9a6df1148cfd Mon Sep 17 00:00:00 2001
From: Julien Ripouteau <julien@ripouteau.com>
Date: Fri, 8 Mar 2024 12:11:33 +0100
Subject: [PATCH 6/6] test: fix failing test

---
 tests/inertia.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/inertia.spec.ts b/tests/inertia.spec.ts
index a4803b8..1890796 100644
--- a/tests/inertia.spec.ts
+++ b/tests/inertia.spec.ts
@@ -55,7 +55,7 @@ test.group('Inertia', () => {
     const inertia = await new InertiaFactory().create()
     const result: any = await inertia.render('foo', { foo: 'bar' })
 
-    assert.deepEqual(result.view, 'root')
+    assert.deepEqual(result.view, 'inertia_layout')
     assert.deepEqual(result.props.page, {
       component: 'foo',
       version: '1',