Skip to content

Commit 828e268

Browse files
committed
chore: update dependencies, fix tests, and adjust configuration for latest Angular and NX versions
1 parent 4d35fd6 commit 828e268

File tree

8 files changed

+12473
-6977
lines changed

8 files changed

+12473
-6977
lines changed

.eslintrc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"ignorePatterns": ["**/*"],
33
"overrides": [
4+
{
5+
"files": "*.json",
6+
"parser": "jsonc-eslint-parser",
7+
"rules": {}
8+
},
49
{
510
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
611
"rules": {

apps/json-api-front/tsconfig.app.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"types": []
5+
"types": [],
6+
"moduleResolution": "bundler"
67
},
78
"files": ["src/main.ts"],
89
"include": ["src/**/*.d.ts"],

apps/json-api-server-e2e/src/json-api/json-api-sdk/check-common-decorator.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ describe('Check common decorator', () => {
8787
} catch (e) {
8888
expect(e).toBeInstanceOf(AxiosError);
8989
expect((e as AxiosError).response?.status).toBe(418);
90-
expect(((e as AxiosError).response?.data as any)?.path).toBe(
90+
expect(decodeURI(((e as AxiosError).response?.data as any)?.path)).toBe(
9191
'/api/users?filter[firstName][eq]=testControllerFilter'
9292
);
9393
expect(((e as AxiosError).response?.data as any)?.method).toBe(false);
@@ -108,7 +108,7 @@ describe('Check common decorator', () => {
108108
expect.assertions(4);
109109
expect(e).toBeInstanceOf(AxiosError);
110110
expect((e as AxiosError).response?.status).toBe(412);
111-
expect(((e as AxiosError).response?.data as any)?.path).toBe(
111+
expect(decodeURI(((e as AxiosError).response?.data as any)?.path)).toBe(
112112
'/api/users?filter[firstName][eq]=testMethodFilter'
113113
);
114114
expect(((e as AxiosError).response?.data as any)?.method).toBe(true);

nx.json

Lines changed: 54 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
"!{projectRoot}/src/test-setup.[jt]s",
1313
"!{projectRoot}/test-setup.[jt]s"
1414
],
15-
"sharedGlobals": [
16-
"{workspaceRoot}/.github/**/*.yml"
17-
]
15+
"sharedGlobals": ["{workspaceRoot}/.github/**/*.yml"]
1816
},
1917
"plugins": [
2018
{
@@ -70,7 +68,59 @@
7068
"unitTestRunner": "jest"
7169
},
7270
"@nx/angular:component": {
73-
"style": "css"
71+
"style": "css",
72+
"type": "component"
73+
},
74+
"@schematics/angular:component": {
75+
"type": "component"
76+
},
77+
"@nx/angular:directive": {
78+
"type": "directive"
79+
},
80+
"@schematics/angular:directive": {
81+
"type": "directive"
82+
},
83+
"@nx/angular:service": {
84+
"type": "service"
85+
},
86+
"@schematics/angular:service": {
87+
"type": "service"
88+
},
89+
"@nx/angular:scam": {
90+
"type": "component"
91+
},
92+
"@nx/angular:scam-directive": {
93+
"type": "directive"
94+
},
95+
"@nx/angular:guard": {
96+
"typeSeparator": "."
97+
},
98+
"@schematics/angular:guard": {
99+
"typeSeparator": "."
100+
},
101+
"@nx/angular:interceptor": {
102+
"typeSeparator": "."
103+
},
104+
"@schematics/angular:interceptor": {
105+
"typeSeparator": "."
106+
},
107+
"@nx/angular:module": {
108+
"typeSeparator": "."
109+
},
110+
"@schematics/angular:module": {
111+
"typeSeparator": "."
112+
},
113+
"@nx/angular:pipe": {
114+
"typeSeparator": "."
115+
},
116+
"@schematics/angular:pipe": {
117+
"typeSeparator": "."
118+
},
119+
"@nx/angular:resolver": {
120+
"typeSeparator": "."
121+
},
122+
"@schematics/angular:resolver": {
123+
"typeSeparator": "."
74124
}
75125
},
76126
"release": {

0 commit comments

Comments
 (0)