feat: made domains configurable, removed locales configurable

freshcells · Apr 4, 2023 · fc12733 · fc12733
1 parent 46ff63d
commit fc12733
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/server/serve.ts b/src/server/serve.ts
@@ -43,7 +43,7 @@ const publicClientDirectory = path.join(staticDirectory, 'client')
 
 type ServingOptions = Pick<
   ServerOptions,
-  'locale' | 'assetPrefix' | 'linkPrefix' | 'outputMode'
+  'locale' | 'assetPrefix' | 'linkPrefix' | 'outputMode' | 'domains'
 >
 type ServingOptionsCb =
   | ServingOptions

diff --git a/src/shell/app-shell.server.tsx b/src/shell/app-shell.server.tsx
@@ -53,9 +53,9 @@ export default async function (
     defaultLocale,
     locale: options.locale || defaultLocale,
     assetPrefix: options.assetPrefix,
-    locales: options.locales || locales,
+    locales,
     basePath,
-    domains,
+    domains: options.domains || domains,
     nodeEnv: options.nodeEnv,
     linkPrefix: options.linkPrefix,
     query: options.query,

diff --git a/src/types/entrypoint.ts b/src/types/entrypoint.ts
@@ -1,5 +1,5 @@
 import type { ComponentType } from 'react'
-import { DomainLocale, I18NConfig } from 'next/dist/server/config-shared.js'
+import { DomainLocale } from 'next/dist/server/config-shared.js'
 import { ParsedUrlQuery } from 'querystring'
 
 export interface WrapperProps {
@@ -28,8 +28,8 @@ export type ServerOptions = {
   /** path to all assets */
   publicPath: string
   outputMode?: OutputMode
+  domains?: DomainLocale[]
   locale?: string
-  locales?: Partial<I18NConfig>['locales']
   assetPrefix?: string
   linkPrefix?: string
   query?: ParsedUrlQuery
@@ -40,8 +40,10 @@ export type NextStaticData = {
   context: Record<string, unknown>
   publicAssetPath: string
   locales?: string[]
-  domains?: DomainLocale[]
   basePath?: string
   defaultLocale?: string
   query?: ParsedUrlQuery
-} & Pick<ServerOptions, 'locale' | 'assetPrefix' | 'nodeEnv' | 'linkPrefix'>
+} & Pick<
+  ServerOptions,
+  'domains' | 'locale' | 'assetPrefix' | 'nodeEnv' | 'linkPrefix'
+>