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

Jump to bottom

Fix: Fixing issue 309, which code block doesn't load all the time #326

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Fix: Fixing issue 309, which code block doesn't load all the time #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc4b0c2
chore: adding prismjs to declared modules
EddieSCJ Jan 20, 2024
050618f
feature: adding language highlight imports to the
EddieSCJ Jan 20, 2024
f0b5ce2
fix: removing prismjs imports of promise in code
EddieSCJ Jan 20, 2024
769a718
chore: adding prismjs as a lib
EddieSCJ Jan 20, 2024
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
3 changes: 2 additions & 1 deletion index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
declare module 'prismjs/components/prism-*.js';
declare module 'prismjs/components/prism-*.js';
declare module 'prismjs/prism';
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"notion-client": "^6.16.0",
"notion-types": "^6.16.0",
"notion-utils": "^6.16.0",
"prismjs": "^1.29.0",
"react": "^18.2.0",
"react-cusdis": "^2.1.3",
"react-dom": "^18.2.0",
Expand All @@ -42,6 +43,7 @@
"next-sitemap": "^3.1.32",
"postcss": "^8.3.11",
"prettier": "^2.7.1",
"prismjs": "^1.29.0",
"typescript": "^4.9.4"
}
}
40 changes: 39 additions & 1 deletion src/layouts/RootLayout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,44 @@
import React, { ReactNode } from "react"
import React, { ReactNode, useEffect } from "react"
import { ThemeProvider } from "./ThemeProvider"
import useScheme from "src/hooks/useScheme"
import Header from "./Header"
import styled from "@emotion/styled"
import Scripts from "src/layouts/RootLayout/Scripts"
import useGtagEffect from "./useGtagEffect"
import Prism from "prismjs/prism"
import 'prismjs/components/prism-markup-templating.js'
import 'prismjs/components/prism-markup.js'
import 'prismjs/components/prism-bash.js'
import 'prismjs/components/prism-c.js'
import 'prismjs/components/prism-cpp.js'
import 'prismjs/components/prism-csharp.js'
import 'prismjs/components/prism-docker.js'
import 'prismjs/components/prism-java.js'
import 'prismjs/components/prism-js-templates.js'
import 'prismjs/components/prism-coffeescript.js'
import 'prismjs/components/prism-diff.js'
import 'prismjs/components/prism-git.js'
import 'prismjs/components/prism-go.js'
import 'prismjs/components/prism-kotlin.js'
import 'prismjs/components/prism-graphql.js'
import 'prismjs/components/prism-handlebars.js'
import 'prismjs/components/prism-less.js'
import 'prismjs/components/prism-makefile.js'
import 'prismjs/components/prism-markdown.js'
import 'prismjs/components/prism-objectivec.js'
import 'prismjs/components/prism-ocaml.js'
import 'prismjs/components/prism-python.js'
import 'prismjs/components/prism-reason.js'
import 'prismjs/components/prism-rust.js'
import 'prismjs/components/prism-sass.js'
import 'prismjs/components/prism-scss.js'
import 'prismjs/components/prism-solidity.js'
import 'prismjs/components/prism-sql.js'
import 'prismjs/components/prism-stylus.js'
import 'prismjs/components/prism-swift.js'
import 'prismjs/components/prism-wasm.js'
import 'prismjs/components/prism-yaml.js'
import "prismjs/components/prism-go.js"

type Props = {
children: ReactNode
Expand All @@ -13,6 +47,10 @@ type Props = {
const RootLayout = ({ children }: Props) => {
const [scheme] = useScheme()
useGtagEffect()
useEffect(() => {
Prism.highlightAll();
}, []);

return (
<ThemeProvider scheme={scheme}>
<Scripts />
Expand Down
37 changes: 1 addition & 36 deletions src/routes/Detail/components/NotionRenderer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,42 +22,7 @@ const _NotionRenderer = dynamic(
)

const Code = dynamic(() =>
import("react-notion-x/build/third-party/code").then(async (m) => {
await Promise.all([
import("prismjs/components/prism-markup-templating.js"),
import("prismjs/components/prism-markup.js"),
import("prismjs/components/prism-bash.js"),
import("prismjs/components/prism-c.js"),
import("prismjs/components/prism-cpp.js"),
import("prismjs/components/prism-csharp.js"),
import("prismjs/components/prism-docker.js"),
import("prismjs/components/prism-java.js"),
import("prismjs/components/prism-js-templates.js"),
import("prismjs/components/prism-coffeescript.js"),
import("prismjs/components/prism-diff.js"),
import("prismjs/components/prism-git.js"),
import("prismjs/components/prism-go.js"),
import("prismjs/components/prism-graphql.js"),
import("prismjs/components/prism-handlebars.js"),
import("prismjs/components/prism-less.js"),
import("prismjs/components/prism-makefile.js"),
import("prismjs/components/prism-markdown.js"),
import("prismjs/components/prism-objectivec.js"),
import("prismjs/components/prism-ocaml.js"),
import("prismjs/components/prism-python.js"),
import("prismjs/components/prism-reason.js"),
import("prismjs/components/prism-rust.js"),
import("prismjs/components/prism-sass.js"),
import("prismjs/components/prism-scss.js"),
import("prismjs/components/prism-solidity.js"),
import("prismjs/components/prism-sql.js"),
import("prismjs/components/prism-stylus.js"),
import("prismjs/components/prism-swift.js"),
import("prismjs/components/prism-wasm.js"),
import("prismjs/components/prism-yaml.js"),
])
return m.Code
})
import("react-notion-x/build/third-party/code").then(async (m) => m.Code )
)

const Collection = dynamic(() =>
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 @@ -3135,7 +3135,7 @@ prettier@^2.7.1:
resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"
integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==

prismjs@^1.27.0:
prismjs@^1.27.0, prismjs@^1.29.0:
version "1.29.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
Expand Down