Skip to content

Commit

Permalink
small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
vygandas committed Dec 16, 2023
1 parent 039d5f2 commit 9629d11
Show file tree
Hide file tree
Showing 17 changed files with 843 additions and 935 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/pr_all_affected_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,6 @@ jobs:
- name: 'Install dependencies'
run: yarn install

- name: 'Link dependencies for mobile app'
run: |
npx nx run mobile:install
npx nx run mobile:sync-deps
npx nx run mobile:ensure-symlink
- name: Run Affected Unit Tests
shell: bash
run:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/pretty_linted_code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ jobs:
- name: 'Install dependencies'
run: yarn install

- name: 'Link dependencies for mobile app'
run: |
npx nx run mobile:install
npx nx run mobile:sync-deps
npx nx run mobile:ensure-symlink
- name: "Check it's pretty"
run: yarn prettier:check

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ Consistency is important.
This is pretty simple, just

```
make nx run-many -- -t test
nx run-many -- -t test
```

```
make nx run-many -- -t e2e
nx run-many -- -t e2e
```

### Running services
Expand All @@ -206,19 +206,19 @@ make nx run-many -- -t e2e
This will launch API service on port 8080:

```
make nx serve-api
nx run api:serve
```

This will launch platform on port 4200:

```
make nx serve-platform
nx run platform:serve
```

This will launch landing on port 3030:

```
make nx serve-landing
nx landing:serve
```

## REPL for Nest.js
Expand Down
16 changes: 12 additions & 4 deletions apps/api-e2e/project.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
{
"name": "api-e2e",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"implicitDependencies": ["api"],
"implicitDependencies": [
"api"
],
"projectType": "application",
"targets": {
"e2e": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{e2eProjectRoot}"],
"outputs": [
"{workspaceRoot}/coverage/{e2eProjectRoot}"
],
"options": {
"jestConfig": "apps/api-e2e/jest.config.ts",
"passWithNoTests": true
}
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": ["apps/api-e2e/**/*.{js,ts}"]
"lintFilePatterns": [
"apps/api-e2e/**/*.{js,ts}"
]
}
}
}
Expand Down
36 changes: 27 additions & 9 deletions apps/api/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,40 @@
"build": {
"executor": "nx:run-commands",
"options": {
"commands": ["nest build -c apps/api/nest-cli.json"]
"commands": [
"nest build -c apps/api/nest-cli.json"
]
},
"outputs": ["{options.outputPath}"]
"outputs": [
"{options.outputPath}"
]
},
"serve": {
"executor": "nx:run-commands",
"options": {
"commands": ["nest start --watch -c apps/api/nest-cli.json"]
"commands": [
"nest start --watch -c apps/api/nest-cli.json"
]
},
"outputs": ["{options.outputPath}"]
"outputs": [
"{options.outputPath}"
]
},
"build:webpack": {
"executor": "@nx/webpack:webpack",
"outputs": ["{options.outputPath}"],
"outputs": [
"{options.outputPath}"
],
"defaultConfiguration": "production",
"options": {
"target": "node",
"compiler": "tsc",
"outputPath": "dist/apps/api",
"main": "apps/api/src/main.ts",
"tsConfig": "apps/api/tsconfig.app.json",
"assets": ["apps/api/src/assets"],
"assets": [
"apps/api/src/assets"
],
"isolatedConfig": true,
"webpackConfig": "apps/api/webpack.config.js"
},
Expand All @@ -54,14 +66,20 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": ["apps/api/**/*.ts"]
"lintFilePatterns": [
"apps/api/**/*.ts"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": {
"jestConfig": "apps/api/jest.config.ts",
"passWithNoTests": true
Expand Down
12 changes: 9 additions & 3 deletions apps/landing-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,18 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": ["apps/landing-e2e/**/*.{js,ts}"]
"lintFilePatterns": [
"apps/landing-e2e/**/*.{js,ts}"
]
}
}
},
"tags": [],
"implicitDependencies": ["landing"]
"implicitDependencies": [
"landing"
]
}
16 changes: 12 additions & 4 deletions apps/landing/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"targets": {
"build": {
"executor": "@nx/next:build",
"outputs": ["{options.outputPath}"],
"outputs": [
"{options.outputPath}"
],
"defaultConfiguration": "production",
"options": {
"outputPath": "dist/apps/landing"
Expand Down Expand Up @@ -44,7 +46,9 @@
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": {
"jestConfig": "apps/landing/jest.config.ts",
"passWithNoTests": true
Expand All @@ -58,9 +62,13 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": ["apps/landing/**/*.{ts,tsx,js,jsx}"]
"lintFilePatterns": [
"apps/landing/**/*.{ts,tsx,js,jsx}"
]
}
}
},
Expand Down
12 changes: 9 additions & 3 deletions apps/mobile-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,18 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": ["apps/mobile/**/*.{ts,tsx,js,jsx}"]
"lintFilePatterns": [
"apps/mobile/**/*.{ts,tsx,js,jsx}"
]
}
}
},
"tags": [],
"implicitDependencies": ["mobile"]
"implicitDependencies": [
"mobile"
]
}
37 changes: 29 additions & 8 deletions apps/mobile/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
"targets": {
"start": {
"executor": "@nx/expo:start",
"dependsOn": ["ensure-symlink", "sync-deps"],
"dependsOn": [
"ensure-symlink",
"sync-deps"
],
"options": {
"port": 8081
}
Expand All @@ -19,14 +22,20 @@
},
"run-ios": {
"executor": "@nx/expo:run",
"dependsOn": ["ensure-symlink", "sync-deps"],
"dependsOn": [
"ensure-symlink",
"sync-deps"
],
"options": {
"platform": "ios"
}
},
"run-android": {
"executor": "@nx/expo:run",
"dependsOn": ["ensure-symlink", "sync-deps"],
"dependsOn": [
"ensure-symlink",
"sync-deps"
],
"options": {
"platform": "android"
}
Expand All @@ -53,7 +62,10 @@
},
"prebuild": {
"executor": "@nx/expo:prebuild",
"dependsOn": ["ensure-symlink", "sync-deps"],
"dependsOn": [
"ensure-symlink",
"sync-deps"
],
"options": {}
},
"install": {
Expand All @@ -66,7 +78,10 @@
},
"export": {
"executor": "@nx/expo:export",
"dependsOn": ["ensure-symlink", "sync-deps"],
"dependsOn": [
"ensure-symlink",
"sync-deps"
],
"options": {
"platform": "all",
"outputDir": "../../dist/apps/mobile"
Expand All @@ -80,14 +95,20 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": ["apps/mobile/**/*.{ts,tsx,js,jsx}"]
"lintFilePatterns": [
"apps/mobile/**/*.{ts,tsx,js,jsx}"
]
}
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"options": {
"jestConfig": "apps/mobile/jest.config.ts"
}
Expand Down
12 changes: 9 additions & 3 deletions apps/platform-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,18 @@
},
"lint": {
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": ["apps/platform-e2e/**/*.{js,ts}"]
"lintFilePatterns": [
"apps/platform-e2e/**/*.{js,ts}"
]
}
}
},
"tags": [],
"implicitDependencies": ["platform"]
"implicitDependencies": [
"platform"
]
}
Loading

0 comments on commit 9629d11

Please sign in to comment.