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

fix(@schematics/angular): default newProjectRoot to current directory

Browse Source
This commit is contained in:
Charles Lyding 2019-02-24 20:21:09 -05:00 committed by Minko Gechev
parent 70b28193c9
commit b96e7bf76f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/schematics/angular/application/index.ts
View File

@ -151,7 +151,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
// } // }
let projectRoot = options.projectRoot !== undefined let projectRoot = options.projectRoot !== undefined
? options.projectRoot ? options.projectRoot
: `${workspace.newProjectRoot}/${options.name}`; : `${workspace.newProjectRoot || ''}/${options.name}`;
if (projectRoot !== '' && !projectRoot.endsWith('/')) { if (projectRoot !== '' && !projectRoot.endsWith('/')) {
projectRoot += '/'; projectRoot += '/';
} }
@ -326,7 +326,7 @@ export default function (options: ApplicationOptions): Rule {
}; };
const workspace = getWorkspace(host); const workspace = getWorkspace(host);
let newProjectRoot = workspace.newProjectRoot || 'projects'; let newProjectRoot = workspace.newProjectRoot || '';
let appDir = `${newProjectRoot}/${options.name}`; let appDir = `${newProjectRoot}/${options.name}`;
let sourceRoot = `${appDir}/src`; let sourceRoot = `${appDir}/src`;
let sourceDir = `${sourceRoot}/app`; let sourceDir = `${sourceRoot}/app`;

2
packages/schematics/angular/library/index.ts
View File

@ -193,7 +193,7 @@ export default function (options: LibraryOptions): Rule {
} }
const workspace = getWorkspace(host); const workspace = getWorkspace(host);
const newProjectRoot = workspace.newProjectRoot || 'projects'; const newProjectRoot = workspace.newProjectRoot || '';
const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : ''; const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : '';
const folderName = `${scopeFolder}${strings.dasherize(options.name)}`; const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;