Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit fc72e09

Browse files
committed
fix(client): enable prism when ssr
1 parent 5d551b3 commit fc72e09

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

packages/client/src/components/ContentView/Base.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, memo } from 'react';
22
import { SlideCore } from '../SlideCore';
3+
import { Prism } from '../../setup/prism';
34
import { createVMEnv } from '../../utils/createVMEnv';
4-
import { getSearchParams } from '../../utils/getSearchParams';
55
import { useMermaid } from '../../hooks/useMermaid';
66

77
export const Base = memo(
@@ -14,19 +14,11 @@ export const Base = memo(
1414
mermaid?.reload();
1515
}
1616

17-
(async () => {
18-
const { Prism } = await import('../../setup/prism');
19-
20-
Prism.highlightAll();
21-
})();
17+
Prism.highlightAll();
2218
}, [hash]);
2319
}
2420

2521
useEffect(() => {
26-
// don't run when creating html
27-
if (!getSearchParams().get('ssr')) {
28-
import(/* webpackMode: "eager" */ '../../setup/prism');
29-
}
3022
if (slides.some(({ fusumaProps }) => !!fusumaProps.hasExecutableCode)) {
3123
createVMEnv();
3224
}

packages/client/src/setup/prism.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import Prism from 'prismjs';
2-
3-
import(/* webpackPreload: true */ '../../assets/style/code.css');
2+
import '../../assets/style/code.css';
43

54
// check https://github.com/PrismJS/prism/issues/1487
6-
Prism.highlightAll();
5+
setTimeout(Prism.highlightAll);
76

87
export { Prism };

packages/fusuma/src/server/dynamicRenderingServer.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,8 @@ async function dynamicRenderingServer(outputDirPath, publicPath, spinner, isThum
5252
if (issues.length) {
5353
spinner.stop();
5454

55-
// only filter code 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail'
56-
const filteredIssues = issues.filter(({ code, context }) => {
57-
return !(
58-
code === 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail' && context.includes('language-')
59-
);
55+
const filteredIssues = issues.filter(({ selector }) => {
56+
return !selector.includes('> code');
6057
});
6158

6259
if (filteredIssues.length) {

0 commit comments

Comments
 (0)