From 048448eba2abb766f67bb6f5b0b397ee6fa8b981 Mon Sep 17 00:00:00 2001 From: vsavkin Date: Mon, 27 Nov 2017 20:49:25 -0500 Subject: [PATCH] refactor(schematics): add all schematics into the collection dir --- e2e/utils.ts | 1 + packages/schematics/index.ts | 4 +-- packages/schematics/src/collection.json | 28 +++++++++--------- .../src/{ => collection}/app/app.spec.ts | 2 +- .../app.component.html__tmpl__ | 0 .../__sourceDir__/assets/__dot__gitkeep | 0 .../__name__/__sourceDir__/assets/nx-logo.png | Bin .../environments/environment.prod.ts__tmpl__ | 0 .../environments/environment.ts__tmpl__ | 0 .../apps/__name__/__sourceDir__/favicon.ico | Bin .../__name__/__sourceDir__/index.html__tmpl__ | 0 .../__name__/__sourceDir__/main.ts__tmpl__ | 0 .../__sourceDir__/polyfills.ts__tmpl__ | 0 .../__name__/__sourceDir__/styles.__style__ | 0 .../apps/__name__/e2e/app.e2e-spec.ts__tmpl__ | 0 .../files/apps/__name__/e2e/app.po.ts__tmpl__ | 0 .../src/{ => collection}/app/index.ts | 0 .../src/{ => collection}/app/schema.d.ts | 0 .../src/{ => collection}/app/schema.json | 0 .../application/application.spec.ts | 2 +- .../application/files/__directory__/README.md | 0 .../__directory__/__dot__angular-cli.json | 0 .../files/__directory__/__dot__editorconfig | 0 .../files/__directory__/__dot__gitignore | 0 .../files/__directory__/apps/.gitkeep | 0 .../files/__directory__/karma.conf.js | 0 .../files/__directory__/libs/.gitkeep | 0 .../files/__directory__/package.json | 0 .../files/__directory__/protractor.conf.js | 0 .../application/files/__directory__/test.js | 0 .../files/__directory__/tsconfig.app.json | 0 .../files/__directory__/tsconfig.e2e.json | 0 .../files/__directory__/tsconfig.json | 0 .../files/__directory__/tsconfig.spec.json | 0 .../files/__directory__/tslint.json | 0 .../src/{ => collection}/application/index.ts | 0 .../{ => collection}/application/schema.d.ts | 0 .../{ => collection}/application/schema.json | 0 .../downgrade-module/downgrade-module.spec.ts | 2 +- .../downgrade-module/index.ts | 0 .../downgrade-module/schema.d.ts | 0 .../downgrade-module/schema.json | 0 .../__fileName__.spec.ts__tmpl__ | 0 .../__sourceDir__/__fileName__.ts__tmpl__ | 0 .../lib/files/libs/__name__/index.ts__tmpl__ | 0 .../src/{ => collection}/lib/index.ts | 0 .../src/{ => collection}/lib/lib.spec.ts | 2 +- .../__fileName__.module.spec.ts__tmpl__ | 0 .../__fileName__.module.ts__tmpl__ | 0 .../ngfiles/libs/__name__/index.ts__tmpl__ | 0 .../src/{ => collection}/lib/schema.d.ts | 0 .../src/{ => collection}/lib/schema.json | 0 .../+state/__fileName__.actions.ts__tmpl__ | 0 .../__fileName__.effects.spec.ts__tmpl__ | 0 .../+state/__fileName__.effects.ts__tmpl__ | 0 .../files/+state/__fileName__.init.ts__tmpl__ | 0 .../+state/__fileName__.interfaces.ts__tmpl__ | 0 .../__fileName__.reducer.spec.ts__tmpl__ | 0 .../+state/__fileName__.reducer.ts__tmpl__ | 0 .../src/{ => collection}/ngrx/index.ts | 0 .../src/{ => collection}/ngrx/ngrx.spec.ts | 2 +- .../src/{ => collection}/ngrx/schema.d.ts | 0 .../src/{ => collection}/ngrx/schema.json | 0 .../src/{ => collection}/testing-utils.ts | 0 .../nxEnforceModuleBoundariesRule.spec.ts | 0 .../tslint/nxEnforceModuleBoundariesRule.ts | 0 .../files/__name__-setup.ts__tmpl__ | 0 .../files/hybrid.spec.ts__tmpl__ | 0 .../{ => collection}/upgrade-module/index.ts | 0 .../upgrade-module/schema.d.ts | 0 .../upgrade-module/schema.json | 0 .../upgrade-module/upgrade-module.spec.ts | 2 +- .../src/{ => collection}/utility/ast-utils.ts | 0 .../src/{ => collection}/utility/common.ts | 0 .../utility/fileutils.spec.ts | 0 .../src/{ => collection}/utility/fileutils.ts | 0 .../{ => collection}/utility/lib-versions.ts | 0 .../{ => collection}/utility/name-utils.ts | 0 .../{ => collection}/workspace/files/test.js | 0 .../src/{ => collection}/workspace/index.ts | 0 .../{ => collection}/workspace/schema.d.ts | 0 .../{ => collection}/workspace/schema.json | 0 82 files changed, 23 insertions(+), 22 deletions(-) rename packages/schematics/src/{ => collection}/app/app.spec.ts (97%) rename packages/schematics/src/{ => collection}/app/component-files/app.component.html__tmpl__ (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/assets/__dot__gitkeep (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/assets/nx-logo.png (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/environments/environment.prod.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/environments/environment.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/favicon.ico (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/index.html__tmpl__ (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/main.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/polyfills.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/__sourceDir__/styles.__style__ (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/e2e/app.e2e-spec.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/app/files/apps/__name__/e2e/app.po.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/app/index.ts (100%) rename packages/schematics/src/{ => collection}/app/schema.d.ts (100%) rename packages/schematics/src/{ => collection}/app/schema.json (100%) rename packages/schematics/src/{ => collection}/application/application.spec.ts (97%) rename packages/schematics/src/{ => collection}/application/files/__directory__/README.md (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/__dot__angular-cli.json (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/__dot__editorconfig (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/__dot__gitignore (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/apps/.gitkeep (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/karma.conf.js (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/libs/.gitkeep (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/package.json (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/protractor.conf.js (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/test.js (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/tsconfig.app.json (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/tsconfig.e2e.json (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/tsconfig.json (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/tsconfig.spec.json (100%) rename packages/schematics/src/{ => collection}/application/files/__directory__/tslint.json (100%) rename packages/schematics/src/{ => collection}/application/index.ts (100%) rename packages/schematics/src/{ => collection}/application/schema.d.ts (100%) rename packages/schematics/src/{ => collection}/application/schema.json (100%) rename packages/schematics/src/{ => collection}/downgrade-module/downgrade-module.spec.ts (98%) rename packages/schematics/src/{ => collection}/downgrade-module/index.ts (100%) rename packages/schematics/src/{ => collection}/downgrade-module/schema.d.ts (100%) rename packages/schematics/src/{ => collection}/downgrade-module/schema.json (100%) rename packages/schematics/src/{ => collection}/lib/files/libs/__name__/__sourceDir__/__fileName__.spec.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/lib/files/libs/__name__/__sourceDir__/__fileName__.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/lib/files/libs/__name__/index.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/lib/index.ts (100%) rename packages/schematics/src/{ => collection}/lib/lib.spec.ts (99%) rename packages/schematics/src/{ => collection}/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.spec.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/lib/ngfiles/libs/__name__/index.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/lib/schema.d.ts (100%) rename packages/schematics/src/{ => collection}/lib/schema.json (100%) rename packages/schematics/src/{ => collection}/ngrx/files/+state/__fileName__.actions.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/ngrx/files/+state/__fileName__.effects.spec.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/ngrx/files/+state/__fileName__.effects.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/ngrx/files/+state/__fileName__.init.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/ngrx/files/+state/__fileName__.interfaces.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/ngrx/files/+state/__fileName__.reducer.spec.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/ngrx/files/+state/__fileName__.reducer.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/ngrx/index.ts (100%) rename packages/schematics/src/{ => collection}/ngrx/ngrx.spec.ts (98%) rename packages/schematics/src/{ => collection}/ngrx/schema.d.ts (100%) rename packages/schematics/src/{ => collection}/ngrx/schema.json (100%) rename packages/schematics/src/{ => collection}/testing-utils.ts (100%) rename packages/schematics/src/{ => collection}/tslint/nxEnforceModuleBoundariesRule.spec.ts (100%) rename packages/schematics/src/{ => collection}/tslint/nxEnforceModuleBoundariesRule.ts (100%) rename packages/schematics/src/{ => collection}/upgrade-module/files/__name__-setup.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/upgrade-module/files/hybrid.spec.ts__tmpl__ (100%) rename packages/schematics/src/{ => collection}/upgrade-module/index.ts (100%) rename packages/schematics/src/{ => collection}/upgrade-module/schema.d.ts (100%) rename packages/schematics/src/{ => collection}/upgrade-module/schema.json (100%) rename packages/schematics/src/{ => collection}/upgrade-module/upgrade-module.spec.ts (98%) rename packages/schematics/src/{ => collection}/utility/ast-utils.ts (100%) rename packages/schematics/src/{ => collection}/utility/common.ts (100%) rename packages/schematics/src/{ => collection}/utility/fileutils.spec.ts (100%) rename packages/schematics/src/{ => collection}/utility/fileutils.ts (100%) rename packages/schematics/src/{ => collection}/utility/lib-versions.ts (100%) rename packages/schematics/src/{ => collection}/utility/name-utils.ts (100%) rename packages/schematics/src/{ => collection}/workspace/files/test.js (100%) rename packages/schematics/src/{ => collection}/workspace/index.ts (100%) rename packages/schematics/src/{ => collection}/workspace/schema.d.ts (100%) rename packages/schematics/src/{ => collection}/workspace/schema.json (100%) diff --git a/e2e/utils.ts b/e2e/utils.ts index 61084ab01e..70ad88eec6 100644 --- a/e2e/utils.ts +++ b/e2e/utils.ts @@ -1,6 +1,7 @@ import { execSync } from 'child_process'; import { readFileSync, statSync, writeFileSync } from 'fs'; import * as path from 'path'; +import {exitCodeFromResult} from '@angular/compiler-cli'; const projectName: string = 'proj'; diff --git a/packages/schematics/index.ts b/packages/schematics/index.ts index 8b33ab9821..9476437ddf 100644 --- a/packages/schematics/index.ts +++ b/packages/schematics/index.ts @@ -1,2 +1,2 @@ -export { addImportToModule, addProviderToModule, insert } from './src/utility/ast-utils'; -export { names, toClassName, toFileName, toPropertyName } from './src/utility/name-utils'; +export { addImportToModule, addProviderToModule, insert } from './src/collection/utility/ast-utils'; +export { names, toClassName, toFileName, toPropertyName } from './src/collection/utility/name-utils'; diff --git a/packages/schematics/src/collection.json b/packages/schematics/src/collection.json index c7f4439d89..e8369e878f 100644 --- a/packages/schematics/src/collection.json +++ b/packages/schematics/src/collection.json @@ -3,44 +3,44 @@ "version": "0.1", "schematics": { "workspace": { - "factory": "./workspace", - "schema": "./workspace/schema.json", + "factory": "./collection/workspace", + "schema": "./collection/workspace/schema.json", "description": "Convert an existing CLI project into an Nx Workspace" }, "application": { - "factory": "./application", - "schema": "./application/schema.json", + "factory": "./collection/application", + "schema": "./collection/application/schema.json", "description": "Create an empty workspace" }, "app": { - "factory": "./app", - "schema": "./app/schema.json", + "factory": "./collection/app", + "schema": "./collection/app/schema.json", "description": "Create an application" }, "lib": { - "factory": "./lib", - "schema": "./lib/schema.json", + "factory": "./collection/lib", + "schema": "./collection/lib/schema.json", "description": "Create a library" }, "ngrx": { - "factory": "./ngrx", - "schema": "./ngrx/schema.json", + "factory": "./collection/ngrx", + "schema": "./collection/ngrx/schema.json", "description": "Add NgRx support to a module" }, "upgrade-module": { - "factory": "./upgrade-module", - "schema": "./upgrade-module/schema.json", + "factory": "./collection/upgrade-module", + "schema": "./collection/upgrade-module/schema.json", "description": "Generates UpgradeModule setup" }, "downgrade-module": { - "factory": "./downgrade-module", - "schema": "./downgrade-module/schema.json", + "factory": "./collection/downgrade-module", + "schema": "./collection/downgrade-module/schema.json", "description": "Generates downgradeModule setup" }, diff --git a/packages/schematics/src/app/app.spec.ts b/packages/schematics/src/collection/app/app.spec.ts similarity index 97% rename from packages/schematics/src/app/app.spec.ts rename to packages/schematics/src/collection/app/app.spec.ts index da4ad57638..c20f2327d3 100644 --- a/packages/schematics/src/app/app.spec.ts +++ b/packages/schematics/src/collection/app/app.spec.ts @@ -5,7 +5,7 @@ import { createEmptyWorkspace } from '../testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('app', () => { - const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../collection.json')); + const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../../collection.json')); let appTree: Tree; diff --git a/packages/schematics/src/app/component-files/app.component.html__tmpl__ b/packages/schematics/src/collection/app/component-files/app.component.html__tmpl__ similarity index 100% rename from packages/schematics/src/app/component-files/app.component.html__tmpl__ rename to packages/schematics/src/collection/app/component-files/app.component.html__tmpl__ diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/assets/__dot__gitkeep b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/assets/__dot__gitkeep similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/assets/__dot__gitkeep rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/assets/__dot__gitkeep diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/assets/nx-logo.png b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/assets/nx-logo.png similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/assets/nx-logo.png rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/assets/nx-logo.png diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/environments/environment.prod.ts__tmpl__ b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/environments/environment.prod.ts__tmpl__ similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/environments/environment.prod.ts__tmpl__ rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/environments/environment.prod.ts__tmpl__ diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/environments/environment.ts__tmpl__ b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/environments/environment.ts__tmpl__ similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/environments/environment.ts__tmpl__ rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/environments/environment.ts__tmpl__ diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/favicon.ico b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/favicon.ico similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/favicon.ico rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/favicon.ico diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/index.html__tmpl__ b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/index.html__tmpl__ similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/index.html__tmpl__ rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/index.html__tmpl__ diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/main.ts__tmpl__ b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/main.ts__tmpl__ similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/main.ts__tmpl__ rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/main.ts__tmpl__ diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/polyfills.ts__tmpl__ b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/polyfills.ts__tmpl__ similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/polyfills.ts__tmpl__ rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/polyfills.ts__tmpl__ diff --git a/packages/schematics/src/app/files/apps/__name__/__sourceDir__/styles.__style__ b/packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/styles.__style__ similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/__sourceDir__/styles.__style__ rename to packages/schematics/src/collection/app/files/apps/__name__/__sourceDir__/styles.__style__ diff --git a/packages/schematics/src/app/files/apps/__name__/e2e/app.e2e-spec.ts__tmpl__ b/packages/schematics/src/collection/app/files/apps/__name__/e2e/app.e2e-spec.ts__tmpl__ similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/e2e/app.e2e-spec.ts__tmpl__ rename to packages/schematics/src/collection/app/files/apps/__name__/e2e/app.e2e-spec.ts__tmpl__ diff --git a/packages/schematics/src/app/files/apps/__name__/e2e/app.po.ts__tmpl__ b/packages/schematics/src/collection/app/files/apps/__name__/e2e/app.po.ts__tmpl__ similarity index 100% rename from packages/schematics/src/app/files/apps/__name__/e2e/app.po.ts__tmpl__ rename to packages/schematics/src/collection/app/files/apps/__name__/e2e/app.po.ts__tmpl__ diff --git a/packages/schematics/src/app/index.ts b/packages/schematics/src/collection/app/index.ts similarity index 100% rename from packages/schematics/src/app/index.ts rename to packages/schematics/src/collection/app/index.ts diff --git a/packages/schematics/src/app/schema.d.ts b/packages/schematics/src/collection/app/schema.d.ts similarity index 100% rename from packages/schematics/src/app/schema.d.ts rename to packages/schematics/src/collection/app/schema.d.ts diff --git a/packages/schematics/src/app/schema.json b/packages/schematics/src/collection/app/schema.json similarity index 100% rename from packages/schematics/src/app/schema.json rename to packages/schematics/src/collection/app/schema.json diff --git a/packages/schematics/src/application/application.spec.ts b/packages/schematics/src/collection/application/application.spec.ts similarity index 97% rename from packages/schematics/src/application/application.spec.ts rename to packages/schematics/src/collection/application/application.spec.ts index 7e5e5be3ad..fba606200a 100644 --- a/packages/schematics/src/application/application.spec.ts +++ b/packages/schematics/src/collection/application/application.spec.ts @@ -5,7 +5,7 @@ import { createEmptyWorkspace } from '../testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('application', () => { - const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../collection.json')); + const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../../collection.json')); let appTree: Tree; diff --git a/packages/schematics/src/application/files/__directory__/README.md b/packages/schematics/src/collection/application/files/__directory__/README.md similarity index 100% rename from packages/schematics/src/application/files/__directory__/README.md rename to packages/schematics/src/collection/application/files/__directory__/README.md diff --git a/packages/schematics/src/application/files/__directory__/__dot__angular-cli.json b/packages/schematics/src/collection/application/files/__directory__/__dot__angular-cli.json similarity index 100% rename from packages/schematics/src/application/files/__directory__/__dot__angular-cli.json rename to packages/schematics/src/collection/application/files/__directory__/__dot__angular-cli.json diff --git a/packages/schematics/src/application/files/__directory__/__dot__editorconfig b/packages/schematics/src/collection/application/files/__directory__/__dot__editorconfig similarity index 100% rename from packages/schematics/src/application/files/__directory__/__dot__editorconfig rename to packages/schematics/src/collection/application/files/__directory__/__dot__editorconfig diff --git a/packages/schematics/src/application/files/__directory__/__dot__gitignore b/packages/schematics/src/collection/application/files/__directory__/__dot__gitignore similarity index 100% rename from packages/schematics/src/application/files/__directory__/__dot__gitignore rename to packages/schematics/src/collection/application/files/__directory__/__dot__gitignore diff --git a/packages/schematics/src/application/files/__directory__/apps/.gitkeep b/packages/schematics/src/collection/application/files/__directory__/apps/.gitkeep similarity index 100% rename from packages/schematics/src/application/files/__directory__/apps/.gitkeep rename to packages/schematics/src/collection/application/files/__directory__/apps/.gitkeep diff --git a/packages/schematics/src/application/files/__directory__/karma.conf.js b/packages/schematics/src/collection/application/files/__directory__/karma.conf.js similarity index 100% rename from packages/schematics/src/application/files/__directory__/karma.conf.js rename to packages/schematics/src/collection/application/files/__directory__/karma.conf.js diff --git a/packages/schematics/src/application/files/__directory__/libs/.gitkeep b/packages/schematics/src/collection/application/files/__directory__/libs/.gitkeep similarity index 100% rename from packages/schematics/src/application/files/__directory__/libs/.gitkeep rename to packages/schematics/src/collection/application/files/__directory__/libs/.gitkeep diff --git a/packages/schematics/src/application/files/__directory__/package.json b/packages/schematics/src/collection/application/files/__directory__/package.json similarity index 100% rename from packages/schematics/src/application/files/__directory__/package.json rename to packages/schematics/src/collection/application/files/__directory__/package.json diff --git a/packages/schematics/src/application/files/__directory__/protractor.conf.js b/packages/schematics/src/collection/application/files/__directory__/protractor.conf.js similarity index 100% rename from packages/schematics/src/application/files/__directory__/protractor.conf.js rename to packages/schematics/src/collection/application/files/__directory__/protractor.conf.js diff --git a/packages/schematics/src/application/files/__directory__/test.js b/packages/schematics/src/collection/application/files/__directory__/test.js similarity index 100% rename from packages/schematics/src/application/files/__directory__/test.js rename to packages/schematics/src/collection/application/files/__directory__/test.js diff --git a/packages/schematics/src/application/files/__directory__/tsconfig.app.json b/packages/schematics/src/collection/application/files/__directory__/tsconfig.app.json similarity index 100% rename from packages/schematics/src/application/files/__directory__/tsconfig.app.json rename to packages/schematics/src/collection/application/files/__directory__/tsconfig.app.json diff --git a/packages/schematics/src/application/files/__directory__/tsconfig.e2e.json b/packages/schematics/src/collection/application/files/__directory__/tsconfig.e2e.json similarity index 100% rename from packages/schematics/src/application/files/__directory__/tsconfig.e2e.json rename to packages/schematics/src/collection/application/files/__directory__/tsconfig.e2e.json diff --git a/packages/schematics/src/application/files/__directory__/tsconfig.json b/packages/schematics/src/collection/application/files/__directory__/tsconfig.json similarity index 100% rename from packages/schematics/src/application/files/__directory__/tsconfig.json rename to packages/schematics/src/collection/application/files/__directory__/tsconfig.json diff --git a/packages/schematics/src/application/files/__directory__/tsconfig.spec.json b/packages/schematics/src/collection/application/files/__directory__/tsconfig.spec.json similarity index 100% rename from packages/schematics/src/application/files/__directory__/tsconfig.spec.json rename to packages/schematics/src/collection/application/files/__directory__/tsconfig.spec.json diff --git a/packages/schematics/src/application/files/__directory__/tslint.json b/packages/schematics/src/collection/application/files/__directory__/tslint.json similarity index 100% rename from packages/schematics/src/application/files/__directory__/tslint.json rename to packages/schematics/src/collection/application/files/__directory__/tslint.json diff --git a/packages/schematics/src/application/index.ts b/packages/schematics/src/collection/application/index.ts similarity index 100% rename from packages/schematics/src/application/index.ts rename to packages/schematics/src/collection/application/index.ts diff --git a/packages/schematics/src/application/schema.d.ts b/packages/schematics/src/collection/application/schema.d.ts similarity index 100% rename from packages/schematics/src/application/schema.d.ts rename to packages/schematics/src/collection/application/schema.d.ts diff --git a/packages/schematics/src/application/schema.json b/packages/schematics/src/collection/application/schema.json similarity index 100% rename from packages/schematics/src/application/schema.json rename to packages/schematics/src/collection/application/schema.json diff --git a/packages/schematics/src/downgrade-module/downgrade-module.spec.ts b/packages/schematics/src/collection/downgrade-module/downgrade-module.spec.ts similarity index 98% rename from packages/schematics/src/downgrade-module/downgrade-module.spec.ts rename to packages/schematics/src/collection/downgrade-module/downgrade-module.spec.ts index 07b6c5cbb4..932ccd004b 100644 --- a/packages/schematics/src/downgrade-module/downgrade-module.spec.ts +++ b/packages/schematics/src/collection/downgrade-module/downgrade-module.spec.ts @@ -5,7 +5,7 @@ import { createApp, createEmptyWorkspace } from '../testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('downgrade-module', () => { - const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../collection.json')); + const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../../collection.json')); let appTree: Tree; diff --git a/packages/schematics/src/downgrade-module/index.ts b/packages/schematics/src/collection/downgrade-module/index.ts similarity index 100% rename from packages/schematics/src/downgrade-module/index.ts rename to packages/schematics/src/collection/downgrade-module/index.ts diff --git a/packages/schematics/src/downgrade-module/schema.d.ts b/packages/schematics/src/collection/downgrade-module/schema.d.ts similarity index 100% rename from packages/schematics/src/downgrade-module/schema.d.ts rename to packages/schematics/src/collection/downgrade-module/schema.d.ts diff --git a/packages/schematics/src/downgrade-module/schema.json b/packages/schematics/src/collection/downgrade-module/schema.json similarity index 100% rename from packages/schematics/src/downgrade-module/schema.json rename to packages/schematics/src/collection/downgrade-module/schema.json diff --git a/packages/schematics/src/lib/files/libs/__name__/__sourceDir__/__fileName__.spec.ts__tmpl__ b/packages/schematics/src/collection/lib/files/libs/__name__/__sourceDir__/__fileName__.spec.ts__tmpl__ similarity index 100% rename from packages/schematics/src/lib/files/libs/__name__/__sourceDir__/__fileName__.spec.ts__tmpl__ rename to packages/schematics/src/collection/lib/files/libs/__name__/__sourceDir__/__fileName__.spec.ts__tmpl__ diff --git a/packages/schematics/src/lib/files/libs/__name__/__sourceDir__/__fileName__.ts__tmpl__ b/packages/schematics/src/collection/lib/files/libs/__name__/__sourceDir__/__fileName__.ts__tmpl__ similarity index 100% rename from packages/schematics/src/lib/files/libs/__name__/__sourceDir__/__fileName__.ts__tmpl__ rename to packages/schematics/src/collection/lib/files/libs/__name__/__sourceDir__/__fileName__.ts__tmpl__ diff --git a/packages/schematics/src/lib/files/libs/__name__/index.ts__tmpl__ b/packages/schematics/src/collection/lib/files/libs/__name__/index.ts__tmpl__ similarity index 100% rename from packages/schematics/src/lib/files/libs/__name__/index.ts__tmpl__ rename to packages/schematics/src/collection/lib/files/libs/__name__/index.ts__tmpl__ diff --git a/packages/schematics/src/lib/index.ts b/packages/schematics/src/collection/lib/index.ts similarity index 100% rename from packages/schematics/src/lib/index.ts rename to packages/schematics/src/collection/lib/index.ts diff --git a/packages/schematics/src/lib/lib.spec.ts b/packages/schematics/src/collection/lib/lib.spec.ts similarity index 99% rename from packages/schematics/src/lib/lib.spec.ts rename to packages/schematics/src/collection/lib/lib.spec.ts index a7a5d16ca7..9b30f1c493 100644 --- a/packages/schematics/src/lib/lib.spec.ts +++ b/packages/schematics/src/collection/lib/lib.spec.ts @@ -5,7 +5,7 @@ import { createApp, createEmptyWorkspace } from '../testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('lib', () => { - const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../collection.json')); + const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../../collection.json')); let appTree: Tree; diff --git a/packages/schematics/src/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.spec.ts__tmpl__ b/packages/schematics/src/collection/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.spec.ts__tmpl__ similarity index 100% rename from packages/schematics/src/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.spec.ts__tmpl__ rename to packages/schematics/src/collection/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.spec.ts__tmpl__ diff --git a/packages/schematics/src/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.ts__tmpl__ b/packages/schematics/src/collection/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.ts__tmpl__ similarity index 100% rename from packages/schematics/src/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.ts__tmpl__ rename to packages/schematics/src/collection/lib/ngfiles/libs/__name__/__sourceDir__/__fileName__.module.ts__tmpl__ diff --git a/packages/schematics/src/lib/ngfiles/libs/__name__/index.ts__tmpl__ b/packages/schematics/src/collection/lib/ngfiles/libs/__name__/index.ts__tmpl__ similarity index 100% rename from packages/schematics/src/lib/ngfiles/libs/__name__/index.ts__tmpl__ rename to packages/schematics/src/collection/lib/ngfiles/libs/__name__/index.ts__tmpl__ diff --git a/packages/schematics/src/lib/schema.d.ts b/packages/schematics/src/collection/lib/schema.d.ts similarity index 100% rename from packages/schematics/src/lib/schema.d.ts rename to packages/schematics/src/collection/lib/schema.d.ts diff --git a/packages/schematics/src/lib/schema.json b/packages/schematics/src/collection/lib/schema.json similarity index 100% rename from packages/schematics/src/lib/schema.json rename to packages/schematics/src/collection/lib/schema.json diff --git a/packages/schematics/src/ngrx/files/+state/__fileName__.actions.ts__tmpl__ b/packages/schematics/src/collection/ngrx/files/+state/__fileName__.actions.ts__tmpl__ similarity index 100% rename from packages/schematics/src/ngrx/files/+state/__fileName__.actions.ts__tmpl__ rename to packages/schematics/src/collection/ngrx/files/+state/__fileName__.actions.ts__tmpl__ diff --git a/packages/schematics/src/ngrx/files/+state/__fileName__.effects.spec.ts__tmpl__ b/packages/schematics/src/collection/ngrx/files/+state/__fileName__.effects.spec.ts__tmpl__ similarity index 100% rename from packages/schematics/src/ngrx/files/+state/__fileName__.effects.spec.ts__tmpl__ rename to packages/schematics/src/collection/ngrx/files/+state/__fileName__.effects.spec.ts__tmpl__ diff --git a/packages/schematics/src/ngrx/files/+state/__fileName__.effects.ts__tmpl__ b/packages/schematics/src/collection/ngrx/files/+state/__fileName__.effects.ts__tmpl__ similarity index 100% rename from packages/schematics/src/ngrx/files/+state/__fileName__.effects.ts__tmpl__ rename to packages/schematics/src/collection/ngrx/files/+state/__fileName__.effects.ts__tmpl__ diff --git a/packages/schematics/src/ngrx/files/+state/__fileName__.init.ts__tmpl__ b/packages/schematics/src/collection/ngrx/files/+state/__fileName__.init.ts__tmpl__ similarity index 100% rename from packages/schematics/src/ngrx/files/+state/__fileName__.init.ts__tmpl__ rename to packages/schematics/src/collection/ngrx/files/+state/__fileName__.init.ts__tmpl__ diff --git a/packages/schematics/src/ngrx/files/+state/__fileName__.interfaces.ts__tmpl__ b/packages/schematics/src/collection/ngrx/files/+state/__fileName__.interfaces.ts__tmpl__ similarity index 100% rename from packages/schematics/src/ngrx/files/+state/__fileName__.interfaces.ts__tmpl__ rename to packages/schematics/src/collection/ngrx/files/+state/__fileName__.interfaces.ts__tmpl__ diff --git a/packages/schematics/src/ngrx/files/+state/__fileName__.reducer.spec.ts__tmpl__ b/packages/schematics/src/collection/ngrx/files/+state/__fileName__.reducer.spec.ts__tmpl__ similarity index 100% rename from packages/schematics/src/ngrx/files/+state/__fileName__.reducer.spec.ts__tmpl__ rename to packages/schematics/src/collection/ngrx/files/+state/__fileName__.reducer.spec.ts__tmpl__ diff --git a/packages/schematics/src/ngrx/files/+state/__fileName__.reducer.ts__tmpl__ b/packages/schematics/src/collection/ngrx/files/+state/__fileName__.reducer.ts__tmpl__ similarity index 100% rename from packages/schematics/src/ngrx/files/+state/__fileName__.reducer.ts__tmpl__ rename to packages/schematics/src/collection/ngrx/files/+state/__fileName__.reducer.ts__tmpl__ diff --git a/packages/schematics/src/ngrx/index.ts b/packages/schematics/src/collection/ngrx/index.ts similarity index 100% rename from packages/schematics/src/ngrx/index.ts rename to packages/schematics/src/collection/ngrx/index.ts diff --git a/packages/schematics/src/ngrx/ngrx.spec.ts b/packages/schematics/src/collection/ngrx/ngrx.spec.ts similarity index 98% rename from packages/schematics/src/ngrx/ngrx.spec.ts rename to packages/schematics/src/collection/ngrx/ngrx.spec.ts index 1c97bab652..374d96a1f4 100644 --- a/packages/schematics/src/ngrx/ngrx.spec.ts +++ b/packages/schematics/src/collection/ngrx/ngrx.spec.ts @@ -5,7 +5,7 @@ import { createApp, createEmptyWorkspace } from '../testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('ngrx', () => { - const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../collection.json')); + const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../../collection.json')); let appTree: Tree; diff --git a/packages/schematics/src/ngrx/schema.d.ts b/packages/schematics/src/collection/ngrx/schema.d.ts similarity index 100% rename from packages/schematics/src/ngrx/schema.d.ts rename to packages/schematics/src/collection/ngrx/schema.d.ts diff --git a/packages/schematics/src/ngrx/schema.json b/packages/schematics/src/collection/ngrx/schema.json similarity index 100% rename from packages/schematics/src/ngrx/schema.json rename to packages/schematics/src/collection/ngrx/schema.json diff --git a/packages/schematics/src/testing-utils.ts b/packages/schematics/src/collection/testing-utils.ts similarity index 100% rename from packages/schematics/src/testing-utils.ts rename to packages/schematics/src/collection/testing-utils.ts diff --git a/packages/schematics/src/tslint/nxEnforceModuleBoundariesRule.spec.ts b/packages/schematics/src/collection/tslint/nxEnforceModuleBoundariesRule.spec.ts similarity index 100% rename from packages/schematics/src/tslint/nxEnforceModuleBoundariesRule.spec.ts rename to packages/schematics/src/collection/tslint/nxEnforceModuleBoundariesRule.spec.ts diff --git a/packages/schematics/src/tslint/nxEnforceModuleBoundariesRule.ts b/packages/schematics/src/collection/tslint/nxEnforceModuleBoundariesRule.ts similarity index 100% rename from packages/schematics/src/tslint/nxEnforceModuleBoundariesRule.ts rename to packages/schematics/src/collection/tslint/nxEnforceModuleBoundariesRule.ts diff --git a/packages/schematics/src/upgrade-module/files/__name__-setup.ts__tmpl__ b/packages/schematics/src/collection/upgrade-module/files/__name__-setup.ts__tmpl__ similarity index 100% rename from packages/schematics/src/upgrade-module/files/__name__-setup.ts__tmpl__ rename to packages/schematics/src/collection/upgrade-module/files/__name__-setup.ts__tmpl__ diff --git a/packages/schematics/src/upgrade-module/files/hybrid.spec.ts__tmpl__ b/packages/schematics/src/collection/upgrade-module/files/hybrid.spec.ts__tmpl__ similarity index 100% rename from packages/schematics/src/upgrade-module/files/hybrid.spec.ts__tmpl__ rename to packages/schematics/src/collection/upgrade-module/files/hybrid.spec.ts__tmpl__ diff --git a/packages/schematics/src/upgrade-module/index.ts b/packages/schematics/src/collection/upgrade-module/index.ts similarity index 100% rename from packages/schematics/src/upgrade-module/index.ts rename to packages/schematics/src/collection/upgrade-module/index.ts diff --git a/packages/schematics/src/upgrade-module/schema.d.ts b/packages/schematics/src/collection/upgrade-module/schema.d.ts similarity index 100% rename from packages/schematics/src/upgrade-module/schema.d.ts rename to packages/schematics/src/collection/upgrade-module/schema.d.ts diff --git a/packages/schematics/src/upgrade-module/schema.json b/packages/schematics/src/collection/upgrade-module/schema.json similarity index 100% rename from packages/schematics/src/upgrade-module/schema.json rename to packages/schematics/src/collection/upgrade-module/schema.json diff --git a/packages/schematics/src/upgrade-module/upgrade-module.spec.ts b/packages/schematics/src/collection/upgrade-module/upgrade-module.spec.ts similarity index 98% rename from packages/schematics/src/upgrade-module/upgrade-module.spec.ts rename to packages/schematics/src/collection/upgrade-module/upgrade-module.spec.ts index 8089a85b46..e39a0903f2 100644 --- a/packages/schematics/src/upgrade-module/upgrade-module.spec.ts +++ b/packages/schematics/src/collection/upgrade-module/upgrade-module.spec.ts @@ -5,7 +5,7 @@ import { createApp, createEmptyWorkspace } from '../testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('upgrade-module', () => { - const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../collection.json')); + const schematicRunner = new SchematicTestRunner('@nrwl/schematics', path.join(__dirname, '../../collection.json')); let appTree: Tree; diff --git a/packages/schematics/src/utility/ast-utils.ts b/packages/schematics/src/collection/utility/ast-utils.ts similarity index 100% rename from packages/schematics/src/utility/ast-utils.ts rename to packages/schematics/src/collection/utility/ast-utils.ts diff --git a/packages/schematics/src/utility/common.ts b/packages/schematics/src/collection/utility/common.ts similarity index 100% rename from packages/schematics/src/utility/common.ts rename to packages/schematics/src/collection/utility/common.ts diff --git a/packages/schematics/src/utility/fileutils.spec.ts b/packages/schematics/src/collection/utility/fileutils.spec.ts similarity index 100% rename from packages/schematics/src/utility/fileutils.spec.ts rename to packages/schematics/src/collection/utility/fileutils.spec.ts diff --git a/packages/schematics/src/utility/fileutils.ts b/packages/schematics/src/collection/utility/fileutils.ts similarity index 100% rename from packages/schematics/src/utility/fileutils.ts rename to packages/schematics/src/collection/utility/fileutils.ts diff --git a/packages/schematics/src/utility/lib-versions.ts b/packages/schematics/src/collection/utility/lib-versions.ts similarity index 100% rename from packages/schematics/src/utility/lib-versions.ts rename to packages/schematics/src/collection/utility/lib-versions.ts diff --git a/packages/schematics/src/utility/name-utils.ts b/packages/schematics/src/collection/utility/name-utils.ts similarity index 100% rename from packages/schematics/src/utility/name-utils.ts rename to packages/schematics/src/collection/utility/name-utils.ts diff --git a/packages/schematics/src/workspace/files/test.js b/packages/schematics/src/collection/workspace/files/test.js similarity index 100% rename from packages/schematics/src/workspace/files/test.js rename to packages/schematics/src/collection/workspace/files/test.js diff --git a/packages/schematics/src/workspace/index.ts b/packages/schematics/src/collection/workspace/index.ts similarity index 100% rename from packages/schematics/src/workspace/index.ts rename to packages/schematics/src/collection/workspace/index.ts diff --git a/packages/schematics/src/workspace/schema.d.ts b/packages/schematics/src/collection/workspace/schema.d.ts similarity index 100% rename from packages/schematics/src/workspace/schema.d.ts rename to packages/schematics/src/collection/workspace/schema.d.ts diff --git a/packages/schematics/src/workspace/schema.json b/packages/schematics/src/collection/workspace/schema.json similarity index 100% rename from packages/schematics/src/workspace/schema.json rename to packages/schematics/src/collection/workspace/schema.json