Skip to content

Commit

Permalink
chore: bunch of formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Princesseuh committed Sep 1, 2023
1 parent 573320b commit bfea423
Show file tree
Hide file tree
Showing 186 changed files with 4,335 additions and 4,875 deletions.
78 changes: 39 additions & 39 deletions .eslintrc.cjs
@@ -1,42 +1,42 @@
/** @type {import("@types/eslint").Linter.Config} */
module.exports = {
ignorePatterns: ["node_modules", "dist"],
root: true,
env: {
node: true,
},
parser: "@typescript-eslint/parser",
plugins: ["@typescript-eslint", "prettier"],
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended",
"plugin:astro/recommended",
],
rules: {
"@typescript-eslint/no-unused-vars": [
"warn",
{ varsIgnorePattern: "Props", ignoreRestSiblings: true },
],
},
overrides: [
{
files: ["*.astro"],
parser: "astro-eslint-parser",
parserOptions: {
parser: "@typescript-eslint/parser",
extraFileExtensions: [".astro"],
},
rules: {
"prettier/prettier": "off",
},
},
{
files: ["./src/assets/scripts/*"],
env: {
node: false,
browser: true,
},
},
],
ignorePatterns: ["node_modules", "dist"],
root: true,
env: {
node: true,
},
parser: "@typescript-eslint/parser",
plugins: ["@typescript-eslint", "prettier"],
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended",
"plugin:astro/recommended",
],
rules: {
"@typescript-eslint/no-unused-vars": [
"warn",
{ varsIgnorePattern: "Props", ignoreRestSiblings: true },
],
},
overrides: [
{
files: ["*.astro"],
parser: "astro-eslint-parser",
parserOptions: {
parser: "@typescript-eslint/parser",
extraFileExtensions: [".astro"],
},
rules: {
"prettier/prettier": "off",
},
},
{
files: ["./src/assets/scripts/*"],
env: {
node: false,
browser: true,
},
},
],
};
28 changes: 14 additions & 14 deletions .prettierrc.js
@@ -1,17 +1,17 @@
/** @type {import("prettier").Options} */
export default {
printWidth: 100,
tabWidth: 2,
trailingComma: "all",
semi: true,
plugins: ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
astroAllowShorthand: false,
overrides: [
{
files: "*.astro",
options: {
parser: "astro",
},
},
],
printWidth: 100,
useTabs: true,
trailingComma: "all",
semi: true,
plugins: ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
astroAllowShorthand: false,
overrides: [
{
files: "*.astro",
options: {
parser: "astro",
},
},
],
};
12 changes: 6 additions & 6 deletions .vscode/extensions.json
@@ -1,8 +1,8 @@
{
"recommendations": [
"astro-build.astro-vscode",
"dbaeumer.vscode-eslint",
"davidanson.vscode-markdownlint",
"esbenp.prettier-vscode"
]
"recommendations": [
"astro-build.astro-vscode",
"dbaeumer.vscode-eslint",
"davidanson.vscode-markdownlint",
"esbenp.prettier-vscode"
]
}
42 changes: 21 additions & 21 deletions .vscode/settings.json
@@ -1,23 +1,23 @@
{
"cSpell.words": ["Astro", "fdir", "Rehype", "vite", "Segoe", "Roboto"],
"cSpell.ignorePaths": [
"package-lock.json",
"node_modules",
"vscode-extension",
".git/objects",
".vscode",
"pnpm-lock.yaml"
],
"editor.formatOnSave": true,
"[markdown]": {
"editor.wordWrap": "on",
"editor.codeActionsOnSave": {
"source.fixAll.markdownlint": true
}
},
"prettier.documentSelectors": ["**/*.astro"],
"markdownlint.config": {
"MD033": false // Since we use components in our markdown files, we disable this rule that prevents HTML
},
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "astro"]
"cSpell.words": ["Astro", "fdir", "Rehype", "vite", "Segoe", "Roboto"],
"cSpell.ignorePaths": [
"package-lock.json",
"node_modules",
"vscode-extension",
".git/objects",
".vscode",
"pnpm-lock.yaml"
],
"editor.formatOnSave": true,
"[markdown]": {
"editor.wordWrap": "on",
"editor.codeActionsOnSave": {
"source.fixAll.markdownlint": true
}
},
"prettier.documentSelectors": ["**/*.astro"],
"markdownlint.config": {
"MD033": false // Since we use components in our markdown files, we disable this rule that prevents HTML
},
"eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact", "astro"]
}
120 changes: 60 additions & 60 deletions astro.config.ts
Expand Up @@ -7,42 +7,42 @@ import expressiveCode from "astro-expressive-code";

// https://astro.build/config
export default defineConfig({
publicDir: "./static",
site: "https://erika.florist/",
markdown: {
syntaxHighlight: "shiki",
shikiConfig: {
theme: "material-darker",
langs: [],
wrap: false,
},
},
image: {
service: {
entrypoint: "./src/imageService.ts",
},
},
integrations: [
tailwind({
applyBaseStyles: false,
}),
AutoImport({
imports: [
{
// Explicitly alias a default export
// generates:
// import { default as B } from './src/components/B.astro';
"./src/components/MarkdownImage.astro": [["default", "Image"]],
"./src/components/MarkdownNoteBlock.astro": [["default", "Blocknote"]],
},
],
}),
expressiveCode({
theme: "material-theme-darker",
plugins: [
{
name: "custom-style",
baseStyles: () => `
publicDir: "./static",
site: "https://erika.florist/",
markdown: {
syntaxHighlight: "shiki",
shikiConfig: {
theme: "material-darker",
langs: [],
wrap: false,
},
},
image: {
service: {
entrypoint: "./src/imageService.ts",
},
},
integrations: [
tailwind({
applyBaseStyles: false,
}),
AutoImport({
imports: [
{
// Explicitly alias a default export
// generates:
// import { default as B } from './src/components/B.astro';
"./src/components/MarkdownImage.astro": [["default", "Image"]],
"./src/components/MarkdownNoteBlock.astro": [["default", "Blocknote"]],
},
],
}),
expressiveCode({
theme: "material-theme-darker",
plugins: [
{
name: "custom-style",
baseStyles: () => `
.frame.is-terminal:not(.has-title) .header {display: none;}
.frame .header {border-bottom: 2px solid #313131;}
.frame.is-terminal .header::before {display: none;}
Expand All @@ -59,28 +59,28 @@ export default defineConfig({
color: #fff;
}
`,
hooks: {},
},
],
frames: {
styleOverrides: {
frameBoxShadowCssValue: "none",
tooltipSuccessBackground: "#e65161",
},
},
useThemedScrollbars: false,
useThemedSelectionColors: false,
styleOverrides: {
uiLineHeight: "inherit",
codeFontSize: "0.875rem",
codeLineHeight: "1.25rem",
borderRadius: "4px",
borderWidth: "0px",
codePaddingInline: "1rem",
codeFontFamily:
'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;',
},
}),
mdx(),
],
hooks: {},
},
],
frames: {
styleOverrides: {
frameBoxShadowCssValue: "none",
tooltipSuccessBackground: "#e65161",
},
},
useThemedScrollbars: false,
useThemedSelectionColors: false,
styleOverrides: {
uiLineHeight: "inherit",
codeFontSize: "0.875rem",
codeLineHeight: "1.25rem",
borderRadius: "4px",
borderWidth: "0px",
codePaddingInline: "1rem",
codeFontFamily:
'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;',
},
}),
mdx(),
],
});

0 comments on commit bfea423

Please sign in to comment.