Skip to content

Commit 92d9d09

Browse files
committed
refactor: prettier
1 parent aaa312c commit 92d9d09

33 files changed

+387
-337
lines changed

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ Thumbs.db
3737
/backup
3838
/module
3939
/www
40+
/.eslintrc.json
41+
/.prettierignore
42+
/.prettierrc
43+
/.editorconfig
4044
/Thumbs.db
4145
/.DS_Store
4246
/**/.DS_Store
@@ -48,9 +52,6 @@ Thumbs.db
4852
/tsconfig.browser.json
4953
/tsconfig.json
5054
/tsconfig.backend.dist.json
51-
/.npmrc
52-
/tslint.json
53-
/.editorconfig
5455
/index.js
5556
/index.d.ts
5657
/index.js.map

.npmignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@
66
/tests
77
tsconfig.json
88
npm-debug.log*
9-
.npmrc
10-
tslint.json
11-
.editorconfig

.vscode/launch.json

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,7 @@
1212
],
1313
"outFiles": [
1414
"${workspaceFolder}/dist/**/*.js",
15-
"!**/node_modules/**",
16-
"c:/Users/darek/projects/npm/firedev-io/static-columns/src/../dist/**/*.js",
17-
"c:/Users/darek/projects/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/main/src/lib/../dist/**/*.js",
18-
"c:/Users/darek/projects/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/second/src/lib/../dist/**/*.js",
19-
"c:/Users/darek/projects/npm/firedev-io/firedev-simple-org/tmp-dist-release/dist/project/firedev-simple-org/third/src/lib/../dist/**/*.js",
20-
"c:/Users/darek/projects/npm/cli-tools/cez-cli/src/../dist/**/*.js",
21-
"c:/Users/darek/projects/npm/firedev-io/firedev-ui/src/../dist/**/*.js",
22-
"c:/Users/darek/projects/npm/cli-tools/navi-cli/src/../dist/**/*.js",
23-
"c:/Users/darek/projects/npm/firedev-io/tnp/tmp-dist-release/dist/project/tnp/src/../dist/**/*.js",
24-
"c:/Users/darek/projects/npm/cli-tools/vpn-cli/src/../dist/**/*.js",
25-
"c:/Users/darek/projects/npm/firedev-io/vpn-split/src/../dist/**/*.js"
15+
"!**/node_modules/**"
2616
],
2717
"runtimeArgs": [
2818
"--nolazy",

.vscode/settings.json

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"backup": true,
1818
"module": true,
1919
"www": true,
20+
".eslintrc.json": true,
21+
".prettierignore": true,
22+
".prettierrc": true,
23+
".editorconfig": true,
2024
"Thumbs.db": true,
2125
".DS_Store": true,
2226
"**/.DS_Store": true,
@@ -27,9 +31,6 @@
2731
"tsconfig.isomorphic-flat-dist.json": true,
2832
"tsconfig.browser.json": true,
2933
"tsconfig.json": true,
30-
".npmrc": true,
31-
"tslint.json": true,
32-
".editorconfig": true,
3334
"index.js": true,
3435
"index.d.ts": true,
3536
"index.js.map": true,
@@ -43,6 +44,7 @@
4344
".gitignore": true,
4445
".npmignore": true,
4546
".babelrc": true,
47+
".npmrc": true,
4648
"devDependencies.json": true,
4749
"package.json": true,
4850
"logo.svg": true
@@ -52,7 +54,7 @@
5254
"activityBar.foreground": "#313129"
5355
},
5456
"editor.rulers": [
55-
100,
57+
80,
5658
120
5759
],
5860
"html.format.wrapAttributes": "force-aligned",
@@ -61,5 +63,45 @@
6163
"docs": true,
6264
"projects": true,
6365
"bin": true
64-
}
66+
},
67+
"[typescriptreact]": {
68+
"editor.defaultFormatter": "esbenp.prettier-vscode",
69+
"editor.formatOnSave": false
70+
},
71+
"[json]": {
72+
"editor.defaultFormatter": "esbenp.prettier-vscode",
73+
"editor.formatOnSave": false
74+
},
75+
"[jsonc]": {
76+
"editor.defaultFormatter": "esbenp.prettier-vscode",
77+
"editor.formatOnSave": false
78+
},
79+
"[json5]": {
80+
"editor.defaultFormatter": "esbenp.prettier-vscode",
81+
"editor.formatOnSave": false
82+
},
83+
"[scss]": {
84+
"editor.defaultFormatter": "esbenp.prettier-vscode",
85+
"editor.formatOnSave": false
86+
},
87+
"[html]": {
88+
"editor.defaultFormatter": "esbenp.prettier-vscode",
89+
"editor.formatOnSave": false
90+
},
91+
"[javascript]": {
92+
"editor.defaultFormatter": "esbenp.prettier-vscode",
93+
"editor.formatOnSave": false
94+
},
95+
"[typescript]": {
96+
"editor.defaultFormatter": "esbenp.prettier-vscode",
97+
"editor.formatOnSave": false
98+
},
99+
"eslint.migration.2_x": "off",
100+
"eslint.enable": true,
101+
"prettier.enable": true,
102+
"editor.suggest.snippetsPreventQuickSuggestions": false,
103+
"editor.inlineSuggest.enabled": true,
104+
"tslint.autoFixOnSave": false,
105+
"tslint.enable": false,
106+
"tslint.alwaysShowRuleFailuresAsWarnings": false
65107
}

docs-app-build-config.json5

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// This file is generated by command: firedev release
22
// With this configuration you can use: firedev automatic:release:docs
33
{
4-
"build": true,
5-
"prod": true,
6-
"websql": true,
7-
"projName": "static-columns"
4+
build: true,
5+
prod: true,
6+
websql: true,
7+
projName: 'static-columns',
88
}
9-
10-

firedev.jsonc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
2-
"resources": [
3-
"README.md",
4-
"screen.png"
5-
],
2+
"resources": ["README.md", "screen.png"],
63

74
"overrided": {
85
"ignoreDepsPattern": [],
@@ -48,8 +45,8 @@
4845
"static",
4946
"columns",
5047
"flexbox",
51-
"columns"
48+
"columns",
5249
],
5350

5451
"workerPlugins": {},
55-
}
52+
}

linked-projects.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"projects": []
3-
}
3+
}

package.json

Lines changed: 46 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@
7878
"@angular-builders/custom-webpack": "~16.0.2-beta.2",
7979
"@angular-devkit/build-angular": "~16.0.5",
8080
"@angular-devkit/core": "~16.0.5",
81+
"@angular-eslint/builder": "~16.3.1",
82+
"@angular-eslint/eslint-plugin": "~16.3.1",
83+
"@angular-eslint/eslint-plugin-template": "~16.3.1",
84+
"@angular-eslint/schematics": "~16.3.1",
85+
"@angular-eslint/template-parser": "~16.3.1",
8186
"@angular-material-extensions/password-strength": "~12.1.0",
8287
"@angular/animations": "~16.0.0",
8388
"@angular/cdk": "~16.0.3",
@@ -95,9 +100,6 @@
95100
"@angular/router": "~16.0.0",
96101
"@angular/service-worker": "~16.0.4",
97102
"@babel/cli": "7.18.6",
98-
"@commitlint/cli": "12.1.1",
99-
"@commitlint/config-conventional": "12.1.1",
100-
"@commitlint/prompt-cli": "12.1.1",
101103
"@compodoc/compodoc": "1.1.20",
102104
"@iconify/icons-fa-solid": "1.2.2",
103105
"@iconify/icons-mdi": "1.2.1",
@@ -119,6 +121,7 @@
119121
"@ngx-formly/material": "6.1.8",
120122
"@ngx-translate/core": "15.0.0",
121123
"@ngx-translate/http-loader": "8.0.0",
124+
"@sqltools/formatter": "1.2.2",
122125
"@sweetalert2/ngx-sweetalert2": "12.1.0",
123126
"@testdeck/jest": "0.3.3",
124127
"@testdeck/mocha": "0.3.3",
@@ -149,15 +152,18 @@
149152
"@types/systeminformation": "3.23.0",
150153
"@types/vinyl": "2.0.2",
151154
"@types/watch": "1.0.0",
155+
"@typescript-eslint/eslint-plugin": "5.62.0",
156+
"@typescript-eslint/parser": "5.62.0",
152157
"@vercel/ncc": "0.38.1",
153158
"accepts": "1.3.4",
154159
"ajv": "8.12.0",
155160
"angular-material-css-vars": "5.0.2",
156161
"angular-resize-event": "3.2.0",
157162
"animate.css": "4.1.1 ",
158-
"any-project-cli": "16.100.8",
163+
"any-project-cli": "16.100.9",
164+
"app-root-path": "3.0.0",
159165
"axios": "1.3.5",
160-
"background-worker-process": "16.100.4",
166+
"background-worker-process": "16.100.10",
161167
"base32": "0.0.7",
162168
"bcryptjs": "2.4.3",
163169
"better-sqlite3": "9.5.0",
@@ -173,6 +179,7 @@
173179
"circular-json": "0.5.1",
174180
"class-transformer": "0.5.1",
175181
"class-validator": "0.14.0",
182+
"cli-highlight": "2.1.11",
176183
"command-exists": "1.2.2",
177184
"compression": "1.7.4",
178185
"concurrently": "3.5.1",
@@ -194,24 +201,27 @@
194201
"enquirer": "2.3.0",
195202
"enum-values": "1.2.1",
196203
"errorhandler": "1.5.0",
197-
"eslint": "7.13.0",
198-
"eslint-plugin-import": "2.22.1",
199-
"eslint-plugin-jsdoc": "30.7.8",
200-
"eslint-plugin-prefer-arrow": "1.2.2",
204+
"eslint": "8.51.0",
205+
"eslint-config-prettier": "9.1.0",
206+
"eslint-plugin-import": "latest",
207+
"eslint-plugin-jsdoc": "latest",
208+
"eslint-plugin-prefer-arrow": "latest",
209+
"eslint-plugin-prettier": "5.1.3",
210+
"eslint-plugin-react": "latest",
201211
"express": "4.16.3",
202212
"express-fileupload": "1.4.0",
203213
"express-session": "1.17.3",
204214
"file-loader": "1.1.5",
205215
"file-saver": "2.0.5",
206216
"file-type": "18.5.0",
207217
"firedev": "^16",
208-
"firedev-crud": "16.100.8",
209-
"firedev-crud-deamon": "16.100.7",
210-
"firedev-ports": "16.100.8",
218+
"firedev-crud": "16.100.9",
219+
"firedev-crud-deamon": "16.100.8",
220+
"firedev-ports": "16.100.9",
211221
"firedev-storage": "16.100.5",
212-
"firedev-type-sql": "16.100.5",
222+
"firedev-type-sql": "16.100.6",
213223
"firedev-typeorm": "16.100.5",
214-
"firedev-ui": "16.100.7",
224+
"firedev-ui": "16.100.8",
215225
"fkill": "6.1.0",
216226
"font-awesome": "4.7.0",
217227
"form-data": "4.0.0",
@@ -229,11 +239,11 @@
229239
"image-focus": "1.2.1",
230240
"immer": "10.0.2",
231241
"immutable": "4.3.0",
232-
"incremental-compiler": "16.100.8",
242+
"incremental-compiler": "16.100.9",
233243
"inquirer": "7.3.3",
234244
"inquirer-autocomplete-prompt": "1.3.0",
235245
"is-elevated": "3.0.0",
236-
"isomorphic-region-loader": "16.100.7",
246+
"isomorphic-region-loader": "16.100.8",
237247
"istanbul-instrumenter-loader": "2.0.0",
238248
"jest": "29.5.0",
239249
"jest-date-mock": "1.0.8",
@@ -244,8 +254,8 @@
244254
"joi": "17.9.2",
245255
"jscodeshift": "0.6.3",
246256
"json-stringify-safe": "5.0.1",
247-
"json10": "16.100.5",
248-
"json10-writer": "16.100.8",
257+
"json10": "16.100.6",
258+
"json10-writer": "16.100.9",
249259
"json5": "2.2.1",
250260
"json5-writer": "0.2.0",
251261
"jszip": "3.10.1",
@@ -254,9 +264,9 @@
254264
"localforage": "1.10.0",
255265
"lockfile": "1.0.4",
256266
"lodash": "4.17.20",
257-
"lodash-walk-object": "16.100.5",
267+
"lodash-walk-object": "16.100.6",
258268
"lowdb": "7.0.1",
259-
"magic-renamer": "16.100.7",
269+
"magic-renamer": "16.100.8",
260270
"material-design-icons": "3.0.1",
261271
"method-override": "2.3.10",
262272
"minimist": "1.2.0",
@@ -267,10 +277,10 @@
267277
"ng-in-viewport": "15.0.2",
268278
"ng-lock": "16.0.1",
269279
"ng-packagr": "16.0.1",
270-
"ng-talkback": "16.100.4",
271-
"ng2-logger": "16.100.8",
280+
"ng-talkback": "16.100.5",
281+
"ng2-logger": "16.100.9",
272282
"ng2-pdfjs-viewer": "16.0.4",
273-
"ng2-rest": "16.100.5",
283+
"ng2-rest": "16.100.6",
274284
"ngx-ace-wrapper": "14.0.0",
275285
"ngx-editor": "15.3.0",
276286
"ngx-highlightjs": "9.0.0",
@@ -283,7 +293,7 @@
283293
"ngx-scrolltop": "6.0.0",
284294
"ngx-store": "3.1.1",
285295
"ngx-typed-js": "2.1.1",
286-
"node-cli-tester": "16.100.4",
296+
"node-cli-tester": "16.100.5",
287297
"node-localstorage": "2.1.6",
288298
"node-notifier": "6.0.0",
289299
"node-polyfill-webpack-plugin": "2.0.1",
@@ -299,7 +309,8 @@
299309
"path-to-regexp": "6.2.2",
300310
"pica": "9.0.1",
301311
"portfinder": "1.0.21",
302-
"prettier": "3.0.0",
312+
"prettier": "3.2.5",
313+
"prettier-eslint": "16.3.0",
303314
"pretty-error": "4.0.0",
304315
"primeflex": "3.3.1",
305316
"primeicons": "6.0.1",
@@ -311,7 +322,7 @@
311322
"q": "1.5.1",
312323
"rallax.js": "2.0.4",
313324
"randomcolor": "0.5.3",
314-
"record-replay-req-res-scenario": "16.100.4",
325+
"record-replay-req-res-scenario": "16.100.5",
315326
"reflect-metadata": "0.1.10",
316327
"rimraf": "2.6.2",
317328
"rxjs": "~7.8.0",
@@ -330,12 +341,12 @@
330341
"systeminformation": "3.45.7",
331342
"task.js": "0.1.5",
332343
"threads": "1.7.0",
333-
"tnp-cli": "16.100.4",
334-
"tnp-config": "16.100.8",
335-
"tnp-core": "16.100.19",
336-
"tnp-db": "16.100.7",
337-
"tnp-helpers": "16.100.9",
338-
"tnp-models": "16.100.8",
344+
"tnp-cli": "16.100.5",
345+
"tnp-config": "16.100.9",
346+
"tnp-core": "16.100.20",
347+
"tnp-db": "16.100.8",
348+
"tnp-helpers": "16.100.17",
349+
"tnp-models": "16.100.9",
339350
"ts-debug": "1.3.0",
340351
"ts-json-schema-generator": "2.1.1",
341352
"ts-loader": "2.3.1",
@@ -344,13 +355,13 @@
344355
"tslint": "5.9.1",
345356
"turndown": "7.1.2",
346357
"typescript": "~5.0.2",
347-
"typescript-class-helpers": "~16.100.8",
358+
"typescript-class-helpers": "~16.100.9",
348359
"typescript-formatter": "~7.2.2",
349360
"underscore": "1.9.1",
350361
"uuid": "8.3.2",
351362
"validator": "9.2.0",
352363
"video.js": "8.3.0",
353-
"vpn-split": "16.100.4",
364+
"vpn-split": "16.100.5",
354365
"watch": "1.0.2",
355366
"webpack": "~5.80",
356367
"webpack-dev-middleware": "~6.0.2",
@@ -359,4 +370,4 @@
359370
"zone.js": "~0.13.0"
360371
},
361372
"main": "dist/app.electron.js"
362-
}
373+
}

0 commit comments

Comments
 (0)