From 8425db7b8b98eca2aba8638e87ddea9ce7247dfc Mon Sep 17 00:00:00 2001 From: Anton Nikolaev Date: Mon, 14 Sep 2020 03:50:27 -0700 Subject: [PATCH] Merge internal and external troubleshooting pages into one with optional internal-only content Summary: Merged internal and external troubleshooting pages into one with optional internal-only content Reviewed By: mweststrate Differential Revision: D23651656 fbshipit-source-id: 330dd4b5cb49ae403a0a3760c1e23e30e56ad190 --- docs/getting-started/index.mdx | 1 - docs/troubleshooting.mdx | 7 +++++++ website/sidebars.js | 3 +-- website/src/components/FBContent.jsx | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/getting-started/index.mdx b/docs/getting-started/index.mdx index 6e24119b8..9824cc8d7 100644 --- a/docs/getting-started/index.mdx +++ b/docs/getting-started/index.mdx @@ -2,7 +2,6 @@ id: index title: Desktop App --- -import useBaseUrl from '@docusaurus/useBaseUrl'; import FBContent from '../../website/src/components/FBContent'; Flipper helps you debug Android and iOS apps running in an emulator/simulator or connected physical development devices. Flipper consists of two parts: diff --git a/docs/troubleshooting.mdx b/docs/troubleshooting.mdx index 9888a687c..e1eec7134 100644 --- a/docs/troubleshooting.mdx +++ b/docs/troubleshooting.mdx @@ -5,6 +5,7 @@ sidebar_label: Troubleshooting Issues --- import useBaseUrl from '@docusaurus/useBaseUrl'; import Link from '@docusaurus/Link'; +import FBContent from '../website/src/components/FBContent'; We hope that flipper works well out of the box, but the software is a work in progress and problems will occur. Below are some known issues and steps you can take to try to resolve them. @@ -165,3 +166,9 @@ If you experience errors such as `Undefined symbol: associated type descriptor f Screenshot showing the places mentioned in the last steps 1. Now you can run your build normally. + +## Facebook-specific issues + + require('./fb/troubleshooting.mdx')} + external={"Luckily you're in Open Source, so you don't have to worry about this stuff."} /> diff --git a/website/sidebars.js b/website/sidebars.js index cfa8afd21..28119494a 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -97,8 +97,7 @@ module.exports = { ], }, 'fb-internal': { - 'FB Internal': fbInternalOnly([ - 'fb/troubleshooting', + 'FB Internal': fbInternalOnly([ 'fb/Add-flipper-to-android-app', 'fb/Adding-flipper-to-ios-app', 'fb/LauncherConfig', diff --git a/website/src/components/FBContent.jsx b/website/src/components/FBContent.jsx index dbc88f8b3..ad6689a34 100644 --- a/website/src/components/FBContent.jsx +++ b/website/src/components/FBContent.jsx @@ -17,6 +17,9 @@ function createElement(createElement) { if (React.isValidElement(createElement)) { return createElement; } + if (typeof createElement === 'string') { + return createElement; + } const element = createElement(); if (React.isValidElement(element)) { return element;