From 73d0fb21d01d120d977d92d4803ad82ec2c7938b Mon Sep 17 00:00:00 2001 From: Jonathan Cammisuli Date: Wed, 27 Jun 2018 14:02:36 -0400 Subject: [PATCH] feat(schematics) check to see if a library is publishable before trying to update ng-package.prod.json --- .../src/collection/library/index.ts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/schematics/src/collection/library/index.ts b/packages/schematics/src/collection/library/index.ts index df1dbb92bd..53f41452f7 100644 --- a/packages/schematics/src/collection/library/index.ts +++ b/packages/schematics/src/collection/library/index.ts @@ -123,7 +123,7 @@ function addLoadChildren(options: NormalizedSchema): Rule { const loadChildren = `@${npmScope}/${options.projectDirectory}#${ options.moduleName - }`; + }`; insert(host, options.parentModule, [ ...addRoute( @@ -273,7 +273,7 @@ describe('${options.moduleName}', () => { ...json.compilerOptions, outDir: `${offsetFromRoot(options.projectRoot)}dist/out-tsc/${ options.projectRoot - }` + }` } }; }), @@ -285,7 +285,7 @@ describe('${options.moduleName}', () => { ...json.compilerOptions, outDir: `${offsetFromRoot(options.projectRoot)}dist/out-tsc/${ options.projectRoot - }` + }` } }; }), @@ -304,10 +304,14 @@ describe('${options.moduleName}', () => { } }; }), - updateJsonInTree(`${options.projectRoot}/ng-package.prod.json`, json => { - json['dest'] = `${offsetFromRoot(options.projectRoot)}dist/@${options.prefix}/${options.name}`; - return json; - }), + options.publishable + ? updateJsonInTree(`${options.projectRoot}/ng-package.prod.json`, json => { + return { + ...json, + dest: `${offsetFromRoot(options.projectRoot)}dist/@${options.prefix}/${options.projectDirectory}` + } + }) + : noop(), host => { const karma = host .read(`${options.projectRoot}/karma.conf.js`) @@ -340,7 +344,7 @@ function updateTsConfig(options: NormalizedSchema): Rule { ]); } -export default function(schema: Schema): Rule { +export default function (schema: Schema): Rule { return (host: Tree, context: SchematicContext) => { const options = normalizeOptions(host, schema); if (!options.routing && options.lazy) {