Skip to content

Commit 8fbb5cd

Browse files
revert update Angular in apps/angular
+ update lock
1 parent 301f9db commit 8fbb5cd

File tree

7 files changed

+2937
-434
lines changed

7 files changed

+2937
-434
lines changed

apps/angular/angular.json

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,18 @@
1111
"schematics": {},
1212
"architect": {
1313
"build": {
14-
"builder": "@angular-devkit/build-angular:application",
14+
"builder": "@angular-devkit/build-angular:browser",
1515
"options": {
16-
"outputPath": {
17-
"base": "dist/sandbox"
18-
},
16+
"outputPath": "dist/sandbox",
1917
"index": "src/index.html",
20-
"polyfills": [
21-
"src/polyfills.ts"
22-
],
18+
"main": "src/main.ts",
19+
"polyfills": "src/polyfills.ts",
2320
"tsConfig": "src/tsconfig.app.json",
2421
"styles": [
2522
"node_modules/devextreme/dist/css/dx.common.css",
2623
"node_modules/devextreme/dist/css/dx.light.css"
2724
],
28-
"scripts": [],
29-
"browser": "src/main.ts"
25+
"scripts": []
3026
},
3127
"configurations": {
3228
"production": {
@@ -39,9 +35,12 @@
3935
"optimization": true,
4036
"outputHashing": "all",
4137
"sourceMap": false,
38+
"extractCss": true,
4239
"namedChunks": false,
4340
"aot": true,
4441
"extractLicenses": true,
42+
"vendorChunk": false,
43+
"buildOptimizer": true,
4544
"budgets": [
4645
{
4746
"type": "initial",
@@ -54,23 +53,26 @@
5453
"optimization": false,
5554
"outputHashing": "none",
5655
"sourceMap": true,
56+
"extractCss": true,
5757
"namedChunks": false,
5858
"aot": true,
59-
"extractLicenses": true
59+
"extractLicenses": true,
60+
"vendorChunk": false,
61+
"buildOptimizer": false
6062
}
6163
}
6264
},
6365
"serve": {
6466
"builder": "@angular-devkit/build-angular:dev-server",
6567
"options": {
66-
"buildTarget": "sandbox:build"
68+
"browserTarget": "sandbox:build"
6769
},
6870
"configurations": {
6971
"production": {
70-
"buildTarget": "sandbox:build:production"
72+
"browserTarget": "sandbox:build:production"
7173
},
7274
"dev": {
73-
"buildTarget": "sandbox:build:dev"
75+
"browserTarget": "sandbox:build:dev"
7476
}
7577
}
7678
},
@@ -91,5 +93,6 @@
9193
}
9294
}
9395
}
94-
}
96+
},
97+
"defaultProject": "sandbox"
9598
}

apps/angular/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,32 @@
66
"author": "Developer Express Inc.",
77
"license": "MIT",
88
"dependencies": {
9-
"@angular/animations": "~19.2.17",
10-
"@angular/common": "~19.2.17",
11-
"@angular/compiler": "~19.2.17",
12-
"@angular/compiler-cli": "~19.2.17",
13-
"@angular/core": "~19.2.17",
14-
"@angular/forms": "~19.2.17",
15-
"@angular/platform-browser": "~19.2.17",
16-
"@angular/platform-browser-dynamic": "~19.2.17",
17-
"@angular/router": "~19.2.17",
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",
1818
"core-js": "^2.6.12",
1919
"devextreme": "workspace:*",
2020
"devextreme-angular": "workspace:*",
21-
"rxjs": "7.8.2",
21+
"rxjs": "7.8.1",
2222
"tslib": "^2.6.1",
23-
"zone.js": "0.15.1"
23+
"zone.js": "0.14.10"
2424
},
2525
"devDependencies": {
26-
"@angular-devkit/build-angular": "~19.2.19",
27-
"@angular/cli": "~19.2.19",
28-
"@angular/language-service": "~19.2.17",
29-
"@angular/platform-server": "~19.2.17",
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",
3030
"@types/jasmine": "5.1.4",
3131
"@types/node": "20.11.17",
3232
"cross-env": "7.0.3",
3333
"ts-node": "10.9.2",
34-
"typescript": "5.8.3"
34+
"typescript": "5.4.5"
3535
},
3636
"scripts": {
3737
"ng": "ng",

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

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

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

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

6+
67
import { DevExtremeModule } from 'devextreme-angular';
78

89
@NgModule({

apps/angular/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"compilerOptions": {
55
"outDir": "./dist/out-tsc",
66
"sourceMap": true,
7-
"esModuleInterop": true,
87
"declaration": false,
98
"module": "es2015",
109
"moduleResolution": "node",

packages/devextreme-angular/tests/src/server/ssr-ajax.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ describe('Universal', () => {
4949
{
5050
declarations: [TestContainerComponent],
5151
imports: [
52-
DxServerModule,
53-
ServerModule,
54-
DxServerTransferStateModule,
52+
DxServerModule,
53+
ServerModule,
54+
DxServerTransferStateModule,
5555
],
5656
},
5757
);

0 commit comments

Comments
 (0)