Skip to content

Commit

Permalink
changed prettier configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
d3rpp committed Aug 1, 2024
1 parent abd0659 commit a6576a9
Show file tree
Hide file tree
Showing 19 changed files with 378 additions and 377 deletions.
39 changes: 20 additions & 19 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
/** @type {import("prettier").Config} */
export default {
/**
/**
Global Config
*/
plugins: [
"prettier-plugin-svelte",
plugins: [
"prettier-plugin-svelte",

// must come last
"prettier-plugin-tailwindcss",
],
overrides: [
{
files: "*.svelte",
options: {
parser: "svelte",
},
},
],
// must come last
"prettier-plugin-tailwindcss",
],
useTabs: true,
overrides: [
{
files: "*.svelte",
options: {
parser: "svelte",
},
},
],

/**
/**
Default Config
*/
htmlWhitespaceSensitivity: "ignore",
bracketSameLine: false,
htmlWhitespaceSensitivity: "ignore",
bracketSameLine: false,

/**
/**
Svelte Config
*/
// nothing here yet
// nothing here yet
};
24 changes: 12 additions & 12 deletions components.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"$schema": "https://shadcn-svelte.com/schema.json",
"style": "default",
"tailwind": {
"config": "tailwind.config.js",
"css": "src/app.css",
"baseColor": "slate"
},
"aliases": {
"components": "$lib/components",
"utils": "$lib/utils"
},
"typescript": true
"$schema": "https://shadcn-svelte.com/schema.json",
"style": "default",
"tailwind": {
"config": "tailwind.config.js",
"css": "src/app.css",
"baseColor": "slate"
},
"aliases": {
"components": "$lib/components",
"utils": "$lib/utils"
},
"typescript": true
}
6 changes: 3 additions & 3 deletions drizzle/meta/_journal.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "7",
"dialect": "sqlite",
"entries": []
"version": "7",
"dialect": "sqlite",
"entries": []
}
60 changes: 30 additions & 30 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,34 @@ import globals from "globals";

/** @type {import('eslint').Linter.Config[]} */
export default [
js.configs.recommended,
...ts.configs.recommended,
...svelte.configs["flat/recommended"],
{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},
},
},
{
files: ["**/*.svelte"],
languageOptions: {
parserOptions: {
parser: ts.parser,
},
},
},
{
ignores: ["build/", ".svelte-kit/", "dist/"],
},
// the generated components have the `$$Events` prop that always goes unused,
// but we wanna keep them, so I'm putting this here to ignore them
{
files: ["src/lib/components/**/*.svelte"],
rules: {
"@typescript-eslint/no-unused-vars": ["off"],
},
},
js.configs.recommended,
...ts.configs.recommended,
...svelte.configs["flat/recommended"],
{
languageOptions: {
globals: {
...globals.browser,
...globals.node,
},
},
},
{
files: ["**/*.svelte"],
languageOptions: {
parserOptions: {
parser: ts.parser,
},
},
},
{
ignores: ["build/", ".svelte-kit/", "dist/"],
},
// the generated components have the `$$Events` prop that always goes unused,
// but we wanna keep them, so I'm putting this here to ignore them
{
files: ["src/lib/components/**/*.svelte"],
rules: {
"@typescript-eslint/no-unused-vars": ["off"],
},
},
];
100 changes: 50 additions & 50 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"name": "bse-205-elective-project",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "eslint .",
"fmt": "prettier --write .",
"fmt:check": "prettier --check .",
"generate": "drizzle-kit generate --dialect sqlite --schema ./src/contrib/schema.ts",
"migrate": "bun ./src/contrib/migrate.ts"
},
"devDependencies": {
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@types/eslint": "^9.6.0",
"autoprefixer": "^10.4.19",
"bun-types": "^1.1.21",
"drizzle-kit": "^0.23.0",
"eslint": "^9.0.0",
"eslint-plugin-svelte": "^2.36.0",
"globals": "^15.0.0",
"postcss": "^8.4.40",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "3",
"prettier-plugin-tailwindcss": "^0.6.5",
"svelte": "^4.2.7",
"svelte-adapter-bun": "^0.5.2",
"svelte-check": "^3.6.0",
"tailwindcss": "^3.4.7",
"typescript": "^5.0.0",
"typescript-eslint": "^8.0.0-alpha.20",
"vite": "^5.0.3"
},
"type": "module",
"trustedDependencies": [
"@sveltejs/kit",
"esbuild",
"svelte-preprocess"
],
"dependencies": {
"bits-ui": "^0.21.13",
"clsx": "^2.1.1",
"drizzle-orm": "^0.32.1",
"tailwind-merge": "^2.4.0",
"tailwind-variants": "^0.2.1"
}
"name": "bse-205-elective-project",
"version": "0.0.1",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
"lint": "eslint .",
"fmt": "prettier --write .",
"fmt:check": "prettier --check .",
"generate": "drizzle-kit generate --dialect sqlite --schema ./src/contrib/schema.ts",
"migrate": "bun ./src/contrib/migrate.ts"
},
"devDependencies": {
"@sveltejs/kit": "^2.0.0",
"@sveltejs/vite-plugin-svelte": "^3.0.0",
"@types/eslint": "^9.6.0",
"autoprefixer": "^10.4.19",
"bun-types": "^1.1.21",
"drizzle-kit": "^0.23.0",
"eslint": "^9.0.0",
"eslint-plugin-svelte": "^2.36.0",
"globals": "^15.0.0",
"postcss": "^8.4.40",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "3",
"prettier-plugin-tailwindcss": "^0.6.5",
"svelte": "^4.2.7",
"svelte-adapter-bun": "^0.5.2",
"svelte-check": "^3.6.0",
"tailwindcss": "^3.4.7",
"typescript": "^5.0.0",
"typescript-eslint": "^8.0.0-alpha.20",
"vite": "^5.0.3"
},
"type": "module",
"trustedDependencies": [
"@sveltejs/kit",
"esbuild",
"svelte-preprocess"
],
"dependencies": {
"bits-ui": "^0.21.13",
"clsx": "^2.1.1",
"drizzle-orm": "^0.32.1",
"tailwind-merge": "^2.4.0",
"tailwind-variants": "^0.2.1"
}
}
8 changes: 4 additions & 4 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
plugins: {
tailwindcss: {},
autoprefixer: {},
},
};
98 changes: 49 additions & 49 deletions src/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,76 +3,76 @@
@tailwind utilities;

@layer base {
:root {
--background: 0 0% 100%;
--foreground: 222.2 84% 4.9%;
:root {
--background: 0 0% 100%;
--foreground: 222.2 84% 4.9%;

--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;
--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;

--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;
--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;

--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;
--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;

--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;
--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;

--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;
--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;

--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;
--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;

--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;
--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;

--destructive: 0 72.2% 50.6%;
--destructive-foreground: 210 40% 98%;
--destructive: 0 72.2% 50.6%;
--destructive-foreground: 210 40% 98%;

--ring: 222.2 84% 4.9%;
--ring: 222.2 84% 4.9%;

--radius: 0.5rem;
}
--radius: 0.5rem;
}

.dark {
--background: 222.2 84% 4.9%;
--foreground: 210 40% 98%;
.dark {
--background: 222.2 84% 4.9%;
--foreground: 210 40% 98%;

--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;
--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;

--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;
--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;

--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;
--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;

--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;

--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;
--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;

--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 210 40% 98%;
--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 210 40% 98%;

--accent: 217.2 32.6% 17.5%;
--accent-foreground: 210 40% 98%;
--accent: 217.2 32.6% 17.5%;
--accent-foreground: 210 40% 98%;

--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 40% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 40% 98%;

--ring: hsl(212.7, 26.8%, 83.9);
}
--ring: hsl(212.7, 26.8%, 83.9);
}
}

@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
}
Loading

0 comments on commit a6576a9

Please sign in to comment.