Skip to content

Commit 09dad6a

Browse files
chore: run nx migrate (#314)
1 parent 4eba508 commit 09dad6a

17 files changed

+90
-82
lines changed

apps/example-app-karma/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
23
"projectType": "application",
3-
"root": "apps/example-app-karma",
44
"sourceRoot": "apps/example-app-karma/src",
55
"prefix": "app",
66
"generators": {},

apps/example-app-karma/tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"extends": "../../tsconfig.base.json",
33
"files": [],
44
"include": [],
5-
"compilerOptions": {},
5+
"compilerOptions": {
6+
"target": "es2020"
7+
},
68
"angularCompilerOptions": {
79
"strictInjectionParameters": true,
810
"strictInputAccessModifiers": true,

apps/example-app/jest.config.js renamed to apps/example-app/jest.config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
module.exports = {
2-
name: 'Example App',
1+
/* eslint-disable */
2+
export default {
33
displayName: {
4-
name: 'Example',
4+
name: 'Example App',
55
color: 'blue',
66
},
77
preset: '../../jest.preset.js',

apps/example-app/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
23
"projectType": "application",
3-
"root": "apps/example-app",
44
"sourceRoot": "apps/example-app/src",
55
"prefix": "app",
66
"generators": {},
@@ -73,7 +73,7 @@
7373
"test": {
7474
"executor": "@nrwl/jest:jest",
7575
"options": {
76-
"jestConfig": "apps/example-app/jest.config.js"
76+
"jestConfig": "apps/example-app/jest.config.ts"
7777
},
7878
"outputs": ["coverage/"]
7979
}

apps/example-app/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
},
99
"files": ["src/main.ts", "src/polyfills.ts"],
1010
"include": ["src/**/*.d.ts"],
11-
"exclude": ["**/*.test.ts", "**/*.spec.ts"]
11+
"exclude": ["**/*.test.ts", "**/*.spec.ts", "jest.config.ts"]
1212
}

apps/example-app/tsconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"extends": "../../tsconfig.base.json",
33
"files": [],
44
"include": [],
5-
"compilerOptions": {},
5+
"compilerOptions": {
6+
"target": "es2020"
7+
},
68
"angularCompilerOptions": {
79
"strictInjectionParameters": true,
810
"strictInputAccessModifiers": true,

apps/example-app/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
"types": ["jest", "node", "@testing-library/jest-dom"]
77
},
88
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
9+
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
1010
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const { getJestProjects } = require('@nrwl/jest');
22

3-
module.exports = {
3+
export default {
44
projects: getJestProjects(),
55
};

jest.preset.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
const nxPreset = require('@nrwl/jest/preset');
1+
const nxPreset = require('@nrwl/jest/preset').default;
2+
23
module.exports = {
34
...nxPreset,
45
testMatch: ['**/+(*.)+(spec|test).+(ts|js)?(x)'],

nx.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@
3434
}
3535
}
3636
},
37-
"targetDependencies": {
38-
"build": [
39-
{
40-
"target": "build",
41-
"projects": "dependencies"
42-
}
43-
]
44-
},
4537
"generators": {
4638
"@nrlw/workspace:library": {
4739
"linter": "eslint",
@@ -60,7 +52,6 @@
6052
"tags": ["type:app"]
6153
},
6254
"@nrwl/angular:library": {
63-
"style": "scss",
6455
"linter": "eslint",
6556
"unitTestRunner": "jest",
6657
"strict": true,
@@ -80,5 +71,11 @@
8071
}
8172
}
8273
},
83-
"defaultProject": "example-app"
74+
"defaultProject": "example-app",
75+
"$schema": "./node_modules/nx/schemas/nx-schema.json",
76+
"targetDefaults": {
77+
"build": {
78+
"dependsOn": ["^build"]
79+
}
80+
}
8481
}

0 commit comments

Comments
 (0)