Skip to content

Commit 38c2fe3

Browse files
committed
feat: update Nx
1 parent 7c7120f commit 38c2fe3

File tree

15 files changed

+10776
-14493
lines changed

15 files changed

+10776
-14493
lines changed

.eslintrc.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"root": true,
33
"ignorePatterns": ["**/*"],
4-
"plugins": ["@nrwl/nx"],
4+
"plugins": ["@nx"],
55
"overrides": [
66
{
77
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
88
"rules": {
9-
"@nrwl/nx/enforce-module-boundaries": [
9+
"@nx/enforce-module-boundaries": [
1010
"error",
1111
{
1212
"enforceBuildableLibDependency": true,
@@ -23,13 +23,19 @@
2323
},
2424
{
2525
"files": ["*.ts", "*.tsx"],
26-
"extends": ["plugin:@nrwl/nx/typescript"],
27-
"rules": {}
26+
"extends": ["plugin:@nx/typescript"],
27+
"rules": {
28+
"@typescript-eslint/no-extra-semi": "error",
29+
"no-extra-semi": "off"
30+
}
2831
},
2932
{
3033
"files": ["*.js", "*.jsx"],
31-
"extends": ["plugin:@nrwl/nx/javascript"],
32-
"rules": {}
34+
"extends": ["plugin:@nx/javascript"],
35+
"rules": {
36+
"@typescript-eslint/no-extra-semi": "error",
37+
"no-extra-semi": "off"
38+
}
3339
},
3440
{
3541
"files": ["*.spec.ts", "*.spec.tsx", "*.spec.js", "*.spec.jsx"],

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,5 @@ testem.log
3838
# System Files
3939
.DS_Store
4040
Thumbs.db
41+
42+
.nx/cache

.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
/dist
44
/coverage
5+
6+
/.nx/cache

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ pending.unwrap({ failure: () => new Error('Custom')}); // throws custom (Error)
719719
#### `Result#fold`
720720
721721
```typescript
722-
function fold<F, S, D>(onInitial: () => D, onPending: () => D, onFailure: (failure: F) => D, onSuccess: (success: S) => D): S;
722+
function fold<D>(onInitial: () => D, onPending: () => D, onFailure: (failure: F) => D, onSuccess: (success: S) => D): S;
723723
```
724724
725725
- Extracts value from `Result` and converts it to `D` based on the factory

jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getJestProjects } from '@nrwl/jest';
1+
import { getJestProjects } from '@nx/jest';
22

33
export default {
44
projects: getJestProjects(),

jest.preset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const nxPreset = require('@nrwl/jest/preset').default;
1+
const nxPreset = require('@nx/jest/preset').default;
22

33
module.exports = {
44
...nxPreset,

nx.json

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
22
"$schema": "./node_modules/nx/schemas/nx-schema.json",
3-
"npmScope": "lonli-lokli",
4-
"affected": {
5-
"defaultBase": "master"
6-
},
7-
"tasksRunnerOptions": {
8-
"default": {
9-
"runner": "nx/tasks-runners/default",
10-
"options": {
11-
"cacheableOperations": ["build", "lint", "test", "e2e"]
12-
}
13-
}
14-
},
153
"targetDefaults": {
164
"build": {
175
"dependsOn": ["^build"],
18-
"inputs": ["production", "^production"]
6+
"inputs": ["production", "^production"],
7+
"cache": true
198
},
20-
"lint": {
21-
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
9+
"@nx/jest:jest": {
10+
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
11+
"cache": true,
12+
"options": {
13+
"passWithNoTests": true
14+
},
15+
"configurations": {
16+
"ci": {
17+
"ci": true,
18+
"codeCoverage": true
19+
}
20+
}
2221
},
23-
"test": {
24-
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
22+
"@nx/eslint:lint": {
23+
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
24+
"cache": true
2525
}
2626
},
2727
"namedInputs": {
@@ -31,12 +31,16 @@
3131
"!{projectRoot}/.eslintrc.json",
3232
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
3333
"!{projectRoot}/tsconfig.spec.json",
34-
"!{projectRoot}/jest.config.[jt]s"
34+
"!{projectRoot}/jest.config.[jt]s",
35+
"!{projectRoot}/src/test-setup.[jt]s"
3536
],
3637
"sharedGlobals": []
3738
},
3839
"workspaceLayout": {
3940
"appsDir": "packages",
4041
"libsDir": "packages"
41-
}
42+
},
43+
"nxCloudAccessToken": "MTljYTJkNjktYWI3YS00ZWIyLTlmZTktYjUzMzI5NTI3NTAzfHJlYWQtd3JpdGU=",
44+
"useInferencePlugins": false,
45+
"defaultBase": "master"
4246
}

0 commit comments

Comments
 (0)