Add <doctype HTML> to HTML pages (#566)

* Add doctype to static rendering

* Set content-type for CSS
This commit is contained in:
Yangshun Tay 2018-04-15 15:50:43 -07:00 committed by GitHub
parent 0593ea0039
commit 946e2cef90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 23 deletions

View file

@ -11,7 +11,6 @@ function execute() {
const CWD = process.cwd();
const fs = require('fs-extra');
const readMetadata = require('./readMetadata.js');
const renderToStaticMarkup = require('react-dom/server').renderToStaticMarkup;
const path = require('path');
const color = require('color');
const toSlug = require('../core/toSlug.js');
@ -28,6 +27,7 @@ function execute() {
const join = path.join;
const sep = path.sep;
const escapeStringRegexp = require('escape-string-regexp');
const {renderToStaticMarkupWithDoctype} = require('./renderUtils');
// create the folder path for a file if it does not exist, then write the file
function writeFileAndCreateFolder(file, content) {
@ -180,7 +180,7 @@ function execute() {
{rawContent}
</DocsLayout>
);
const str = renderToStaticMarkup(docComp);
const str = renderToStaticMarkupWithDoctype(docComp);
const targetFile = join(buildDir, metadata.permalink);
writeFileAndCreateFolder(targetFile, str);
@ -198,7 +198,7 @@ function execute() {
redirect={siteConfig.baseUrl + metadata.permalink}
/>
);
const redirectStr = renderToStaticMarkup(redirectComp);
const redirectStr = renderToStaticMarkupWithDoctype(redirectComp);
// create a redirects page for doc files
const redirectFile = join(
@ -264,7 +264,7 @@ function execute() {
{rawContent}
</BlogPostLayout>
);
const str = renderToStaticMarkup(blogPostComp);
const str = renderToStaticMarkupWithDoctype(blogPostComp);
let targetFile = join(buildDir, 'blog', filePath);
writeFileAndCreateFolder(targetFile, str);
@ -282,7 +282,7 @@ function execute() {
config={siteConfig}
/>
);
const str = renderToStaticMarkup(blogPageComp);
const str = renderToStaticMarkupWithDoctype(blogPageComp);
let targetFile = join(
buildDir,
@ -456,7 +456,7 @@ function execute() {
continue;
}
translate.setLanguage(language);
const str = renderToStaticMarkup(
const str = renderToStaticMarkupWithDoctype(
<Site
language={language}
config={siteConfig}
@ -474,7 +474,7 @@ function execute() {
// write to base level
let language = env.translation.enabled ? 'en' : '';
translate.setLanguage(language);
const str = renderToStaticMarkup(
const str = renderToStaticMarkupWithDoctype(
<Site language={language} config={siteConfig} metadata={{id: pageID}}>
<ReactComp language={language} />
</Site>
@ -487,7 +487,7 @@ function execute() {
// allow for rendering of other files not in pages/en folder
let language = env.translation.enabled ? 'en' : '';
translate.setLanguage(language);
const str = renderToStaticMarkup(
const str = renderToStaticMarkupWithDoctype(
<Site language={language} config={siteConfig} metadata={{id: pageID}}>
<ReactComp language={language} />
</Site>
@ -499,7 +499,7 @@ function execute() {
const pageID = path.basename(normalizedFile, '.html');
const parts = normalizedFile.split('pages');
const targetFile = join(buildDir, parts[1]);
const str = renderToStaticMarkup(
const str = renderToStaticMarkupWithDoctype(
<Site language="en" config={siteConfig} metadata={{id: pageID}}>
<div
dangerouslySetInnerHTML={{