olova 2.0.57 → 2.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "olova",
-  "version": "2.0.57",
+  "version": "2.0.60",
   "description": "Vite plugin for Olova SSR/SSG framework with React",
   "type": "module",
   "main": "./olova.ts",

package/src/generator/index.ts

@@ -86,7 +86,7 @@ export function generateRouteTree(
   const routeNames: { moduleName: string; lazyName: string; eager: boolean }[] = [];
 
   const routeImports = routes.map((route) => {
-    const relativePath = stripImportExtension('./' + path.relative(srcDir, route.component).replace(/\\/g, '/'));
+    const relativePath = stripImportExtension('./app/' + path.relative(srcDir, route.component).replace(/\\/g, '/'));
     // ALWAYS eager import for SSG - lazy() doesn't work with renderToString
     const moduleName = getRouteName(route.component, 'RouteModule');
     const lazyName = getRouteName(route.component, 'Route');
@@ -96,7 +96,7 @@ export function generateRouteTree(
 
   const notFoundNames: string[] = [];
   const notFoundImports = notFoundPages.map((nf) => {
-    const relativePath = stripImportExtension('./' + path.relative(srcDir, nf.filePath).replace(/\\/g, '/'));
+    const relativePath = stripImportExtension('./app/' + path.relative(srcDir, nf.filePath).replace(/\\/g, '/'));
     if (nf.hasMetadata) {
       const moduleName = getRouteName(nf.filePath, 'NotFoundModule');
       notFoundNames.push(moduleName);
@@ -111,7 +111,7 @@ export function generateRouteTree(
 
   const layoutNames: string[] = [];
   const layoutImports = layouts.map((layout) => {
-    const relativePath = stripImportExtension('./' + path.relative(srcDir, layout.filePath).replace(/\\/g, '/'));
+    const relativePath = stripImportExtension('./app/' + path.relative(srcDir, layout.filePath).replace(/\\/g, '/'));
     if (layout.hasMetadata) {
       const moduleName = getRouteName(layout.filePath, 'LayoutModule');
       layoutNames.push(moduleName);
@@ -126,7 +126,7 @@ export function generateRouteTree(
 
   const loadingNames: string[] = [];
   const loadingImports = loadingPages.map((lp) => {
-    const relativePath = stripImportExtension('./' + path.relative(srcDir, lp.filePath).replace(/\\/g, '/'));
+    const relativePath = stripImportExtension('./app/' + path.relative(srcDir, lp.filePath).replace(/\\/g, '/'));
     const importName = getRouteName(lp.filePath, 'Loading');
     loadingNames.push(importName);
     if (lp.hasDefault) return `import ${importName} from '${relativePath}';`;
@@ -136,7 +136,7 @@ export function generateRouteTree(
 
   const errorNames: string[] = [];
   const errorImports = errorPages.map((ep) => {
-    const relativePath = stripImportExtension('./' + path.relative(srcDir, ep.filePath).replace(/\\/g, '/'));
+    const relativePath = stripImportExtension('./app/' + path.relative(srcDir, ep.filePath).replace(/\\/g, '/'));
     const importName = getRouteName(ep.filePath, 'Error');
     errorNames.push(importName);
     if (ep.hasDefault) return `import ${importName} from '${relativePath}';`;
@@ -146,7 +146,7 @@ export function generateRouteTree(
 
   const middlewareNames: string[] = [];
   const middlewareImports = middlewares.map((mw) => {
-    const relativePath = stripImportExtension('./' + path.relative(srcDir, mw.filePath).replace(/\\/g, '/'));
+    const relativePath = stripImportExtension('./app/' + path.relative(srcDir, mw.filePath).replace(/\\/g, '/'));
     const importName = getRouteName(mw.filePath, 'Middleware');
     middlewareNames.push(importName);
     if (mw.hasDefault) return `import ${importName} from '${relativePath}';`;

package/src/plugin/index.ts

@@ -8,7 +8,7 @@ import type { ErrorWithExport, LayoutWithExport, LoadingWithExport, MiddlewareWi
 import { detectExportType, getRouteName } from '../utils';
 
 export function olovaRouter(options: OlovaRouterOptions = {}): PluginOption[] {
-  const rootDir = options.rootDir || 'src';
+  const rootDir = options.rootDir || 'src/app';
   const extensions = options.extensions || ['.tsx', '.ts', '.mdx'];
   const packageName = options.packageName || 'olovastart';
 
@@ -98,7 +98,7 @@ export function olovaRouter(options: OlovaRouterOptions = {}): PluginOption[] {
     });
 
     const content = generateRouteTree(routeConfigs, notFoundConfigs, layoutConfigs, loadingConfigs, errorConfigs, middlewareConfigs, absoluteRootDir, packageName);
-    const treePath = path.resolve(absoluteRootDir, 'route.tree.ts');
+    const treePath = path.resolve(config.root, 'src', 'route.tree.ts');
 
     const existing = fs.existsSync(treePath) ? fs.readFileSync(treePath, 'utf-8') : '';
     if (existing !== content) {
@@ -117,9 +117,9 @@ export function olovaRouter(options: OlovaRouterOptions = {}): PluginOption[] {
       const ext = path.extname(filename);
       const isConfiguredExtension = extensions.includes(ext);
 
-      const isIndexFile = (filename.includes('index') && isConfiguredExtension);
-      const isAppFile = (filename.includes('App') && isConfiguredExtension);
+      const isPageFile = (filename.includes('page') && isConfiguredExtension);
       const is404File = (filename.includes('404') && isConfiguredExtension);
+      const isNotFoundFile = (filename.includes('not-found') && isConfiguredExtension);
       const isLayoutFile = (filename.includes('layout') && isConfiguredExtension);
       const isLoadingFile = (filename.includes('loading') && isConfiguredExtension);
       const isErrorFile = (filename.includes('error') && isConfiguredExtension);
@@ -128,8 +128,8 @@ export function olovaRouter(options: OlovaRouterOptions = {}): PluginOption[] {
       const isDynamicSegment = filename.includes('[');
       const isRenameEvent = eventType === 'rename';
 
-      if (isIndexFile || isAppFile || is404File || isLayoutFile || isLoadingFile || isErrorFile || isMiddlewareFile || isDirectory || isDynamicSegment || isRenameEvent) {
-        if (isIndexFile && filename) {
+      if (isPageFile || is404File || isNotFoundFile || isLayoutFile || isLoadingFile || isErrorFile || isMiddlewareFile || isDirectory || isDynamicSegment || isRenameEvent) {
+        if (isPageFile && filename) {
           const fullPath = path.join(absoluteRootDir, filename);
           if (fs.existsSync(fullPath)) {
             const stat = fs.statSync(fullPath);

package/src/scanner/index.ts

@@ -4,8 +4,8 @@ import type { ErrorEntry, LayoutEntry, LoadingEntry, MiddlewareEntry, NotFoundEn
 import { isRouteGroup, pathToRoute } from '../utils';
 
 const RESERVED_NAMES = new Set([
-  'index', 'layout', 'loading', 'error', '404', 'middleware',
-  'App', 'main', 'route.tree',
+  'page', 'layout', 'loading', 'error', 'not-found', 'middleware',
+  'route.tree',
 ]);
 
 function scanDirectory(
@@ -66,15 +66,13 @@ function scanDirectory(
           filePath: fullPath
         });
       }
-      else if (baseName === '404' && extensions.includes(ext)) {
+      else if ((baseName === 'not-found' || baseName === '404') && extensions.includes(ext)) {
         const relativeParts = path.relative(rootDir, dir).split(path.sep).filter(Boolean);
         const filteredParts = relativeParts.filter(p => !isRouteGroup(p));
         const pathPrefix = isRoot ? '' : '/' + filteredParts.join('/');
         notFoundPages.push({ pathPrefix: pathPrefix || '', filePath: fullPath });
-      } else if (isRoot && baseName === 'App' && extensions.includes(ext)) {
-        routes.push({ path: '/', filePath: fullPath, isDynamic: false, params: [] });
-      } else if (!isRoot && baseName === 'index' && extensions.includes(ext)) {
-        const relativePath = path.relative(rootDir, path.dirname(fullPath));
+      } else if (baseName === 'page' && extensions.includes(ext)) {
+        const relativePath = path.relative(rootDir, dir);
         const { routePath, params } = pathToRoute(relativePath, path.sep);
         routes.push({ path: routePath, filePath: fullPath, isDynamic: params.length > 0, params });
       } else if (

package/src/types/index.ts

@@ -41,7 +41,6 @@ export interface GeneratorOptions {
 }
 
 export interface OlovaRouterOptions {
-  rootDir?: string;
   extensions?: string[];
   packageName?: string;
 }