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

Update to Prettier 3 #44

Merged
merged 3 commits into from
Jul 24, 2023
Merged

Update to Prettier 3 #44

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec6700d
Update to Prettier 3 & run it
WarningImHack3r Jul 19, 2023
8e609db
Merge branch 'main' into prettier-3
WarningImHack3r Jul 24, 2023
97eedd8
Update lock file
WarningImHack3r Jul 24, 2023
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
1 change: 0 additions & 1 deletion .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@
"trailingComma": "none",
"arrowParens": "avoid",
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
"pluginSearchDirs": false,
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
}
12 changes: 6 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"deps:update-latest": "pnpm up -L",
"check": "svelte-kit sync && svelte-check --tsconfig tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig tsconfig.json --watch",
"lint": "prettier --plugin-search-dir . --check . && eslint .",
"format": "prettier --plugin-search-dir . --write .",
"ci:lint": "prettier --plugin-search-dir . --check ./src && eslint ./src",
"lint": "prettier --check . && eslint .",
"format": "prettier --write .",
"ci:lint": "prettier --check ./src && eslint ./src",
"ci:update-inlang": "node ./scripts/update-inlang-config.js"
},
"devDependencies": {
Expand All @@ -33,9 +33,9 @@
"mini-svg-data-uri": "^1.4.4",
"postcss": "^8.4.24",
"postcss-import": "^15.1.0",
"prettier": "^2.8.8",
"prettier-plugin-svelte": "^2.10.1",
"prettier-plugin-tailwindcss": "^0.3.0",
"prettier": "^3.0.0",
"prettier-plugin-svelte": "^3.0.0",
"prettier-plugin-tailwindcss": "^0.4.1",
"svelte": "^3.59.1",
"svelte-check": "^3.4.3",
"svelte-meta-tags": "^2.8.0",
Expand Down
38 changes: 19 additions & 19 deletions pnpm-lock.yaml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
Expand Down
21 changes: 14 additions & 7 deletions src/chillax.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@

@font-face {
font-family: "Chillax-Variable";
src: url("/fonts/chillax/Chillax-Variable.woff2") format("woff2"),
src:
url("/fonts/chillax/Chillax-Variable.woff2") format("woff2"),
url("/fonts/chillax/Chillax-Variable.woff") format("woff"),
url("/fonts/chillax/Chillax-Variable.ttf") format("truetype");
font-weight: 200 700;
Expand All @@ -40,7 +41,8 @@

@font-face {
font-family: "Chillax";
src: url("/fonts/chillax/Chillax-Extralight.woff2") format("woff2"),
src:
url("/fonts/chillax/Chillax-Extralight.woff2") format("woff2"),
url("/fonts/chillax/Chillax-Extralight.woff") format("woff"),
url("/fonts/chillax/Chillax-Extralight.ttf") format("truetype");
font-weight: 200;
Expand All @@ -50,7 +52,8 @@

@font-face {
font-family: "Chillax";
src: url("/fonts/chillax/Chillax-Light.woff2") format("woff2"),
src:
url("/fonts/chillax/Chillax-Light.woff2") format("woff2"),
url("/fonts/chillax/Chillax-Light.woff") format("woff"),
url("/fonts/chillax/Chillax-Light.ttf") format("truetype");
font-weight: 300;
Expand All @@ -60,7 +63,8 @@

@font-face {
font-family: "Chillax";
src: url("/fonts/chillax/Chillax-Regular.woff2") format("woff2"),
src:
url("/fonts/chillax/Chillax-Regular.woff2") format("woff2"),
url("/fonts/chillax/Chillax-Regular.woff") format("woff"),
url("/fonts/chillax/Chillax-Regular.ttf") format("truetype");
font-weight: 400;
Expand All @@ -70,7 +74,8 @@

@font-face {
font-family: "Chillax";
src: url("/fonts/chillax/Chillax-Medium.woff2") format("woff2"),
src:
url("/fonts/chillax/Chillax-Medium.woff2") format("woff2"),
url("/fonts/chillax/Chillax-Medium.woff") format("woff"),
url("/fonts/chillax/Chillax-Medium.ttf") format("truetype");
font-weight: 500;
Expand All @@ -80,7 +85,8 @@

@font-face {
font-family: "Chillax";
src: url("/fonts/chillax/Chillax-Semibold.woff2") format("woff2"),
src:
url("/fonts/chillax/Chillax-Semibold.woff2") format("woff2"),
url("/fonts/chillax/Chillax-Semibold.woff") format("woff"),
url("/fonts/chillax/Chillax-Semibold.ttf") format("truetype");
font-weight: 600;
Expand All @@ -90,7 +96,8 @@

@font-face {
font-family: "Chillax";
src: url("/fonts/chillax/Chillax-Bold.woff2") format("woff2"),
src:
url("/fonts/chillax/Chillax-Bold.woff2") format("woff2"),
url("/fonts/chillax/Chillax-Bold.woff") format("woff"),
url("/fonts/chillax/Chillax-Bold.ttf") format("truetype");
font-weight: 700;
Expand Down