Skip to content

Commit 9f385a3

Browse files
Up to Angular 19 of devextreme-angular (#32041)
1 parent cfeef53 commit 9f385a3

33 files changed

+1696
-3986
lines changed

apps/angular/angular.json

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,22 @@
1111
"schematics": {},
1212
"architect": {
1313
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
14+
"builder": "@angular-devkit/build-angular:application",
1515
"options": {
16-
"outputPath": "dist/sandbox",
16+
"outputPath": {
17+
"base": "dist/sandbox"
18+
},
1719
"index": "src/index.html",
18-
"main": "src/main.ts",
19-
"polyfills": "src/polyfills.ts",
20+
"polyfills": [
21+
"src/polyfills.ts"
22+
],
2023
"tsConfig": "src/tsconfig.app.json",
2124
"styles": [
2225
"node_modules/devextreme/dist/css/dx.common.css",
2326
"node_modules/devextreme/dist/css/dx.light.css"
2427
],
25-
"scripts": []
28+
"scripts": [],
29+
"browser": "src/main.ts"
2630
},
2731
"configurations": {
2832
"production": {
@@ -35,12 +39,9 @@
3539
"optimization": true,
3640
"outputHashing": "all",
3741
"sourceMap": false,
38-
"extractCss": true,
3942
"namedChunks": false,
4043
"aot": true,
4144
"extractLicenses": true,
42-
"vendorChunk": false,
43-
"buildOptimizer": true,
4445
"budgets": [
4546
{
4647
"type": "initial",
@@ -53,26 +54,23 @@
5354
"optimization": false,
5455
"outputHashing": "none",
5556
"sourceMap": true,
56-
"extractCss": true,
5757
"namedChunks": false,
5858
"aot": true,
59-
"extractLicenses": true,
60-
"vendorChunk": false,
61-
"buildOptimizer": false
59+
"extractLicenses": true
6260
}
6361
}
6462
},
6563
"serve": {
6664
"builder": "@angular-devkit/build-angular:dev-server",
6765
"options": {
68-
"browserTarget": "sandbox:build"
66+
"buildTarget": "sandbox:build"
6967
},
7068
"configurations": {
7169
"production": {
72-
"browserTarget": "sandbox:build:production"
70+
"buildTarget": "sandbox:build:production"
7371
},
7472
"dev": {
75-
"browserTarget": "sandbox:build:dev"
73+
"buildTarget": "sandbox:build:dev"
7674
}
7775
}
7876
},
@@ -93,6 +91,5 @@
9391
}
9492
}
9593
}
96-
},
97-
"defaultProject": "sandbox"
94+
}
9895
}

apps/angular/package.json

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,28 @@
66
"author": "Developer Express Inc.",
77
"license": "MIT",
88
"dependencies": {
9-
"@angular/animations": "17.3.12",
10-
"@angular/common": "17.3.12",
11-
"@angular/compiler": "17.3.12",
12-
"@angular/compiler-cli": "17.3.12",
13-
"@angular/core": "17.3.12",
14-
"@angular/forms": "17.3.12",
15-
"@angular/platform-browser": "17.3.12",
16-
"@angular/platform-browser-dynamic": "17.3.12",
17-
"@angular/router": "17.3.12",
9+
"@angular/common": "catalog:angular",
10+
"@angular/compiler": "catalog:angular",
11+
"@angular/compiler-cli": "catalog:angular",
12+
"@angular/core": "catalog:angular",
13+
"@angular/forms": "catalog:angular",
14+
"@angular/platform-browser": "catalog:angular",
15+
"@angular/platform-browser-dynamic": "catalog:angular",
16+
"@angular/router": "catalog:angular",
1817
"core-js": "^2.6.12",
1918
"devextreme": "workspace:*",
2019
"devextreme-angular": "workspace:*",
21-
"rxjs": "7.8.1",
2220
"tslib": "^2.6.1",
23-
"zone.js": "0.14.10"
21+
"zone.js": "catalog:angular"
2422
},
2523
"devDependencies": {
26-
"@angular-devkit/build-angular": "17.3.11",
27-
"@angular/cli": "17.3.11",
28-
"@angular/language-service": "17.3.12",
29-
"@angular/platform-server": "17.3.12",
24+
"@angular-devkit/build-angular": "catalog:angular",
25+
"@angular/cli": "catalog:angular",
3026
"@types/jasmine": "5.1.4",
3127
"@types/node": "20.11.17",
3228
"cross-env": "7.0.3",
3329
"ts-node": "10.9.2",
34-
"typescript": "5.4.5"
30+
"typescript": "catalog:angular"
3531
},
3632
"scripts": {
3733
"ng": "ng",

apps/angular/src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* tslint:disable:component-selector */
2-
32
import {
43
Component,
54
OnInit,
@@ -95,7 +94,8 @@ import ArrayStore from 'devextreme/data/array_store';
9594
CustomerService,
9695
AppointmentService,
9796
OwnerService
98-
]
97+
],
98+
standalone: false
9999
})
100100
export class AppComponent implements OnInit, AfterViewInit {
101101
@ViewChild(DxPopoverComponent) popover: DxPopoverComponent;

apps/angular/src/app/app.module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { BrowserModule } from '@angular/platform-browser';
33
import { ReactiveFormsModule } from '@angular/forms';
44
import { AppComponent } from './app.component';
55

6-
76
import { DevExtremeModule } from 'devextreme-angular';
87

98
@NgModule({

apps/angular/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
"outDir": "./dist/out-tsc",
66
"sourceMap": true,
77
"declaration": false,
8-
"module": "es2015",
8+
"module": "ES2022",
99
"moduleResolution": "node",
1010
"emitDecoratorMetadata": true,
1111
"experimentalDecorators": true,
1212
"importHelpers": true,
13-
"target": "es5",
1413
"typeRoots": [
1514
"node_modules/@types"
1615
],

packages/devextreme-angular/package.json

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,22 @@
1919
"author": "Developer Express Inc.",
2020
"license": "MIT",
2121
"peerDependencies": {
22-
"@angular/common": ">=17.0.0",
23-
"@angular/core": ">=17.0.0",
24-
"@angular/forms": ">=17.0.0",
22+
"@angular/common": ">=19.0.0",
23+
"@angular/core": ">=19.0.0",
24+
"@angular/forms": ">=19.0.0",
2525
"devextreme": "workspace:*"
2626
},
2727
"devDependencies": {
28-
"@angular-devkit/architect": "0.1900.2",
29-
"@angular-devkit/schematics": "17.3.11",
30-
"@angular/animations": "17.3.12",
31-
"@angular/cli": "17.3.11",
32-
"@angular/common": "17.3.12",
33-
"@angular/compiler": "17.3.12",
34-
"@angular/compiler-cli": "17.3.12",
35-
"@angular/core": "17.3.12",
36-
"@angular/forms": "17.3.12",
37-
"@angular/platform-browser": "17.3.12",
38-
"@angular/platform-browser-dynamic": "17.3.12",
39-
"@angular/platform-server": "17.3.12",
28+
"@angular-devkit/architect": "catalog:angular",
29+
"@angular/cli": "catalog:angular",
30+
"@angular/common": "catalog:angular",
31+
"@angular/compiler": "catalog:angular",
32+
"@angular/compiler-cli": "catalog:angular",
33+
"@angular/core": "catalog:angular",
34+
"@angular/forms": "catalog:angular",
35+
"@angular/platform-browser": "catalog:angular",
36+
"@angular/platform-browser-dynamic": "catalog:angular",
37+
"@angular/platform-server": "catalog:angular",
4038
"@babel/eslint-parser": "catalog:",
4139
"@eslint/eslintrc": "catalog:",
4240
"@eslint-stylistic/metadata": "catalog:",
@@ -54,23 +52,23 @@
5452
"eslint-config-devextreme": "1.1.5",
5553
"eslint-plugin-import": "catalog:",
5654
"eslint-migration-utils": "workspace:*",
57-
"jasmine": "5.4.0",
55+
"jasmine": "5.12.0",
5856
"karma": "6.4.4",
5957
"karma-chrome-launcher": "3.2.0",
6058
"karma-jasmine": "5.1.0",
6159
"karma-junit-reporter": "2.0.1",
6260
"karma-webpack": "5.0.1",
63-
"ng-packagr": "17.3.0",
61+
"ng-packagr": "catalog:angular",
6462
"puppeteer": "23.6.1",
63+
"rxjs": "7.8.2",
6564
"reflect-metadata": "0.1.13",
66-
"rxjs": "7.8.1",
6765
"stream-browserify": "3.0.0",
6866
"style-loader": "3.3.4",
6967
"tslib": "2.6.3",
70-
"typescript": "5.4.5",
68+
"typescript": "catalog:angular",
7169
"webpack": "5.96.1",
7270
"yargs": "17.7.2",
73-
"zone.js": "0.14.10"
71+
"zone.js": "catalog:angular"
7472
},
7573
"main": "./src/index.ts",
7674
"keywords": [
@@ -111,7 +109,7 @@
111109
"shadowdom"
112110
],
113111
"dependencies": {
114-
"@angular-devkit/schematics": "17.3.11",
112+
"@angular-devkit/schematics": "catalog:angular",
115113
"devextreme-schematics": "*",
116114
"inferno-server": "catalog:"
117115
},

packages/devextreme-angular/tests/src/core/component-extension.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ DxTestExtension.defaultOptions({
3030
});
3131

3232
@Component({
33+
standalone: false,
3334
selector: 'dx-test-extension',
3435
template: '',
3536
providers: [DxTemplateHost, WatcherHelper],
@@ -52,6 +53,7 @@ export class DxTestExtensionComponent extends DxComponentExtension {
5253
}
5354

5455
@Component({
56+
standalone: false,
5557
selector: 'test-container-component',
5658
template: '',
5759
})

packages/devextreme-angular/tests/src/core/component.spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ DxTestWidget.defaultOptions({
3939
});
4040

4141
@Component({
42+
standalone: false,
4243
selector: 'dx-test-widget',
4344
template: '',
4445
providers: [DxTemplateHost, WatcherHelper],
@@ -104,6 +105,7 @@ export class DxTestWidgetComponent extends DxComponent implements OnDestroy {
104105
}
105106

106107
@Component({
108+
standalone: false,
107109
selector: 'test-container-component',
108110
template: '',
109111
})

packages/devextreme-angular/tests/src/core/nested-option.spec.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ DxTestWidget.defaultOptions({
4848
});
4949

5050
@Component({
51+
standalone: false,
5152
selector: 'dxo-test-option',
5253
template: '',
5354
providers: [NestedOptionHost],
@@ -81,6 +82,7 @@ export class DxoTestOptionComponent extends NestedOption {
8182
}
8283

8384
@Component({
85+
standalone: false,
8486
selector: 'dxi-test-collection-option',
8587
template: '',
8688
providers: [NestedOptionHost],
@@ -114,6 +116,7 @@ export class DxiTestCollectionOptionComponent extends CollectionNestedOption {
114116
}
115117

116118
@Component({
119+
standalone: false,
117120
selector: 'dxi-test-collection-option-with-template',
118121
template: '<ng-content></ng-content>',
119122
providers: [NestedOptionHost],
@@ -163,6 +166,7 @@ export class DxiTestCollectionOptionWithTemplateComponent extends CollectionNest
163166
}
164167

165168
@Component({
169+
standalone: false,
166170
selector: 'dx-test-widget',
167171
template: '',
168172
providers: [DxTemplateHost, NestedOptionHost, WatcherHelper],
@@ -244,6 +248,7 @@ export class DxTestWidgetComponent extends DxComponent {
244248
}
245249

246250
@Component({
251+
standalone: false,
247252
selector: 'test-container-component',
248253
template: '',
249254
})

packages/devextreme-angular/tests/src/core/template.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ DxTestWidget.defaultOptions({
3636
});
3737

3838
@Component({
39+
standalone: false,
3940
selector: 'dx-test-widget',
4041
template: '',
4142
providers: [DxTemplateHost, WatcherHelper],
@@ -76,6 +77,7 @@ export class DxTestWidgetComponent extends DxComponent {
7677
}
7778

7879
@Component({
80+
standalone: false,
7981
selector: 'dx-test',
8082
template: '',
8183
providers: [DxTemplateHost, WatcherHelper],
@@ -116,6 +118,7 @@ export class DxTestComponent extends DxComponent implements AfterViewInit {
116118
}
117119

118120
@Component({
121+
standalone: false,
119122
selector: 'test-container-component',
120123
template: '',
121124
providers: [DxTemplateHost],
@@ -143,6 +146,7 @@ export class TestContainerComponent {
143146
}
144147

145148
@Component({
149+
standalone: false,
146150
selector: 'dx-imitation',
147151
template: `
148152
<div *dxTemplate="let d of 'ImportedTemlate'">

0 commit comments

Comments
 (0)