Skip to content

Commit 421e5cd

Browse files
committed
deps: update to latest nx; add nrwl angular package for testing
1 parent b2b414f commit 421e5cd

12 files changed

+2890
-11433
lines changed

.eslintrc

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"parserOptions": {
55
"ecmaVersion": 2018,
66
"sourceType": "module",
7-
"project": "./tsconfig.json"
7+
"project": "./tsconfig.base.json"
88
},
99
"plugins": ["@typescript-eslint", "@nrwl/nx"],
1010
"extends": [
@@ -24,7 +24,10 @@
2424
"enforceBuildableLibDependency": true,
2525
"allow": [],
2626
"depConstraints": [
27-
{ "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] }
27+
{
28+
"sourceTag": "*",
29+
"onlyDependOnLibsWithTags": ["*"]
30+
}
2831
]
2932
}
3033
]

apps/ddd-e2e/tsconfig.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
44
"types": ["node", "jest"]
55
},
6-
"include": ["**/*.ts"]
6+
"include": [],
7+
"files": [],
8+
"references": [
9+
{
10+
"path": "./tsconfig.spec.json"
11+
}
12+
]
713
}

libs/ddd/.eslintrc

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
{ "extends": "../../.eslintrc", "rules": {} }
1+
{
2+
"extends": "../../.eslintrc",
3+
"rules": {},
4+
"ignorePatterns": ["!**/*"]
5+
}

libs/ddd/jest.config.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ module.exports = {
22
name: 'ddd',
33
preset: '../../jest.config.js',
44
transform: {
5-
'^.+\\.[tj]sx?$': 'ts-jest'
5+
'^.+\\.[tj]sx?$': 'ts-jest',
66
},
77
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
8-
coverageDirectory: '../../coverage/libs/ddd'
8+
coverageDirectory: '../../coverage/libs/ddd',
9+
globals: { 'ts-jest': { tsConfig: '<rootDir>/tsconfig.spec.json' } },
910
};

libs/ddd/tsconfig.json

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
44
"types": ["node", "jest"]
55
},
6-
"include": ["**/*.ts"]
6+
"include": [],
7+
"files": [],
8+
"references": [
9+
{
10+
"path": "./tsconfig.lib.json"
11+
},
12+
{
13+
"path": "./tsconfig.spec.json"
14+
}
15+
]
716
}

nx.json

+13-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"dependencies": "*",
77
"devDependencies": "*"
88
},
9-
"tsconfig.json": "*",
109
"tslint.json": "*",
11-
"nx.json": "*"
10+
"nx.json": "*",
11+
"tsconfig.base.json": "*"
1212
},
1313
"projects": {
1414
"ddd": {
@@ -18,5 +18,16 @@
1818
"tags": [],
1919
"implicitDependencies": ["ddd"]
2020
}
21+
},
22+
"tasksRunnerOptions": {
23+
"default": {
24+
"runner": "@nrwl/workspace/tasks-runners/default",
25+
"options": {
26+
"cacheableOperations": ["build", "lint", "test", "e2e"]
27+
}
28+
}
29+
},
30+
"affected": {
31+
"defaultBase": "master"
2132
}
2233
}

0 commit comments

Comments
 (0)