minor cleanup

vikejs · May 24, 2021 · 59318f6 · 59318f6
1 parent ba150e2
commit 59318f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/examples/vue-router/.gitignore b/examples/vue-router/.gitignore
@@ -1,2 +1 @@
 /node_modules/
-dist
diff --git a/src/route.shared.ts b/src/route.shared.ts
@@ -245,7 +245,7 @@ function resolveRouteFunction(
 type PageRoute<T=string | Function | RouteFunctionMatch> = {
   pageRouteFile?: string
   pageRoute: T
-  id: PageId
+  pageId: PageId
 }
 async function loadPageRoutes(): Promise<Record<PageId, PageRoute>> {
   const userRouteFiles = await getPageFiles('.page.route')
@@ -261,10 +261,10 @@ async function loadPageRoutes(): Promise<Record<PageId, PageRoute>> {
         `The default export of ${filePath} should be a string or a function.`
       )
       const pageRoute = fileExports.default
-      const id = computePageId(filePath)
+      const pageId = computePageId(filePath)
       const pageRouteFile = filePath
 
-      pageRoutes[id] = { pageRoute, pageRouteFile, id }
+      pageRoutes[pageId] = { pageRoute, pageRouteFile, pageId }
     })
   )
 
@@ -302,8 +302,8 @@ function getRouteStrings(routes: PageRoute[], pageIds: PageId[]) {
   const { sortRoutes } = getCustomRouter();
 
   const fsRouteStrings : PageRoute[] = pageIds
-    .filter(pageId => !routes.some(route => route.id === pageId) && !isErrorPage(pageId))
-    .map(id => ({ pageRoute: getFilesystemRoute(id, pageIds), id }));
+    .filter(pageId => !routes.some(route => route.pageId === pageId) && !isErrorPage(pageId))
+    .map(pageId => ({ pageRoute: getFilesystemRoute(pageId, pageIds), pageId }));
 
   const routeStrings = Object.values(routes)
     .filter(route => !isCallable(route.pageRoute));
@@ -338,7 +338,7 @@ async function matchPathToRegexpRoutes(
 
   for (var ii = 0; ii < routes.length; ++ii) {
     const route = routes[ii];
-    const { pageRoute, id: pageId } = route;
+    const { pageRoute, pageId } = route;
 
     // Route with `.page.route.js` defined route string
     if (typeof pageRoute === 'string') {

diff --git a/src/ssrEnv.node.ts b/src/ssrEnv.node.ts
@@ -1,5 +1,4 @@
 import { ViteDevServer } from 'vite'
-import { RoutingHandler } from './route.shared';
 
 export { setSsrEnv }
 export { getSsrEnv }
@@ -10,15 +9,13 @@ type SsrEnv =
       isProduction: false
       viteDevServer: ViteDevServer
       root: string
-      baseUrl: string,
-      customRouting?: RoutingHandler
+      baseUrl: string
     }
   | {
       isProduction: true
       viteDevServer: undefined
       root?: string
       baseUrl: string
-      customRouting?: RoutingHandler
     }
 
 function getSsrEnv(): SsrEnv {