From 76405982397f0761ad59709701b837480dec3656 Mon Sep 17 00:00:00 2001 From: Victor Savkin Date: Tue, 25 Jun 2019 21:27:43 -0400 Subject: [PATCH] feat(nx): remove prompt asking for tags and for unit and e2e test runners --- .../src/schematics/application/schema.json | 37 ++++--------------- .../src/schematics/library/schema.json | 20 ++++------ .../src/schematics/application/schema.json | 3 +- .../src/schematics/application/schema.json | 3 +- .../src/schematics/application/schema.json | 3 +- .../src/schematics/application/schema.json | 3 +- .../react/src/schematics/library/schema.json | 3 +- .../src/schematics/application/schema.json | 3 +- .../src/schematics/library/schema.json | 3 +- 9 files changed, 21 insertions(+), 57 deletions(-) diff --git a/packages/angular/src/schematics/application/schema.json b/packages/angular/src/schematics/application/schema.json index 4e587c52b210a..1c2c4d29b26b4 100644 --- a/packages/angular/src/schematics/application/schema.json +++ b/packages/angular/src/schematics/application/schema.json @@ -26,7 +26,10 @@ "message": "Which stylesheet format would you like to use?", "type": "list", "items": [ - { "value": "css", "label": "CSS" }, + { + "value": "css", + "label": "CSS" + }, { "value": "scss", "label": "SASS(.scss) [ http://sass-lang.com ]" @@ -96,43 +99,17 @@ "type": "string", "enum": ["karma", "jest", "none"], "description": "Test runner to use for unit tests", - "default": "jest", - "x-prompt": { - "message": "Which Unit Test Runner would you like to use for the application?", - "type": "list", - "items": [ - { "value": "jest", "label": "Jest [ https://jestjs.io ]" }, - { - "value": "karma", - "label": "Karma [ https://karma-runner.github.io ]" - } - ] - } + "default": "jest" }, "e2eTestRunner": { "type": "string", "enum": ["protractor", "cypress", "none"], "description": "Test runner to use for end to end (e2e) tests", - "default": "cypress", - "x-prompt": { - "message": "Which E2E Test Runner would you like to use for the application?", - "type": "list", - "items": [ - { - "value": "cypress", - "label": "Cypress [ https://www.cypress.io ]" - }, - { - "value": "protractor", - "label": "Protractor [ https://www.protractortest.org ]" - } - ] - } + "default": "cypress" }, "tags": { "type": "string", - "description": "Add tags to the application (used for linting)", - "x-prompt": "Which tags would you like to add to the application? (used for linting)" + "description": "Add tags to the application (used for linting)" } }, "required": [] diff --git a/packages/angular/src/schematics/library/schema.json b/packages/angular/src/schematics/library/schema.json index 0eab169b60984..69966c438dfff 100644 --- a/packages/angular/src/schematics/library/schema.json +++ b/packages/angular/src/schematics/library/schema.json @@ -1,6 +1,6 @@ { "$schema": "http://json-schema.org/schema", - "id": "SchematicsNxLibrary", + "id": "SchematicsAngularLibrary", "title": "Create a library", "type": "object", "properties": { @@ -57,7 +57,10 @@ "message": "Which stylesheet format would you like to use?", "type": "list", "items": [ - { "value": "css", "label": "CSS" }, + { + "value": "css", + "label": "CSS" + }, { "value": "scss", "label": "SASS(.scss) [ http://sass-lang.com ]" @@ -89,22 +92,13 @@ }, "tags": { "type": "string", - "description": "Add tags to the library (used for linting)", - "x-prompt": "Which tags would you like to add to the library? (used for linting)" + "description": "Add tags to the library (used for linting)" }, "unitTestRunner": { "type": "string", "enum": ["karma", "jest", "none"], "description": "Test runner to use for unit tests", - "default": "jest", - "x-prompt": { - "message": "Which Unit Test Runner would you like to use for the library?", - "type": "list", - "items": [ - { "value": "jest", "label": "Jest [https://jestjs.io/]" }, - { "value": "karma", "label": "Karma" } - ] - } + "default": "jest" } }, "required": [] diff --git a/packages/express/src/schematics/application/schema.json b/packages/express/src/schematics/application/schema.json index ebf731aae689d..a746ce645da2f 100644 --- a/packages/express/src/schematics/application/schema.json +++ b/packages/express/src/schematics/application/schema.json @@ -36,8 +36,7 @@ }, "tags": { "type": "string", - "description": "Add tags to the application (used for linting)", - "x-prompt": "Which tags would you like to add to the node application? (used for linting)" + "description": "Add tags to the application (used for linting)" }, "frontendProject": { "type": "string", diff --git a/packages/nest/src/schematics/application/schema.json b/packages/nest/src/schematics/application/schema.json index 692c1c12f1c85..628dae369ba7d 100644 --- a/packages/nest/src/schematics/application/schema.json +++ b/packages/nest/src/schematics/application/schema.json @@ -36,8 +36,7 @@ }, "tags": { "type": "string", - "description": "Add tags to the application (used for linting)", - "x-prompt": "Which tags would you like to add to the node application? (used for linting)" + "description": "Add tags to the application (used for linting)" }, "frontendProject": { "type": "string", diff --git a/packages/node/src/schematics/application/schema.json b/packages/node/src/schematics/application/schema.json index 0d8e371eaa08a..8f771fa76ca47 100644 --- a/packages/node/src/schematics/application/schema.json +++ b/packages/node/src/schematics/application/schema.json @@ -36,8 +36,7 @@ }, "tags": { "type": "string", - "description": "Add tags to the application (used for linting)", - "x-prompt": "Which tags would you like to add to the node application? (used for linting)" + "description": "Add tags to the application (used for linting)" }, "frontendProject": { "type": "string", diff --git a/packages/react/src/schematics/application/schema.json b/packages/react/src/schematics/application/schema.json index ba9ebe8a9f638..621303275e418 100644 --- a/packages/react/src/schematics/application/schema.json +++ b/packages/react/src/schematics/application/schema.json @@ -74,8 +74,7 @@ }, "tags": { "type": "string", - "description": "Add tags to the application (used for linting)", - "x-prompt": "Which tags would you like to add to the application? (used for linting)" + "description": "Add tags to the application (used for linting)" }, "pascalCaseFiles": { "type": "boolean", diff --git a/packages/react/src/schematics/library/schema.json b/packages/react/src/schematics/library/schema.json index eaf0423c64486..8cdb958b2a589 100644 --- a/packages/react/src/schematics/library/schema.json +++ b/packages/react/src/schematics/library/schema.json @@ -58,8 +58,7 @@ }, "tags": { "type": "string", - "description": "Add tags to the library (used for linting)", - "x-prompt": "Which tags would you like to add to the library? (used for linting)" + "description": "Add tags to the library (used for linting)" }, "skipFormat": { "description": "Skip formatting files", diff --git a/packages/web/src/schematics/application/schema.json b/packages/web/src/schematics/application/schema.json index df188f5e7493c..31599003b5242 100644 --- a/packages/web/src/schematics/application/schema.json +++ b/packages/web/src/schematics/application/schema.json @@ -61,8 +61,7 @@ }, "tags": { "type": "string", - "description": "Add tags to the application (used for linting)", - "x-prompt": "Which tags would you like to add to the application? (used for linting)" + "description": "Add tags to the application (used for linting)" } }, "required": [] diff --git a/packages/workspace/src/schematics/library/schema.json b/packages/workspace/src/schematics/library/schema.json index d1386e3718a5c..2ca423e0a159a 100644 --- a/packages/workspace/src/schematics/library/schema.json +++ b/packages/workspace/src/schematics/library/schema.json @@ -26,8 +26,7 @@ }, "tags": { "type": "string", - "description": "Add tags to the library (used for linting)", - "x-prompt": "Which tags would you like to add to the library? (used for linting)" + "description": "Add tags to the library (used for linting)" }, "skipFormat": { "description": "Skip formatting files",