From cdc5871b90ade006f2d22fe8895c240f898878e9 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Mon, 18 Jan 2021 20:21:46 +0200 Subject: [PATCH 01/13] Add support for Prettier --- .editorconfig | 12 ------------ .prettierrc | 1 + package.json | 8 +++++++- yarn.lock | 23 ++++++++++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 .editorconfig create mode 100644 .prettierrc diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index eab3139d4c..0000000000 --- a/.editorconfig +++ /dev/null @@ -1,12 +0,0 @@ -# https://editorconfig.org/ - -# top-most EditorConfig file -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/.prettierrc @@ -0,0 +1 @@ +{} diff --git a/package.json b/package.json index bfa7108556..c783dbcb26 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,13 @@ "yarn": "^1" }, "dependencies": { - "xml2js": "^0.4.19" + "prettier": "2.2.1", + "xml2js": "0.4.19" + }, + "scripts": { + "format": "yarn prettier --write", + "lint": "yarn prettier --list-different", + "prettier": "prettier \"**/*.{ts,js,json,md,scss,yaml,yml}\"" }, "workspaces": [ "ui", diff --git a/yarn.lock b/yarn.lock index 88c6781532..becaf7fbcc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3511,6 +3511,11 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= +prettier@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" + integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + pretty-bytes@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" @@ -4775,18 +4780,18 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -xml2js@^0.4.19: - version "0.4.23" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" - integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== +xml2js@0.4.19: + version "0.4.19" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" + integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== dependencies: sax ">=0.6.0" - xmlbuilder "~11.0.0" + xmlbuilder "~9.0.1" -xmlbuilder@~11.0.0: - version "11.0.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" - integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== +xmlbuilder@~9.0.1: + version "9.0.7" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" + integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.0, xtend@~4.0.1: version "4.0.2" From 2ebd12ef877700ef525f78867619608df954e1f0 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Mon, 18 Jan 2021 20:24:32 +0200 Subject: [PATCH 02/13] prettier ignore --- .prettierignore | 1 + .prettierrc | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..3877180705 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +public/vendor/ diff --git a/.prettierrc b/.prettierrc index 0967ef424b..c99ac50b3f 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1 +1,4 @@ -{} +{ + "singleQuote": true, + "proseWrap": "never" +} From 310979fec575bd7d8016742a0419cc00f6826e14 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Mon, 18 Jan 2021 20:29:22 +0200 Subject: [PATCH 03/13] Settings --- .prettierrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index c99ac50b3f..f1a0b0186e 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,5 @@ { + "proseWrap": "never", "singleQuote": true, - "proseWrap": "never" + "trailingComma": "all" } From 49bc5911544c8f10a29478973fe6802491caeb27 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Mon, 18 Jan 2021 20:32:06 +0200 Subject: [PATCH 04/13] Settings --- .prettierrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierrc b/.prettierrc index f1a0b0186e..06bb0c266b 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,6 @@ { "proseWrap": "never", + "quoteProps": "consistent", "singleQuote": true, "trailingComma": "all" } From 143d27932db91f890f2df499a34c3efb6c40ed9e Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Mon, 18 Jan 2021 22:04:25 +0200 Subject: [PATCH 05/13] Add XML --- .prettierignore | 1 + .prettierrc | 10 +++++++++- package.json | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.prettierignore b/.prettierignore index 3877180705..ea78de8774 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1 +1,2 @@ public/vendor/ +public/javascript/vendor/ diff --git a/.prettierrc b/.prettierrc index 06bb0c266b..fb896abf24 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,5 +2,13 @@ "proseWrap": "never", "quoteProps": "consistent", "singleQuote": true, - "trailingComma": "all" + "trailingComma": "all", + "overrides": [ + { + "files": "*.{json,xml}", + "options": { + "printWidth": 500 + } + } + ] } diff --git a/package.json b/package.json index c783dbcb26..8c1236c73c 100644 --- a/package.json +++ b/package.json @@ -22,13 +22,14 @@ "yarn": "^1" }, "dependencies": { + "@prettier/plugin-xml": "0.12.0", "prettier": "2.2.1", "xml2js": "0.4.19" }, "scripts": { "format": "yarn prettier --write", "lint": "yarn prettier --list-different", - "prettier": "prettier \"**/*.{ts,js,json,md,scss,yaml,yml}\"" + "prettier": "prettier \"**/*.{ts,js,json,md,scss,yaml,yml,xml}\"" }, "workspaces": [ "ui", From 971c4a55347a0d287960937c669f4b3ed9482870 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Tue, 19 Jan 2021 01:37:47 +0200 Subject: [PATCH 06/13] Single --- .prettierrc | 1 - 1 file changed, 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index fb896abf24..e46ce52ab9 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,7 +1,6 @@ { "proseWrap": "never", "quoteProps": "consistent", - "singleQuote": true, "trailingComma": "all", "overrides": [ { From fe7bb38f8d36f17b4cc9950c749bac687c4f2c7b Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Tue, 19 Jan 2021 01:41:13 +0200 Subject: [PATCH 07/13] 1000 --- .prettierrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index e46ce52ab9..6c5a6c1ee3 100644 --- a/.prettierrc +++ b/.prettierrc @@ -6,7 +6,7 @@ { "files": "*.{json,xml}", "options": { - "printWidth": 500 + "printWidth": 10000 } } ] From e9b60ea04c428dae97180de01c626d9704f09b1e Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Sun, 24 Jan 2021 12:35:28 +0200 Subject: [PATCH 08/13] Remove xml --- .prettierrc | 2 +- package.json | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.prettierrc b/.prettierrc index 6c5a6c1ee3..bf6010f459 100644 --- a/.prettierrc +++ b/.prettierrc @@ -4,7 +4,7 @@ "trailingComma": "all", "overrides": [ { - "files": "*.{json,xml}", + "files": "*.{json}", "options": { "printWidth": 10000 } diff --git a/package.json b/package.json index 8c1236c73c..c783dbcb26 100644 --- a/package.json +++ b/package.json @@ -22,14 +22,13 @@ "yarn": "^1" }, "dependencies": { - "@prettier/plugin-xml": "0.12.0", "prettier": "2.2.1", "xml2js": "0.4.19" }, "scripts": { "format": "yarn prettier --write", "lint": "yarn prettier --list-different", - "prettier": "prettier \"**/*.{ts,js,json,md,scss,yaml,yml,xml}\"" + "prettier": "prettier \"**/*.{ts,js,json,md,scss,yaml,yml}\"" }, "workspaces": [ "ui", From 29bacfdd84a15932b37863106042ea5cb22c555e Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Sun, 24 Jan 2021 12:35:52 +0200 Subject: [PATCH 09/13] 1000 --- .prettierrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.prettierrc b/.prettierrc index bf6010f459..4ca4384be6 100644 --- a/.prettierrc +++ b/.prettierrc @@ -6,7 +6,7 @@ { "files": "*.{json}", "options": { - "printWidth": 10000 + "printWidth": 1000 } } ] From 2ed0364584fde2dbcc871cd04b1ca342492aa6e3 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Mon, 25 Jan 2021 19:23:06 +0200 Subject: [PATCH 10/13] Arrow parens --- .prettierrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.prettierrc b/.prettierrc index 4ca4384be6..1154726c26 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,5 @@ { + "arrowParens": "avoid", "proseWrap": "never", "quoteProps": "consistent", "trailingComma": "all", From 91705cfc911c1173292e7ba19bfa770637dd2240 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Wed, 27 Jan 2021 11:15:01 +0200 Subject: [PATCH 11/13] Add lint --- .github/workflows/lint.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000000..91e8d0fe6d --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,16 @@ +name: Lint + +on: + push: + pull_request: + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + submodules: recursive + - run: | + yarn + yarn lint From 3ab04572fcc3fe1e34ac010fd068745621a5b185 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Wed, 27 Jan 2021 11:16:41 +0200 Subject: [PATCH 12/13] Lint --- .github/workflows/lint.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 91e8d0fe6d..64dd7680b3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,10 +7,16 @@ on: jobs: lint: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - run: | - yarn - yarn lint + - uses: actions/checkout@v1 + + - name: Setup Node.js 14.x + uses: actions/setup-node@v1 + with: + node-version: 14.x + + - name: Install and lint + run: | + yarn + yarn lint From 6f56aac60b4431abac966e3d706ffb9ea332ef8c Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Wed, 27 Jan 2021 11:19:59 +0200 Subject: [PATCH 13/13] title --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 64dd7680b3..7e23248fc1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,4 +1,4 @@ -name: Lint +name: Lint code on: push: