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.

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

Upgrade dependencies #84

Merged
merged 8 commits into from
Feb 27, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version-file: ".tool-versions"
- name: Get the Yarn cache directory path
id: yarn-cache-dir-path
run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
Expand All @@ -30,8 +30,8 @@ jobs:
run: yarn run format:check
# - name: Lint the code
# run: yarn run lint
- name: Export the website
run: yarn run export
- name: Build the website
run: yarn run build
- name: Run Lighthouse
run: npx --package=@lhci/cli lhci autorun
env:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.16.0
20.11.1
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18.16.0
nodejs 20.11.1
13 changes: 11 additions & 2 deletions components/SyntaxHighlighter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,20 @@ import {LightAsync} from "react-syntax-highlighter";
import {a11yDark} from "react-syntax-highlighter/dist/cjs/styles/hljs";

function SyntaxHighlighter(props) {
const {children, className} = props;
if (!children) {
return null;
}

// An example className is "language-python"
const languageMatch = /language-(\w+)/.exec(className || "");

return (
<LightAsync
language={props.language}
PreTag="div"
children={children}
language={languageMatch?.[1] ?? "txt"}
style={a11yDark}
children={props.value || ""}
/>
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a simplified version of the react-markdown example.

);
}
Expand Down
6 changes: 3 additions & 3 deletions components/Template.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import ReactMarkdown from "react-markdown";
import TextareaAutosize from "react-textarea-autosize";
import SyntaxHighlighter from "./SyntaxHighlighter";

const initialTemplate = `# Foobar
const INITIAL_TEMPLATE = `# Foobar

Foobar is a Python library for dealing with word pluralization.

Expand Down Expand Up @@ -42,7 +42,7 @@ Please make sure to update tests as appropriate.
[MIT](https://choosealicense.com/licenses/mit/)`;

export function Template() {
const [template, setTemplate] = useState(initialTemplate);
const [template, setTemplate] = useState(INITIAL_TEMPLATE);

return (
<section id="template" className="bg-medium-gray pb-10">
Expand Down Expand Up @@ -72,7 +72,7 @@ export function Template() {
id="rendered"
className="markdown-body bg-white p-4 rounded-lg"
>
<ReactMarkdown renderers={{code: SyntaxHighlighter}}>
<ReactMarkdown components={{code: SyntaxHighlighter}}>
{template}
</ReactMarkdown>
</div>
Expand Down
6 changes: 6 additions & 0 deletions global.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,9 @@ a.anchorjs-link:hover {
#faq h2 > a.anchorjs-link {
@apply text-blue-400;
}

/* For code examples in the rendered template, avoid padding because the div
that comes with react-syntax-highlighter has padding. */
.markdown-body pre {
padding: 0px;
}
16 changes: 8 additions & 8 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[build]
command = "yarn run export"
publish = "build"
command = "yarn run build"
publish = "build"

# Plausible
[[redirects]]
from = "/lava-cake/js/script.js"
to = "https://plausible.io/js/script.js"
status = 200
from = "/lava-cake/js/script.js"
to = "https://plausible.io/js/script.js"
status = 200
[[redirects]]
from = "/lava-cake/api/event"
to = "https://plausible.io/api/event"
status = 200
from = "/lava-cake/api/event"
to = "https://plausible.io/api/event"
status = 200
11 changes: 10 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
module.exports = {
// @ts-check

/**
* @type {import('next').NextConfig}
**/
const nextConfig = {
distDir: "build",
output: "export",
productionBrowserSourceMaps: true
};

module.exports = nextConfig;
29 changes: 14 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"scripts": {
"dev": "yarn install && next dev",
"build": "next build",
"export": "next build && next export -o build",
"format": "prettier --write .",
"format:check": "prettier --check ."
},
Expand All @@ -14,27 +13,27 @@
"license": "MIT",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "6.2.0",
"@fortawesome/free-solid-svg-icons": "6.2.0",
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-solid-svg-icons": "6.5.1",
"@fortawesome/react-fontawesome": "0.2.0",
"github-markdown-css": "5.1.0",
"github-markdown-css": "5.5.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-github-corner": "2.5.0",
"react-markdown": "5.0.3",
"react-markdown": "9.0.1",
"react-syntax-highlighter": "15.5.0",
"react-textarea-autosize": "8.4.1"
"react-textarea-autosize": "8.5.3"
},
"devDependencies": {
"@types/node": "18.11.9",
"@types/react": "18.0.25",
"@types/react-syntax-highlighter": "15.5.5",
"autoprefixer": "10.4.13",
"next": "13.5.1",
"postcss": "8.4.31",
"prettier": "2.7.1",
"tailwindcss": "3.2.2",
"typescript": "4.8.4"
"@types/node": "20.11.20",
"@types/react": "18.2.57",
"@types/react-syntax-highlighter": "15.5.11",
"autoprefixer": "10.4.17",
"next": "14.0.0",
"postcss": "8.4.35",
"prettier": "3.2.5",
"tailwindcss": "3.4.1",
"typescript": "5.3.3"
},
"prettier": {
"bracketSpacing": false,
Expand Down
Loading