refactor(v2): remove page plugin component

packages/docusaurus-plugin-content-pages/src/index.js

@@ -13,7 +13,6 @@ 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/Page',
 };
 
 class DocusaurusPluginContentPages {
@@ -65,7 +64,6 @@ class DocusaurusPluginContentPages {
   }
 
   async contentLoaded({content, actions}) {
-    const {component} = this.options;
     const {addRoute, createData} = actions;
 
     await Promise.all(
@@ -77,10 +75,9 @@ class DocusaurusPluginContentPages {
         );
         addRoute({
           path: permalink,
-          component,
+          component: source,
           exact: true,
           modules: {
-            content: source,
             metadata: metadataPath,
           },
         });

packages/docusaurus/lib/default-theme/Page/index.js

@@ -1,20 +0,0 @@
-/**
- * Copyright (c) 2017-present, Facebook, Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-import React from 'react';
-import Layout from '@theme/Layout'; // eslint-disable-line
-
-function Page(props) {
-  const {content: PageContent} = props;
-  return (
-    <Layout>
-      <PageContent />
-    </Layout>
-  );
-}
-
-export default Page;

website/pages/feedback/index.js

@@ -6,6 +6,8 @@
  */
 
 import React, {useEffect} from 'react';
+import Layout from '@theme/Layout';
+
 import canny from '../../scripts/canny';
 
 const BOARD_TOKEN = '054e0e53-d951-b14c-7e74-9eb8f9ed2f91';
@@ -20,7 +22,11 @@ function Feedback() {
       });
   }, []);
 
-  return <div className="container margin-vert--xl" data-canny />;
+  return (
+    <Layout>
+      <div className="container margin-vert--xl" data-canny />
+    </Layout>
+  );
 }
 
 export default Feedback;

website/pages/index.js

@@ -10,6 +10,8 @@ import Head from '@docusaurus/Head';
 import DocusaurusContext from '@docusaurus/context';
 import Link from '@docusaurus/Link';
 
+import Layout from '@theme/Layout';
+
 import classnames from 'classnames';
 
 import styles from './styles.module.css';
@@ -73,7 +75,7 @@ function Home() {
   }, []);
 
   return (
-    <div>
+    <Layout>
       <div className={styles['index-hero']}>
         <div className={styles['index-hero-inner']}>
           <h1 className={styles['index-hero-project-tagline']}>
@@ -214,7 +216,7 @@ function Home() {
           </div>
         </div>
       </div>
-    </div>
+    </Layout>
   );
 }