diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..de845f8e4 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,11 @@ +# Compilation/build outputs +build/ +dist/ +dist-ssr/ + +# GUI +/api-editor/gui/vite.config.ts +/api-editor/gui/src/theme/index.d.ts + +# Backend +/api-editor/backend/src/main/resources/static/ diff --git a/api-editor/.eslintrc.js b/.eslintrc.js similarity index 100% rename from api-editor/.eslintrc.js rename to .eslintrc.js diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3e0944375..5f8be7eae 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,20 +5,20 @@ version: 2 updates: - - package-ecosystem: 'npm' + - package-ecosystem: 'github-actions' directory: '/' schedule: interval: 'monthly' - - package-ecosystem: 'npm' - directory: '/client' + - package-ecosystem: 'gradle' + directory: '/api-editor' schedule: interval: 'monthly' - - package-ecosystem: 'gradle' + - package-ecosystem: 'npm' directory: '/' schedule: interval: 'monthly' - - package-ecosystem: 'github-actions' - directory: '/' + - package-ecosystem: 'npm' + directory: '/api-editor/gui' schedule: interval: 'monthly' - package-ecosystem: 'pip' diff --git a/.mega-linter.yml b/.mega-linter.yml index 5babbf077..2b622c0d2 100644 --- a/.mega-linter.yml +++ b/.mega-linter.yml @@ -111,7 +111,7 @@ ENABLE_LINTERS: # - TERRAFORM_CHECKOV - TSX_ESLINT - TYPESCRIPT_ES - - TYPESCRIPT_STANDARD + # - TYPESCRIPT_STANDARD - TYPESCRIPT_PRETTIER # - VBDOTNET_DOTNET_FORMAT - XML_XMLLINT diff --git a/.prettierignore b/.prettierignore index 0d3350e96..af4df2ddf 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,4 +3,4 @@ build/ dist/ dist-ssr/ -api-editor/server/src/main/resources/static/ +api-editor/backend/src/main/resources/static/ diff --git a/api-editor/.eslintignore b/api-editor/.eslintignore deleted file mode 100644 index 0f802a127..000000000 --- a/api-editor/.eslintignore +++ /dev/null @@ -1,14 +0,0 @@ -# Compilation/build outputs -build/ -dist/ -dist-ssr/ - -# Configuration -.eslintrc.js - -# GUI -/gui/vite.config.ts -/gui/src/theme/index.d.ts - -# Backend -/backend/src/main/resources/static/ diff --git a/api-editor/gui/package-lock.json b/api-editor/gui/package-lock.json index b0e612691..697292772 100644 --- a/api-editor/gui/package-lock.json +++ b/api-editor/gui/package-lock.json @@ -38,7 +38,7 @@ "devDependencies": { "@chakra-ui/cli": "^1.8.1", "@hookform/devtools": "^4.0.2", - "@lars-reimann/prettier-config": "^4.0.4", + "@lars-reimann/prettier-config": "^5.0.0", "@testing-library/jest-dom": "^5.16.2", "@testing-library/react": "^12.1.3", "@types/jest": "^27.4.0", @@ -2282,9 +2282,9 @@ } }, "node_modules/@lars-reimann/prettier-config": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@lars-reimann/prettier-config/-/prettier-config-4.0.4.tgz", - "integrity": "sha512-/ZNaWoQouy0gmjEmjLlek5xOY7OULEJSBAZR3mHJPCXgaCweJULME0cVadlOrpODbskO6Tr/8zPr0uie8kjOag==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@lars-reimann/prettier-config/-/prettier-config-5.0.0.tgz", + "integrity": "sha512-52Ha8xMKpQESiaEzceWgyQb+fuPVD3wl2p6Op1mpLyLj6natjq7Vy8lAmbWS3AbPRjPlJZZHnp/b+sOAOdNqbA==", "dev": true, "peerDependencies": { "prettier": ">= 2" @@ -13608,9 +13608,9 @@ } }, "@lars-reimann/prettier-config": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@lars-reimann/prettier-config/-/prettier-config-4.0.4.tgz", - "integrity": "sha512-/ZNaWoQouy0gmjEmjLlek5xOY7OULEJSBAZR3mHJPCXgaCweJULME0cVadlOrpODbskO6Tr/8zPr0uie8kjOag==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@lars-reimann/prettier-config/-/prettier-config-5.0.0.tgz", + "integrity": "sha512-52Ha8xMKpQESiaEzceWgyQb+fuPVD3wl2p6Op1mpLyLj6natjq7Vy8lAmbWS3AbPRjPlJZZHnp/b+sOAOdNqbA==", "dev": true, "requires": {} }, diff --git a/api-editor/gui/package.json b/api-editor/gui/package.json index 7db78438f..f560cd974 100644 --- a/api-editor/gui/package.json +++ b/api-editor/gui/package.json @@ -41,7 +41,7 @@ "devDependencies": { "@chakra-ui/cli": "^1.8.1", "@hookform/devtools": "^4.0.2", - "@lars-reimann/prettier-config": "^4.0.4", + "@lars-reimann/prettier-config": "^5.0.0", "@testing-library/jest-dom": "^5.16.2", "@testing-library/react": "^12.1.3", "@types/jest": "^27.4.0", diff --git a/api-editor/gui/tsconfig.json b/api-editor/gui/tsconfig.json index 193c2f4e4..6d2c935b5 100644 --- a/api-editor/gui/tsconfig.json +++ b/api-editor/gui/tsconfig.json @@ -15,6 +15,6 @@ "noEmit": true, "jsx": "react" }, - "include": ["src/"], + "include": ["src/**/*"], "exclude": ["**/*.test.ts"] } diff --git a/api-editor/tsconfig.eslint.json b/api-editor/tsconfig.eslint.json deleted file mode 100644 index a2abd9727..000000000 --- a/api-editor/tsconfig.eslint.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./client/tsconfig.json", - "compilerOptions": { - "noEmit": true - }, - "include": ["./gui/src", "./gui/vite.config.ts"], - "exclude": [] -} diff --git a/package-lock.json b/package-lock.json index b125f03b8..612235e31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "com.larsreimann.api_editor", "version": "0.0.1", "devDependencies": { - "@lars-reimann/eslint-config": "^4.1.2", + "@lars-reimann/eslint-config": "^4.2.0", "@lars-reimann/prettier-config": "^5.0.0" } }, @@ -196,9 +196,9 @@ "peer": true }, "node_modules/@lars-reimann/eslint-config": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@lars-reimann/eslint-config/-/eslint-config-4.1.2.tgz", - "integrity": "sha512-I8FkPY44T534UsabmrCpg9OcmQUpzEwJkEI3jujKzOD48D9PbIfaGsewmEJ6EzjcPM3J1FGgi9N4okQwwYekWA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@lars-reimann/eslint-config/-/eslint-config-4.2.0.tgz", + "integrity": "sha512-6QJMin0IP4fzqB8AXUpPnYKfP0XgnRJrP4KZ2O1yw21Vluq3LfBuuTtUkMstDoVsuBuNajeHlS8qrBOzG+26xg==", "dev": true, "dependencies": { "eslint-config-airbnb": "^19.0.2", @@ -3589,9 +3589,9 @@ "peer": true }, "@lars-reimann/eslint-config": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@lars-reimann/eslint-config/-/eslint-config-4.1.2.tgz", - "integrity": "sha512-I8FkPY44T534UsabmrCpg9OcmQUpzEwJkEI3jujKzOD48D9PbIfaGsewmEJ6EzjcPM3J1FGgi9N4okQwwYekWA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@lars-reimann/eslint-config/-/eslint-config-4.2.0.tgz", + "integrity": "sha512-6QJMin0IP4fzqB8AXUpPnYKfP0XgnRJrP4KZ2O1yw21Vluq3LfBuuTtUkMstDoVsuBuNajeHlS8qrBOzG+26xg==", "dev": true, "requires": { "eslint-config-airbnb": "^19.0.2", diff --git a/package.json b/package.json index c01b73ea4..a83694b17 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "prettier": "@lars-reimann/prettier-config", "devDependencies": { - "@lars-reimann/eslint-config": "^4.1.2", + "@lars-reimann/eslint-config": "^4.2.0", "@lars-reimann/prettier-config": "^5.0.0" } } diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json new file mode 100644 index 000000000..9ab51453a --- /dev/null +++ b/tsconfig.eslint.json @@ -0,0 +1,8 @@ +{ + "extends": "./api-editor/gui/tsconfig.json", + "compilerOptions": { + "noEmit": true + }, + "include": ["./.eslintrc.js", "./api-editor/gui/src/**/*", "./api-editor/gui/vite.config.ts"], + "exclude": [] +}