Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
MFM-347 committed Feb 8, 2025
1 parent 1b6a969 commit 6df30ea
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 42 deletions.
21 changes: 8 additions & 13 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: format
on:
push:
paths:
- '**/*'
- "**/*"
branches:
- main
pull_request:
paths:
- '**/*'
- "**/*"
branches:
- main
workflow_dispatch:
Expand All @@ -24,22 +24,17 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: "16"
- name: Configure Prettier
run: |
echo '{
"semi": true,
"semi": false,
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "es5",
"printWidth": 100,
"arrowParens": "always",
"printWidth": 120,
"plugins": [
"prettier-plugin-tailwindcss",
"prettier-plugin-java",
"prettier-plugin-kotlin",
"prettier-plugin-organize-imports",
"prettier-plugin-packagejson"
"prettier-plugin-organize-imports"
]
}' > .prettierrc
echo 'dist
Expand All @@ -49,7 +44,7 @@ jobs:
- name: Install Prettier with plugins
run: |
npm i -D prettier prettier-plugin-tailwindcss prettier-plugin-organize-imports prettier-plugin-packagejson prettier-plugin-java prettier-plugin-kotlin
npm i -D prettier prettier-plugin-tailwindcss prettier-plugin-organize-imports
- name: Format all files
run: |
Expand All @@ -60,7 +55,7 @@ jobs:
rm -rf node_modules
rm -f .prettierrc
rm -f .prettierignore
npm uninstall prettier prettier-plugin-tailwindcss prettier-plugin-organize-imports prettier-plugin-packagejson prettier-plugin-java prettier-plugin-kotlin
npm uninstall prettier prettier-plugin-tailwindcss prettier-plugin-organize-imports
- name: Format all files
run: |
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ coverage

# Editor directories and files
.vscode/*
!.vscode/settings.json
!.vscode/extensions.json
.idea
*.suo
Expand All @@ -34,4 +35,4 @@ coverage
*.zip
*.7z
*/tmp/*
*.tmp.*
*.tmp.*
28 changes: 0 additions & 28 deletions .npmignore

This file was deleted.

10 changes: 10 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"recommendations": [
"Vue.volar",
"bradlc.vscode-tailwindcss",
"dbaeumer.vscode-eslint",
"EditorConfig.EditorConfig",
"esbenp.prettier-vscode",
"formulahendry.auto-complete-tag"
]
}
16 changes: 16 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"editor.fontSize": 13,
"editor.fontFamily": "JetBrains Mono, Hack, Monaco, Consolas, 'Courier New', monospace",
"editor.fontWeight": 500,
"editor.trimAutoWhitespace": true,
"editor.lineNumbers": "on",
"editor.tabSize": 2,
"editor.autoIndent": "full",
"editor.detectIndentation": true,
"editor.wordWrapColumn": 120,
"files.autoSave": "afterDelay",
"files.autoSaveDelay": 1000,
"files.insertFinalNewline": true,
"files.encoding": "utf8",
"editor.insertSpaces": true
}

0 comments on commit 6df30ea

Please sign in to comment.