From f94532529f493ccd4eea72c7a78dd8039246ff31 Mon Sep 17 00:00:00 2001 From: Peter Petrik Date: Fri, 21 Apr 2023 15:26:32 +0200 Subject: [PATCH 1/4] add js and py styling --- .github/workflows/code_style.yml | 27 +++++++++++++++++++++++++++ README.md | 3 ++- web-app/babel.config.js | 3 +++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/code_style.yml create mode 100644 web-app/babel.config.js diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml new file mode 100644 index 00000000..d0af27f9 --- /dev/null +++ b/.github/workflows/code_style.yml @@ -0,0 +1,27 @@ +name: Code Layout + +on: push + +jobs: + code_style_python: + name: Python code convention check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - uses: psf/black@stable + with: + options: "--check --verbose --diff" + src: "./server" + + code_style_js: + name: JavaScript code convention check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + - name: Check JS + run: | + cd web-app + yarn install + npx eslint ./packages/** --config .eslintrc.js --ext .js,.vue --ignore-path .gitignore diff --git a/README.md b/README.md index 56ef4dd6..b0d6fc4f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,8 @@

- +
+[![Code Layout](https://github.com/MerginMaps/mergin/actions/workflows/code_style.yml/badge.svg)](https://github.com/MerginMaps/mergin/actions/workflows/code_style.yml)

## About diff --git a/web-app/babel.config.js b/web-app/babel.config.js new file mode 100644 index 00000000..716b0237 --- /dev/null +++ b/web-app/babel.config.js @@ -0,0 +1,3 @@ +module.exports = { + presets: ['@vue/cli-plugin-babel/preset'] +} From 039fe30237c10c6e2c431e486c7db21ebb81e46e Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Thu, 25 May 2023 13:01:46 +0200 Subject: [PATCH 2/4] Added lint for every package with eslint Note: If first linter abort (/lib) pipeline will exit --- .github/workflows/code_style.yml | 2 +- web-app/package.json | 4 ++-- web-app/packages/admin-app/package.json | 2 +- web-app/packages/admin-lib/.eslintrc.js | 3 +-- web-app/packages/admin-lib/package.json | 2 +- web-app/packages/app/package.json | 2 +- web-app/packages/lib/.eslintrc.js | 3 +-- web-app/packages/lib/package.json | 2 +- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/code_style.yml b/.github/workflows/code_style.yml index d0af27f9..2c384dc8 100644 --- a/.github/workflows/code_style.yml +++ b/.github/workflows/code_style.yml @@ -24,4 +24,4 @@ jobs: run: | cd web-app yarn install - npx eslint ./packages/** --config .eslintrc.js --ext .js,.vue --ignore-path .gitignore + yarn run lint:all diff --git a/web-app/package.json b/web-app/package.json index 22091a1d..2de18a63 100644 --- a/web-app/package.json +++ b/web-app/package.json @@ -26,13 +26,13 @@ "build:admin:dev": "yarn workspace @mergin/admin-app build:dev", "clean:libs": "yarn workspace @mergin/lib clean && yarn workspace @mergin/admin-lib clean", "clean:libs:noadmin": "yarn workspace @mergin/lib clean", - "lint": "yarn workspace @mergin/app lint", "i18n:report": "yarn workspace @mergin/app 18n:report", "types:libs": "yarn workspaces run build:types", "types:lib": "yarn workspace @mergin/lib build:types", "types:admin-lib": "yarn workspace @mergin/admin-lib build:types", "watch:lib": "yarn workspace @mergin/lib build:lib:watch", - "watch:admin-lib": "yarn workspace @mergin/admin-lib build:lib:watch" + "watch:admin-lib": "yarn workspace @mergin/admin-lib build:lib:watch", + "lint:all": "yarn workspaces run lint" }, "devDependencies": { "@babel/core": "^7.17.9", diff --git a/web-app/packages/admin-app/package.json b/web-app/packages/admin-app/package.json index d4565b8d..0e75b39d 100644 --- a/web-app/packages/admin-app/package.json +++ b/web-app/packages/admin-app/package.json @@ -13,7 +13,7 @@ "build:lib:all:prod": "yarn build:lib:prod && yarn build:types", "build:types": "echo 'Not defined script'", "clean": "echo 'Nothing to clean.'", - "lint": "vue-cli-service lint --fix", + "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts", "i18n:report": "vue-cli-service i18n:report --src './src/admin/**/*.?(js|vue)' --locales './src/admin/locales/**/*.json'" }, "dependencies": { diff --git a/web-app/packages/admin-lib/.eslintrc.js b/web-app/packages/admin-lib/.eslintrc.js index 53487599..97146dec 100644 --- a/web-app/packages/admin-lib/.eslintrc.js +++ b/web-app/packages/admin-lib/.eslintrc.js @@ -6,8 +6,7 @@ module.exports = { extends: [ 'plugin:vue/essential', 'eslint:recommended', - '@vue/typescript/recommended', - '../../.eslintrc.js' + '@vue/typescript/recommended' ], parser: 'vue-eslint-parser', parserOptions: { diff --git a/web-app/packages/admin-lib/package.json b/web-app/packages/admin-lib/package.json index c87bd7da..1abe9533 100644 --- a/web-app/packages/admin-lib/package.json +++ b/web-app/packages/admin-lib/package.json @@ -17,7 +17,7 @@ "clean:lib": "rimraf ./dist", "clean:types:temp": "rimraf ./**/*.vue.ts", "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp", - "lint": "vue-cli-service lint" + "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts" }, "dependencies": { "@mergin/lib": "file:../lib", diff --git a/web-app/packages/app/package.json b/web-app/packages/app/package.json index 4adf89c5..c21986b6 100644 --- a/web-app/packages/app/package.json +++ b/web-app/packages/app/package.json @@ -13,7 +13,7 @@ "build:lib:all": "yarn build:lib && yarn build:types", "build:lib:all:prod": "yarn build:lib:prod && yarn build:types", "clean": "echo 'Nothing to clean.'", - "lint": "vue-cli-service lint --fix", + "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts", "i18n:report": "vue-cli-service i18n:report --src './src/admin/**/*.?(js|vue)' --locales './src/admin/locales/**/*.json'" }, "dependencies": { diff --git a/web-app/packages/lib/.eslintrc.js b/web-app/packages/lib/.eslintrc.js index 53487599..97146dec 100644 --- a/web-app/packages/lib/.eslintrc.js +++ b/web-app/packages/lib/.eslintrc.js @@ -6,8 +6,7 @@ module.exports = { extends: [ 'plugin:vue/essential', 'eslint:recommended', - '@vue/typescript/recommended', - '../../.eslintrc.js' + '@vue/typescript/recommended' ], parser: 'vue-eslint-parser', parserOptions: { diff --git a/web-app/packages/lib/package.json b/web-app/packages/lib/package.json index b56bffb1..ab108f49 100644 --- a/web-app/packages/lib/package.json +++ b/web-app/packages/lib/package.json @@ -18,7 +18,7 @@ "clean:lib": "rimraf ./dist", "clean:types:temp": "rimraf ./**/*.vue.ts", "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp", - "lint": "vue-cli-service lint" + "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts --no-exit-on-fatal-error" }, "dependencies": { "axios": "^0.26.1", From e55851e857bd6019504d8400ea47b996ad851d23 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Thu, 25 May 2023 13:44:40 +0200 Subject: [PATCH 3/4] Fix: - IDE was not lintiing with root: true New config for eslint command created in libs with root: true --- web-app/packages/admin-lib/.eslintrc.js | 1 - web-app/packages/admin-lib/.eslintrc.lint.js | 4 ++++ web-app/packages/admin-lib/package.json | 2 +- web-app/packages/lib/.eslintrc.js | 1 - web-app/packages/lib/.eslintrc.lint.js | 4 ++++ web-app/packages/lib/package.json | 2 +- 6 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 web-app/packages/admin-lib/.eslintrc.lint.js create mode 100644 web-app/packages/lib/.eslintrc.lint.js diff --git a/web-app/packages/admin-lib/.eslintrc.js b/web-app/packages/admin-lib/.eslintrc.js index 97146dec..51dfd9e4 100644 --- a/web-app/packages/admin-lib/.eslintrc.js +++ b/web-app/packages/admin-lib/.eslintrc.js @@ -1,5 +1,4 @@ module.exports = { - root: true, env: { node: true }, diff --git a/web-app/packages/admin-lib/.eslintrc.lint.js b/web-app/packages/admin-lib/.eslintrc.lint.js new file mode 100644 index 00000000..defb45a1 --- /dev/null +++ b/web-app/packages/admin-lib/.eslintrc.lint.js @@ -0,0 +1,4 @@ +module.exports = { + root: true, + extends: '.eslintrc.js' +} diff --git a/web-app/packages/admin-lib/package.json b/web-app/packages/admin-lib/package.json index 1abe9533..c7c8175d 100644 --- a/web-app/packages/admin-lib/package.json +++ b/web-app/packages/admin-lib/package.json @@ -17,7 +17,7 @@ "clean:lib": "rimraf ./dist", "clean:types:temp": "rimraf ./**/*.vue.ts", "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp", - "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts" + "lint": "eslint . --config .eslintrc.lint.js ../../.eslintrc.js --no-eslintrc --ext .js,.vue,.ts" }, "dependencies": { "@mergin/lib": "file:../lib", diff --git a/web-app/packages/lib/.eslintrc.js b/web-app/packages/lib/.eslintrc.js index 97146dec..51dfd9e4 100644 --- a/web-app/packages/lib/.eslintrc.js +++ b/web-app/packages/lib/.eslintrc.js @@ -1,5 +1,4 @@ module.exports = { - root: true, env: { node: true }, diff --git a/web-app/packages/lib/.eslintrc.lint.js b/web-app/packages/lib/.eslintrc.lint.js new file mode 100644 index 00000000..defb45a1 --- /dev/null +++ b/web-app/packages/lib/.eslintrc.lint.js @@ -0,0 +1,4 @@ +module.exports = { + root: true, + extends: '.eslintrc.js' +} diff --git a/web-app/packages/lib/package.json b/web-app/packages/lib/package.json index ab108f49..64e45ac6 100644 --- a/web-app/packages/lib/package.json +++ b/web-app/packages/lib/package.json @@ -18,7 +18,7 @@ "clean:lib": "rimraf ./dist", "clean:types:temp": "rimraf ./**/*.vue.ts", "clean:types": "rimraf ./types ./tsconfig.tsbuildinfo && yarn clean:types:temp", - "lint": "eslint . --config .eslintrc.js --ext .js,.vue,.ts --no-exit-on-fatal-error" + "lint": "eslint . -c ./.eslintrc.lint.js ../../.eslintrc.js --no-eslintrc --ext .js,.vue,.ts" }, "dependencies": { "axios": "^0.26.1", From fdcafc146b7d8451bcdf7433b7c6de49be036250 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Thu, 25 May 2023 13:49:53 +0200 Subject: [PATCH 4/4] Added licenses from develop to prevent conflicts --- LICENSES/CLA-signed-list.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/LICENSES/CLA-signed-list.md b/LICENSES/CLA-signed-list.md index 1fdad7a2..309bfd91 100644 --- a/LICENSES/CLA-signed-list.md +++ b/LICENSES/CLA-signed-list.md @@ -12,4 +12,7 @@ C/ My company has custom contribution contract with Lutra Consulting Ltd. or I a * PeterPetrik, 31st March 2023 * tomasMizera, 31st March 2023 +* MarcelGeo, 19th April 2023 * harminius, 18th Aril 2023 +* varmar05, 12th April 2023 +* lavor, 26th April 2023