From 643a656cd9644cb9cb31342c0ec06b54d656e5e9 Mon Sep 17 00:00:00 2001 From: Anton Nikolaev Date: Mon, 14 Sep 2020 07:32:58 -0700 Subject: [PATCH] Back out "Merge internal and external troubleshooting pages into one with optional internal-only content" Summary: Unfortunately optional require does not work with docusaurus bundler configuration in case file not exist, so open source build is failing now. I'm backing out this commit until solution for dynamic imports in docusaurus found. Reviewed By: mweststrate Differential Revision: D23679147 fbshipit-source-id: 7934e0a7decf128c1914f52645adaf4617c97eea --- docs/getting-started/index.mdx | 1 + docs/troubleshooting.mdx | 7 ------- website/sidebars.js | 3 ++- website/src/components/FBContent.jsx | 3 --- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/docs/getting-started/index.mdx b/docs/getting-started/index.mdx index 9824cc8d7..6e24119b8 100644 --- a/docs/getting-started/index.mdx +++ b/docs/getting-started/index.mdx @@ -2,6 +2,7 @@ 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 e1eec7134..9888a687c 100644 --- a/docs/troubleshooting.mdx +++ b/docs/troubleshooting.mdx @@ -5,7 +5,6 @@ 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. @@ -166,9 +165,3 @@ 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 28119494a..cfa8afd21 100644 --- a/website/sidebars.js +++ b/website/sidebars.js @@ -97,7 +97,8 @@ module.exports = { ], }, 'fb-internal': { - 'FB Internal': fbInternalOnly([ + 'FB Internal': fbInternalOnly([ + 'fb/troubleshooting', '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 ad6689a34..dbc88f8b3 100644 --- a/website/src/components/FBContent.jsx +++ b/website/src/components/FBContent.jsx @@ -17,9 +17,6 @@ function createElement(createElement) { if (React.isValidElement(createElement)) { return createElement; } - if (typeof createElement === 'string') { - return createElement; - } const element = createElement(); if (React.isValidElement(element)) { return element;