@docusaurus/module-type-aliases 2.0.0-beta.15a2b59f9 → 2.0.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docusaurus/module-type-aliases",
-  "version": "2.0.0-beta.15a2b59f9",
+  "version": "2.0.0-beta.17",
   "description": "Docusaurus module type aliases.",
   "types": "./src/index.d.ts",
   "publishConfig": {
@@ -11,13 +11,17 @@
     "url": "https://github.com/facebook/docusaurus.git",
     "directory": "packages/docusaurus-module-type-aliases"
   },
-  "devDependencies": {
+  "dependencies": {
+    "@docusaurus/types": "2.0.0-beta.17",
     "@types/react": "*",
-    "@types/react-helmet": "*",
-    "@types/react-loadable": "*",
     "@types/react-router-config": "*",
-    "@types/react-router-dom": "*"
+    "@types/react-router-dom": "*",
+    "react-helmet-async": "*"
+  },
+  "peerDependencies": {
+    "react": "*",
+    "react-dom": "*"
   },
   "license": "MIT",
-  "gitHead": "34881586224092fb9b5b2f455a46e19b3eee7f08"
+  "gitHead": "0032c0b0480083227af2e1b4da2d3ee6ce992403"
 }

package/src/index.d.ts

@@ -6,45 +6,58 @@
  */
 
 declare module '@generated/client-modules' {
-  const clientModules: readonly any[];
+  import type {ClientModule} from '@docusaurus/types';
+
+  const clientModules: readonly (ClientModule & {default: ClientModule})[];
   export default clientModules;
 }
 
 declare module '@generated/docusaurus.config' {
-  const config: any;
+  import type {DocusaurusConfig} from '@docusaurus/types';
+
+  const config: DocusaurusConfig;
   export default config;
 }
 
 declare module '@generated/site-metadata' {
-  const siteMetadata: any;
-  export default siteMetadata;
+  import type {DocusaurusSiteMetadata} from '@docusaurus/types';
+
+  const siteMetadata: DocusaurusSiteMetadata;
+  export = siteMetadata;
 }
 
 declare module '@generated/registry' {
   const registry: {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     readonly [key: string]: [() => Promise<any>, string, string];
   };
   export default registry;
 }
 
 declare module '@generated/routes' {
-  type Route = {
+  import type {RouteConfig} from 'react-router-config';
+
+  export type Route = {
     readonly path: string;
-    readonly component: any;
+    readonly component: RouteConfig['component'];
     readonly exact?: boolean;
+    readonly routes?: Route[];
   };
   const routes: Route[];
   export default routes;
 }
 
 declare module '@generated/routesChunkNames' {
-  const routesChunkNames: Record<string, Record<string, string>>;
-  export default routesChunkNames;
+  import type {RouteChunksTree} from '@docusaurus/types';
+
+  const routesChunkNames: Record<string, RouteChunksTree>;
+  export = routesChunkNames;
 }
 
 declare module '@generated/globalData' {
-  const globalData: Record<string, unknown>;
-  export default globalData;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const globalData: Record<string, any>;
+  export = globalData;
 }
 
 declare module '@generated/i18n' {
@@ -52,72 +65,127 @@ declare module '@generated/i18n' {
     defaultLocale: string;
     locales: [string, ...string[]];
     currentLocale: string;
-    localeConfigs: Record<string, {label: string; direction: string}>;
+    localeConfigs: Record<
+      string,
+      {
+        label: string;
+        direction: string;
+        htmlLang: string;
+      }
+    >;
   };
-  export default i18n;
+  export = i18n;
 }
 
 declare module '@generated/codeTranslations' {
   const codeTranslations: Record<string, string>;
-  export default codeTranslations;
+  export = codeTranslations;
 }
 
-declare module '@theme/*';
-
 declare module '@theme-original/*';
+declare module '@theme-init/*';
+
+declare module '@theme/Error' {
+  export interface Props {
+    readonly error: Error;
+    readonly tryAgain: () => void;
+  }
+  export default function Error(props: Props): JSX.Element;
+}
 
-declare module '@docusaurus/*';
+declare module '@theme/Layout' {
+  import type {ReactNode} from 'react';
 
-declare module '@docusaurus/Head' {
-  import type {HelmetProps} from 'react-helmet';
+  export interface Props {
+    readonly children?: ReactNode;
+    readonly title?: string;
+    readonly description?: string;
+  }
+  export default function Layout(props: Props): JSX.Element;
+}
+
+declare module '@theme/Loading' {
+  import type {LoadingComponentProps} from 'react-loadable';
+
+  export default function Loading(props: LoadingComponentProps): JSX.Element;
+}
+
+declare module '@theme/NotFound' {
+  export default function NotFound(): JSX.Element;
+}
+
+declare module '@theme/Root' {
   import type {ReactNode} from 'react';
 
-  export type HeadProps = HelmetProps & {children: ReactNode};
+  export interface Props {
+    readonly children: ReactNode;
+  }
+  export default function Root({children}: Props): JSX.Element;
+}
 
-  const Head: (props: HeadProps) => JSX.Element;
-  export default Head;
+declare module '@docusaurus/constants' {
+  export const DEFAULT_PLUGIN_ID: 'default';
 }
 
-declare module '@docusaurus/Link' {
+declare module '@docusaurus/ErrorBoundary' {
   import type {ReactNode} from 'react';
+  import type ErrorComponent from '@theme/Error';
 
-  type RRLinkProps = Partial<import('react-router-dom').LinkProps>;
-  export type LinkProps = RRLinkProps & {
-    readonly isNavLink?: boolean;
-    readonly to?: string;
-    readonly href?: string;
-    readonly activeClassName?: string;
-    readonly children?: ReactNode;
-    readonly isActive?: (match: any, location: any) => boolean;
-    readonly autoAddBaseUrl?: boolean;
+  export interface Props {
+    readonly fallback?: typeof ErrorComponent;
+    readonly children: ReactNode;
+  }
+  export default function ErrorBoundary(props: Props): JSX.Element;
+}
 
-    // escape hatch in case broken links check is annoying for a specific link
-    readonly 'data-noBrokenLinkCheck'?: boolean;
-  };
-  const Link: (props: LinkProps) => JSX.Element;
-  export default Link;
+declare module '@docusaurus/Head' {
+  import type {HelmetProps} from 'react-helmet-async';
+  import type {ReactNode} from 'react';
+
+  export type Props = HelmetProps & {children: ReactNode};
+
+  export default function Head(props: Props): JSX.Element;
+}
+
+declare module '@docusaurus/Link' {
+  import type {CSSProperties, ComponentProps} from 'react';
+
+  type NavLinkProps = Partial<import('react-router-dom').NavLinkProps>;
+  export type Props = NavLinkProps &
+    ComponentProps<'a'> & {
+      readonly className?: string;
+      readonly style?: CSSProperties;
+      readonly isNavLink?: boolean;
+      readonly to?: string;
+      readonly href?: string;
+      readonly autoAddBaseUrl?: boolean;
+
+      // escape hatch in case broken links check is annoying for a specific link
+      readonly 'data-noBrokenLinkCheck'?: boolean;
+    };
+  export default function Link(props: Props): JSX.Element;
 }
 
 declare module '@docusaurus/Interpolate' {
   import type {ReactNode} from 'react';
 
-  // TODO use TS template literal feature to make values typesafe!
-  // (requires upgrading TS first)
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  export type ExtractInterpolatePlaceholders<Str extends string> = string;
+  export type ExtractInterpolatePlaceholders<Str extends string> =
+    Str extends `${string}{${infer Key}}${infer Rest}`
+      ? Key | ExtractInterpolatePlaceholders<Rest>
+      : never;
 
   export type InterpolateValues<
     Str extends string,
-    Value extends ReactNode
+    Value extends ReactNode,
   > = Record<ExtractInterpolatePlaceholders<Str>, Value>;
 
-  // TS function overload: if all the values are plain strings, then interpolate returns a simple string
+  // If all the values are plain strings, interpolate returns a simple string
   export function interpolate<Str extends string>(
     text: Str,
     values?: InterpolateValues<Str, string | number>,
   ): string;
 
-  // If values contain any ReactNode, then the return is a ReactNode
+  // If values contain any ReactNode, the return is a ReactNode
   export function interpolate<Str extends string, Value extends ReactNode>(
     text: Str,
     values?: InterpolateValues<Str, Value>,
@@ -134,18 +202,23 @@ declare module '@docusaurus/Interpolate' {
 }
 
 declare module '@docusaurus/Translate' {
-  import type {
-    InterpolateProps,
-    InterpolateValues,
-  } from '@docusaurus/Interpolate';
+  import type {ReactNode} from 'react';
+  import type {InterpolateValues} from '@docusaurus/Interpolate';
 
-  export type TranslateParam<Str extends string> = Partial<
-    InterpolateProps<Str>
+  // TS type to ensure that at least one of id or message is always provided
+  // (Generic permits to handled message provided as React children)
+  type IdOrMessage<
+    MessageKey extends 'children' | 'message',
+    Str extends string,
+  > =
+    | ({[key in MessageKey]: Str} & {id?: string})
+    | ({[key in MessageKey]?: Str} & {id: string});
+
+  export type TranslateParam<Str extends string> = IdOrMessage<
+    'message',
+    Str
   > & {
-    message: Str;
-    id?: string;
     description?: string;
-    values?: InterpolateValues<Str, string | number>;
   };
 
   export function translate<Str extends string>(
@@ -153,9 +226,12 @@ declare module '@docusaurus/Translate' {
     values?: InterpolateValues<Str, string | number>,
   ): string;
 
-  export type TranslateProps<Str extends string> = InterpolateProps<Str> & {
-    id?: string;
+  export type TranslateProps<Str extends string> = IdOrMessage<
+    'children',
+    Str
+  > & {
     description?: string;
+    values?: InterpolateValues<Str, ReactNode>;
   };
 
   export default function Translate<Str extends string>(
@@ -165,15 +241,17 @@ declare module '@docusaurus/Translate' {
 
 declare module '@docusaurus/router' {
   // eslint-disable-next-line import/no-extraneous-dependencies
-  export * from 'react-router-dom';
-}
-declare module '@docusaurus/history' {
-  // eslint-disable-next-line import/no-extraneous-dependencies
-  export * from 'history';
+  export {useHistory, useLocation, Redirect, matchPath} from 'react-router-dom';
 }
 
 declare module '@docusaurus/useDocusaurusContext' {
-  export default function (): any;
+  import type {DocusaurusContext} from '@docusaurus/types';
+
+  export default function useDocusaurusContext(): DocusaurusContext;
+}
+
+declare module '@docusaurus/useIsBrowser' {
+  export default function useIsBrowser(): boolean;
 }
 
 declare module '@docusaurus/useBaseUrl' {
@@ -207,20 +285,18 @@ declare module '@docusaurus/ExecutionEnvironment' {
 declare module '@docusaurus/ComponentCreator' {
   import type Loadable from 'react-loadable';
 
-  function ComponentCreator(
+  export default function ComponentCreator(
     path: string,
     hash: string,
   ): ReturnType<typeof Loadable>;
-  export default ComponentCreator;
 }
 
 declare module '@docusaurus/BrowserOnly' {
-  export type Props = {
-    children?: () => JSX.Element;
-    fallback?: JSX.Element;
-  };
-  const BrowserOnly: (props: Props) => JSX.Element | null;
-  export default BrowserOnly;
+  export interface Props {
+    readonly children?: () => JSX.Element;
+    readonly fallback?: JSX.Element;
+  }
+  export default function BrowserOnly(props: Props): JSX.Element | null;
 }
 
 declare module '@docusaurus/isInternalUrl' {
@@ -249,8 +325,16 @@ declare module '@docusaurus/useGlobalData' {
     pluginId?: string,
   ): T;
 
-  function useGlobalData(): Record<string, any>;
-  export default useGlobalData;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  export default function useGlobalData(): Record<string, any>;
+}
+
+declare module '*.svg' {
+  import type {ComponentType, SVGProps} from 'react';
+
+  const ReactComponent: ComponentType<SVGProps<SVGSVGElement>>;
+
+  export default ReactComponent;
 }
 
 declare module '*.module.css' {