From 56b112a8dbaf693fb3bf1d3270fa296055443cf4 Mon Sep 17 00:00:00 2001 From: Konstantin Tsabolov <1006564+tsabolov@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:56:32 +0100 Subject: [PATCH] chore: move prettier to the repo root --- .../.prettierignore => .prettierignore | 9 +++-- .../.prettierrc => .prettierrc | 0 apps/attestation-manager/package.json | 3 -- apps/connection-manager/.prettierignore | 17 --------- apps/connection-manager/.prettierrc | 4 --- apps/connection-manager/package.json | 3 -- apps/principal-manager/.prettierignore | 17 --------- apps/principal-manager/.prettierrc | 4 --- apps/principal-manager/package.json | 3 -- apps/proof-manager/.prettierignore | 17 --------- apps/proof-manager/.prettierrc | 4 --- apps/proof-manager/package.json | 3 -- package.json | 7 ++-- pnpm-lock.yaml | 36 +++---------------- 14 files changed, 17 insertions(+), 110 deletions(-) rename apps/attestation-manager/.prettierignore => .prettierignore (63%) rename apps/attestation-manager/.prettierrc => .prettierrc (100%) delete mode 100644 apps/connection-manager/.prettierignore delete mode 100644 apps/connection-manager/.prettierrc delete mode 100644 apps/principal-manager/.prettierignore delete mode 100644 apps/principal-manager/.prettierrc delete mode 100644 apps/proof-manager/.prettierignore delete mode 100644 apps/proof-manager/.prettierrc diff --git a/apps/attestation-manager/.prettierignore b/.prettierignore similarity index 63% rename from apps/attestation-manager/.prettierignore rename to .prettierignore index 487d869..71809b4 100644 --- a/apps/attestation-manager/.prettierignore +++ b/.prettierignore @@ -10,8 +10,13 @@ !*/ # ... in these ones -!src/* +!apps/**/src/* # Explicitly ignore these locations node_modules -dist +apps/**/dist +compose +documentation + +# Ignore ssi-abstraction for now +apps/ssi-abstraction diff --git a/apps/attestation-manager/.prettierrc b/.prettierrc similarity index 100% rename from apps/attestation-manager/.prettierrc rename to .prettierrc diff --git a/apps/attestation-manager/package.json b/apps/attestation-manager/package.json index a3c8ddf..9be54b8 100644 --- a/apps/attestation-manager/package.json +++ b/apps/attestation-manager/package.json @@ -18,8 +18,6 @@ "start:docker": "yarn prisma:generate && yarn dbSchema && yarn start", "lint": "eslint --fix", "lint:all": "npm run lint -- .", - "format": "prettier --write", - "format:all": "npm run format -- .", "test": "jest", "test:watch": "jest --watch", "test:cov": "jest --coverage", @@ -75,7 +73,6 @@ "husky": "^8.0.3", "jest": "^29.7.0", "node-mocks-http": "^1.13.0", - "prettier": "^3.1.0", "prisma": "^5.6.0", "rimraf": "^5.0.5", "source-map-support": "^0.5.21", diff --git a/apps/connection-manager/.prettierignore b/apps/connection-manager/.prettierignore deleted file mode 100644 index 487d869..0000000 --- a/apps/connection-manager/.prettierignore +++ /dev/null @@ -1,17 +0,0 @@ -# Ignore everything -* - -# Except for these files -!*.ts -!*.d.ts -!jest.config.js - -# .. also in subdirectories -!*/ - -# ... in these ones -!src/* - -# Explicitly ignore these locations -node_modules -dist diff --git a/apps/connection-manager/.prettierrc b/apps/connection-manager/.prettierrc deleted file mode 100644 index dcb7279..0000000 --- a/apps/connection-manager/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "singleQuote": true, - "trailingComma": "all" -} \ No newline at end of file diff --git a/apps/connection-manager/package.json b/apps/connection-manager/package.json index c4ac370..51bdde5 100644 --- a/apps/connection-manager/package.json +++ b/apps/connection-manager/package.json @@ -19,8 +19,6 @@ "start:docker:prod": "pnpm prisma:migrate && node dist/src/main", "lint": "eslint --fix", "lint:all": "npm run lint -- .", - "format": "prettier --write", - "format:all": "npm run format -- .", "test": "jest", "test:watch": "jest --watch", "test:cov": "jest --coverage", @@ -77,7 +75,6 @@ "husky": "^8.0.3", "jest": "^29.7.0", "node-mocks-http": "^1.13.0", - "prettier": "^3.1.0", "prisma": "^5.6.0", "source-map-support": "^0.5.21", "supertest": "^6.3.3", diff --git a/apps/principal-manager/.prettierignore b/apps/principal-manager/.prettierignore deleted file mode 100644 index 487d869..0000000 --- a/apps/principal-manager/.prettierignore +++ /dev/null @@ -1,17 +0,0 @@ -# Ignore everything -* - -# Except for these files -!*.ts -!*.d.ts -!jest.config.js - -# .. also in subdirectories -!*/ - -# ... in these ones -!src/* - -# Explicitly ignore these locations -node_modules -dist diff --git a/apps/principal-manager/.prettierrc b/apps/principal-manager/.prettierrc deleted file mode 100644 index dcb7279..0000000 --- a/apps/principal-manager/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "singleQuote": true, - "trailingComma": "all" -} \ No newline at end of file diff --git a/apps/principal-manager/package.json b/apps/principal-manager/package.json index 93c3d31..6c3b01d 100644 --- a/apps/principal-manager/package.json +++ b/apps/principal-manager/package.json @@ -19,8 +19,6 @@ "start:docker": "pnpm prisma:migrate && pnpm start", "lint": "eslint --fix", "lint:all": "npm run lint -- .", - "format": "prettier --write", - "format:all": "npm run format -- .", "test": "jest", "test:watch": "jest --watch", "test:cov": "jest --coverage", @@ -79,7 +77,6 @@ "eslint-plugin-prettier": "^5.0.1", "husky": "^8.0.3", "jest": "^29.7.0", - "prettier": "^3.1.0", "prisma": "^5.6.0", "rimraf": "^5.0.5", "source-map-support": "^0.5.21", diff --git a/apps/proof-manager/.prettierignore b/apps/proof-manager/.prettierignore deleted file mode 100644 index 487d869..0000000 --- a/apps/proof-manager/.prettierignore +++ /dev/null @@ -1,17 +0,0 @@ -# Ignore everything -* - -# Except for these files -!*.ts -!*.d.ts -!jest.config.js - -# .. also in subdirectories -!*/ - -# ... in these ones -!src/* - -# Explicitly ignore these locations -node_modules -dist diff --git a/apps/proof-manager/.prettierrc b/apps/proof-manager/.prettierrc deleted file mode 100644 index dcb7279..0000000 --- a/apps/proof-manager/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "singleQuote": true, - "trailingComma": "all" -} \ No newline at end of file diff --git a/apps/proof-manager/package.json b/apps/proof-manager/package.json index cea0314..fa57919 100644 --- a/apps/proof-manager/package.json +++ b/apps/proof-manager/package.json @@ -19,8 +19,6 @@ "start:docker": "pnpm prisma:generate && pnpm dbSchema && pnpm start", "lint": "eslint --fix", "lint:all": "npm run lint -- .", - "format": "prettier --write", - "format:all": "npm run format -- .", "test": "jest", "test:watch": "jest --watch", "test:cov": "jest --coverage", @@ -75,7 +73,6 @@ "husky": "^8.0.3", "jest": "^29.7.0", "node-mocks-http": "^1.13.0", - "prettier": "^3.1.0", "prisma": "^5.6.0", "rimraf": "^5.0.5", "source-map-support": "^0.5.21", diff --git a/package.json b/package.json index ae7358e..db7424f 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,10 @@ "proof:build": "pnpm -F proof-manager build", "ssi:build": "pnpm -F ssi-abstraction build", "lint": "pnpm -r lint", - "prettier": "prettier --ignore-path .gitignore '**/*.+(js|json|ts|md|yml|yaml)'", - "format": "pnpm prettier --write" + "format": "prettier --write", + "format:all": "npm run format -- ." + }, + "devDependencies": { + "prettier": "^3.1.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3b3118a..14adcd8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,11 @@ settings: importers: - .: {} + .: + devDependencies: + prettier: + specifier: ^3.1.0 + version: 3.1.0 apps/attestation-manager: dependencies: @@ -119,27 +123,9 @@ importers: '@types/supertest': specifier: ^2.0.16 version: 2.0.16 - '@typescript-eslint/eslint-plugin': - specifier: ^6.11.0 - version: 6.11.0(@typescript-eslint/parser@6.11.0)(eslint@8.53.0)(typescript@5.2.2) - '@typescript-eslint/parser': - specifier: ^6.11.0 - version: 6.11.0(eslint@8.53.0)(typescript@5.2.2) dotenv-cli: specifier: ^7.3.0 version: 7.3.0 - eslint: - specifier: ^8.53.0 - version: 8.53.0 - eslint-config-prettier: - specifier: ^9.0.0 - version: 9.0.0(eslint@8.53.0) - eslint-plugin-jest: - specifier: ^27.6.0 - version: 27.6.0(@typescript-eslint/eslint-plugin@6.11.0)(eslint@8.53.0)(jest@29.7.0)(typescript@5.2.2) - eslint-plugin-prettier: - specifier: ^5.0.1 - version: 5.0.1(eslint-config-prettier@9.0.0)(eslint@8.53.0)(prettier@3.1.0) husky: specifier: ^8.0.3 version: 8.0.3 @@ -149,9 +135,6 @@ importers: node-mocks-http: specifier: ^1.13.0 version: 1.13.0 - prettier: - specifier: ^3.1.0 - version: 3.1.0 prisma: specifier: ^5.6.0 version: 5.6.0 @@ -315,9 +298,6 @@ importers: node-mocks-http: specifier: ^1.13.0 version: 1.13.0 - prettier: - specifier: ^3.1.0 - version: 3.1.0 prisma: specifier: ^5.6.0 version: 5.6.0 @@ -487,9 +467,6 @@ importers: jest: specifier: ^29.7.0 version: 29.7.0(@types/node@20.9.0)(ts-node@10.9.1) - prettier: - specifier: ^3.1.0 - version: 3.1.0 prisma: specifier: ^5.6.0 version: 5.6.0 @@ -656,9 +633,6 @@ importers: node-mocks-http: specifier: ^1.13.0 version: 1.13.0 - prettier: - specifier: ^3.1.0 - version: 3.1.0 prisma: specifier: ^5.6.0 version: 5.6.0 -- GitLab