Skip to content

Commit 9284d5e

Browse files
manfredsteyermanfredsteyer
committed
update to v16
1 parent 832dead commit 9284d5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+13067
-13198
lines changed

‎.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

‎.eslintrc.json

Lines changed: 4 additions & 4 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,
@@ -101,12 +101,12 @@
101101
},
102102
{
103103
"files": ["*.ts", "*.tsx"],
104-
"extends": ["plugin:@nrwl/nx/typescript"],
104+
"extends": ["plugin:@nx/typescript"],
105105
"rules": {}
106106
},
107107
{
108108
"files": ["*.js", "*.jsx"],
109-
"extends": ["plugin:@nrwl/nx/javascript"],
109+
"extends": ["plugin:@nx/javascript"],
110110
"rules": {}
111111
},
112112
{

‎.vscode/settings.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
11
{
2-
"eslint.validate": ["json"]
2+
"eslint.validate": [
3+
"json"
4+
],
5+
"files.exclude": {
6+
"**/.git": true,
7+
"**/.svn": true,
8+
"**/.hg": true,
9+
"**/CVS": true,
10+
"**/.DS_Store": true,
11+
"**/Thumbs.db": true
12+
},
13+
"hide-files.files": []
314
}

‎angular.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎apps/ddd-e2e/jest.config.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
export default {
33
displayName: 'ddd-e2e',
44
preset: '../../jest.preset.js',
5-
globals: {
6-
'ts-jest': {
7-
tsconfig: '<rootDir>/tsconfig.spec.json',
8-
},
9-
},
5+
globals: {},
106
transform: {
11-
'^.+\\.[tj]s$': 'ts-jest',
7+
'^.+\\.[tj]s$': [
8+
'ts-jest',
9+
{
10+
tsconfig: '<rootDir>/tsconfig.spec.json',
11+
},
12+
],
1213
},
1314
moduleFileExtensions: ['ts', 'js', 'html'],
1415
coverageDirectory: '../../coverage/apps/ddd-e2e',

‎apps/ddd-e2e/project.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
2+
"name": "ddd-e2e",
23
"$schema": "..\\..\\node_modules\\nx\\schemas\\project-schema.json",
34
"projectType": "application",
45
"sourceRoot": "apps/ddd-e2e/src",
56
"targets": {
67
"e2e": {
7-
"executor": "@nrwl/nx-plugin:e2e",
8+
"executor": "@nx/jest:jest",
89
"options": {
9-
"target": "ddd:build",
10-
"jestConfig": "apps/ddd-e2e/jest.config.ts"
11-
}
10+
"jestConfig": "apps/ddd-e2e/jest.config.ts",
11+
"runInBand": true
12+
},
13+
"dependsOn": ["ddd:build"]
1214
}
1315
},
1416
"tags": [],

‎apps/ddd-e2e/tests/ddd.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
readJson,
55
runNxCommandAsync,
66
uniq,
7-
} from '@nrwl/nx-plugin/testing';
7+
} from '@nx/plugin/testing';
88

99
describe('ddd e2e', () => {
1010
// Setting up individual workspaces per

‎apps/demo-app-e2e/project.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
2+
"name": "demo-app-e2e",
23
"$schema": "..\\..\\node_modules\\nx\\schemas\\project-schema.json",
34
"sourceRoot": "apps/demo-app-e2e/src",
45
"projectType": "application",
56
"targets": {
67
"e2e": {
7-
"executor": "@nrwl/cypress:cypress",
8+
"executor": "@nx/cypress:cypress",
89
"options": {
910
"cypressConfig": "apps/demo-app-e2e/cypress.json",
1011
"devServerTarget": "demo-app:serve:development"
@@ -16,7 +17,7 @@
1617
}
1718
},
1819
"lint": {
19-
"executor": "@nrwl/linter:eslint",
20+
"executor": "@nx/linter:eslint",
2021
"outputs": ["{options.outputFile}"],
2122
"options": {
2223
"lintFilePatterns": ["apps/demo-app-e2e/**/*.{js,ts}"]

‎apps/demo-app/.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"files": ["*.ts"],
77
"extends": [
8-
"plugin:@nrwl/nx/angular",
8+
"plugin:@nx/angular",
99
"plugin:@angular-eslint/template/process-inline-templates"
1010
],
1111
"rules": {
@@ -29,7 +29,7 @@
2929
},
3030
{
3131
"files": ["*.html"],
32-
"extends": ["plugin:@nrwl/nx/angular-template"],
32+
"extends": ["plugin:@nx/angular-template"],
3333
"rules": {}
3434
}
3535
]

‎apps/demo-app/jest.config.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ export default {
33
displayName: 'demo-app',
44
preset: '../../jest.preset.js',
55
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
6-
globals: {
7-
'ts-jest': {
8-
tsconfig: '<rootDir>/tsconfig.spec.json',
9-
stringifyContentPathRegex: '\\.(html|svg)$',
10-
},
11-
},
6+
globals: {},
127
coverageDirectory: '../../coverage/apps/demo-app',
138
transform: {
14-
'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular',
9+
'^.+\\.(ts|mjs|js|html)$': [
10+
'jest-preset-angular',
11+
{
12+
tsconfig: '<rootDir>/tsconfig.spec.json',
13+
stringifyContentPathRegex: '\\.(html|svg)$',
14+
},
15+
],
1516
},
1617
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
1718
snapshotSerializers: [

0 commit comments

Comments
 (0)