Skip to content

Commit 85ae227

Browse files
yann510yann510
authored
Merge pull request #175 from chocolat-chaud-io/119-package-cleanup
chore: cleaned up dependencies
2 parents f39e4f0 + 67efa85 commit 85ae227

File tree

12 files changed

+756
-50501
lines changed

12 files changed

+756
-50501
lines changed

‎.github/pull_request_template.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
closes #issue_number
2+
3+
### Pull request creator checklist
4+
5+
- [ ] Add an issue closing statement in the PR description. E.g: `closes #123`
6+
- [ ] Ensure you respect all the requirements of the issue you completed.
7+
- [ ] `conditional` UI/UX improvements: Try to think how you would like the feature to have been build if you get into the role of the end user. E.g: when you click a button, a modal opens up, personally as a user when I press escape I would like the modal to be closed.
8+
- [ ] Review your code as if you were reviewing someone else's code. Don't hesitate to refactor everywhere you think your code could be cleaner.
9+
- [ ] Test thoroughly every new feature you added and try to think if your changes could have affected some other flows. E.g: you modified a generic component used in other areas; if you think it can cause issues, please test these other areas.
10+
11+
### Pull request reviewer checklist
12+
13+
- [ ] Ensure all the requirements of the issue have been implemented.
14+
- [ ] Identify potential bugs and code improvements.
15+
- [ ] `conditional` Identify potential UI/UX improvements.
16+
- [ ] Test thoroughly every new feature that were added and try to think if any changes could have affected some other flows. E.g: you modified a generic component used in other areas; if you think it can cause issues, please test these other areas.

‎.prettierrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"trailingComma": "es5",
77
"semi": false,
88
"jsxSingleQuote": false,
9-
"jsxBracketSameLine": false,
9+
"bracketSameLine": false,
1010
"printWidth": 140
1111
}

‎apps/api/project.json‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"root": "apps/api",
3+
"sourceRoot": "apps/api/src",
4+
"projectType": "application",
5+
"prefix": "api",
6+
"generators": {},
7+
"targets": {
8+
"build": {
9+
"executor": "@nrwl/node:build",
10+
"options": {
11+
"outputPath": "dist/apps/api",
12+
"main": "apps/api/src/main.ts",
13+
"tsConfig": "apps/api/tsconfig.app.json",
14+
"assets": ["apps/api/src/assets"],
15+
"generatePackageJson": true,
16+
"webpackConfig": "apps/api/webpack.config.ts",
17+
"showCircularDependencies": false,
18+
"maxWorkers": 2,
19+
"memoryLimit": 1024
20+
},
21+
"configurations": {
22+
"production": {
23+
"optimization": true,
24+
"extractLicenses": true,
25+
"generatePackageJson": true,
26+
"inspect": false,
27+
"fileReplacements": [
28+
{
29+
"replace": "apps/api/src/environments/environment.ts",
30+
"with": "apps/api/src/environments/environment.prod.ts"
31+
}
32+
]
33+
}
34+
},
35+
"outputs": ["{options.outputPath}"]
36+
},
37+
"serve": {
38+
"executor": "@nrwl/node:execute",
39+
"options": {
40+
"buildTarget": "api:build"
41+
}
42+
},
43+
"debug": {
44+
"executor": "@nrwl/node:execute",
45+
"options": {
46+
"buildTarget": "api:build",
47+
"inspect": true,
48+
"port": 7777
49+
}
50+
},
51+
"lint": {
52+
"executor": "@nrwl/linter:eslint",
53+
"options": {
54+
"lintFilePatterns": ["apps/api/**/*.{ts,tsx,js,jsx}"]
55+
},
56+
"outputs": ["{options.outputFile}"]
57+
},
58+
"test": {
59+
"executor": "@nrwl/jest:jest",
60+
"options": {
61+
"jestConfig": "apps/api/jest.config.js",
62+
"passWithNoTests": true
63+
},
64+
"outputs": ["coverage/apps/api"]
65+
}
66+
},
67+
"tags": []
68+
}

‎apps/api/src/config/configuration.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const getOrmConfigFn = async (configService: ConfigService): Promise<Type
2727
password: configService.get("database.password"),
2828
synchronize: configService.get("database.synchronize"),
2929
keepConnectionAlive: configService.get("database.keepConnectionAlive"),
30-
ssl: configService.get("database.certificateAuthority") ?? false,
30+
ssl: configService.get("database.certificateAuthority") ? { ca: configService.get("database.certificateAuthority") } : false,
3131
entities: [Todo],
3232
logging: ["error"],
3333
retryAttempts: configService.get<number>("database.retryAttempts"),

‎apps/api/src/utils/test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class TestingHelper {
5959
}
6060

6161
private getFixturePath() {
62-
const possibleFixturePaths = ["./src/assets/fixtures", "./assets/fixtures", "./apps/api/src/assets/fixtures"]
62+
const possibleFixturePaths = ["./apps/api/src/assets/fixtures", "./src/assets/fixtures", "./assets/fixtures"]
6363
for (const possibleFixturePath of possibleFixturePaths) {
6464
if (fs.existsSync(possibleFixturePath)) {
6565
return possibleFixturePath

‎apps/cli/project.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"root": "apps/cli",
3+
"sourceRoot": "apps/cli/src",
4+
"projectType": "application",
5+
"targets": {
6+
"build": {
7+
"executor": "@nrwl/node:build",
8+
"outputs": ["{options.outputPath}"],
9+
"options": {
10+
"outputPath": "cli",
11+
"main": "apps/cli/src/main.ts",
12+
"tsConfig": "apps/cli/tsconfig.app.json"
13+
},
14+
"configurations": {
15+
"production": {
16+
"optimization": true,
17+
"extractLicenses": true,
18+
"inspect": false,
19+
"fileReplacements": [
20+
{
21+
"replace": "apps/cli/src/environments/environment.ts",
22+
"with": "apps/cli/src/environments/environment.prod.ts"
23+
}
24+
]
25+
}
26+
}
27+
},
28+
"serve": {
29+
"executor": "@nrwl/node:execute",
30+
"options": {
31+
"buildTarget": "cli:build"
32+
}
33+
},
34+
"lint": {
35+
"executor": "@nrwl/linter:eslint",
36+
"options": {
37+
"lintFilePatterns": ["apps/cli/**/*.ts"]
38+
},
39+
"outputs": ["{options.outputFile}"]
40+
},
41+
"test": {
42+
"executor": "@nrwl/jest:jest",
43+
"outputs": ["coverage/apps/cli"],
44+
"options": {
45+
"jestConfig": "apps/cli/jest.config.js",
46+
"passWithNoTests": true
47+
}
48+
}
49+
},
50+
"tags": []
51+
}

‎apps/webapp-e2e/project.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"root": "apps/webapp-e2e",
3+
"sourceRoot": "apps/webapp-e2e/src",
4+
"projectType": "application",
5+
"targets": {
6+
"e2e": {
7+
"executor": "@nrwl/cypress:cypress",
8+
"options": {
9+
"cypressConfig": "apps/webapp-e2e/cypress.json",
10+
"tsConfig": "apps/webapp-e2e/tsconfig.e2e.json",
11+
"devServerTarget": "webapp:serve"
12+
},
13+
"configurations": {
14+
"production": {
15+
"devServerTarget": "webapp:serve:production"
16+
}
17+
}
18+
},
19+
"lint": {
20+
"executor": "@nrwl/linter:eslint",
21+
"options": {
22+
"lintFilePatterns": ["apps/webapp-e2e/**/*.{ts,tsx,js,jsx}"]
23+
},
24+
"outputs": ["{options.outputFile}"]
25+
}
26+
},
27+
"tags": [],
28+
"implicitDependencies": ["webapp"]
29+
}

‎apps/webapp/project.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"root": "apps/webapp",
3+
"sourceRoot": "apps/webapp/src",
4+
"projectType": "application",
5+
"generators": {},
6+
"targets": {
7+
"build": {
8+
"executor": "@nrwl/web:webpack",
9+
"options": {
10+
"outputPath": "dist/apps/webapp",
11+
"index": "apps/webapp/src/index.html",
12+
"main": "apps/webapp/src/main.tsx",
13+
"polyfills": "apps/webapp/src/polyfills.ts",
14+
"tsConfig": "apps/webapp/tsconfig.app.json",
15+
"assets": ["apps/webapp/src/favicon.ico", "apps/webapp/src/assets"],
16+
"styles": ["apps/webapp/src/styles.scss"],
17+
"scripts": [],
18+
"webpackConfig": "@nrwl/react/plugins/webpack",
19+
"showCircularDependencies": false,
20+
"maxWorkers": 2,
21+
"memoryLimit": 1024
22+
},
23+
"configurations": {
24+
"production": {
25+
"fileReplacements": [
26+
{
27+
"replace": "apps/webapp/src/environments/environment.ts",
28+
"with": "apps/webapp/src/environments/environment.prod.ts"
29+
}
30+
],
31+
"optimization": true,
32+
"outputHashing": "all",
33+
"sourceMap": false,
34+
"extractCss": true,
35+
"namedChunks": false,
36+
"extractLicenses": true,
37+
"vendorChunk": false,
38+
"budgets": [
39+
{
40+
"type": "initial",
41+
"maximumWarning": "2mb",
42+
"maximumError": "5mb"
43+
}
44+
]
45+
}
46+
},
47+
"outputs": ["{options.outputPath}"]
48+
},
49+
"serve": {
50+
"executor": "@nrwl/web:dev-server",
51+
"options": {
52+
"buildTarget": "webapp:build"
53+
},
54+
"configurations": {
55+
"production": {
56+
"buildTarget": "webapp:build:production"
57+
}
58+
}
59+
},
60+
"lint": {
61+
"executor": "@nrwl/linter:eslint",
62+
"options": {
63+
"lintFilePatterns": ["apps/webapp/**/*.{ts,tsx,js,jsx}"]
64+
},
65+
"outputs": ["{options.outputFile}"]
66+
},
67+
"test": {
68+
"executor": "@nrwl/jest:jest",
69+
"options": {
70+
"jestConfig": "apps/webapp/jest.config.js",
71+
"passWithNoTests": true
72+
},
73+
"outputs": ["coverage/apps/webapp"]
74+
}
75+
},
76+
"tags": []
77+
}

‎libs/models/project.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"root": "libs/models",
3+
"sourceRoot": "libs/models/src",
4+
"projectType": "library",
5+
"generators": {},
6+
"targets": {
7+
"linter": {
8+
"executor": "@nrwl/linter:eslint",
9+
"options": {
10+
"linter": "eslint",
11+
"tsConfig": ["libs/models/tsconfig.lib.json", "libs/models/tsconfig.spec.json"],
12+
"exclude": ["**/node_modules/**", "!libs/models/**/*"]
13+
}
14+
},
15+
"test": {
16+
"executor": "@nrwl/jest:jest",
17+
"options": {
18+
"jestConfig": "libs/models/jest.config.js",
19+
"passWithNoTests": true
20+
},
21+
"outputs": ["coverage/libs/models"]
22+
}
23+
},
24+
"tags": []
25+
}

0 commit comments

Comments
 (0)