Skip to content

Commit 13cd3c1

Browse files
authored
Merge branch 'vnext' into mkirkova/combo-set-disableFiltering-prop
2 parents f26f470 + fd22149 commit 13cd3c1

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

angular.json

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,7 @@
3939
"node_modules"
4040
]
4141
},
42-
"browser": "src/main.ts",
43-
"server": "src/main.server.ts",
44-
"outputMode": "static",
45-
"ssr": {
46-
"entry": "src/server.ts"
47-
}
42+
"browser": "src/main.ts"
4843
},
4944
"configurations": {
5045
"production": {
@@ -164,12 +159,7 @@
164159
]
165160
},
166161
"preserveSymlinks": true,
167-
"browser": "projects/app-lob/src/main.ts",
168-
"server": "projects/app-lob/src/main.server.ts",
169-
"outputMode": "static",
170-
"ssr": {
171-
"entry": "projects/app-lob/src/server.ts"
172-
}
162+
"browser": "projects/app-lob/src/main.ts"
173163
},
174164
"configurations": {
175165
"production": {
@@ -294,12 +284,7 @@
294284
"node_modules"
295285
]
296286
},
297-
"browser": "projects/app-crm/src/main.ts",
298-
"server": "projects/app-crm/src/main.server.ts",
299-
"outputMode": "static",
300-
"ssr": {
301-
"entry": "projects/app-crm/src/server.ts"
302-
}
287+
"browser": "projects/app-crm/src/main.ts"
303288
},
304289
"configurations": {
305290
"production": {

src/app/app.routes.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const serverRoutes: ServerRoute[] = [
103103
},
104104
{
105105
path: 'samples/grid/**',
106-
renderMode: RenderMode.Prerender // TODO: Fails with Prerender
106+
renderMode: RenderMode.Client // TODO: Fails with Prerender
107107
},
108108
{
109109
path: '**',

0 commit comments

Comments
 (0)