Skip to content

Commit 4cb5f98

Browse files
Merge branch 'master' into update-dotnet-project
2 parents 2f0bc42 + e576006 commit 4cb5f98

File tree

21 files changed

+11444
-10297
lines changed

21 files changed

+11444
-10297
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ jobs:
2929
npm run lint
3030
npm run build-all
3131
32-
standalone-examples-node18:
32+
standalone-examples-node20:
3333
runs-on: ubuntu-latest
3434

3535
steps:
36-
- name: Use NodeJS v18
36+
- name: Use NodeJS v20
3737
uses: actions/setup-node@v4
3838
with:
39-
node-version: "18"
39+
node-version: "20"
4040

4141
- name: Check out repository
4242
uses: actions/checkout@v4
@@ -87,7 +87,7 @@ jobs:
8787
run: |
8888
npm ci
8989
90-
- name: Build ASP.NET Core Integration app
90+
- name: Build Java Integration app
9191
working-directory: ./examples-standalone/kendoangular-java-integration/ClientApp
9292
run: |
9393
npm ci

examples-standalone/kendoangular-java-integration/ClientApp/angular.json

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"prefix": "app",
1212
"architect": {
1313
"build": {
14-
"builder": "@angular-devkit/build-angular:application",
14+
"builder": "@angular/build:application",
1515
"options": {
1616
"outputPath": "dist/client",
1717
"index": "src/index.html",
@@ -60,7 +60,7 @@
6060
"defaultConfiguration": "production"
6161
},
6262
"serve": {
63-
"builder": "@angular-devkit/build-angular:dev-server",
63+
"builder": "@angular/build:dev-server",
6464
"configurations": {
6565
"production": {
6666
"buildTarget": "client:build:production"
@@ -72,10 +72,10 @@
7272
"defaultConfiguration": "development"
7373
},
7474
"extract-i18n": {
75-
"builder": "@angular-devkit/build-angular:extract-i18n"
75+
"builder": "@angular/build:extract-i18n"
7676
},
7777
"test": {
78-
"builder": "@angular-devkit/build-angular:karma",
78+
"builder": "@angular/build:karma",
7979
"options": {
8080
"polyfills": [
8181
"zone.js",
@@ -103,5 +103,31 @@
103103
},
104104
"cli": {
105105
"analytics": false
106+
},
107+
"schematics": {
108+
"@schematics/angular:component": {
109+
"type": "component"
110+
},
111+
"@schematics/angular:directive": {
112+
"type": "directive"
113+
},
114+
"@schematics/angular:service": {
115+
"type": "service"
116+
},
117+
"@schematics/angular:guard": {
118+
"typeSeparator": "."
119+
},
120+
"@schematics/angular:interceptor": {
121+
"typeSeparator": "."
122+
},
123+
"@schematics/angular:module": {
124+
"typeSeparator": "."
125+
},
126+
"@schematics/angular:pipe": {
127+
"typeSeparator": "."
128+
},
129+
"@schematics/angular:resolver": {
130+
"typeSeparator": "."
131+
}
106132
}
107133
}

0 commit comments

Comments
 (0)