From 0792965e3e0d4cb27b106ff933ab1047f609dbae Mon Sep 17 00:00:00 2001 From: Hans Date: Wed, 4 Apr 2018 19:50:44 -0700 Subject: [PATCH 1/2] fix(@angular/cli): allow some schematic commands to allow private Fix #10182 --- packages/@angular/cli/commands/add.ts | 1 + packages/@angular/cli/models/schematic-command.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/@angular/cli/commands/add.ts b/packages/@angular/cli/commands/add.ts index 9126e0f3c88a..6fef4eb771b0 100644 --- a/packages/@angular/cli/commands/add.ts +++ b/packages/@angular/cli/commands/add.ts @@ -11,6 +11,7 @@ const SilentError = require('silent-error'); export default class AddCommand extends SchematicCommand { readonly name = 'add'; readonly description = 'Add support for a library to your project.'; + readonly allowPrivateSchematics = true; scope = CommandScope.inProject; arguments = ['collection']; options: Option[] = []; diff --git a/packages/@angular/cli/models/schematic-command.ts b/packages/@angular/cli/models/schematic-command.ts index e671cd4beb59..ae11d4f2c10c 100644 --- a/packages/@angular/cli/models/schematic-command.ts +++ b/packages/@angular/cli/models/schematic-command.ts @@ -34,6 +34,7 @@ export interface GetOptionsResult { export abstract class SchematicCommand extends Command { readonly options: Option[] = []; + readonly allowPrivateSchematics: boolean = false; private _host = new NodeJsSyncHost(); private _workspace: experimental.workspace.Workspace; private _deAliasedName: string; @@ -140,6 +141,7 @@ export abstract class SchematicCommand extends Command { options: schematicOptions, debug: debug, logger: this.logger, + allowPrivate: this.allowPrivateSchematics, }) .subscribe({ error: (err: Error) => { From a2a7ed9fbb1ae59488cabda1d33c8abe0243d50d Mon Sep 17 00:00:00 2001 From: Hans Date: Wed, 4 Apr 2018 20:01:17 -0700 Subject: [PATCH 2/2] test: use latest snapshots of master for e2e --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7f1a5f2e7d81..72a285a7be29 100644 --- a/package.json +++ b/package.json @@ -41,11 +41,11 @@ }, "homepage": "https://github.com/angular/angular-cli", "dependencies": { - "@angular-devkit/architect": "0.5.0", - "@angular-devkit/core": "0.5.0", - "@angular-devkit/schematics": "0.5.0", - "@schematics/angular": "0.5.0", - "@schematics/update": "0.5.0", + "@angular-devkit/architect": "angular/angular-devkit-architect-builds", + "@angular-devkit/core": "angular/angular-devkit-core-builds", + "@angular-devkit/schematics": "angular/angular-devkit-schematics-builds", + "@schematics/angular": "angular/schematics-angular-builds", + "@schematics/update": "angular/schematics-update-builds", "chalk": "~2.2.0", "ember-cli-string-utils": "^1.0.0", "fs-extra": "^4.0.0",