From c554c99af63e1b81a526d4bc223cae31d781ed11 Mon Sep 17 00:00:00 2001
From: Alan <alan.agius4@gmail.com>
Date: Mon, 9 Sep 2019 15:59:40 +0200
Subject: [PATCH] fix(@schematics/angular): infer main server file name from
 main option

---
 .../universal/files/root/__tsconfigFileName__.json.template    | 2 +-
 packages/schematics/angular/universal/index.ts                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
index c62101e0cd14..e960e9a8f385 100644
--- a/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
+++ b/packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template
@@ -5,7 +5,7 @@
     "module": "commonjs"
   },
   "files": [
-    "src/main.server.ts"
+    "src/<%= stripTsExtension(main) %>.ts"
   ],
   "angularCompilerOptions": {
     "entryModule": "./<%= rootInSrc ? '' : 'src/' %><%= appDir %>/<%= stripTsExtension(rootModuleFileName) %>#<%= rootModuleClassName %>"
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index e6e9a263b89b..9d52c9a68eb6 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -49,12 +49,13 @@ function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): R
         fileReplacements = buildTarget.configurations.production.fileReplacements;
       }
 
+      const mainPath = options.main as string;
       clientProject.targets.add({
         name: 'server',
         builder: Builders.Server,
         options: {
           outputPath: `dist/${options.clientProject}-server`,
-          main: join(normalize(clientProject.root), 'src/main.server.ts'),
+          main: join(normalize(clientProject.root), 'src', mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts'),
           tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
         },
         configurations: {