Skip to content

fix(@schematics/angular): dasherize library package name #11599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hansl merged 1 commit into from
Sep 26, 2018
Merged

fix(@schematics/angular): dasherize library package name #11599

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions packages/schematics/angular/library/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function addDependenciesToPackageJson() {
}

function addAppToWorkspaceFile(options: LibraryOptions, workspace: WorkspaceSchema,
projectRoot: string, packageName: string): Rule {
projectRoot: string, projectName: string): Rule {

const project: WorkspaceProject<ProjectType.Library> = {
root: projectRoot,
Expand Down Expand Up @@ -169,7 +169,7 @@ function addAppToWorkspaceFile(options: LibraryOptions, workspace: WorkspaceSche
},
};

return addProjectToWorkspace(workspace, packageName, project);
return addProjectToWorkspace(workspace, projectName, project);
}

export default function (options: LibraryOptions): Rule {
Expand All @@ -182,7 +182,8 @@ export default function (options: LibraryOptions): Rule {
validateProjectName(options.name);

// If scoped project (i.e. "@foo/bar"), convert projectDir to "foo/bar".
const packageName = options.name;
const projectName = options.name;
const packageName = strings.dasherize(projectName);
let scopeName = null;
if (/^@.*\/.*/.test(options.name)) {
const [scope, name] = options.name.split('/');
Expand Down Expand Up @@ -218,7 +219,7 @@ export default function (options: LibraryOptions): Rule {

return chain([
branchAndMerge(mergeWith(templateSource)),
addAppToWorkspaceFile(options, workspace, projectRoot, packageName),
addAppToWorkspaceFile(options, workspace, projectRoot, projectName),
options.skipPackageJson ? noop() : addDependenciesToPackageJson(),
options.skipTsConfig ? noop() : updateTsConfig(packageName, distRoot),
schematic('module', {
Expand Down