fix: basename order (#491)

ice-lab · Aug 30, 2022 · c2c697e · c2c697e · vercel · Aug 30, 2022
1 parent 6fc832f
commit c2c697e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/ice/src/utils/getRouterBasename.ts b/packages/ice/src/utils/getRouterBasename.ts
@@ -3,7 +3,7 @@ import type { Config } from '@ice/types';
 import type { TaskConfig } from 'build-scripts';
 
 const getRouterBasename = (taskConfig: TaskConfig<Config>, appConfig: AppConfig) => {
-  return taskConfig?.config?.basename || appConfig?.router?.basename;
+  return appConfig?.router?.basename ?? taskConfig?.config?.basename ?? '';
 };
 
 export default getRouterBasename;
diff --git a/packages/ice/templates/core/entry.client.ts.ejs b/packages/ice/templates/core/entry.client.ts.ejs
@@ -6,7 +6,7 @@ import Document from '@/document';
 
 const getRouterBasename = () => {
   const appConfig = getAppConfig(app);
-  return '<%- basename %>' || appConfig?.router?.basename || '';
+  return appConfig?.router?.basename ?? '<%- basename %>' ?? '';
 }
 
 runClientApp({

diff --git a/packages/ice/templates/core/entry.server.ts.ejs b/packages/ice/templates/core/entry.server.ts.ejs
@@ -9,7 +9,7 @@ import routes from './routes';
 
 const getRouterBasename = () => {
   const appConfig = runtime.getAppConfig(app);
-  return '<%- basename %>' || appConfig?.router?.basename || '';
+  return appConfig?.router?.basename ?? '<%- basename %>' ?? '';
 }
 
 const setRuntimeEnv = (renderMode) => {