diff --git a/packages/docusaurus-module-type-aliases/src/index.d.ts b/packages/docusaurus-module-type-aliases/src/index.d.ts index 5cc70d825d..3e5d0bc066 100644 --- a/packages/docusaurus-module-type-aliases/src/index.d.ts +++ b/packages/docusaurus-module-type-aliases/src/index.d.ts @@ -56,18 +56,9 @@ declare module '@generated/globalData' { } declare module '@generated/i18n' { - const i18n: { - defaultLocale: string; - locales: [string, ...string[]]; - currentLocale: string; - localeConfigs: { - [localeName: string]: { - label: string; - direction: string; - htmlLang: string; - }; - }; - }; + import type {I18n} from '@docusaurus/types'; + + const i18n: I18n; export = i18n; } diff --git a/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts b/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts index 40aad894e8..92d375fc70 100644 --- a/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts +++ b/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts @@ -647,13 +647,11 @@ declare module '@docusaurus/plugin-content-docs/client' { sidebars?: {[sidebarId: string]: GlobalSidebar}; }; - export type GlobalSidebarLink = { - label: string; - path: string; - }; - export type GlobalSidebar = { - link?: GlobalSidebarLink; + link?: { + label: string; + path: string; + }; // ... we may add other things here later }; export type GlobalPluginData = { diff --git a/packages/docusaurus-types/package.json b/packages/docusaurus-types/package.json index 33ffb60a21..df32340b17 100644 --- a/packages/docusaurus-types/package.json +++ b/packages/docusaurus-types/package.json @@ -16,6 +16,7 @@ "test": "tsc -p ." }, "dependencies": { + "@docusaurus/react-loadable": "5.5.2", "react-loadable": "npm:@docusaurus/react-loadable@5.5.2", "commander": "^5.1.0", "history": "^4.9.0", diff --git a/packages/docusaurus-types/src/index.d.ts b/packages/docusaurus-types/src/index.d.ts index 41866831df..4b8ec22087 100644 --- a/packages/docusaurus-types/src/index.d.ts +++ b/packages/docusaurus-types/src/index.d.ts @@ -10,7 +10,7 @@ import type {CustomizeRuleString} from 'webpack-merge/dist/types'; import type {CommanderStatic} from 'commander'; import type {ParsedUrlQueryInput} from 'querystring'; import type Joi from 'joi'; -import type {Overwrite, DeepPartial} from 'utility-types'; +import type {Overwrite, DeepPartial, DeepRequired} from 'utility-types'; import type {Location} from 'history'; import type Loadable from 'react-loadable'; @@ -130,12 +130,7 @@ export type I18nConfig = { localeConfigs: {[locale: string]: Partial}; }; -export type I18n = { - defaultLocale: string; - locales: [string, ...string[]]; - currentLocale: string; - localeConfigs: {[locale: string]: I18nLocaleConfig}; -}; +export type I18n = DeepRequired & {currentLocale: string}; export type GlobalData = {[pluginName: string]: {[pluginId: string]: unknown}};