Skip to content

Commit

Permalink
build: update Nx (#3251)
Browse files Browse the repository at this point in the history
  • Loading branch information
timdeschryver authored Dec 2, 2021
1 parent b7ad7fd commit 49b888b
Show file tree
Hide file tree
Showing 6 changed files with 106 additions and 112 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
# Test
- run:
name: Run All Lint Checks
command: yarn nx run-many --target=lint --all
command: yarn nx run-many --target=lint --all --parallel=1

lint-affected:
<<: *run_in_node
Expand All @@ -77,7 +77,7 @@ jobs:
- write_master_hash
- run:
name: Run Affected Lint Checks
command: yarn nx affected:lint --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1
command: yarn nx affected:lint --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1 --parallel=1

# Enforce some static analysis invariants.
# Note that generally, these should be checked only on the delta in each change,
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
# Test
- run:
name: Run All Unit Tests
command: yarn nx run-many --target=test --all
command: yarn nx run-many --target=test --all --parallel=1

test-affected:
<<: *run_in_browser
Expand All @@ -128,7 +128,7 @@ jobs:
- write_master_hash
- run:
name: Run Affected Unit Tests
command: yarn nx affected:test --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1
command: yarn nx affected:test --base=$(cat ~/project/master.txt) --head=$CIRCLE_SHA1 --parallel=1

build:
<<: *run_in_node
Expand Down
5 changes: 5 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
{
"files": ["*.ts"],
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": [
"warn",
{ "argsIgnorePattern": "^_" }
],
"@typescript-eslint/naming-convention": [
"error",
{
Expand Down
18 changes: 2 additions & 16 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
{
"version": 1,
"schematics": {
"@schematics/angular:component": {
"inlineStyle": true,
"inlineTemplate": true,
"flat": true,
"skipTests": true,
"prefix": "bc",
"style": "css"
},
"@schematics/angular:directive": {
"prefix": "bc"
}
},
"projects": {
"component": {
"projectType": "library",
Expand Down Expand Up @@ -253,9 +240,8 @@
"builder": "@nrwl/jest:jest",
"options": {
"jestConfig": "projects/data-example-app/jest.config.js",
"tsConfig": "projects/data-example-app/tsconfig.spec.json",
"passWithNoTests": true,
"setupFile": "projects/data-example-app/src/test-setup.ts"
"runInBand": true,
"passWithNoTests": true
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"e2e"
],
"canTrackAnalytics": false,
"showUsageWarnings": true
"showUsageWarnings": true,
"parallel": 1
}
}
},
Expand Down
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"@angular/platform-server": "13.0.0",
"@angular/router": "13.0.0",
"@applitools/eyes-cypress": "^3.4.12",
"@nrwl/angular": "13.2.0-beta.1",
"@nrwl/angular": "13.2.2",
"core-js": "^2.5.4",
"opencollective": "^1.0.3",
"rxjs": "~7.4.0",
Expand All @@ -130,15 +130,15 @@
"@bazel/jasmine": "1.6.0",
"@bazel/typescript": "1.6.0",
"@cypress/webpack-preprocessor": "^4.0.3",
"@nrwl/cli": "13.2.0-beta.1",
"@nrwl/cypress": "13.2.0-beta.1",
"@nrwl/eslint-plugin-nx": "13.2.0-beta.1",
"@nrwl/jest": "13.2.0-beta.1",
"@nrwl/linter": "13.2.0-beta.1",
"@nrwl/node": "13.2.0-beta.1",
"@nrwl/nx-cloud": "12.5.2",
"@nrwl/tao": "13.2.0-beta.1",
"@nrwl/workspace": "13.2.0-beta.1",
"@nrwl/cli": "13.2.2",
"@nrwl/cypress": "13.2.2",
"@nrwl/eslint-plugin-nx": "13.2.2",
"@nrwl/jest": "13.2.2",
"@nrwl/linter": "13.2.2",
"@nrwl/node": "13.2.2",
"@nrwl/nx-cloud": "12.5.4",
"@nrwl/tao": "13.2.2",
"@nrwl/workspace": "13.2.2",
"@octokit/rest": "^15.17.0",
"@testing-library/cypress": "^7.0.1",
"@types/fs-extra": "^2.1.0",
Expand Down Expand Up @@ -228,3 +228,4 @@
}
}
}

Loading

0 comments on commit 49b888b

Please sign in to comment.