fix(@schematics/angular): infer main server file name from main option

angular · Sep 10, 2019 · 40f9494 · 40f9494
1 parent bf8d43f
commit 40f9494
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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: {