Skip to content

Commit 87d2223

Browse files
alan-agius4Keen Yee Liau
authored and
Keen Yee Liau
committed
Merge pull request #15559 from alan-agius4/main-server-file-option
fix(@schematics/angular): infer main server file name from main option
1 parent fcea244 commit 87d2223

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

packages/schematics/angular/universal/files/root/__tsconfigFileName__.json.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"module": "commonjs"
66
},
77
"files": [
8-
"src/main.server.ts"
8+
"src/<%= stripTsExtension(main) %>.ts"
99
],
1010
"angularCompilerOptions": {
1111
"entryModule": "./<%= rootInSrc ? '' : 'src/' %><%= appDir %>/<%= stripTsExtension(rootModuleFileName) %>#<%= rootModuleClassName %>"

packages/schematics/angular/universal/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@ function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): R
4949
fileReplacements = buildTarget.configurations.production.fileReplacements;
5050
}
5151

52+
const mainPath = options.main as string;
5253
clientProject.targets.add({
5354
name: 'server',
5455
builder: Builders.Server,
5556
options: {
5657
outputPath: `dist/${options.clientProject}-server`,
57-
main: join(normalize(clientProject.root), 'src/main.server.ts'),
58+
main: join(normalize(clientProject.root), 'src', mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts'),
5859
tsConfig: join(tsConfigDirectory, `${options.tsconfigFileName}.json`),
5960
},
6061
configurations: {

0 commit comments

Comments
 (0)