Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs] Fix emotion broken in SSR #22731

Merged
merged 2 commits into from
Sep 25, 2020
Merged

[docs] Fix emotion broken in SSR #22731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38a988d
fixed emotion ssr
mnajdova Sep 25, 2020
258d12b
prettier
mnajdova Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
"clipboard-copy": "^3.0.0",
"clsx": "^1.0.4",
"core-js": "^2.6.11",
"create-emotion-server": "^10.0.27",
"cross-env": "^7.0.0",
"css-mediaquery": "^0.1.2",
"date-fns": "^2.15.0",
"docsearch.js": "^2.6.3",
"doctrine": "^3.0.0",
"emotion-server": "^10.0.27",
"emotion-theming": "^10.0.27",
"express": "^4.17.1",
"fg-loadcss": "^2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ function findActivePage(currentPages, pathname) {
}

// Cache for the ltr version of the styles
const cacheLtr = createCache();
export const cacheLtr = createCache();
cacheLtr.compat = true;

// Cache for the rtl version of the styles
Expand Down
5 changes: 4 additions & 1 deletion docs/pages/_document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import React from 'react';
import { ServerStyleSheets } from '@material-ui/styles';
import { ServerStyleSheet } from 'styled-components';
import { extractCritical } from 'emotion-server';
import createEmotionServer from 'create-emotion-server';
import Document, { Html, Head, Main, NextScript } from 'next/document';
import { LANGUAGES_SSR } from 'docs/src/modules/constants';
import { pathnameToLanguage } from 'docs/src/modules/utils/helpers';
import { themeColor } from 'docs/src/modules/components/ThemeContext';
import { cacheLtr } from 'docs/pages/_app';

const { extractCritical } = createEmotionServer(cacheLtr);

// You can find a benchmark of the available CSS minifiers under
// https://github.com/GoalSmashers/css-minification-benchmark
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5540,7 +5540,7 @@ create-ecdh@^4.0.0:
bn.js "^4.1.0"
elliptic "^6.0.0"

create-emotion-server@10.0.27:
create-emotion-server@10.0.27, create-emotion-server@^10.0.27:
version "10.0.27"
resolved "https://registry.yarnpkg.com/create-emotion-server/-/create-emotion-server-10.0.27.tgz#24b135d9ef3bca32b6812c0b670feb675edd17e3"
integrity sha512-1EbZgdjiho9ue1BSTpAez8SIdfbTXomtz0bg+LPOEvf/5OV7xqCGJaoSCDCB+y7kZ73hwoEhLsoPmqKSGIQMXg==
Expand Down