From f826fa7d6928669d43af148f813a4864afafae7f Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Sat, 11 Jun 2022 20:38:27 +0800 Subject: [PATCH] quick fix --- .../__snapshots__/actions.test.ts.snap | 15 +++++++++++--- .../__snapshots__/index.test.ts.snap | 20 +++++++++++++++---- .../src/commands/swizzle/actions.ts | 5 ++++- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/actions.test.ts.snap b/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/actions.test.ts.snap index 2608fd767172..36fc80b4478f 100644 --- a/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/actions.test.ts.snap +++ b/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/actions.test.ts.snap @@ -47,7 +47,10 @@ exports[`wrap TypeScript wrap ComponentInFolder 2`] = ` import ComponentInFolder from '@theme-original/ComponentInFolder'; import type ComponentInFolderType from '@theme/ComponentInFolder'; -type Props = ComponentProps; +type RawProps = ComponentProps; +// ComponentProps is a little buggy, quick fix. +// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60766 +type Props = unknown extends RawProps ? {} : RawProps; export default function ComponentInFolderWrapper(props: Props): JSX.Element { return ( @@ -64,7 +67,10 @@ exports[`wrap TypeScript wrap ComponentInFolder/ComponentInSubFolder 2`] = ` import ComponentInSubFolder from '@theme-original/ComponentInFolder/ComponentInSubFolder'; import type ComponentInSubFolderType from '@theme/ComponentInFolder/ComponentInSubFolder'; -type Props = ComponentProps; +type RawProps = ComponentProps; +// ComponentProps is a little buggy, quick fix. +// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60766 +type Props = unknown extends RawProps ? {} : RawProps; export default function ComponentInSubFolderWrapper(props: Props): JSX.Element { return ( @@ -81,7 +87,10 @@ exports[`wrap TypeScript wrap FirstLevelComponent 2`] = ` import FirstLevelComponent from '@theme-original/FirstLevelComponent'; import type FirstLevelComponentType from '@theme/FirstLevelComponent'; -type Props = ComponentProps; +type RawProps = ComponentProps; +// ComponentProps is a little buggy, quick fix. +// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60766 +type Props = unknown extends RawProps ? {} : RawProps; export default function FirstLevelComponentWrapper(props: Props): JSX.Element { return ( diff --git a/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/index.test.ts.snap b/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/index.test.ts.snap index a686e30fae35..e1d28fc40529 100644 --- a/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/index.test.ts.snap +++ b/packages/docusaurus/src/commands/swizzle/__tests__/__snapshots__/index.test.ts.snap @@ -277,7 +277,10 @@ exports[`swizzle wrap ComponentInFolder TS: ComponentInFolder/index.tsx 1`] = ` import ComponentInFolder from '@theme-original/ComponentInFolder'; import type ComponentInFolderType from '@theme/ComponentInFolder'; -type Props = ComponentProps; +type RawProps = ComponentProps; +// ComponentProps is a little buggy, quick fix. +// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60766 +type Props = unknown extends RawProps ? {} : RawProps; export default function ComponentInFolderWrapper(props: Props): JSX.Element { return ( @@ -321,7 +324,10 @@ exports[`swizzle wrap ComponentInFolder/ComponentInSubFolder TS: ComponentInFold import ComponentInSubFolder from '@theme-original/ComponentInFolder/ComponentInSubFolder'; import type ComponentInSubFolderType from '@theme/ComponentInFolder/ComponentInSubFolder'; -type Props = ComponentProps; +type RawProps = ComponentProps; +// ComponentProps is a little buggy, quick fix. +// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60766 +type Props = unknown extends RawProps ? {} : RawProps; export default function ComponentInSubFolderWrapper(props: Props): JSX.Element { return ( @@ -365,7 +371,10 @@ exports[`swizzle wrap ComponentInFolder/Sibling TS: ComponentInFolder/Sibling.ts import Sibling from '@theme-original/ComponentInFolder/Sibling'; import type SiblingType from '@theme/ComponentInFolder/Sibling'; -type Props = ComponentProps; +type RawProps = ComponentProps; +// ComponentProps is a little buggy, quick fix. +// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60766 +type Props = unknown extends RawProps ? {} : RawProps; export default function SiblingWrapper(props: Props): JSX.Element { return ( @@ -407,7 +416,10 @@ exports[`swizzle wrap FirstLevelComponent TS: FirstLevelComponent.tsx 1`] = ` import FirstLevelComponent from '@theme-original/FirstLevelComponent'; import type FirstLevelComponentType from '@theme/FirstLevelComponent'; -type Props = ComponentProps; +type RawProps = ComponentProps; +// ComponentProps is a little buggy, quick fix. +// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60766 +type Props = unknown extends RawProps ? {} : RawProps; export default function FirstLevelComponentWrapper(props: Props): JSX.Element { return ( diff --git a/packages/docusaurus/src/commands/swizzle/actions.ts b/packages/docusaurus/src/commands/swizzle/actions.ts index 44aba75cca13..548de7aedf98 100644 --- a/packages/docusaurus/src/commands/swizzle/actions.ts +++ b/packages/docusaurus/src/commands/swizzle/actions.ts @@ -125,7 +125,10 @@ export async function wrap({ import ${componentName} from '@theme-${importType}/${themeComponentName}'; import type ${componentName}Type from '@theme/${themeComponentName}'; -type Props = ComponentProps; +type RawProps = ComponentProps; +// ComponentProps is a little buggy, quick fix. +// https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60766 +type Props = unknown extends RawProps ? {} : RawProps; export default function ${wrapperComponentName}(props: Props): JSX.Element { return (