diff --git a/server.js b/server.js
index fd6a77b..8d4d6b7 100644
--- a/server.js
+++ b/server.js
@@ -5,7 +5,6 @@ import { fileURLToPath } from 'node:url'
import express from 'express'
import { generateConsoleMessage } from './src/ssr/utils/generateConsoleMessage.js'
-
const isTest = process.env.VITEST
export async function createServer(
@@ -103,10 +102,10 @@ if (!isTest) {
createServer().then(({ app }) =>
app.listen(6173, () => {
generateConsoleMessage({ port: 6173, url: 'http://localhost' })
- })
- )
+ })
+ )
}
function makeAppContainer(app = '') {
return `
${app}
`
-}
\ No newline at end of file
+}
diff --git a/src/router/index.js b/src/router/index.js
index 2130867..a3b8e71 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,27 +8,36 @@ import {
import dynamicRoutes from '~pages'
const coreModuleRoutes = import.meta.glob('@/modules/**/router/*.js', {
- import: 'default', eager: true
+ import: 'default',
+ eager: true
})
const userModuleRoutes = import.meta.glob('#/modules/**/router/*.js', {
- import: 'default', eager: true
+ import: 'default',
+ eager: true
})
+
+const { base_url, hash_mode } = __APP_ENV__
+
const moduleRoutes = [].concat(
...Object.values(coreModuleRoutes),
...Object.values(userModuleRoutes)
)
-const { base_url, hash_mode } = __APP_ENV__
-
export const routes = [...dynamicRoutes, ...moduleRoutes]
+function getHistory() {
+ if (import.meta.env.SSR) {
+ return createMemoryHistory(base_url)
+ } else if (hash_mode) {
+ return createWebHashHistory(base_url)
+ } else {
+ return createWebHistory(base_url)
+ }
+}
export function createRouter() {
return _createRouter({
- history: import.meta.env.SSR
- ? createMemoryHistory('/')
- : createWebHistory(base_url),
-
+ history: getHistory(),
routes
})
}