feat(v2): support non-css modules when loading styles (facebook#1069)

phated · Oct 26, 2018 · c733646 · c733646
1 parent 13b23ed
commit c733646
Show file tree

Hide file tree

Showing 24 changed files with 439 additions and 430 deletions.
diff --git a/v2/lib/theme/BlogPost/index.js b/v2/lib/theme/BlogPost/index.js
@@ -12,7 +12,7 @@ import Helmet from 'react-helmet';
 import classnames from 'classnames';
 import Layout from '@theme/Layout'; // eslint-disable-line
 
-import styles from './styles.css';
+import styles from './styles.module.css';
 export default class BlogPost extends React.Component {
   renderPostHeader() {
     const {metadata, siteConfig} = this.props;

diff --git a/v2/lib/theme/BlogPost/styles.css → v2/lib/theme/BlogPost/styles.module.css b/v2/lib/theme/BlogPost/styles.css → v2/lib/theme/BlogPost/styles.module.css
diff --git a/v2/lib/theme/Doc/index.js b/v2/lib/theme/Doc/index.js
@@ -15,7 +15,7 @@ import Footer from '@theme/Footer'; // eslint-disable-line
 import Navbar from '@theme/Navbar'; // eslint-disable-line
 import Sidebar from '@theme/Sidebar'; // eslint-disable-line
 
-import styles from './styles.css';
+import styles from './styles.module.css';
 
 class Doc extends React.Component {
   render() {
@@ -36,7 +36,6 @@ class Doc extends React.Component {
           {language && <html lang={language} />}
           {language && <meta name="docsearch:language" content={language} />}
           {version && <meta name="docsearch:version" content={version} />}
-          <link rel="stylesheet" type="text/css" href="/css/main.css" />
         </Helmet>
         <Navbar docsMetadatas={docsMetadatas} />
         <Sidebar

diff --git a/v2/lib/theme/Doc/styles.css → v2/lib/theme/Doc/styles.module.css b/v2/lib/theme/Doc/styles.css → v2/lib/theme/Doc/styles.module.css
diff --git a/v2/lib/theme/DocsPaginator/index.js b/v2/lib/theme/DocsPaginator/index.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import {Link} from 'react-router-dom';
 
-import styles from './styles.css';
+import styles from './styles.module.css';
 
 export default class DocsPaginator extends React.Component {
   render() {

diff --git a/v2/lib/theme/DocsPaginator/styles.css → v2/lib/theme/DocsPaginator/styles.module.css b/v2/lib/theme/DocsPaginator/styles.css → v2/lib/theme/DocsPaginator/styles.module.css
diff --git a/v2/lib/theme/Footer/index.js b/v2/lib/theme/Footer/index.js
@@ -8,7 +8,7 @@
 import React from 'react';
 import {Link} from 'react-router-dom';
 
-import styles from './styles.css';
+import styles from './styles.module.css';
 
 function Footer(props) {
   return (

diff --git a/v2/lib/theme/Footer/styles.css → v2/lib/theme/Footer/styles.module.css b/v2/lib/theme/Footer/styles.css → v2/lib/theme/Footer/styles.module.css
diff --git a/v2/lib/theme/Layout/index.js b/v2/lib/theme/Layout/index.js
@@ -6,7 +6,6 @@
  */
 
 import React from 'react';
-import Helmet from 'react-helmet';
 
 import Footer from '@theme/Footer'; // eslint-disable-line
 import Navbar from '@theme/Navbar'; // eslint-disable-line
@@ -24,9 +23,6 @@ export default class Layout extends React.Component {
     } = this.props;
     return (
       <div>
-        <Helmet>
-          <link rel="stylesheet" type="text/css" href="/css/main.css" />
-        </Helmet>
         <Navbar docsMetadatas={docsMetadatas} />
         {children}
         <Footer