Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-15 18:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@schematics/angular): use app root to set server paths in options

Browse Source
This commit is contained in:
Alan Agius 2018-09-06 13:07:53 +02:00 committed by Keen Yee Liau
parent d07e68aa95
commit 432fe97d89
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/schematics/angular/migrations/update-6/index.ts
View File

@ -536,8 +536,8 @@ function extractProjectsConfig(
if (serverApp) {
const serverOptions: JsonObject = {
outputPath: serverApp.outDir || defaults.serverOutDir,
main: serverApp.main || defaults.serverMain,
tsConfig: serverApp.tsconfig || defaults.serverTsConfig,
main: `${appRoot}/${serverApp.main || defaults.serverMain}`,
tsConfig: `${appRoot}/${serverApp.tsconfig || defaults.serverTsConfig}`,
};
const serverTarget: JsonObject = {
builder: '@angular-devkit/build-angular:server',

4
packages/schematics/angular/migrations/update-6/index_spec.ts
View File

@ -992,8 +992,8 @@ describe('Migration to v6', () => {
expect(target).toBeDefined();
expect(target.builder).toEqual('@angular-devkit/build-angular:server');
expect(target.options.outputPath).toEqual('dist/server');
expect(target.options.main).toEqual('main.server.ts');
expect(target.options.tsConfig).toEqual('tsconfig.server.json');
expect(target.options.main).toEqual('src/main.server.ts');
expect(target.options.tsConfig).toEqual('src/tsconfig.server.json');
});
});
});