Update routing options

Author: ije

framework/core/routing.ts

@@ -1,5 +1,5 @@
 import util from '../../shared/util.ts'
-import type { RouterURL } from '../../types.d.ts'
+import type { Config, RouterURL } from '../../types.d.ts'
 
 const ghostRoute: Route = { path: '', module: '' }
 
@@ -9,12 +9,9 @@ export type Route = {
   children?: Route[]
 }
 
-export type RoutingOptions = {
-  basePath?: string
-  defaultLocale?: string
-  locales?: string[]
-  routes?: Route[]
+export type RoutingOptions = Pick<Config, 'basePath' | 'i18n'> & {
   rewrites?: Record<string, string>
+  routes?: Route[]
   redirect?: (url: string, replace?: boolean) => void
 }
 
@@ -28,17 +25,16 @@ export class Routing {
 
   constructor({
     basePath = '/',
-    defaultLocale = 'en',
-    locales = [],
+    i18n = { defaultLocale: 'en', locales: [] },
     routes = [],
     rewrites,
-    redirect
+    redirect,
   }: RoutingOptions = {}) {
     this._basePath = basePath
-    this._defaultLocale = defaultLocale
-    this._locales = locales
-    this._routes = routes
+    this._defaultLocale = i18n.defaultLocale || 'en'
+    this._locales = i18n.locales
     this._rewrites = rewrites
+    this._routes = routes
     this._redirect = redirect
   }
 

framework/react/bootstrap.ts

@@ -7,16 +7,16 @@ import Router, { createPageRoute, importPageModules } from './components/Router.
 import { loadSSRDataFromTag, setStaticDataRoutes } from './pagedata.ts'
 
 type BootstrapOptions = Required<RoutingOptions> & {
+  renderMode: 'ssr' | 'spa',
   dataRoutes?: string[],
   appModule?: string,
-  renderMode: 'ssr' | 'spa'
 }
 
 export default async function bootstrap(options: BootstrapOptions) {
-  const { basePath, defaultLocale, locales, appModule: appModuleSpcifier, routes, dataRoutes, rewrites, renderMode } = options
+  const { basePath, i18n, appModule: appModuleSpcifier, routes, dataRoutes, rewrites, renderMode } = options
   const { document } = window as any
   const appModule = appModuleSpcifier ? await importModule(basePath, appModuleSpcifier) : {}
-  const routing = new Routing({ routes, rewrites, basePath, defaultLocale, locales, redirect })
+  const routing = new Routing({ basePath, i18n, rewrites, routes, redirect })
   const [url, nestedModules] = routing.createRouter()
   const components = await importPageModules(url, nestedModules)
 

server/aleph.ts

@@ -105,9 +105,13 @@ export class Aleph implements IAleph {
       Object.assign(this.#importMap, getDefaultImportMap())
     }
     if (configFile) {
-      const config = await loadConfig(configFile)
-      Object.assign(this.#config, config, config.i18n)
-      this.#pageRouting = new Routing(this.#config)
+      Object.assign(this.#config, await loadConfig(configFile))
+      const { basePath, i18n, server: { rewrites } } = this.#config
+      this.#pageRouting = new Routing({
+        basePath,
+        i18n,
+        rewrites,
+      })
     }
 
     await fixConfig(this.#workingDir, this.#config, this.#importMap)
@@ -660,16 +664,15 @@ export class Aleph implements IAleph {
   async createMainJS(bundleMode = false): Promise<string> {
     const alephPkgUri = getAlephPkgUri()
     const alephPkgPath = alephPkgUri.replace('https://', '').replace('http://localhost:', 'http_localhost_')
-    const { framework, basePath: basePath, i18n: { defaultLocale, locales } } = this.#config
+    const { framework, basePath, i18n, ssr, server: { rewrites } } = this.#config
     const { routes } = this.#pageRouting
     const config: Record<string, any> = {
+      renderMode: ssr ? 'ssr' : 'spa',
       basePath,
       appModule: this.#appModule?.specifier,
       routes,
-      renderMode: this.#config.ssr ? 'ssr' : 'spa',
-      defaultLocale,
-      locales,
-      rewrites: this.#config.server.rewrites,
+      i18n,
+      rewrites: rewrites,
     }
 
     let code: string