From fc72e09f70be83ac0fec68da56ab937dd7d549f2 Mon Sep 17 00:00:00 2001
From: Yuta Hiroto <git@hiroppy.me>
Date: Sun, 7 Feb 2021 22:49:57 +0900
Subject: [PATCH] fix(client): enable prism when ssr

---
 packages/client/src/components/ContentView/Base.js   | 12 ++----------
 packages/client/src/setup/prism.js                   |  5 ++---
 packages/fusuma/src/server/dynamicRenderingServer.js |  7 ++-----
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/components/ContentView/Base.js b/packages/client/src/components/ContentView/Base.js
index fc93ee2c0..cca62ef7c 100644
--- a/packages/client/src/components/ContentView/Base.js
+++ b/packages/client/src/components/ContentView/Base.js
@@ -1,7 +1,7 @@
 import React, { useEffect, memo } from 'react';
 import { SlideCore } from '../SlideCore';
+import { Prism } from '../../setup/prism';
 import { createVMEnv } from '../../utils/createVMEnv';
-import { getSearchParams } from '../../utils/getSearchParams';
 import { useMermaid } from '../../hooks/useMermaid';
 
 export const Base = memo(
@@ -14,19 +14,11 @@ export const Base = memo(
           mermaid?.reload();
         }
 
-        (async () => {
-          const { Prism } = await import('../../setup/prism');
-
-          Prism.highlightAll();
-        })();
+        Prism.highlightAll();
       }, [hash]);
     }
 
     useEffect(() => {
-      // don't run when creating html
-      if (!getSearchParams().get('ssr')) {
-        import(/* webpackMode: "eager"  */ '../../setup/prism');
-      }
       if (slides.some(({ fusumaProps }) => !!fusumaProps.hasExecutableCode)) {
         createVMEnv();
       }
diff --git a/packages/client/src/setup/prism.js b/packages/client/src/setup/prism.js
index 182123284..9827cb9e2 100644
--- a/packages/client/src/setup/prism.js
+++ b/packages/client/src/setup/prism.js
@@ -1,8 +1,7 @@
 import Prism from 'prismjs';
-
-import(/* webpackPreload: true */ '../../assets/style/code.css');
+import '../../assets/style/code.css';
 
 // check https://github.com/PrismJS/prism/issues/1487
-Prism.highlightAll();
+setTimeout(Prism.highlightAll);
 
 export { Prism };
diff --git a/packages/fusuma/src/server/dynamicRenderingServer.js b/packages/fusuma/src/server/dynamicRenderingServer.js
index 6084ac14d..20f33e356 100644
--- a/packages/fusuma/src/server/dynamicRenderingServer.js
+++ b/packages/fusuma/src/server/dynamicRenderingServer.js
@@ -52,11 +52,8 @@ async function dynamicRenderingServer(outputDirPath, publicPath, spinner, isThum
   if (issues.length) {
     spinner.stop();
 
-    // only filter code 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail'
-    const filteredIssues = issues.filter(({ code, context }) => {
-      return !(
-        code === 'WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail' && context.includes('language-')
-      );
+    const filteredIssues = issues.filter(({ selector }) => {
+      return !selector.includes('> code');
     });
 
     if (filteredIssues.length) {