From 797f31c4abcb6971f2bc10ad416327110a74f078 Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Thu, 6 Apr 2023 18:03:40 +0300 Subject: [PATCH] add prettier --- .editorconfig | 6 +++++- .prettierignore | 4 ++++ .prettierrc | 10 ++++++++++ package-lock.json | 27 +++++++++++++++++++++++++++ package.json | 5 +++++ src/js/app.js | 2 +- src/js/pointer.js | 11 +++++++---- src/js/scene.js | 11 +++++++++-- src/js/settings.js | 4 +++- 9 files changed, 71 insertions(+), 9 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.editorconfig b/.editorconfig index d94a129..701b070 100644 --- a/.editorconfig +++ b/.editorconfig @@ -16,10 +16,14 @@ indent_size = 2 indent_style = tab indent_size = 4 +[{package*.json,.prettierrc}] +indent_style = space +indent_size = 2 + [*.md] trim_trailing_whitespace = false -[/.git/**] +[{node_modules/**,.git/**}] charset = unset end_of_line = unset insert_final_newline = unset diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..e1ee063 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,4 @@ +**/.git +**/node_modules + +*.html diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..8390dae --- /dev/null +++ b/.prettierrc @@ -0,0 +1,10 @@ +printWidth: 100 +endOfLine: lf +useTabs: false +singleQuote: true +bracketSpacing: true +semi: true +overrides: + - files: 'src/js/*.{js}' + options: + parser: meriyah diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..fe18050 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,27 @@ +{ + "name": "microJSengine", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "devDependencies": { + "prettier": "2.8.7" + } + }, + "node_modules/prettier": { + "version": "2.8.7", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz", + "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..2c93fee --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "devDependencies": { + "prettier": "2.8.7" + } +} diff --git a/src/js/app.js b/src/js/app.js index 7f04aee..a41785f 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -23,5 +23,5 @@ export class App { this.scene.run(); requestAnimationFrame(this.run); - } + }; } diff --git a/src/js/pointer.js b/src/js/pointer.js index ba6c9bc..3d43ef8 100644 --- a/src/js/pointer.js +++ b/src/js/pointer.js @@ -11,20 +11,23 @@ export class Pointer { window.addEventListener('mouseup', this.mouseUp); } - static set pos({ x, y }) { this.#x = x; this.#y = y; } + static set pos({ x, y }) { + this.#x = x; + this.#y = y; + } static get pos() { return { x: this.#x, y: this.#y }; } static mouseMove = (e) => { this.pos = { x: e.pageX, y: e.pageY }; - } + }; static mouseDown = (e) => { this.pos = { x: e.pageX, y: e.pageY }; - } + }; static mouseUp = (e) => { this.pos = { x: e.pageX, y: e.pageY }; - } + }; } diff --git a/src/js/scene.js b/src/js/scene.js index b05d8ff..1bddd22 100644 --- a/src/js/scene.js +++ b/src/js/scene.js @@ -54,8 +54,15 @@ export class Scene { break; case 'uStrokeRect': - this.#drawStrokeRect(item.x, item.y, item.width, item.height, - item.fillColor, item.strokeColor, item.strokeWidth); + this.#drawStrokeRect( + item.x, + item.y, + item.width, + item.height, + item.fillColor, + item.strokeColor, + item.strokeWidth + ); break; default: diff --git a/src/js/settings.js b/src/js/settings.js index 5a74836..b45c87d 100644 --- a/src/js/settings.js +++ b/src/js/settings.js @@ -11,7 +11,9 @@ export class Settings { configurable: true, enumerable: true, get: () => this.#props[property], - set: (setValue) => { this.#props[property] = setValue; }, + set: (setValue) => { + this.#props[property] = setValue; + }, }); }