diff --git a/packages/docusaurus-plugin-content-blog/src/index.js b/packages/docusaurus-plugin-content-blog/src/index.js index c4b3eb1473..d6af82b886 100644 --- a/packages/docusaurus-plugin-content-blog/src/index.js +++ b/packages/docusaurus-plugin-content-blog/src/index.js @@ -24,8 +24,8 @@ const DEFAULT_OPTIONS = { routeBasePath: 'blog', // URL Route. include: ['*.md', '*.mdx'], // Extensions to include. pageCount: 10, // How many entries per page. - blogPageComponent: '@theme/BlogPage', - blogPostComponent: '@theme/BlogPost', + blogListComponent: '@theme/BlogList', + blogItemComponent: '@theme/BlogPost', }; class DocusaurusPluginContentBlog { @@ -113,7 +113,7 @@ class DocusaurusPluginContentBlog { } async contentLoaded({content, actions}) { - const {blogPageComponent, blogPostComponent} = this.options; + const {blogListComponent, blogItemComponent} = this.options; const {addRoute, createData} = actions; await Promise.all( content.map(async metadataItem => { @@ -125,7 +125,7 @@ class DocusaurusPluginContentBlog { if (isBlogPage) { addRoute({ path: permalink, - component: blogPageComponent, + component: blogListComponent, exact: true, modules: { entries: metadataItem.posts.map(post => ({ @@ -145,7 +145,7 @@ class DocusaurusPluginContentBlog { addRoute({ path: permalink, - component: blogPostComponent, + component: blogItemComponent, exact: true, modules: { content: metadataItem.source, diff --git a/packages/docusaurus-plugin-content-docs/src/index.js b/packages/docusaurus-plugin-content-docs/src/index.js index ddc8cbf66a..59854501b9 100644 --- a/packages/docusaurus-plugin-content-docs/src/index.js +++ b/packages/docusaurus-plugin-content-docs/src/index.js @@ -21,8 +21,8 @@ const DEFAULT_OPTIONS = { // TODO: Change format to array. sidebarPath: '', // Path to sidebar configuration for showing a list of markdown pages. // TODO: Settle themeing. - docLayoutComponent: '@theme/Doc', - docItemComponent: '@theme/DocBody', + docLayoutComponent: '@theme/DocPage', + docItemComponent: '@theme/DocItem', }; class DocusaurusPluginContentDocs { diff --git a/packages/docusaurus-plugin-content-pages/src/index.js b/packages/docusaurus-plugin-content-pages/src/index.js index f9f5d30264..74bcbb2ec2 100644 --- a/packages/docusaurus-plugin-content-pages/src/index.js +++ b/packages/docusaurus-plugin-content-pages/src/index.js @@ -13,7 +13,7 @@ const DEFAULT_OPTIONS = { path: 'pages', // Path to data on filesystem, relative to site dir. routeBasePath: '', // URL Route. include: ['**/*.{js,jsx}'], // Extensions to include. - component: '@theme/Pages', + component: '@theme/Page', }; class DocusaurusPluginContentPages { diff --git a/packages/docusaurus/lib/client/App.js b/packages/docusaurus/lib/client/App.js index 61ad5ad4e5..7d41a2c338 100644 --- a/packages/docusaurus/lib/client/App.js +++ b/packages/docusaurus/lib/client/App.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import React, {useState} from 'react'; +import React from 'react'; import {renderRoutes} from 'react-router-config'; import Head from '@docusaurus/Head'; // eslint-disable-line @@ -15,9 +15,8 @@ import DocusaurusContext from '@docusaurus/context'; // eslint-disable-line import PendingNavigation from './PendingNavigation'; function App() { - const [context, setContext] = useState({}); return ( - + {/* TODO: this link stylesheet to infima is temporary */} {BlogPosts.map((PostContent, index) => (
- + - +
))} diff --git a/packages/docusaurus/lib/default-theme/BlogPost/index.js b/packages/docusaurus/lib/default-theme/BlogPost/index.js index af65a4c304..60c304dd5f 100644 --- a/packages/docusaurus/lib/default-theme/BlogPost/index.js +++ b/packages/docusaurus/lib/default-theme/BlogPost/index.js @@ -8,20 +8,20 @@ import React from 'react'; import Layout from '@theme/Layout'; // eslint-disable-line -import Post from '../Post'; +import BlogPostItem from '../BlogPostItem'; + +function BlogPostPage(props) { + const {content: BlogPostContents, metadata} = props; -function BlogPost(props) { - const {content, metadata} = props; - const BlogPostContents = content; return ( {BlogPostContents && (
- + - +
@@ -30,4 +30,4 @@ function BlogPost(props) { ); } -export default BlogPost; +export default BlogPostPage; diff --git a/packages/docusaurus/lib/default-theme/Post/index.js b/packages/docusaurus/lib/default-theme/BlogPostItem/index.js similarity index 95% rename from packages/docusaurus/lib/default-theme/Post/index.js rename to packages/docusaurus/lib/default-theme/BlogPostItem/index.js index e363a38cd5..f2cc756eb9 100644 --- a/packages/docusaurus/lib/default-theme/Post/index.js +++ b/packages/docusaurus/lib/default-theme/BlogPostItem/index.js @@ -8,7 +8,7 @@ import React from 'react'; import Link from '@docusaurus/Link'; -function Post(props) { +function BlogPostItem(props) { const {metadata, children, truncated} = props; const renderPostHeader = () => { if (!metadata) { @@ -86,7 +86,7 @@ function Post(props) { return (
{renderPostHeader()} -
{children}
+
{children}
{truncated && (
@@ -98,4 +98,4 @@ function Post(props) { ); } -export default Post; +export default BlogPostItem; diff --git a/packages/docusaurus/lib/default-theme/DocBody/index.js b/packages/docusaurus/lib/default-theme/DocItem/index.js similarity index 82% rename from packages/docusaurus/lib/default-theme/DocBody/index.js rename to packages/docusaurus/lib/default-theme/DocItem/index.js index 673b07422e..85041692ec 100644 --- a/packages/docusaurus/lib/default-theme/DocBody/index.js +++ b/packages/docusaurus/lib/default-theme/DocItem/index.js @@ -7,12 +7,13 @@ import React from 'react'; -import DocsPaginator from '@theme/DocsPaginator'; // eslint-disable-line import Head from '@docusaurus/Head'; +import DocPaginator from '../DocPaginator'; + import styles from './styles.module.css'; -const Headings = ({headings, isChild}) => { +function Headings({headings, isChild}) { if (!headings.length) return null; return (
    @@ -26,10 +27,11 @@ const Headings = ({headings, isChild}) => { ))}
); -}; +} -function DocBody(props) { +function DocItem(props) { const {metadata, content: DocContent, docsMetadata} = props; + return (
@@ -46,9 +48,9 @@ function DocBody(props) {
-
- -
+
+ +
{DocContent.rightToc && } @@ -59,4 +61,4 @@ function DocBody(props) { ); } -export default DocBody; +export default DocItem; diff --git a/packages/docusaurus/lib/default-theme/DocBody/styles.module.css b/packages/docusaurus/lib/default-theme/DocItem/styles.module.css similarity index 100% rename from packages/docusaurus/lib/default-theme/DocBody/styles.module.css rename to packages/docusaurus/lib/default-theme/DocItem/styles.module.css diff --git a/packages/docusaurus/lib/default-theme/Doc/index.js b/packages/docusaurus/lib/default-theme/DocPage/index.js similarity index 80% rename from packages/docusaurus/lib/default-theme/Doc/index.js rename to packages/docusaurus/lib/default-theme/DocPage/index.js index f2e38da079..8f1e9893f4 100644 --- a/packages/docusaurus/lib/default-theme/Doc/index.js +++ b/packages/docusaurus/lib/default-theme/DocPage/index.js @@ -9,16 +9,18 @@ import React from 'react'; import {renderRoutes} from 'react-router-config'; import Layout from '@theme/Layout'; // eslint-disable-line -import Sidebar from '@theme/Sidebar'; // eslint-disable-line -function Doc(props) { +import DocSidebar from '../DocSidebar'; + +function DocPage(props) { const {route, docsMetadata, location} = props; + return (
- +
{renderRoutes(route.routes, {docsMetadata})} @@ -29,4 +31,4 @@ function Doc(props) { ); } -export default Doc; +export default DocPage; diff --git a/packages/docusaurus/lib/default-theme/DocsPaginator/index.js b/packages/docusaurus/lib/default-theme/DocPaginator/index.js similarity index 88% rename from packages/docusaurus/lib/default-theme/DocsPaginator/index.js rename to packages/docusaurus/lib/default-theme/DocPaginator/index.js index f129246512..a3525007c3 100644 --- a/packages/docusaurus/lib/default-theme/DocsPaginator/index.js +++ b/packages/docusaurus/lib/default-theme/DocPaginator/index.js @@ -8,9 +8,11 @@ import React from 'react'; import Link from '@docusaurus/Link'; -function DocsPaginator(props) { - const {docsMetadata, metadata} = props; - const {docs} = docsMetadata; +function DocPaginator(props) { + const { + docsMetadata: {docs}, + metadata, + } = props; return (
@@ -39,4 +41,4 @@ function DocsPaginator(props) { ); } -export default DocsPaginator; +export default DocPaginator; diff --git a/packages/docusaurus/lib/default-theme/Sidebar/index.js b/packages/docusaurus/lib/default-theme/DocSidebar/index.js similarity index 97% rename from packages/docusaurus/lib/default-theme/Sidebar/index.js rename to packages/docusaurus/lib/default-theme/DocSidebar/index.js index 1baca74cd5..a8da8462b7 100644 --- a/packages/docusaurus/lib/default-theme/Sidebar/index.js +++ b/packages/docusaurus/lib/default-theme/DocSidebar/index.js @@ -11,7 +11,7 @@ import Link from '@docusaurus/Link'; // eslint-disable-line import './styles.css'; -function Sidebar(props) { +function DocSidebar(props) { const {docsMetadata, location} = props; const id = @@ -85,4 +85,4 @@ function Sidebar(props) { ); } -export default Sidebar; +export default DocSidebar; diff --git a/packages/docusaurus/lib/default-theme/Sidebar/styles.css b/packages/docusaurus/lib/default-theme/DocSidebar/styles.css similarity index 100% rename from packages/docusaurus/lib/default-theme/Sidebar/styles.css rename to packages/docusaurus/lib/default-theme/DocSidebar/styles.css diff --git a/packages/docusaurus/lib/default-theme/Loading/index.js b/packages/docusaurus/lib/default-theme/Loading/index.js index 4da0562805..e430c572cb 100644 --- a/packages/docusaurus/lib/default-theme/Loading/index.js +++ b/packages/docusaurus/lib/default-theme/Loading/index.js @@ -11,7 +11,7 @@ import styles from './styles.module.css'; export default props => { if (props.error) { - console.log(props.error); + console.warn(props.error); return
Error
; } diff --git a/packages/docusaurus/lib/default-theme/Pages/index.js b/packages/docusaurus/lib/default-theme/Page/index.js similarity index 80% rename from packages/docusaurus/lib/default-theme/Pages/index.js rename to packages/docusaurus/lib/default-theme/Page/index.js index d505a14998..68533c9582 100644 --- a/packages/docusaurus/lib/default-theme/Pages/index.js +++ b/packages/docusaurus/lib/default-theme/Page/index.js @@ -8,7 +8,8 @@ import React from 'react'; import Layout from '@theme/Layout'; // eslint-disable-line -function Pages({content: PageContent}) { +function Page(props) { + const {content: PageContent} = props; return ( @@ -16,4 +17,4 @@ function Pages({content: PageContent}) { ); } -export default Pages; +export default Page; diff --git a/packages/docusaurus/lib/server/load/theme.js b/packages/docusaurus/lib/server/load/theme.js index 9a21a392df..e229a230e3 100644 --- a/packages/docusaurus/lib/server/load/theme.js +++ b/packages/docusaurus/lib/server/load/theme.js @@ -15,7 +15,6 @@ module.exports = function loadConfig(siteDir) { : path.resolve(__dirname, '../../default-theme'); const requiredComponents = ['Loading', 'NotFound']; - requiredComponents.forEach(component => { try { require.resolve(path.join(themePath, component));