Skip to content

Commit 7ae1657

Browse files
jogelinjogelin
committed
chore(nx): Upgrade to Nx 18 - align angular package libs
1 parent 098947f commit 7ae1657

24 files changed

+159
-160
lines changed

‎libs/mf-runtime/.eslintrc.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": ["../../.eslintrc.json"],
2+
"extends": ["../../.eslintrc.json", "../../.eslintrc.base.json"],
33
"ignorePatterns": ["!**/*"],
44
"overrides": [
55
{
@@ -31,6 +31,13 @@
3131
"files": ["*.html"],
3232
"extends": ["plugin:@nx/angular-template"],
3333
"rules": {}
34+
},
35+
{
36+
"files": ["*.json"],
37+
"parser": "jsonc-eslint-parser",
38+
"rules": {
39+
"@nx/dependency-checks": "error"
40+
}
3441
}
3542
]
3643
}

‎libs/mf-runtime/jest.config.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@ export default {
33
displayName: 'mf-runtime',
44
preset: '../../jest.preset.js',
55
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
6-
globals: {},
76
coverageDirectory: '../../coverage/libs/mf-runtime',
8-
snapshotSerializers: [
9-
'jest-preset-angular/build/serializers/no-ng-attributes',
10-
'jest-preset-angular/build/serializers/ng-snapshot',
11-
'jest-preset-angular/build/serializers/html-comment',
12-
],
137
transform: {
14-
'^.+.(ts|mjs|js|html)$': [
8+
'^.+\\.(ts|mjs|js|html)$': [
159
'jest-preset-angular',
1610
{
17-
stringifyContentPathRegex: '\\.(html|svg)$',
18-
1911
tsconfig: '<rootDir>/tsconfig.spec.json',
12+
stringifyContentPathRegex: '\\.(html|svg)$',
2013
},
2114
],
2215
},
23-
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
16+
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
17+
snapshotSerializers: [
18+
'jest-preset-angular/build/serializers/no-ng-attributes',
19+
'jest-preset-angular/build/serializers/ng-snapshot',
20+
'jest-preset-angular/build/serializers/html-comment',
21+
],
2422
};

‎libs/mf-runtime/project.json

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,19 @@
77
"targets": {
88
"build": {
99
"executor": "@nx/angular:package",
10+
"outputs": ["{workspaceRoot}/dist/{projectRoot}"],
1011
"options": {
11-
"tsConfig": "libs/mf-runtime/tsconfig.lib.json",
1212
"project": "libs/mf-runtime/ng-package.json"
1313
},
1414
"configurations": {
1515
"production": {
1616
"tsConfig": "libs/mf-runtime/tsconfig.lib.prod.json"
17+
},
18+
"development": {
19+
"tsConfig": "libs/mf-runtime/tsconfig.lib.json"
1720
}
18-
}
19-
},
20-
"lint": {
21-
"executor": "@nx/eslint:lint",
22-
"outputs": ["{options.outputFile}"]
23-
},
24-
"test": {
25-
"executor": "@nx/jest:jest",
26-
"outputs": ["{workspaceRoot}/coverage/libs/mf-runtime"],
27-
"options": {
28-
"jestConfig": "libs/mf-runtime/jest.config.ts"
29-
}
21+
},
22+
"defaultConfiguration": "production"
3023
}
3124
},
3225
"tags": []

‎libs/mf-runtime/src/test-setup.ts

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1+
// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
2+
globalThis.ngJest = {
3+
testEnvironmentOptions: {
4+
errorOnUnknownElements: true,
5+
errorOnUnknownProperties: true,
6+
},
7+
};
18
import 'jest-preset-angular/setup-jest';
2-
3-
import { getTestBed } from '@angular/core/testing';
4-
import {
5-
BrowserDynamicTestingModule,
6-
platformBrowserDynamicTesting,
7-
} from '@angular/platform-browser-dynamic/testing';
8-
9-
getTestBed().resetTestEnvironment();
10-
getTestBed().initTestEnvironment(
11-
BrowserDynamicTestingModule,
12-
platformBrowserDynamicTesting(),
13-
{ teardown: { destroyAfterEach: false } }
14-
);

‎libs/mf-runtime/tsconfig.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
11
{
22
"extends": "../../tsconfig.base.json",
3+
"compilerOptions": {
4+
"target": "es2022",
5+
"useDefineForClassFields": false,
6+
"forceConsistentCasingInFileNames": true,
7+
"strict": true,
8+
"noImplicitOverride": true,
9+
"noPropertyAccessFromIndexSignature": true,
10+
"noImplicitReturns": true,
11+
"noFallthroughCasesInSwitch": true
12+
},
313
"files": [],
414
"include": [],
515
"references": [
616
{
717
"path": "./tsconfig.lib.json"
818
},
9-
{
10-
"path": "./tsconfig.lib.prod.json"
11-
},
1219
{
1320
"path": "./tsconfig.spec.json"
1421
}
1522
],
16-
"compilerOptions": {
17-
"target": "es2020"
23+
"angularCompilerOptions": {
24+
"enableI18nLegacyMessageIdFormat": false,
25+
"strictInjectionParameters": true,
26+
"strictInputAccessModifiers": true,
27+
"strictTemplates": true
1828
}
1929
}

‎libs/mf-runtime/tsconfig.lib.json

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,16 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"target": "ES2022",
65
"declaration": true,
76
"declarationMap": true,
87
"inlineSources": true,
9-
"types": [],
10-
"lib": ["dom", "es2018"],
11-
"useDefineForClassFields": false
12-
},
13-
"angularCompilerOptions": {
14-
"enableIvy": true,
15-
"compilationMode": "partial"
8+
"types": []
169
},
1710
"exclude": [
11+
"src/**/*.spec.ts",
1812
"src/test-setup.ts",
19-
"**/*.spec.ts",
20-
"**/*.test.ts",
21-
"jest.config.ts"
13+
"jest.config.ts",
14+
"src/**/*.test.ts"
2215
],
23-
"include": ["**/*.ts"]
16+
"include": ["src/**/*.ts"]
2417
}

‎libs/mf-runtime/tsconfig.lib.prod.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
{
22
"extends": "./tsconfig.lib.json",
33
"compilerOptions": {
4-
"declarationMap": false,
5-
"target": "ES2022",
6-
"useDefineForClassFields": false
4+
"declarationMap": false
75
},
86
"angularCompilerOptions": {
97
"compilationMode": "partial"
10-
},
11-
"exclude": ["jest.config.ts"]
8+
}
129
}

‎libs/mf-runtime/tsconfig.spec.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,14 @@
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
55
"module": "commonjs",
6+
"target": "es2016",
67
"types": ["jest", "node"]
78
},
89
"files": ["src/test-setup.ts"],
9-
"include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
10+
"include": [
11+
"jest.config.ts",
12+
"src/**/*.test.ts",
13+
"src/**/*.spec.ts",
14+
"src/**/*.d.ts"
15+
]
1016
}

‎libs/mf-tools/.eslintrc.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": ["../../.eslintrc.json"],
2+
"extends": ["../../.eslintrc.json", "../../.eslintrc.base.json"],
33
"ignorePatterns": ["!**/*"],
44
"overrides": [
55
{
@@ -31,6 +31,13 @@
3131
"files": ["*.html"],
3232
"extends": ["plugin:@nx/angular-template"],
3333
"rules": {}
34+
},
35+
{
36+
"files": ["*.json"],
37+
"parser": "jsonc-eslint-parser",
38+
"rules": {
39+
"@nx/dependency-checks": "error"
40+
}
3441
}
3542
]
3643
}

‎libs/mf-tools/jest.config.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,20 @@ export default {
33
displayName: 'mf-tools',
44
preset: '../../jest.preset.js',
55
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
6-
globals: {},
76
coverageDirectory: '../../coverage/libs/mf-tools',
8-
snapshotSerializers: [
9-
'jest-preset-angular/build/serializers/no-ng-attributes',
10-
'jest-preset-angular/build/serializers/ng-snapshot',
11-
'jest-preset-angular/build/serializers/html-comment',
12-
],
137
transform: {
14-
'^.+.(ts|mjs|js|html)$': [
8+
'^.+\\.(ts|mjs|js|html)$': [
159
'jest-preset-angular',
1610
{
17-
stringifyContentPathRegex: '\\.(html|svg)$',
18-
1911
tsconfig: '<rootDir>/tsconfig.spec.json',
12+
stringifyContentPathRegex: '\\.(html|svg)$',
2013
},
2114
],
2215
},
23-
transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
16+
transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],
17+
snapshotSerializers: [
18+
'jest-preset-angular/build/serializers/no-ng-attributes',
19+
'jest-preset-angular/build/serializers/ng-snapshot',
20+
'jest-preset-angular/build/serializers/html-comment',
21+
],
2422
};

0 commit comments

Comments
 (0)