diff --git a/packages/angular/collection.json b/packages/angular/collection.json index 133abfd704..f295c47e7b 100644 --- a/packages/angular/collection.json +++ b/packages/angular/collection.json @@ -1,7 +1,7 @@ { "name": "nx/angular", "version": "0.1", - "extends": ["@schematics/angular"], + "extends": ["@schematics/angular", "@nrwl/workspace"], "schematics": { "ng-add": { "factory": "./src/schematics/ng-add/ng-add", diff --git a/packages/angular/src/schematics/application/schema.json b/packages/angular/src/schematics/application/schema.json index c3145ec0c2..6285746b1c 100644 --- a/packages/angular/src/schematics/application/schema.json +++ b/packages/angular/src/schematics/application/schema.json @@ -55,10 +55,18 @@ "type": "list", "items": [ { "value": "css", "label": "CSS" }, - { "value": "scss", "label": "SCSS [ http://sass-lang.com ]" }, - { "value": "sass", "label": "SASS [ http://sass-lang.com ]" }, - { "value": "less", "label": "LESS [ http://lesscss.org ]" }, - { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" } + { + "value": "scss", + "label": "SASS(.scss) [ http://sass-lang.com ]" + }, + { + "value": "styl", + "label": "Stylus(.styl)[ http://stylus-lang.com ]" + }, + { + "value": "less", + "label": "LESS [ http://lesscss.org ]" + } ] } }, diff --git a/packages/express/collection.json b/packages/express/collection.json index e8034d5a42..ab58922857 100644 --- a/packages/express/collection.json +++ b/packages/express/collection.json @@ -1,6 +1,7 @@ { "name": "nx/express", "version": "0.1", + "extends": ["@nrwl/workspace"], "schematics": { "ng-add": { "factory": "./src/schematics/ng-add/ng-add", diff --git a/packages/nest/collection.json b/packages/nest/collection.json index c8cb3ed441..fbfca334f6 100644 --- a/packages/nest/collection.json +++ b/packages/nest/collection.json @@ -1,6 +1,7 @@ { "name": "nx/nest", "version": "0.1", + "extends": ["@nrwl/workspace"], "schematics": { "ng-add": { "factory": "./src/schematics/ng-add/ng-add", diff --git a/packages/node/collection.json b/packages/node/collection.json index 4f08a7a6ac..3ca654de87 100644 --- a/packages/node/collection.json +++ b/packages/node/collection.json @@ -1,6 +1,7 @@ { "name": "nx/node", "version": "0.1", + "extends": ["@nrwl/workspace"], "schematics": { "ng-add": { "factory": "./src/schematics/ng-add/ng-add", diff --git a/packages/react/collection.json b/packages/react/collection.json index 74403265d5..6eff550e2a 100644 --- a/packages/react/collection.json +++ b/packages/react/collection.json @@ -1,6 +1,7 @@ { "name": "nx/react", "version": "0.1", + "extends": ["@nrwl/workspace"], "schematics": { "ng-add": { "factory": "./src/schematics/ng-add/ng-add", diff --git a/packages/react/src/schematics/library/schema.json b/packages/react/src/schematics/library/schema.json index d4ab538298..ccc6fce6ac 100644 --- a/packages/react/src/schematics/library/schema.json +++ b/packages/react/src/schematics/library/schema.json @@ -27,10 +27,18 @@ "type": "list", "items": [ { "value": "css", "label": "CSS" }, - { "value": "scss", "label": "SCSS [ http://sass-lang.com ]" }, - { "value": "sass", "label": "SASS [ http://sass-lang.com ]" }, - { "value": "less", "label": "LESS [ http://lesscss.org ]" }, - { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" } + { + "value": "scss", + "label": "SASS(.scss) [ http://sass-lang.com ]" + }, + { + "value": "styl", + "label": "Stylus(.styl)[ http://stylus-lang.com ]" + }, + { + "value": "less", + "label": "LESS [ http://lesscss.org ]" + } ] } }, diff --git a/packages/web/collection.json b/packages/web/collection.json index 0aa04f6604..0690e6fa44 100644 --- a/packages/web/collection.json +++ b/packages/web/collection.json @@ -1,6 +1,7 @@ { "name": "nx/web", "version": "0.1", + "extends": ["@nrwl/workspace"], "schematics": { "ng-add": { "factory": "./src/schematics/ng-add/ng-add", diff --git a/packages/workspace/collection.json b/packages/workspace/collection.json index 15915057c0..e2ecbe2742 100644 --- a/packages/workspace/collection.json +++ b/packages/workspace/collection.json @@ -26,7 +26,8 @@ "ng-new": { "factory": "./src/schematics/ng-new/ng-new", "schema": "./src/schematics/ng-new/schema.json", - "description": "Create a workspace" + "description": "Create a workspace", + "hidden": true }, "library": { diff --git a/packages/workspace/src/schematics/library/library.spec.ts b/packages/workspace/src/schematics/library/library.spec.ts index 8475f6048d..7fc3426fcb 100644 --- a/packages/workspace/src/schematics/library/library.spec.ts +++ b/packages/workspace/src/schematics/library/library.spec.ts @@ -211,18 +211,6 @@ describe('lib', () => { }); }); - describe('--style scss', () => { - it('should use scss for styles', async () => { - const result = await runSchematic( - 'lib', - { name: 'myLib', style: 'scss' }, - appTree - ); - - expect(result.exists('libs/my-lib/src/lib/my-lib.scss')); - }); - }); - describe('--unit-test-runner none', () => { it('should not generate test configuration', async () => { const resultTree = await runSchematic( diff --git a/packages/workspace/src/schematics/library/schema.d.ts b/packages/workspace/src/schematics/library/schema.d.ts index 99773d089b..74b79b7e97 100644 --- a/packages/workspace/src/schematics/library/schema.d.ts +++ b/packages/workspace/src/schematics/library/schema.d.ts @@ -4,7 +4,6 @@ import { Framework } from '../../utils/framework'; export interface Schema { name: string; directory?: string; - style?: string; skipTsConfig: boolean; skipFormat: boolean; tags?: string; diff --git a/packages/workspace/src/schematics/library/schema.json b/packages/workspace/src/schematics/library/schema.json index d4ab538298..8013af7ab9 100644 --- a/packages/workspace/src/schematics/library/schema.json +++ b/packages/workspace/src/schematics/library/schema.json @@ -18,22 +18,6 @@ "description": "A directory where the app is placed", "x-prompt": "In which directory should the library be generated?" }, - "style": { - "description": "The file extension to be used for style files.", - "type": "string", - "default": "css", - "x-prompt": { - "message": "Which stylesheet format would you like to use?", - "type": "list", - "items": [ - { "value": "css", "label": "CSS" }, - { "value": "scss", "label": "SCSS [ http://sass-lang.com ]" }, - { "value": "sass", "label": "SASS [ http://sass-lang.com ]" }, - { "value": "less", "label": "LESS [ http://lesscss.org ]" }, - { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" } - ] - } - }, "unitTestRunner": { "type": "string", "enum": ["jest", "none"], diff --git a/packages/workspace/src/schematics/ng-add/schema.json b/packages/workspace/src/schematics/ng-add/schema.json index 773237a794..70104cefe9 100644 --- a/packages/workspace/src/schematics/ng-add/schema.json +++ b/packages/workspace/src/schematics/ng-add/schema.json @@ -7,8 +7,7 @@ "properties": { "npmScope": { "type": "string", - "description": "Npm scope for importing libs.", - "x-prompt": "What is the npm scope you would like to use for your Nx Workspace?" + "description": "Npm scope for importing libs." }, "skipInstall": { "type": "boolean", diff --git a/packages/workspace/src/schematics/ng-new/schema.json b/packages/workspace/src/schematics/ng-new/schema.json index 8d36161cb1..88281aa58e 100644 --- a/packages/workspace/src/schematics/ng-new/schema.json +++ b/packages/workspace/src/schematics/ng-new/schema.json @@ -23,10 +23,18 @@ "type": "list", "items": [ { "value": "css", "label": "CSS" }, - { "value": "scss", "label": "SCSS [ http://sass-lang.com ]" }, - { "value": "sass", "label": "SASS [ http://sass-lang.com ]" }, - { "value": "less", "label": "LESS [ http://lesscss.org ]" }, - { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" } + { + "value": "scss", + "label": "SASS(.scss) [ http://sass-lang.com ]" + }, + { + "value": "styl", + "label": "Stylus(.styl)[ http://stylus-lang.com ]" + }, + { + "value": "less", + "label": "LESS [ http://lesscss.org ]" + } ] } }, diff --git a/packages/workspace/src/schematics/preset/schema.json b/packages/workspace/src/schematics/preset/schema.json index 40fa00c2d1..401b861323 100644 --- a/packages/workspace/src/schematics/preset/schema.json +++ b/packages/workspace/src/schematics/preset/schema.json @@ -25,10 +25,18 @@ "type": "list", "items": [ { "value": "css", "label": "CSS" }, - { "value": "scss", "label": "SCSS [ http://sass-lang.com ]" }, - { "value": "sass", "label": "SASS [ http://sass-lang.com ]" }, - { "value": "less", "label": "LESS [ http://lesscss.org ]" }, - { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" } + { + "value": "scss", + "label": "SASS(.scss) [ http://sass-lang.com ]" + }, + { + "value": "styl", + "label": "Stylus(.styl)[ http://stylus-lang.com ]" + }, + { + "value": "less", + "label": "LESS [ http://lesscss.org ]" + } ] } } diff --git a/packages/workspace/src/schematics/workspace/schema.json b/packages/workspace/src/schematics/workspace/schema.json index 4b35d6fff4..482ec70792 100644 --- a/packages/workspace/src/schematics/workspace/schema.json +++ b/packages/workspace/src/schematics/workspace/schema.json @@ -23,10 +23,18 @@ "type": "list", "items": [ { "value": "css", "label": "CSS" }, - { "value": "scss", "label": "SCSS [ http://sass-lang.com ]" }, - { "value": "sass", "label": "SASS [ http://sass-lang.com ]" }, - { "value": "less", "label": "LESS [ http://lesscss.org ]" }, - { "value": "styl", "label": "Stylus [ http://stylus-lang.com ]" } + { + "value": "scss", + "label": "SASS(.scss) [ http://sass-lang.com ]" + }, + { + "value": "styl", + "label": "Stylus(.styl)[ http://stylus-lang.com ]" + }, + { + "value": "less", + "label": "LESS [ http://lesscss.org ]" + } ] } },