Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
cf47959
fix apps/angular
GoodDayForSurf Dec 10, 2025
4b9c804
update devextreme-angular to angular 19
GoodDayForSurf Dec 10, 2025
33405ea
remove angular/platform-server from apps/demos and apps/angular
GoodDayForSurf Dec 10, 2025
e916b31
fix lock
GoodDayForSurf Dec 10, 2025
0aec32d
up peerDeps in devextreme-angular
GoodDayForSurf Dec 10, 2025
1515ac3
fix lock
GoodDayForSurf Dec 11, 2025
2c99549
update apps/angular to Angular 19
GoodDayForSurf Dec 11, 2025
afc5ce0
update lock
GoodDayForSurf Dec 11, 2025
b519205
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Dec 11, 2025
7df84e7
update lock
GoodDayForSurf Dec 11, 2025
b5627d5
return rxjs to devextreme-angular
GoodDayForSurf Dec 11, 2025
e04f168
Merge branch '25_2' into 25_2_update_angular19
GoodDayForSurf Dec 11, 2025
756afe6
fix ssr test
GoodDayForSurf Dec 11, 2025
e0e810d
Merge branch '25_2_update_angular19' of https://github.com/GoodDayFor…
GoodDayForSurf Dec 11, 2025
730c595
fix lint in ssr test
GoodDayForSurf Dec 11, 2025
3ec4e60
fix ssr test
GoodDayForSurf Dec 11, 2025
5ceab2a
WIP. log hydration test
GoodDayForSurf Dec 11, 2025
16087be
WIP. log hydration test
GoodDayForSurf Dec 11, 2025
f5e0221
WIP. log hydration test
GoodDayForSurf Dec 11, 2025
702f878
WIP. log hydration test
GoodDayForSurf Dec 11, 2025
5de4d2e
WIP. log hydration test
GoodDayForSurf Dec 11, 2025
10d6da6
WIP. log hydration test
GoodDayForSurf Dec 12, 2025
3d8271b
Merge branch '25_2' into 25_2_update_angular19
GoodDayForSurf Dec 12, 2025
0ec6d59
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Dec 12, 2025
fc7e242
Merge branch '25_2' into 25_2_update_angular19
GoodDayForSurf Dec 12, 2025
1b506e8
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Dec 12, 2025
c624088
update lock
GoodDayForSurf Dec 12, 2025
34d5601
Merge branch '25_2_update_angular19' of https://github.com/GoodDayFor…
GoodDayForSurf Dec 12, 2025
65e27b5
update hydration test
GoodDayForSurf Dec 12, 2025
5a9de7d
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Dec 12, 2025
4ca2011
Merge branch '25_2' into 25_2_update_angular19
GoodDayForSurf Dec 12, 2025
d01e307
fix lint in hydration test
GoodDayForSurf Dec 12, 2025
0306ba2
Merge remote-tracking branch 'my/25_2_update_angular19' into 25_2_upd…
GoodDayForSurf Dec 12, 2025
057be42
fix lint in hydration test
GoodDayForSurf Dec 13, 2025
9b36b9b
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Dec 22, 2025
7cd819b
update lock
GoodDayForSurf Dec 22, 2025
912664f
Merge branch '25_2' into 25_2_update_angular19
GoodDayForSurf Dec 23, 2025
b2e716e
Merge branch '25_2' into 25_2_update_angular19
GoodDayForSurf Dec 24, 2025
3462b4d
Merge branch '25_2_update_angular19' of https://github.com/GoodDayFor…
GoodDayForSurf Dec 24, 2025
b3a8ae1
fix deps
GoodDayForSurf Dec 24, 2025
ea3cbb4
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Dec 25, 2025
0955d71
update lock
GoodDayForSurf Dec 25, 2025
abb78c1
fix deps in apps/angular
GoodDayForSurf Dec 25, 2025
de12d06
place deps for angular to common catalog
GoodDayForSurf Dec 25, 2025
85799d9
increase timeout for wrappers tests
GoodDayForSurf Dec 26, 2025
7d514a7
Merge branch '25_2' into 25_2_update_angular19
GoodDayForSurf Dec 26, 2025
e57b997
fix deps
GoodDayForSurf Dec 26, 2025
82bee5c
Merge branch '25_2_update_angular19' of https://github.com/GoodDayFor…
GoodDayForSurf Dec 26, 2025
462b82f
Merge branch '25_2' of https://github.com/DevExpress/DevExtreme into …
GoodDayForSurf Dec 26, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/wrapper_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
jobs:
build:
runs-on: devextreme-shr2
timeout-minutes: 15
timeout-minutes: 30

steps:
- name: Get sources
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
fi

test:
timeout-minutes: 20
timeout-minutes: 30
needs: build
runs-on: devextreme-shr2
strategy:
Expand Down
31 changes: 14 additions & 17 deletions apps/angular/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,22 @@
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/sandbox",
"outputPath": {
"base": "dist/sandbox"
},
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"polyfills": [
"src/polyfills.ts"
],
"tsConfig": "src/tsconfig.app.json",
"styles": [
"node_modules/devextreme/dist/css/dx.common.css",
"node_modules/devextreme/dist/css/dx.light.css"
],
"scripts": []
"scripts": [],
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand All @@ -35,12 +39,9 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
Expand All @@ -53,26 +54,23 @@
"optimization": false,
"outputHashing": "none",
"sourceMap": true,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": false
"extractLicenses": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "sandbox:build"
"buildTarget": "sandbox:build"
},
"configurations": {
"production": {
"browserTarget": "sandbox:build:production"
"buildTarget": "sandbox:build:production"
},
"dev": {
"browserTarget": "sandbox:build:dev"
"buildTarget": "sandbox:build:dev"
}
}
},
Expand All @@ -93,6 +91,5 @@
}
}
}
},
"defaultProject": "sandbox"
}
}
28 changes: 12 additions & 16 deletions apps/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,28 @@
"author": "Developer Express Inc.",
"license": "MIT",
"dependencies": {
"@angular/animations": "17.3.12",
"@angular/common": "17.3.12",
"@angular/compiler": "17.3.12",
"@angular/compiler-cli": "17.3.12",
"@angular/core": "17.3.12",
"@angular/forms": "17.3.12",
"@angular/platform-browser": "17.3.12",
"@angular/platform-browser-dynamic": "17.3.12",
"@angular/router": "17.3.12",
"@angular/common": "catalog:angular",
"@angular/compiler": "catalog:angular",
"@angular/compiler-cli": "catalog:angular",
"@angular/core": "catalog:angular",
"@angular/forms": "catalog:angular",
"@angular/platform-browser": "catalog:angular",
"@angular/platform-browser-dynamic": "catalog:angular",
"@angular/router": "catalog:angular",
"core-js": "^2.6.12",
"devextreme": "workspace:*",
"devextreme-angular": "workspace:*",
"rxjs": "7.8.1",
"tslib": "^2.6.1",
"zone.js": "0.14.10"
"zone.js": "catalog:angular"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.3.11",
"@angular/cli": "17.3.11",
"@angular/language-service": "17.3.12",
"@angular/platform-server": "17.3.12",
"@angular-devkit/build-angular": "catalog:angular",
"@angular/cli": "catalog:angular",
"@types/jasmine": "5.1.4",
"@types/node": "20.11.17",
"cross-env": "7.0.3",
"ts-node": "10.9.2",
"typescript": "5.4.5"
"typescript": "catalog:angular"
},
"scripts": {
"ng": "ng",
Expand Down
4 changes: 2 additions & 2 deletions apps/angular/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* tslint:disable:component-selector */

import {
Component,
OnInit,
Expand Down Expand Up @@ -95,7 +94,8 @@ import ArrayStore from 'devextreme/data/array_store';
CustomerService,
AppointmentService,
OwnerService
]
],
standalone: false
})
export class AppComponent implements OnInit, AfterViewInit {
@ViewChild(DxPopoverComponent) popover: DxPopoverComponent;
Expand Down
1 change: 0 additions & 1 deletion apps/angular/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { BrowserModule } from '@angular/platform-browser';
import { ReactiveFormsModule } from '@angular/forms';
import { AppComponent } from './app.component';


import { DevExtremeModule } from 'devextreme-angular';

@NgModule({
Expand Down
3 changes: 1 addition & 2 deletions apps/angular/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "es2015",
"module": "ES2022",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"target": "es5",
"typeRoots": [
"node_modules/@types"
],
Expand Down
40 changes: 19 additions & 21 deletions packages/devextreme-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,22 @@
"author": "Developer Express Inc.",
"license": "MIT",
"peerDependencies": {
"@angular/common": ">=17.0.0",
"@angular/core": ">=17.0.0",
"@angular/forms": ">=17.0.0",
"@angular/common": ">=19.0.0",
"@angular/core": ">=19.0.0",
"@angular/forms": ">=19.0.0",
"devextreme": "workspace:*"
},
"devDependencies": {
"@angular-devkit/architect": "0.1900.2",
"@angular-devkit/schematics": "17.3.11",
"@angular/animations": "17.3.12",
"@angular/cli": "17.3.11",
"@angular/common": "17.3.12",
"@angular/compiler": "17.3.12",
"@angular/compiler-cli": "17.3.12",
"@angular/core": "17.3.12",
"@angular/forms": "17.3.12",
"@angular/platform-browser": "17.3.12",
"@angular/platform-browser-dynamic": "17.3.12",
"@angular/platform-server": "17.3.12",
"@angular-devkit/architect": "catalog:angular",
"@angular/cli": "catalog:angular",
"@angular/common": "catalog:angular",
"@angular/compiler": "catalog:angular",
"@angular/compiler-cli": "catalog:angular",
"@angular/core": "catalog:angular",
"@angular/forms": "catalog:angular",
"@angular/platform-browser": "catalog:angular",
"@angular/platform-browser-dynamic": "catalog:angular",
"@angular/platform-server": "catalog:angular",
"@babel/eslint-parser": "catalog:",
"@eslint/eslintrc": "catalog:",
"@eslint-stylistic/metadata": "catalog:",
Expand All @@ -54,23 +52,23 @@
"eslint-config-devextreme": "1.1.5",
"eslint-plugin-import": "catalog:",
"eslint-migration-utils": "workspace:*",
"jasmine": "5.4.0",
"jasmine": "5.12.0",
"karma": "6.4.4",
"karma-chrome-launcher": "3.2.0",
"karma-jasmine": "5.1.0",
"karma-junit-reporter": "2.0.1",
"karma-webpack": "5.0.1",
"ng-packagr": "17.3.0",
"ng-packagr": "catalog:angular",
"puppeteer": "23.6.1",
"rxjs": "7.8.2",
"reflect-metadata": "0.1.13",
"rxjs": "7.8.1",
"stream-browserify": "3.0.0",
"style-loader": "3.3.4",
"tslib": "2.6.3",
"typescript": "5.4.5",
"typescript": "catalog:angular",
"webpack": "5.96.1",
"yargs": "17.7.2",
"zone.js": "0.14.10"
"zone.js": "catalog:angular"
},
"main": "./src/index.ts",
"keywords": [
Expand Down Expand Up @@ -111,7 +109,7 @@
"shadowdom"
],
"dependencies": {
"@angular-devkit/schematics": "17.3.11",
"@angular-devkit/schematics": "catalog:angular",
"devextreme-schematics": "*",
"inferno-server": "catalog:"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ DxTestExtension.defaultOptions({
});

@Component({
standalone: false,
selector: 'dx-test-extension',
template: '',
providers: [DxTemplateHost, WatcherHelper],
Expand All @@ -52,6 +53,7 @@ export class DxTestExtensionComponent extends DxComponentExtension {
}

@Component({
standalone: false,
selector: 'test-container-component',
template: '',
})
Expand Down
2 changes: 2 additions & 0 deletions packages/devextreme-angular/tests/src/core/component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ DxTestWidget.defaultOptions({
});

@Component({
standalone: false,
selector: 'dx-test-widget',
template: '',
providers: [DxTemplateHost, WatcherHelper],
Expand Down Expand Up @@ -104,6 +105,7 @@ export class DxTestWidgetComponent extends DxComponent implements OnDestroy {
}

@Component({
standalone: false,
selector: 'test-container-component',
template: '',
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ DxTestWidget.defaultOptions({
});

@Component({
standalone: false,
selector: 'dxo-test-option',
template: '',
providers: [NestedOptionHost],
Expand Down Expand Up @@ -81,6 +82,7 @@ export class DxoTestOptionComponent extends NestedOption {
}

@Component({
standalone: false,
selector: 'dxi-test-collection-option',
template: '',
providers: [NestedOptionHost],
Expand Down Expand Up @@ -114,6 +116,7 @@ export class DxiTestCollectionOptionComponent extends CollectionNestedOption {
}

@Component({
standalone: false,
selector: 'dxi-test-collection-option-with-template',
template: '<ng-content></ng-content>',
providers: [NestedOptionHost],
Expand Down Expand Up @@ -163,6 +166,7 @@ export class DxiTestCollectionOptionWithTemplateComponent extends CollectionNest
}

@Component({
standalone: false,
selector: 'dx-test-widget',
template: '',
providers: [DxTemplateHost, NestedOptionHost, WatcherHelper],
Expand Down Expand Up @@ -244,6 +248,7 @@ export class DxTestWidgetComponent extends DxComponent {
}

@Component({
standalone: false,
selector: 'test-container-component',
template: '',
})
Expand Down
4 changes: 4 additions & 0 deletions packages/devextreme-angular/tests/src/core/template.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ DxTestWidget.defaultOptions({
});

@Component({
standalone: false,
selector: 'dx-test-widget',
template: '',
providers: [DxTemplateHost, WatcherHelper],
Expand Down Expand Up @@ -76,6 +77,7 @@ export class DxTestWidgetComponent extends DxComponent {
}

@Component({
standalone: false,
selector: 'dx-test',
template: '',
providers: [DxTemplateHost, WatcherHelper],
Expand Down Expand Up @@ -116,6 +118,7 @@ export class DxTestComponent extends DxComponent implements AfterViewInit {
}

@Component({
standalone: false,
selector: 'test-container-component',
template: '',
providers: [DxTemplateHost],
Expand Down Expand Up @@ -143,6 +146,7 @@ export class TestContainerComponent {
}

@Component({
standalone: false,
selector: 'dx-imitation',
template: `
<div *dxTemplate="let d of 'ImportedTemlate'">
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-angular/tests/src/http/ajax.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ const generateString = (size: number, content?) => {
};

@Component({
standalone: false,
selector: 'test-container-component',
template: `<dx-file-uploader
uploadUrl="https://js.devexpress.com/Demos/NetCore/FileUploader/Upload"
Expand Down
Loading
Loading