Skip to content

Commit

Permalink
chore(prettier): fix some style issues and add multiline-arrays plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
Badisi committed Sep 2, 2024
1 parent 7434bac commit 4d38f4d
Show file tree
Hide file tree
Showing 116 changed files with 2,512 additions and 1,685 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"root": true,
"extends": ["@hug/eslint-config/recommended"]
"extends": [
"@hug/eslint-config/recommended"
]
}
13 changes: 0 additions & 13 deletions .hintrc

This file was deleted.

21 changes: 9 additions & 12 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
# Ignore all JS and TS files:
**/*.js
**/*.ts
**/*.md

/node_modules/
/.angular/
/.husky/
/.vscode/
/dist/
/.angular
/.git
/.nx
/node_modules
/dist

/projects/**/package.json
/projects/**/ng-package.json
package-lock.json

**/*.md
**/*.js
**/*.ts
16 changes: 9 additions & 7 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"trailingComma": "all",
"tabWidth": 4,
"useTabs": false,
"$schema": "https://json.schemastore.org/prettierrc.json",
"plugins": [
"prettier-plugin-multiline-arrays"
],
"singleQuote": true,
"bracketSameLine": true,
"tabWidth": 4,
"printWidth": 120,
"endOfLine": "lf",
"htmlWhitespaceSensitivity": "ignore",
"proseWrap": "never",
"endOfLine": "auto",
"singleAttributePerLine": false,
"printWidth": 800,
"singleQuote": true
"multilineArraysWrapThreshold": 0
}
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"recommendations": [
"angular.ng-template",
"sibiraj-s.vscode-scss-formatter",
"esbenp.prettier-vscode",
"dbaeumer.vscode-eslint",
"pkief.material-icon-theme"
]
}
36 changes: 18 additions & 18 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "ng serve",
"type": "pwa-chrome",
"request": "launch",
"preLaunchTask": "npm: start",
"url": "http://localhost:4200/"
},
{
"name": "ng test",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: test",
"url": "http://localhost:9876/debug.html"
}
]
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "ng serve",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: start",
"url": "http://localhost:4200/"
},
{
"name": "ng test",
"type": "chrome",
"request": "launch",
"preLaunchTask": "npm: test",
"url": "http://localhost:9876/debug.html"
}
]
}
21 changes: 15 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,28 @@
"workbench.iconTheme": "material-icon-theme",
"material-icon-theme.folders.theme": "none",
"material-icon-theme.opacity": 0.6,
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[scss]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"editor.formatOnSave": true,
"eslint.format.enable": true,
"html.format.wrapAttributes": "force-aligned",
"html.format.wrapLineLength": 120,
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[scss]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"npm.exclude": "**/{dist,tmp}{,/**}",
"npm.scriptExplorerExclude": [
"install"
Expand Down
61 changes: 42 additions & 19 deletions README.md

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@
"polyfills": "projects/demo-app/src/polyfills.ts",
"tsConfig": "projects/demo-app/tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": ["projects/demo-app/src/favicon.ico", "projects/demo-app/src/assets"],
"styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "projects/demo-app/src/styles.scss"],
"assets": [
"projects/demo-app/src/favicon.ico",
"projects/demo-app/src/assets"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"projects/demo-app/src/styles.scss"
],
"scripts": []
},
"configurations": {
Expand Down Expand Up @@ -86,8 +92,14 @@
"tsConfig": "projects/demo-app/tsconfig.spec.json",
"karmaConfig": "projects/demo-app/karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": ["projects/demo-app/src/favicon.ico", "projects/demo-app/src/assets"],
"styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "projects/demo-app/src/styles.scss"],
"assets": [
"projects/demo-app/src/favicon.ico",
"projects/demo-app/src/assets"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"projects/demo-app/src/styles.scss"
],
"scripts": []
}
}
Expand Down
4 changes: 3 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build:ng": {
"dependsOn": ["^build:ng"]
"dependsOn": [
"^build:ng"
]
}
},
"release": {
Expand Down
Loading

0 comments on commit 4d38f4d

Please sign in to comment.