Fix yarn tsc errors

coder · Feb 24, 2024 · 7954baf · 7954baf
1 parent deac4f3
commit 7954baf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
@@ -79,13 +79,6 @@ const app = createApp({
   },
 });
 
-/**
- * 2024-02-13 - The version of TechDocsAddons that Backstage ships with makes
- * the TypeScript compiler complain when you try to render it as JSX. This seems
- * like it's just a type mismatch issue, and things still work at runtime
- */
-const FixedTechDocsAddons = TechDocsAddons as React.FC<unknown>;
-
 const routes = (
   <FlatRoutes>
     <Route path="/" element={<Navigate to="catalog" />} />
@@ -101,9 +94,9 @@ const routes = (
       path="/docs/:namespace/:kind/:name/*"
       element={<TechDocsReaderPage />}
     >
-      <FixedTechDocsAddons>
+      <TechDocsAddons>
         <ReportIssue />
-      </FixedTechDocsAddons>
+      </TechDocsAddons>
     </Route>
     <Route path="/create" element={<ScaffolderPage />} />
     <Route path="/api-docs" element={<ApiExplorerPage />} />

diff --git a/packages/app/src/components/catalog/EntityPage.tsx b/packages/app/src/components/catalog/EntityPage.tsx
@@ -60,18 +60,11 @@ import { ReportIssue } from '@backstage/plugin-techdocs-module-addons-contrib';
 
 import { CoderWorkspacesCard } from '@coder/backstage-plugin-coder';
 
-/**
- * 2024-02-13 - The version of TechDocsAddons that Backstage ships with makes
- * the TypeScript compiler complain when you try to render it as JSX. This seems
- * like it's just a type mismatch issue, and things still work at runtime
- */
-const FixedTechDocsAddons = TechDocsAddons as React.FC<unknown>;
-
 const techdocsContent = (
   <EntityTechdocsContent>
-    <FixedTechDocsAddons>
+    <TechDocsAddons>
       <ReportIssue />
-    </FixedTechDocsAddons>
+    </TechDocsAddons>
   </EntityTechdocsContent>
 );
 

diff --git a/plugins/backstage-plugin-coder/src/components/CoderErrorBoundary/CoderErrorBoundary.tsx b/plugins/backstage-plugin-coder/src/components/CoderErrorBoundary/CoderErrorBoundary.tsx
@@ -1,6 +1,5 @@
 import React, {
   type ErrorInfo,
-  type FC,
   type ReactNode,
   Component,
 } from 'react';
@@ -39,7 +38,7 @@ class ErrorBoundaryCore extends Component<
   }
 
   componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
-    this.props.onError(error, errorInfo.componentStack);
+    this.props.onError(error, errorInfo.componentStack || "no details");
   }
 
   render() {
@@ -53,10 +52,10 @@ type CoderErrorBoundaryProps = {
   fallbackUi?: ReactNode;
 };
 
-export const CoderErrorBoundary: FC<CoderErrorBoundaryProps> = ({
+export const CoderErrorBoundary = ({
   children,
   fallbackUi,
-}) => {
+}: CoderErrorBoundaryProps) => {
   const errorApi = useApi(errorApiRef);
   const fallbackContent = fallbackUi ?? <FallbackUi />;