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

build(deps): update prettier from 2.7.1 to 3.1.0 #71

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: "npm"
cache: 'npm'
- name: Install dependencies
run: npm ci
- name: Lint
Expand Down
55 changes: 37 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,48 @@
# dependencies
/node_modules
/.pnp
.pnp.js
# Dependency directories
node_modules/

# testing
# Production build files
/build

# ESLint cache
.eslintcache

# Stylelint cache
.stylelintcache

# Coverage directory used by Jest
/coverage

# production
/build
# TypeScript compiled output
/dist
/out
/ts-build

# misc
/deprecated
.DS_Store
# Logs
logs
*.log
npm-debug.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

# Environment Variables
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
.eslintcache
.stylelintcache

npm-debug.log*
yarn-debug.log*
yarn-error.log*

react.md
# Misc
.DS_Store
Thumbs.db
/deprecated

# Local Netlify folder
# Netlify configuration file
.netlify
2 changes: 1 addition & 1 deletion .lintstagedrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ module.exports = {
'stylelint --cache --fix --max-warnings 0',
'prettier --cache --write',
],
'*.{json,md}': 'prettier --cache --write',
'*.{html,json,md,yml}': 'prettier --cache --write',
};
1 change: 0 additions & 1 deletion .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/** @type {import("prettier").Config} */
module.exports = {
arrowParens: 'always',
singleQuote: true,
};
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"test:coverage": "react-scripts test --coverage --watchAll=false",
"eject": "react-scripts eject",
"lint": "eslint --cache --fix --max-warnings 0 ./src/",
"format": "prettier --cache --write ./src/",
"format": "prettier --cache --write ./{.github,public,src}/",
"prepare": "husky install"
},
"dependencies": {
Expand All @@ -32,7 +32,7 @@
"husky": "^8.0.3",
"jest-canvas-mock": "^2.4.0",
"lint-staged": "^15.1.0",
"prettier": "^2.7.1",
"prettier": "^3.1.0",
"react-scripts": "^5.0.1",
"sass": "^1.54.8",
"stylelint": "^15.11.0",
Expand Down
70 changes: 40 additions & 30 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,36 +1,46 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="author" content="Adam Alston" />
<meta name="keywords" content="Adam Alston, Adam, Alston, adamalston, software engineer" />
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="author" content="Adam Alston" />
<meta
name="keywords"
content="Adam Alston, Adam, Alston, adamalston, software engineer"
/>

<meta name="title" property="og:title" content="Adam Alston" />
<meta name="description" property="og:description" content="Source: https://github.com/adamalston/v2" />
<meta name="title" property="og:title" content="Adam Alston" />
<meta
name="description"
property="og:description"
content="Source: https://github.com/adamalston/v2"
/>

<meta property="og:site_name" content="Adam Alston's personal website" />
<meta property="og:url" content="http://www.adamalston.com/" />
<meta property="og:locale" content="en_US" />
<meta property="og:image" content="https://git.io/JUWDe" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="1280" />
<meta property="og:image:height" content="640" />
<meta property="og:image:alt" content="adamalston.com" />
<meta property="og:type" content="website" />
<meta property="og:site_name" content="Adam Alston's personal website" />
<meta property="og:url" content="http://www.adamalston.com/" />
<meta property="og:locale" content="en_US" />
<meta property="og:image" content="https://git.io/JUWDe" />
<meta property="og:image:type" content="image/png" />
<meta property="og:image:width" content="1280" />
<meta property="og:image:height" content="640" />
<meta property="og:image:alt" content="adamalston.com" />
<meta property="og:type" content="website" />

<link rel="icon" href="%PUBLIC_URL%/icons/favicon.ico" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/icons/apple-touch-icon.png" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.webmanifest" />
<link rel="icon" href="%PUBLIC_URL%/icons/favicon.ico" />
<link
rel="apple-touch-icon"
href="%PUBLIC_URL%/icons/apple-touch-icon.png"
/>
<link rel="manifest" href="%PUBLIC_URL%/manifest.webmanifest" />

<title>Adam Alston</title>
</head>
<body>
<noscript>
Enable JavaScript to see this website.
<a href="https://github.com/adamalston/v2"> Source</a>
</noscript>
<div id="root"></div>
</body>
<title>Adam Alston</title>
</head>
<body>
<noscript>
Enable JavaScript to see this website.
<a href="https://github.com/adamalston/v2"> Source</a>
</noscript>
<div id="root"></div>
</body>
</html>
2 changes: 1 addition & 1 deletion src/App/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const App = () => {
const init = () => {
if (
window.matchMedia(
'(max-device-width: 820px) and (-webkit-min-device-pixel-ratio: 2)'
'(max-device-width: 820px) and (-webkit-min-device-pixel-ratio: 2)',
)?.matches
) {
setIsMobile(true);
Expand Down
12 changes: 6 additions & 6 deletions src/Index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('application tests', () => {
const checkContent = (
element: HTMLElement,
display: RegExp,
link?: string
link?: string,
) => {
expect(element).toBeVisible();
expect(element).toHaveAccessibleName();
Expand All @@ -42,7 +42,7 @@ describe('application tests', () => {
parent: HTMLElement,
child: HTMLElement,
display: RegExp,
link: string
link: string,
) => {
expect(child).toHaveTextContent(display);

Expand Down Expand Up @@ -91,7 +91,7 @@ describe('application tests', () => {
parent,
child,
/^LinkedIn$/,
'https://www.linkedin.com/in/adam-alston/'
'https://www.linkedin.com/in/adam-alston/',
);
});

Expand All @@ -103,7 +103,7 @@ describe('application tests', () => {
parent,
child,
/^Resume$/,
'https://drive.google.com/file/d/1VQ_Oeim_e92QEMi64ejGWY5Hf4RRxfeJ/view'
'https://drive.google.com/file/d/1VQ_Oeim_e92QEMi64ejGWY5Hf4RRxfeJ/view',
);
});

Expand Down Expand Up @@ -141,15 +141,15 @@ describe('application tests', () => {
const footer = screen.getByTestId('footer');

expect(footer).toHaveTextContent(
/^Designed and built by Adam Alston \| Source$/
/^Designed and built by Adam Alston \| Source$/,
);
});
});

describe('app context tests', () => {
it('should render partial footer on mobile', () => {
render(
<AppProvider config={{} as any} isMobile={true} children={<Footer />} />
<AppProvider config={{} as any} isMobile={true} children={<Footer />} />,
);

// partial footer should now be visible
Expand Down
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ render(
<StrictMode>
<App />
</StrictMode>,
document.getElementById('root')
document.getElementById('root'),
);