Skip to content

Commit 713bc0c

Browse files
pranabdasJosh-Cena
andauthoredMar 21, 2022
website: upgrade docusaurus and other dependencies (facebookincubator#215)
* website: upgrade docusaurus and other dependencies * upgrade * revert prettier change * upgrade node Co-authored-by: Joshua Chen <sidachen2003@gmail.com>
1 parent 6c0bc40 commit 713bc0c

File tree

9 files changed

+3836
-3770
lines changed

9 files changed

+3836
-3770
lines changed
 

‎.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Install
1414
run: yarn install
1515
- name: Prettier
16-
run: yarn prettier:ci
16+
run: yarn format:ci
1717
- name: Stylelint
1818
run: yarn lint:ci
1919
# Ensure that all the expected files have been commited (yarn.lock, /dist...)

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12
1+
16.14.0

‎.prettierrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"arrowParens": "always",
33
"bracketSpacing": false,
4-
"jsxBracketSameLine": true,
4+
"bracketSameLine": true,
55
"printWidth": 80,
66
"proseWrap": "never",
77
"singleQuote": true,

‎netlify.toml

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
command = "yarn workspace infima build && yarn workspace infima-website build && cp -R packages/core/demo website/build/demo"
55
publish = "/website/build"
66

7+
[build.environment]
8+
NODE_VERSION = "16"

‎package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
],
99
"private": true,
1010
"scripts": {
11-
"prettier": "prettier --config .prettierrc --write \"**/*.{js,jsx,ts,tsx}\"",
12-
"prettier:docs": "prettier --config .prettierrc --write \"**/*.{md,mdx}\"",
13-
"prettier:ci": "prettier --config .prettierrc --check \"**/*.{js,jsx,ts,tsx,md,mdx}\"",
11+
"format": "prettier --config .prettierrc --write \"**/*.{js,jsx,ts,tsx}\"",
12+
"format:docs": "prettier --config .prettierrc --write \"**/*.{md,mdx}\"",
13+
"format:ci": "prettier --config .prettierrc --check \"**/*.{js,jsx,ts,tsx,md,mdx}\"",
1414
"lint:ci": "yarn workspace infima lint",
1515
"start": "cd packages/core && npm start",
1616
"build": "yarn workspace infima build",
@@ -19,12 +19,12 @@
1919
"website:build": "yarn workspace infima-website build",
2020
"website:deploy": "yarn workspace infima-website deploy",
2121
"lock:update": "npx yarn-deduplicate",
22-
"postinstall": "is-ci || husky install && yarn lock:update"
22+
"postinstall": "yarn lock:update",
23+
"prepare": "husky install"
2324
},
2425
"devDependencies": {
25-
"husky": "^5.0.9",
26-
"is-ci": "^3.0.0",
27-
"prettier": "^2.2.1"
26+
"husky": "^7.0.4",
27+
"prettier": "^2.6.0"
2828
},
2929
"lint-staged": {
3030
"*.{js,jsx,ts,tsx}": [

‎website/package.json

+13-9
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@
44
"description": "Website for Infima",
55
"private": true,
66
"scripts": {
7+
"docusaurus": "docusaurus",
78
"start": "docusaurus start",
89
"build": "docusaurus build",
9-
"eject": "docusaurus eject",
10+
"swizzle": "docusaurus swizzle",
11+
"deploy": "GIT_USER=facebookincubator USE_SSH=true docusaurus deploy",
12+
"clear": "docusaurus clear",
1013
"serve": "docusaurus serve",
11-
"deploy": "GIT_USER=facebookincubator USE_SSH=true docusaurus deploy"
14+
"write-translations": "docusaurus write-translations",
15+
"write-heading-ids": "docusaurus write-heading-ids"
1216
},
1317
"dependencies": {
14-
"@docusaurus/core": "2.0.0-beta.3",
15-
"@docusaurus/preset-classic": "2.0.0-beta.3",
16-
"classnames": "^2.2.6",
17-
"prettier": "^1.17.1",
18-
"react": "^16.12.0",
19-
"react-dom": "^16.12.0",
20-
"react-element-to-jsx-string": "^14.0.2"
18+
"@docusaurus/core": "2.0.0-beta.17",
19+
"@docusaurus/preset-classic": "2.0.0-beta.17",
20+
"clsx": "^1.1.1",
21+
"prettier": "1.17.1",
22+
"react": "^17.0.2",
23+
"react-dom": "^17.0.2",
24+
"react-element-to-jsx-string": "^14.3.4"
2125
}
2226
}

‎website/src/pages/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import React from 'react';
9-
import classnames from 'classnames';
9+
import clsx from 'clsx';
1010
import Layout from '@theme/Layout';
1111
import Link from '@docusaurus/Link';
1212
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
@@ -21,17 +21,17 @@ function Home() {
2121
<Layout
2222
title={siteConfig.title}
2323
description="A modern styling framework for content-driven websites">
24-
<header className={classnames('hero', styles.heroBanner)}>
24+
<header className={clsx('hero', styles.heroBanner)}>
2525
<div className="container">
2626
<img
27-
className={classnames(styles.heroBannerLogo, 'margin-vert--md')}
27+
className={clsx(styles.heroBannerLogo, 'margin-vert--md')}
2828
src={useBaseUrl('img/logo.png')}
2929
/>
3030
<h1 className="hero__title">{siteConfig.title}</h1>
3131
<p className="hero__subtitle">{siteConfig.tagline}</p>
3232
<div className={styles.buttons}>
3333
<Link
34-
className={classnames(
34+
className={clsx(
3535
'button button--primary button--lg',
3636
styles.getStarted,
3737
)}

‎website/src/theme/Playground.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Playground(props) {
2626
dangerouslySetInnerHTML={{__html: htmlString}}
2727
/>
2828
<br />
29-
<CodeBlock className="html">{htmlString}</CodeBlock>
29+
<CodeBlock language="html">{htmlString}</CodeBlock>
3030
</div>
3131
);
3232
}

0 commit comments

Comments
 (0)