Skip to content

Commit 4bd624c

Browse files
mddragnevmddragnev
authored
Merge pull request #114 from IgniteUI/mdragnev/try-ssr
Update the main applicatin and standalone samples to use SSR
1 parent b768784 commit 4bd624c

43 files changed

Lines changed: 36351 additions & 63676 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎angular.json‎

Lines changed: 55 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:application",
18+
"builder": "@angular/build:application",
1919
"options": {
2020
"outputPath": "dist/grid-demos",
2121
"index": "src/index.html",
@@ -63,6 +63,11 @@
6363
"includePaths": [
6464
"node_modules"
6565
]
66+
},
67+
"server": "src/main.server.ts",
68+
"outputMode": "static",
69+
"ssr": {
70+
"entry": "src/server.ts"
6671
}
6772
},
6873
"configurations": {
@@ -90,7 +95,7 @@
9095
"defaultConfiguration": "production"
9196
},
9297
"serve": {
93-
"builder": "@angular-devkit/build-angular:dev-server",
98+
"builder": "@angular/build:dev-server",
9499
"configurations": {
95100
"production": {
96101
"buildTarget": "grid-demos:build:production"
@@ -102,10 +107,10 @@
102107
"defaultConfiguration": "development"
103108
},
104109
"extract-i18n": {
105-
"builder": "@angular-devkit/build-angular:extract-i18n"
110+
"builder": "@angular/build:extract-i18n"
106111
},
107112
"test": {
108-
"builder": "@angular-devkit/build-angular:karma",
113+
"builder": "@angular/build:karma",
109114
"options": {
110115
"polyfills": [
111116
"zone.js",
@@ -146,7 +151,7 @@
146151
"prefix": "app",
147152
"architect": {
148153
"build": {
149-
"builder": "@angular-devkit/build-angular:application",
154+
"builder": "@angular/build:application",
150155
"options": {
151156
"outputPath": "dist/erp-hgrid",
152157
"index": "projects/erp-hgrid/src/index.html",
@@ -204,7 +209,7 @@
204209
"defaultConfiguration": "production"
205210
},
206211
"serve": {
207-
"builder": "@angular-devkit/build-angular:dev-server",
212+
"builder": "@angular/build:dev-server",
208213
"configurations": {
209214
"production": {
210215
"buildTarget": "erp-hgrid:build:production"
@@ -216,10 +221,10 @@
216221
"defaultConfiguration": "development"
217222
},
218223
"extract-i18n": {
219-
"builder": "@angular-devkit/build-angular:extract-i18n"
224+
"builder": "@angular/build:extract-i18n"
220225
},
221226
"test": {
222-
"builder": "@angular-devkit/build-angular:karma",
227+
"builder": "@angular/build:karma",
223228
"options": {
224229
"polyfills": [
225230
"zone.js",
@@ -260,7 +265,7 @@
260265
"prefix": "app",
261266
"architect": {
262267
"build": {
263-
"builder": "@angular-devkit/build-angular:application",
268+
"builder": "@angular/build:application",
264269
"options": {
265270
"outputPath": "dist/finance-grid",
266271
"index": "projects/finance-grid/src/index.html",
@@ -318,7 +323,7 @@
318323
"defaultConfiguration": "production"
319324
},
320325
"serve": {
321-
"builder": "@angular-devkit/build-angular:dev-server",
326+
"builder": "@angular/build:dev-server",
322327
"configurations": {
323328
"production": {
324329
"buildTarget": "finance-grid:build:production"
@@ -330,10 +335,10 @@
330335
"defaultConfiguration": "development"
331336
},
332337
"extract-i18n": {
333-
"builder": "@angular-devkit/build-angular:extract-i18n"
338+
"builder": "@angular/build:extract-i18n"
334339
},
335340
"test": {
336-
"builder": "@angular-devkit/build-angular:karma",
341+
"builder": "@angular/build:karma",
337342
"options": {
338343
"polyfills": [
339344
"zone.js",
@@ -374,7 +379,7 @@
374379
"prefix": "app",
375380
"architect": {
376381
"build": {
377-
"builder": "@angular-devkit/build-angular:application",
382+
"builder": "@angular/build:application",
378383
"options": {
379384
"outputPath": "dist/hr-portal",
380385
"index": "projects/hr-portal/src/index.html",
@@ -432,7 +437,7 @@
432437
"defaultConfiguration": "production"
433438
},
434439
"serve": {
435-
"builder": "@angular-devkit/build-angular:dev-server",
440+
"builder": "@angular/build:dev-server",
436441
"configurations": {
437442
"production": {
438443
"buildTarget": "hr-portal:build:production"
@@ -444,10 +449,10 @@
444449
"defaultConfiguration": "development"
445450
},
446451
"extract-i18n": {
447-
"builder": "@angular-devkit/build-angular:extract-i18n"
452+
"builder": "@angular/build:extract-i18n"
448453
},
449454
"test": {
450-
"builder": "@angular-devkit/build-angular:karma",
455+
"builder": "@angular/build:karma",
451456
"options": {
452457
"polyfills": [
453458
"zone.js",
@@ -488,7 +493,7 @@
488493
"prefix": "app",
489494
"architect": {
490495
"build": {
491-
"builder": "@angular-devkit/build-angular:application",
496+
"builder": "@angular/build:application",
492497
"options": {
493498
"outputPath": "dist/sales-grid",
494499
"index": "projects/sales-grid/src/index.html",
@@ -546,7 +551,7 @@
546551
"defaultConfiguration": "production"
547552
},
548553
"serve": {
549-
"builder": "@angular-devkit/build-angular:dev-server",
554+
"builder": "@angular/build:dev-server",
550555
"configurations": {
551556
"production": {
552557
"buildTarget": "sales-grid:build:production"
@@ -558,10 +563,10 @@
558563
"defaultConfiguration": "development"
559564
},
560565
"extract-i18n": {
561-
"builder": "@angular-devkit/build-angular:extract-i18n"
566+
"builder": "@angular/build:extract-i18n"
562567
},
563568
"test": {
564-
"builder": "@angular-devkit/build-angular:karma",
569+
"builder": "@angular/build:karma",
565570
"options": {
566571
"polyfills": [
567572
"zone.js",
@@ -602,7 +607,7 @@
602607
"prefix": "app",
603608
"architect": {
604609
"build": {
605-
"builder": "@angular-devkit/build-angular:application",
610+
"builder": "@angular/build:application",
606611
"options": {
607612
"outputPath": "dist/fleet-management",
608613
"index": "projects/fleet-management-grid/src/index.html",
@@ -656,7 +661,7 @@
656661
"defaultConfiguration": "production"
657662
},
658663
"serve": {
659-
"builder": "@angular-devkit/build-angular:dev-server",
664+
"builder": "@angular/build:dev-server",
660665
"configurations": {
661666
"production": {
662667
"buildTarget": "fleet-management:build:production"
@@ -668,10 +673,10 @@
668673
"defaultConfiguration": "development"
669674
},
670675
"extract-i18n": {
671-
"builder": "@angular-devkit/build-angular:extract-i18n"
676+
"builder": "@angular/build:extract-i18n"
672677
},
673678
"test": {
674-
"builder": "@angular-devkit/build-angular:karma",
679+
"builder": "@angular/build:karma",
675680
"options": {
676681
"polyfills": [
677682
"zone.js",
@@ -703,5 +708,31 @@
703708
},
704709
"cli": {
705710
"analytics": false
711+
},
712+
"schematics": {
713+
"@schematics/angular:component": {
714+
"type": "component"
715+
},
716+
"@schematics/angular:directive": {
717+
"type": "directive"
718+
},
719+
"@schematics/angular:service": {
720+
"type": "service"
721+
},
722+
"@schematics/angular:guard": {
723+
"typeSeparator": "."
724+
},
725+
"@schematics/angular:interceptor": {
726+
"typeSeparator": "."
727+
},
728+
"@schematics/angular:module": {
729+
"typeSeparator": "."
730+
},
731+
"@schematics/angular:pipe": {
732+
"typeSeparator": "."
733+
},
734+
"@schematics/angular:resolver": {
735+
"typeSeparator": "."
736+
}
706737
}
707738
}

‎azure-pipelines/igniteui-angular-grid-examples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ stages:
3636
displayName: 'Install Node'
3737
inputs:
3838
versionSource: 'spec'
39-
versionSpec: '18.x'
39+
versionSpec: '20.x'
4040

4141
- task: Bash@3
4242
displayName: 'Create download artifact per sample (Shell)'

0 commit comments

Comments
 (0)