Skip to content

Commit e0d381b

Browse files
lexasqlexasq
authored
Alex migreate to 21 (#2024)
* chore(readme): updated README.md table * chore(version): updated to support Angular 21 * chore(version): fixed CI npm install * chore(version): fixed CI test run
1 parent 9370149 commit e0d381b

File tree

14 files changed

+12752
-17679
lines changed

14 files changed

+12752
-17679
lines changed

‎README.md‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ changes to start using the library right away.
108108
<td>v7.x</td>
109109
<td>v8.x</td>
110110
<td>v9.x</td>
111+
<td>v10.x</td>
111112
</tr>
112113

113114
<tr>
@@ -121,6 +122,7 @@ changes to start using the library right away.
121122
<td></td>
122123
<td></td>
123124
<td></td>
125+
<td></td>
124126
</tr>
125127

126128
<tr>
@@ -134,6 +136,7 @@ changes to start using the library right away.
134136
<td></td>
135137
<td></td>
136138
<td></td>
139+
<td></td>
137140
</tr>
138141

139142
<tr>
@@ -147,6 +150,7 @@ changes to start using the library right away.
147150
<td></td>
148151
<td></td>
149152
<td></td>
153+
<td></td>
150154
</tr>
151155

152156
<tr>
@@ -160,6 +164,7 @@ changes to start using the library right away.
160164
<td></td>
161165
<td></td>
162166
<td></td>
167+
<td></td>
163168
</tr>
164169

165170
<tr>
@@ -173,6 +178,7 @@ changes to start using the library right away.
173178
<td></td>
174179
<td></td>
175180
<td></td>
181+
<td></td>
176182
</tr>
177183

178184
<tr>
@@ -186,6 +192,7 @@ changes to start using the library right away.
186192
<td></td>
187193
<td></td>
188194
<td></td>
195+
<td></td>
189196
</tr>
190197

191198
<tr>
@@ -199,6 +206,7 @@ changes to start using the library right away.
199206
<td></td>
200207
<td></td>
201208
<td></td>
209+
<td></td>
202210
</tr>
203211

204212
<tr>
@@ -212,6 +220,7 @@ changes to start using the library right away.
212220
<td></td>
213221
<td></td>
214222
<td></td>
223+
<td></td>
215224
</tr>
216225

217226
<tr>
@@ -225,6 +234,7 @@ changes to start using the library right away.
225234
<td></td>
226235
<td></td>
227236
<td></td>
237+
<td></td>
228238
</tr>
229239

230240
<tr>
@@ -238,6 +248,7 @@ changes to start using the library right away.
238248
<td>✓</td>
239249
<td></td>
240250
<td></td>
251+
<td></td>
241252
</tr>
242253

243254
<tr>
@@ -251,6 +262,7 @@ changes to start using the library right away.
251262
<td></td>
252263
<td>✓</td>
253264
<td></td>
265+
<td></td>
254266
</tr>
255267

256268
<tr>
@@ -264,6 +276,21 @@ changes to start using the library right away.
264276
<td></td>
265277
<td></td>
266278
<td>✓</td>
279+
<td></td>
280+
</tr>
281+
282+
<tr>
283+
<td>21</td>
284+
<td></td>
285+
<td></td>
286+
<td></td>
287+
<td></td>
288+
<td></td>
289+
<td></td>
290+
<td></td>
291+
<td></td>
292+
<td></td>
293+
<td>✓</td>
267294
</tr>
268295

269296
</tbody></table>

‎apps/ng2-charts-demo/jest.config.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const esModules = ['lodash-es'].join('|');
1+
const esModules = ['lodash-es', 'marked', 'ngx-markdown'].join('|');
22
export default {
33
displayName: 'ng2-charts',
44
preset: '../../jest.preset.js',
@@ -17,6 +17,24 @@ export default {
1717
transformIgnorePatterns: [`node_modules/(?!.*\\.mjs$|${esModules})`],
1818
moduleNameMapper: {
1919
'.*\\.txt': 'jest-raw-loader',
20+
'^@angular/core/testing$':
21+
'<rootDir>/../../node_modules/@angular/core/fesm2022/testing.mjs',
22+
'^@angular/common/testing$':
23+
'<rootDir>/../../node_modules/@angular/common/fesm2022/testing.mjs',
24+
'^@angular/common/http$':
25+
'<rootDir>/../../node_modules/@angular/common/fesm2022/http.mjs',
26+
'^@angular/common/http/testing$':
27+
'<rootDir>/../../node_modules/@angular/common/fesm2022/http-testing.mjs',
28+
'^@angular/platform-browser/testing$':
29+
'<rootDir>/../../node_modules/@angular/platform-browser/fesm2022/testing.mjs',
30+
'^@angular/platform-browser/animations$':
31+
'<rootDir>/../../node_modules/@angular/platform-browser/fesm2022/animations.mjs',
32+
'^@angular/router$':
33+
'<rootDir>/../../node_modules/@angular/router/fesm2022/router.mjs',
34+
'^@angular/router/testing$':
35+
'<rootDir>/../../node_modules/@angular/router/fesm2022/testing.mjs',
36+
'^@angular/material/(.+)$':
37+
'<rootDir>/../../node_modules/@angular/material/fesm2022/$1.mjs',
2038
},
2139
snapshotSerializers: [
2240
'jest-preset-angular/build/serializers/no-ng-attributes',

‎apps/ng2-charts-demo/src/main.server.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
import { bootstrapApplication } from '@angular/platform-browser';
1+
import {
2+
bootstrapApplication,
3+
BootstrapContext,
4+
} from '@angular/platform-browser';
25
import { AppComponent } from './app/app.component';
36
import { config } from './app/app.config.server';
47

5-
const bootstrap = () => bootstrapApplication(AppComponent, config);
8+
const bootstrap = (context: BootstrapContext) =>
9+
bootstrapApplication(AppComponent, config, context);
610

711
export default bootstrap;

‎apps/ng2-charts-demo/src/test-setup.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@ global.ResizeObserver = jest.fn().mockImplementation(() => ({
44
disconnect: jest.fn(),
55
}));
66

7-
// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
8-
globalThis.ngJest = {
9-
testEnvironmentOptions: {
10-
errorOnUnknownElements: true,
11-
errorOnUnknownProperties: true,
12-
},
13-
};
14-
import 'jest-preset-angular/setup-jest';
7+
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
8+
setupZoneTestEnv({
9+
errorOnUnknownElements: true,
10+
errorOnUnknownProperties: true,
11+
});
1512
import 'jest-canvas-mock';

‎apps/ng2-charts-demo/tsconfig.spec.json‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,56 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../dist/out-tsc",
5-
"module": "commonjs",
6-
"types": ["jest", "node"]
5+
"module": "ES2022",
6+
"types": ["jest", "node"],
7+
"paths": {
8+
"@angular/core/testing": [
9+
"node_modules/@angular/core/types/testing.d.ts"
10+
],
11+
"@angular/common/testing": [
12+
"node_modules/@angular/common/types/testing.d.ts"
13+
],
14+
"@angular/common/http": ["node_modules/@angular/common/types/http.d.ts"],
15+
"@angular/common/http/testing": [
16+
"node_modules/@angular/common/types/http-testing.d.ts"
17+
],
18+
"@angular/platform-browser/testing": [
19+
"node_modules/@angular/platform-browser/types/testing.d.ts"
20+
],
21+
"@angular/platform-browser/animations": [
22+
"node_modules/@angular/platform-browser/types/animations.d.ts"
23+
],
24+
"@angular/router": ["node_modules/@angular/router/types/router.d.ts"],
25+
"@angular/router/testing": [
26+
"node_modules/@angular/router/types/testing.d.ts"
27+
],
28+
"@angular/material/button": [
29+
"node_modules/@angular/material/types/button.d.ts"
30+
],
31+
"@angular/material/card": [
32+
"node_modules/@angular/material/types/card.d.ts"
33+
],
34+
"@angular/material/tabs": [
35+
"node_modules/@angular/material/types/tabs.d.ts"
36+
],
37+
"@angular/material/divider": [
38+
"node_modules/@angular/material/types/divider.d.ts"
39+
],
40+
"@angular/material/toolbar": [
41+
"node_modules/@angular/material/types/toolbar.d.ts"
42+
],
43+
"@angular/material/slide-toggle": [
44+
"node_modules/@angular/material/types/slide-toggle.d.ts"
45+
],
46+
"@angular/material/menu": [
47+
"node_modules/@angular/material/types/menu.d.ts"
48+
],
49+
"@angular/material/icon": [
50+
"node_modules/@angular/material/types/icon.d.ts"
51+
],
52+
"ng2-charts": ["libs/ng2-charts/src/index.ts"],
53+
"ng2-charts-schematics": ["libs/ng2-charts-schematics/src/index.ts"]
54+
}
755
},
856
"files": ["src/test-setup.ts"],
957
"include": [

‎libs/ng2-charts-schematics/jest.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default {
66
transform: {
77
'^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
88
},
9+
transformIgnorePatterns: [],
910
moduleFileExtensions: ['ts', 'js', 'html'],
1011
coverageDirectory: '../../coverage/libs/ng2-charts-schematics',
1112
};

‎libs/ng2-charts-schematics/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"module": "commonjs"
4+
"module": "commonjs",
5+
"moduleResolution": "node"
56
},
67
"references": [
78
{

‎libs/ng2-charts/jest.config.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,18 @@ export default {
2020
'jest-preset-angular/build/serializers/ng-snapshot',
2121
'jest-preset-angular/build/serializers/html-comment',
2222
],
23+
moduleNameMapper: {
24+
'^@angular/core/testing$':
25+
'<rootDir>/../../node_modules/@angular/core/fesm2022/testing.mjs',
26+
'^@angular/common/testing$':
27+
'<rootDir>/../../node_modules/@angular/common/fesm2022/testing.mjs',
28+
'^@angular/common/http$':
29+
'<rootDir>/../../node_modules/@angular/common/fesm2022/http.mjs',
30+
'^@angular/common/http/testing$':
31+
'<rootDir>/../../node_modules/@angular/common/fesm2022/http-testing.mjs',
32+
'^@angular/platform-browser/testing$':
33+
'<rootDir>/../../node_modules/@angular/platform-browser/fesm2022/testing.mjs',
34+
'^@angular/platform-browser/animations$':
35+
'<rootDir>/../../node_modules/@angular/platform-browser/fesm2022/animations.mjs',
36+
},
2337
};

‎libs/ng2-charts/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"version": "9.0.2",
2+
"version": "10.0.0",
33
"name": "ng2-charts",
44
"description": "Reactive, responsive, beautiful charts for Angular based on Chart.js",
55
"peerDependencies": {
6-
"@angular/platform-browser": ">=20.0.0",
7-
"@angular/common": ">=20.0.0",
8-
"@angular/core": ">=20.0.0",
9-
"@angular/cdk": ">=20.0.0",
6+
"@angular/platform-browser": ">=21.0.0",
7+
"@angular/common": ">=21.0.0",
8+
"@angular/core": ">=21.0.0",
9+
"@angular/cdk": ">=21.0.0",
1010
"chart.js": "^3.4.0 || ^4.0.0",
1111
"rxjs": "^6.5.3 || ^7.4.0"
1212
},

‎libs/ng2-charts/src/test-setup.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@ import { Chart } from 'chart.js';
33
// @ts-expect-error TS2339: Property 'Chart' does not exist on type 'Window & typeof globalThis'.
44
window.Chart = Chart;
55

6-
// @ts-expect-error https://thymikee.github.io/jest-preset-angular/docs/getting-started/test-environment
7-
globalThis.ngJest = {
8-
testEnvironmentOptions: {
9-
errorOnUnknownElements: true,
10-
errorOnUnknownProperties: true,
11-
},
12-
};
13-
import 'jest-preset-angular/setup-jest';
6+
import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone';
7+
setupZoneTestEnv({
8+
errorOnUnknownElements: true,
9+
errorOnUnknownProperties: true,
10+
});
1411
import 'jest-canvas-mock';
1512

1613
window.ResizeObserver =

0 commit comments

Comments
 (0)