From cc49f366fadb1626ac655a86c888b33a55cc9c75 Mon Sep 17 00:00:00 2001 From: vsavkin Date: Tue, 13 Mar 2018 19:50:58 -0400 Subject: [PATCH] fix(schemtics): restruct the folder structure to avoid releasing the shared package --- e2e/schematics/workspace.test.ts | 15 ++------------- packages/bazel/src/collection/app/app.spec.ts | 2 +- packages/bazel/src/collection/app/index.ts | 10 +++++----- .../bazel/src/collection/application/index.ts | 2 +- packages/schematics/index.ts | 2 -- .../migrations/20171129-change-schema.ts | 2 +- .../migrations/20171202-change-schema.ts | 2 +- .../20171205-remove-npmscope-from-tslintjson.ts | 2 +- .../20171211-create-tsconfigapp-per-app.ts | 4 ++-- ...0171213-update-tsconfig-spec-to-exclude-e2e.ts | 2 +- .../migrations/20171219-add-affected-commands.ts | 2 +- .../20180103-update-command-line-scripts.ts | 2 +- ...date-command-line-scripts-to-use-nx-command.ts | 2 +- .../migrations/20180120-update-prettier.ts | 2 +- .../migrations/20180121-update-angular.ts | 2 +- .../20180122-add-angular-devkit-core.ts | 4 ++-- .../20180130-add-migration-check-and-skip.ts | 2 +- .../migrations/20180130-add-postinstall.ts | 2 +- .../20180130-angular-devkit-schematics.ts | 4 ++-- .../migrations/20180225-switch-to-cli17.ts | 2 +- .../migrations/20180227-cleanup-scripts.ts | 2 +- .../20180309-create-or-update-prettierrc-file.ts | 4 ++-- .../schematics/migrations/20180313-add-tags.ts | 2 +- .../schematics/src/collection/app/app.spec.ts | 2 +- packages/schematics/src/collection/app/index.ts | 10 +++++----- .../collection/application/application.spec.ts | 2 +- .../src/collection/application/index.ts | 4 ++-- .../downgrade-module/downgrade-module.spec.ts | 2 +- .../src/collection/downgrade-module/index.ts | 6 +++--- packages/schematics/src/collection/lib/index.ts | 10 +++++----- .../schematics/src/collection/lib/lib.spec.ts | 2 +- packages/schematics/src/collection/ngrx/index.ts | 10 +++++----- .../schematics/src/collection/ngrx/ngrx.spec.ts | 2 +- .../src/collection/upgrade-module/index.ts | 10 +++++----- .../upgrade-module/upgrade-module.spec.ts | 2 +- .../schematics/src/collection/workspace/index.ts | 8 ++++---- .../{shared => schematics/src}/lib-versions.ts | 2 +- .../{shared => schematics/src/utils}/ast-utils.ts | 0 .../{shared => schematics/src/utils}/common.ts | 4 ++-- .../src/utils}/fileutils.spec.ts | 0 .../{shared => schematics/src/utils}/fileutils.ts | 0 .../src/utils}/name-utils.ts | 0 .../{shared => schematics/src/utils}/tasks.ts | 0 .../src/utils}/testing-utils.ts | 0 scripts/package.sh | 4 ++-- tsconfig.json | 3 +++ 46 files changed, 74 insertions(+), 84 deletions(-) rename packages/{shared => schematics/src}/lib-versions.ts (94%) rename packages/{shared => schematics/src/utils}/ast-utils.ts (100%) rename packages/{shared => schematics/src/utils}/common.ts (94%) rename packages/{shared => schematics/src/utils}/fileutils.spec.ts (100%) rename packages/{shared => schematics/src/utils}/fileutils.ts (100%) rename packages/{shared => schematics/src/utils}/name-utils.ts (100%) rename packages/{shared => schematics/src/utils}/tasks.ts (100%) rename packages/{shared => schematics/src/utils}/testing-utils.ts (100%) diff --git a/e2e/schematics/workspace.test.ts b/e2e/schematics/workspace.test.ts index d3df259733..9882e7391d 100644 --- a/e2e/schematics/workspace.test.ts +++ b/e2e/schematics/workspace.test.ts @@ -1,16 +1,5 @@ -import { - checkFilesExist, - cleanup, - runNgNew, - readFile, - runCLI, - runSchematic, - updateFile, - runCommand, - copyMissingPackages, - fileExists -} from '../utils'; -import { angularCliSchema } from '../../packages/shared/lib-versions'; +import {checkFilesExist, cleanup, copyMissingPackages, readFile, runCLI, runNgNew, updateFile} from '../utils'; +import {angularCliSchema} from '../../packages/schematics/src/lib-versions'; describe('Nrwl Convert to Nx Workspace', () => { beforeEach(cleanup); diff --git a/packages/bazel/src/collection/app/app.spec.ts b/packages/bazel/src/collection/app/app.spec.ts index c30c89c7ce..75cfb3cebe 100644 --- a/packages/bazel/src/collection/app/app.spec.ts +++ b/packages/bazel/src/collection/app/app.spec.ts @@ -1,7 +1,7 @@ import { SchematicTestRunner } from '@angular-devkit/schematics/testing'; import * as path from 'path'; import { Tree, VirtualTree } from '@angular-devkit/schematics'; -import { createEmptyWorkspace } from '../../../../shared/testing-utils'; +import { createEmptyWorkspace } from '../../../../schematics/src/utils/testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; import * as stripJsonComments from 'strip-json-comments'; diff --git a/packages/bazel/src/collection/app/index.ts b/packages/bazel/src/collection/app/index.ts index b54e74fefe..5b69dad32d 100644 --- a/packages/bazel/src/collection/app/index.ts +++ b/packages/bazel/src/collection/app/index.ts @@ -16,14 +16,14 @@ import { } from '@angular-devkit/schematics'; import { Schema } from './schema'; import {strings} from '@angular-devkit/core'; -import { addImportToModule, insert, toFileName } from '@nrwl/schematics'; +import { addImportToModule, insert, addImportToTestBed } from '@nrwl/schematics/src/utils/ast-utils'; +import { toFileName } from '@nrwl/schematics/src/utils/name-utils'; import * as ts from 'typescript'; import { addBootstrapToModule } from '@schematics/angular/utility/ast-utils'; import { insertImport } from '@schematics/angular/utility/route-utils'; -import { addApp, serializeJson, cliConfig, readCliConfigFile } from '../../../../shared/fileutils'; -import { addImportToTestBed } from '../../../../shared/ast-utils'; -import { offsetFromRoot } from '../../../../shared/common'; -import {FormatFiles, wrapIntoFormat} from '../../../../shared/tasks'; +import { addApp, serializeJson, cliConfig, readCliConfigFile } from '@nrwl/schematics/src/utils/fileutils'; +import { offsetFromRoot } from '@nrwl/schematics/src/utils/common'; +import {FormatFiles, wrapIntoFormat} from '@nrwl/schematics/src/utils/tasks'; interface NormalizedSchema extends Schema { fullName: string; diff --git a/packages/bazel/src/collection/application/index.ts b/packages/bazel/src/collection/application/index.ts index 53c9a1dd8e..15c1e9cbd9 100644 --- a/packages/bazel/src/collection/application/index.ts +++ b/packages/bazel/src/collection/application/index.ts @@ -12,7 +12,7 @@ import { import {Schema} from './schema'; import {strings} from '@angular-devkit/core'; import {NodePackageInstallTask, RepositoryInitializerTask} from '@angular-devkit/schematics/tasks'; -import {libVersions} from '../../../../shared/lib-versions'; +import {libVersions} from '@nrwl/schematics/src/lib-versions'; export default function(options: Schema): Rule { return (host: Tree, context: SchematicContext) => { diff --git a/packages/schematics/index.ts b/packages/schematics/index.ts index f469c35e32..e69de29bb2 100644 --- a/packages/schematics/index.ts +++ b/packages/schematics/index.ts @@ -1,2 +0,0 @@ -export { addImportToModule, addProviderToModule, insert } from '../shared/ast-utils'; -export { names, toClassName, toFileName, toPropertyName } from '../shared/name-utils'; diff --git a/packages/schematics/migrations/20171129-change-schema.ts b/packages/schematics/migrations/20171129-change-schema.ts index a6c7bf2b74..531163e602 100644 --- a/packages/schematics/migrations/20171129-change-schema.ts +++ b/packages/schematics/migrations/20171129-change-schema.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Update the schema file to point to the nrwl schema.', diff --git a/packages/schematics/migrations/20171202-change-schema.ts b/packages/schematics/migrations/20171202-change-schema.ts index 402eb61a14..dfe7a179b9 100644 --- a/packages/schematics/migrations/20171202-change-schema.ts +++ b/packages/schematics/migrations/20171202-change-schema.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Update the schema file to reflect the `allow` option for `nx-enforce-module-boundaries`.', diff --git a/packages/schematics/migrations/20171205-remove-npmscope-from-tslintjson.ts b/packages/schematics/migrations/20171205-remove-npmscope-from-tslintjson.ts index e70fec59ff..bb5eefc074 100644 --- a/packages/schematics/migrations/20171205-remove-npmscope-from-tslintjson.ts +++ b/packages/schematics/migrations/20171205-remove-npmscope-from-tslintjson.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Remove npmScope from tslint.json', diff --git a/packages/schematics/migrations/20171211-create-tsconfigapp-per-app.ts b/packages/schematics/migrations/20171211-create-tsconfigapp-per-app.ts index ddee392d30..f51dd5258d 100644 --- a/packages/schematics/migrations/20171211-create-tsconfigapp-per-app.ts +++ b/packages/schematics/migrations/20171211-create-tsconfigapp-per-app.ts @@ -1,6 +1,6 @@ -import { cliConfig, readCliConfigFile, updateJsonFile } from '../../shared/fileutils'; +import { cliConfig, readCliConfigFile, updateJsonFile } from '../src/utils/fileutils'; import { writeFileSync, unlinkSync } from 'fs'; -import { offsetFromRoot } from '../../shared/common'; +import { offsetFromRoot } from '../src/utils/common'; import * as path from 'path'; export default { diff --git a/packages/schematics/migrations/20171213-update-tsconfig-spec-to-exclude-e2e.ts b/packages/schematics/migrations/20171213-update-tsconfig-spec-to-exclude-e2e.ts index b6ec5f9034..c204ab1a59 100644 --- a/packages/schematics/migrations/20171213-update-tsconfig-spec-to-exclude-e2e.ts +++ b/packages/schematics/migrations/20171213-update-tsconfig-spec-to-exclude-e2e.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Update tsconfig.spec.json to exclude e2e specs', diff --git a/packages/schematics/migrations/20171219-add-affected-commands.ts b/packages/schematics/migrations/20171219-add-affected-commands.ts index 3abd68b916..4e6a19e4f3 100644 --- a/packages/schematics/migrations/20171219-add-affected-commands.ts +++ b/packages/schematics/migrations/20171219-add-affected-commands.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Update package.json to include apps:affected, build:affected, e2e:affected', diff --git a/packages/schematics/migrations/20180103-update-command-line-scripts.ts b/packages/schematics/migrations/20180103-update-command-line-scripts.ts index d382cde19b..b71abae1e0 100644 --- a/packages/schematics/migrations/20180103-update-command-line-scripts.ts +++ b/packages/schematics/migrations/20180103-update-command-line-scripts.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Add format:write and format:check to npm scripts', diff --git a/packages/schematics/migrations/20180116-update-command-line-scripts-to-use-nx-command.ts b/packages/schematics/migrations/20180116-update-command-line-scripts-to-use-nx-command.ts index 49f2aec280..97b36e2854 100644 --- a/packages/schematics/migrations/20180116-update-command-line-scripts-to-use-nx-command.ts +++ b/packages/schematics/migrations/20180116-update-command-line-scripts-to-use-nx-command.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Update npm scripts to use the nx command', diff --git a/packages/schematics/migrations/20180120-update-prettier.ts b/packages/schematics/migrations/20180120-update-prettier.ts index 6ed2a5c3ca..85f2ecca0e 100644 --- a/packages/schematics/migrations/20180120-update-prettier.ts +++ b/packages/schematics/migrations/20180120-update-prettier.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Update the version of prettier', diff --git a/packages/schematics/migrations/20180121-update-angular.ts b/packages/schematics/migrations/20180121-update-angular.ts index ad6b4c2e1d..5ed2941e9f 100644 --- a/packages/schematics/migrations/20180121-update-angular.ts +++ b/packages/schematics/migrations/20180121-update-angular.ts @@ -1,4 +1,4 @@ -import { copyFile, updateJsonFile } from '../../shared/fileutils'; +import { copyFile, updateJsonFile } from '../src/utils/fileutils'; import * as path from 'path'; export default { diff --git a/packages/schematics/migrations/20180122-add-angular-devkit-core.ts b/packages/schematics/migrations/20180122-add-angular-devkit-core.ts index 5ad742aa17..d9caa2ec21 100644 --- a/packages/schematics/migrations/20180122-add-angular-devkit-core.ts +++ b/packages/schematics/migrations/20180122-add-angular-devkit-core.ts @@ -1,5 +1,5 @@ -import { updateJsonFile } from '../../shared/fileutils'; -import { devKitCoreVersion } from '../../shared/lib-versions'; +import { updateJsonFile } from '../src/utils/fileutils'; +import { devKitCoreVersion } from '../src/lib-versions'; export default { description: 'Add @angular-devkit/core as a dev dependency', diff --git a/packages/schematics/migrations/20180130-add-migration-check-and-skip.ts b/packages/schematics/migrations/20180130-add-migration-check-and-skip.ts index ff2264d8d2..71e5395ec6 100644 --- a/packages/schematics/migrations/20180130-add-migration-check-and-skip.ts +++ b/packages/schematics/migrations/20180130-add-migration-check-and-skip.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Add nx-migrate:check and nx-migrate:skip to npm scripts', diff --git a/packages/schematics/migrations/20180130-add-postinstall.ts b/packages/schematics/migrations/20180130-add-postinstall.ts index f99ea521a6..048f633b4d 100644 --- a/packages/schematics/migrations/20180130-add-postinstall.ts +++ b/packages/schematics/migrations/20180130-add-postinstall.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; export default { description: 'Add postinstall script to run nx-migrate:check', diff --git a/packages/schematics/migrations/20180130-angular-devkit-schematics.ts b/packages/schematics/migrations/20180130-angular-devkit-schematics.ts index b5678e5792..dff742d24e 100644 --- a/packages/schematics/migrations/20180130-angular-devkit-schematics.ts +++ b/packages/schematics/migrations/20180130-angular-devkit-schematics.ts @@ -1,9 +1,9 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; import { devKitCoreVersion, devKitSchematicsVersion, schematicsAngularVersion -} from '../../shared/lib-versions'; +} from '../src/lib-versions'; export default { description: 'Add @angular-devkit/schematics as a dev dependency', diff --git a/packages/schematics/migrations/20180225-switch-to-cli17.ts b/packages/schematics/migrations/20180225-switch-to-cli17.ts index 0f999a5538..b8ef561acd 100644 --- a/packages/schematics/migrations/20180225-switch-to-cli17.ts +++ b/packages/schematics/migrations/20180225-switch-to-cli17.ts @@ -1,4 +1,4 @@ -import { updateJsonFile } from '../../shared/fileutils'; +import { updateJsonFile } from '../src/utils/fileutils'; import { unlinkSync } from 'fs'; export default { diff --git a/packages/schematics/migrations/20180227-cleanup-scripts.ts b/packages/schematics/migrations/20180227-cleanup-scripts.ts index c10542350b..beed705abc 100644 --- a/packages/schematics/migrations/20180227-cleanup-scripts.ts +++ b/packages/schematics/migrations/20180227-cleanup-scripts.ts @@ -1,4 +1,4 @@ -import {updateJsonFile} from '../../shared/fileutils'; +import {updateJsonFile} from '../src/utils/fileutils'; export default { description: 'Add update, update:skip, update:check scripts', diff --git a/packages/schematics/migrations/20180309-create-or-update-prettierrc-file.ts b/packages/schematics/migrations/20180309-create-or-update-prettierrc-file.ts index 37fe1431d9..56636be1f9 100644 --- a/packages/schematics/migrations/20180309-create-or-update-prettierrc-file.ts +++ b/packages/schematics/migrations/20180309-create-or-update-prettierrc-file.ts @@ -1,8 +1,8 @@ import { writeFileSync, readFileSync, readdirSync, unlinkSync } from 'fs'; import { join } from 'path'; -import { updateJsonFile } from '../../shared/fileutils'; -import { ExistingPrettierConfig, resolveUserExistingPrettierConfig } from '../../shared/common'; +import { updateJsonFile } from '../src/utils/fileutils'; +import { ExistingPrettierConfig, resolveUserExistingPrettierConfig } from '../src/utils/common'; export default { description: 'Create or update prettier configuration', diff --git a/packages/schematics/migrations/20180313-add-tags.ts b/packages/schematics/migrations/20180313-add-tags.ts index c9eca9bbcb..5bf91f07d9 100644 --- a/packages/schematics/migrations/20180313-add-tags.ts +++ b/packages/schematics/migrations/20180313-add-tags.ts @@ -1,4 +1,4 @@ -import {updateJsonFile} from '../../shared/fileutils'; +import {updateJsonFile} from '../src/utils/fileutils'; export default { description: 'Add tags to all app and libs', diff --git a/packages/schematics/src/collection/app/app.spec.ts b/packages/schematics/src/collection/app/app.spec.ts index 47c278394f..a7f36139af 100644 --- a/packages/schematics/src/collection/app/app.spec.ts +++ b/packages/schematics/src/collection/app/app.spec.ts @@ -1,7 +1,7 @@ import { SchematicTestRunner } from '@angular-devkit/schematics/testing'; import * as path from 'path'; import { Tree, VirtualTree } from '@angular-devkit/schematics'; -import { createEmptyWorkspace } from '../../../../shared/testing-utils'; +import { createEmptyWorkspace } from '../../utils/testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; import * as stripJsonComments from 'strip-json-comments'; diff --git a/packages/schematics/src/collection/app/index.ts b/packages/schematics/src/collection/app/index.ts index 50e1b0945c..8306081863 100644 --- a/packages/schematics/src/collection/app/index.ts +++ b/packages/schematics/src/collection/app/index.ts @@ -16,14 +16,14 @@ import { } from '@angular-devkit/schematics'; import { Schema } from './schema'; import {strings} from '@angular-devkit/core'; -import { addImportToModule, insert, toFileName } from '@nrwl/schematics'; import * as ts from 'typescript'; import { addBootstrapToModule } from '@schematics/angular/utility/ast-utils'; import { insertImport } from '@schematics/angular/utility/route-utils'; -import { addApp, serializeJson, cliConfig, readCliConfigFile } from '../../../../shared/fileutils'; -import { addImportToTestBed } from '../../../../shared/ast-utils'; -import { offsetFromRoot } from '../../../../shared/common'; -import {FormatFiles, wrapIntoFormat} from '../../../../shared/tasks'; +import { addApp, serializeJson, cliConfig, readCliConfigFile } from '../../utils/fileutils'; +import {addImportToModule, addImportToTestBed, insert} from '../../utils/ast-utils'; +import { offsetFromRoot } from '../../utils/common'; +import { wrapIntoFormat} from '../../utils/tasks'; +import {toFileName} from '../../utils/name-utils'; interface NormalizedSchema extends Schema { fullName: string; diff --git a/packages/schematics/src/collection/application/application.spec.ts b/packages/schematics/src/collection/application/application.spec.ts index ef8af70495..ac10f4abe2 100644 --- a/packages/schematics/src/collection/application/application.spec.ts +++ b/packages/schematics/src/collection/application/application.spec.ts @@ -1,7 +1,7 @@ import { SchematicTestRunner } from '@angular-devkit/schematics/testing'; import * as path from 'path'; import { Tree, VirtualTree } from '@angular-devkit/schematics'; -import { createEmptyWorkspace } from '../../../../shared/testing-utils'; +import { createEmptyWorkspace } from '../../utils/testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('application', () => { diff --git a/packages/schematics/src/collection/application/index.ts b/packages/schematics/src/collection/application/index.ts index 9a72cf50df..0f03e7dd02 100644 --- a/packages/schematics/src/collection/application/index.ts +++ b/packages/schematics/src/collection/application/index.ts @@ -12,8 +12,8 @@ import { import {Schema} from './schema'; import {strings} from '@angular-devkit/core'; import {NodePackageInstallTask, RepositoryInitializerTask} from '@angular-devkit/schematics/tasks'; -import {libVersions} from '../../../../shared/lib-versions'; -import { DEFAULT_NRWL_PRETTIER_CONFIG } from '../../../../shared/common'; +import {libVersions} from '../../lib-versions'; +import { DEFAULT_NRWL_PRETTIER_CONFIG } from '../../utils/common'; export default function(options: Schema): Rule { return (host: Tree, context: SchematicContext) => { diff --git a/packages/schematics/src/collection/downgrade-module/downgrade-module.spec.ts b/packages/schematics/src/collection/downgrade-module/downgrade-module.spec.ts index 94e453f4ae..cae1530bd8 100644 --- a/packages/schematics/src/collection/downgrade-module/downgrade-module.spec.ts +++ b/packages/schematics/src/collection/downgrade-module/downgrade-module.spec.ts @@ -1,7 +1,7 @@ import { SchematicTestRunner } from '@angular-devkit/schematics/testing'; import * as path from 'path'; import { Tree, VirtualTree } from '@angular-devkit/schematics'; -import { createApp, createEmptyWorkspace } from '../../../../shared/testing-utils'; +import { createApp, createEmptyWorkspace } from '../../utils/testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('downgrade-module', () => { diff --git a/packages/schematics/src/collection/downgrade-module/index.ts b/packages/schematics/src/collection/downgrade-module/index.ts index fa36a17945..616fa3f9df 100644 --- a/packages/schematics/src/collection/downgrade-module/index.ts +++ b/packages/schematics/src/collection/downgrade-module/index.ts @@ -1,8 +1,8 @@ import {chain, noop, Rule, Tree} from '@angular-devkit/schematics'; -import {addEntryComponents, addMethod, insert, readBootstrapInfo, removeFromNgModule} from '../../../../shared/ast-utils'; +import {addEntryComponents, addMethod, insert, readBootstrapInfo, removeFromNgModule} from '../../utils/ast-utils'; import {Schema} from './schema'; -import {addUpgradeToPackageJson} from '../../../../shared/common'; -import {wrapIntoFormat} from '../../../../shared/tasks'; +import {addUpgradeToPackageJson} from '../../utils/common'; +import {wrapIntoFormat} from '../../utils/tasks'; function updateMain(angularJsImport: string, options: Schema): Rule { return (host: Tree) => { diff --git a/packages/schematics/src/collection/lib/index.ts b/packages/schematics/src/collection/lib/index.ts index b705e602f2..cef6376442 100644 --- a/packages/schematics/src/collection/lib/index.ts +++ b/packages/schematics/src/collection/lib/index.ts @@ -1,13 +1,13 @@ import {apply, branchAndMerge, chain, mergeWith, noop, Rule, template, Tree, url} from '@angular-devkit/schematics'; import {Schema} from './schema'; -import {addImportToModule, insert, names, toClassName, toFileName, toPropertyName} from '@nrwl/schematics'; import * as path from 'path'; -import {addApp, cliConfig, serializeJson} from '../../../../shared/fileutils'; +import {addApp, cliConfig, serializeJson} from '../../utils/fileutils'; import {insertImport} from '@schematics/angular/utility/route-utils'; import * as ts from 'typescript'; -import {addGlobal, addIncludeToTsConfig, addReexport, addRoute} from '../../../../shared/ast-utils'; -import {offsetFromRoot} from '../../../../shared/common'; -import {wrapIntoFormat} from '../../../../shared/tasks'; +import {addGlobal, addImportToModule, addIncludeToTsConfig, addReexport, addRoute, insert} from '../../utils/ast-utils'; +import {offsetFromRoot} from '../../utils/common'; +import {wrapIntoFormat} from '../../utils/tasks'; +import {names, toClassName, toFileName, toPropertyName} from '../../utils/name-utils'; interface NormalizedSchema extends Schema { name: string; diff --git a/packages/schematics/src/collection/lib/lib.spec.ts b/packages/schematics/src/collection/lib/lib.spec.ts index a286d6fe9e..8de0d31a44 100644 --- a/packages/schematics/src/collection/lib/lib.spec.ts +++ b/packages/schematics/src/collection/lib/lib.spec.ts @@ -1,7 +1,7 @@ import { SchematicTestRunner } from '@angular-devkit/schematics/testing'; import * as path from 'path'; import { Tree, VirtualTree } from '@angular-devkit/schematics'; -import { createApp, createEmptyWorkspace } from '../../../../shared/testing-utils'; +import { createApp, createEmptyWorkspace } from '../../utils/testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; import * as stripJsonComments from 'strip-json-comments'; diff --git a/packages/schematics/src/collection/ngrx/index.ts b/packages/schematics/src/collection/ngrx/index.ts index 3e2d12c95b..c61c0de4f7 100644 --- a/packages/schematics/src/collection/ngrx/index.ts +++ b/packages/schematics/src/collection/ngrx/index.ts @@ -11,15 +11,15 @@ import { url } from '@angular-devkit/schematics'; -import {names, toClassName, toFileName, toPropertyName} from '../../../../shared/name-utils'; +import {names, toClassName, toFileName, toPropertyName} from '../../utils/name-utils'; import * as path from 'path'; import * as ts from 'typescript'; -import {addImportToModule, addProviderToModule, insert} from '../../../../shared/ast-utils'; +import {addImportToModule, addProviderToModule, insert} from '../../utils/ast-utils'; import {insertImport} from '@schematics/angular/utility/route-utils'; import {Schema} from './schema'; -import {ngrxVersion, routerStoreVersion, ngrxStoreFreezeVersion} from '../../../../shared/lib-versions'; -import {serializeJson} from '../../../../shared/fileutils'; -import {wrapIntoFormat} from '../../../../shared/tasks'; +import {ngrxVersion, routerStoreVersion, ngrxStoreFreezeVersion} from '../../lib-versions'; +import {serializeJson} from '../../utils/fileutils'; +import {wrapIntoFormat} from '../../utils/tasks'; function addImportsToModule(name: string, options: Schema): Rule { return (host: Tree) => { diff --git a/packages/schematics/src/collection/ngrx/ngrx.spec.ts b/packages/schematics/src/collection/ngrx/ngrx.spec.ts index 6ece7a6825..5ab2672b03 100644 --- a/packages/schematics/src/collection/ngrx/ngrx.spec.ts +++ b/packages/schematics/src/collection/ngrx/ngrx.spec.ts @@ -1,7 +1,7 @@ import { SchematicTestRunner } from '@angular-devkit/schematics/testing'; import * as path from 'path'; import { Tree, VirtualTree } from '@angular-devkit/schematics'; -import { createApp, createEmptyWorkspace } from '../../../../shared/testing-utils'; +import { createApp, createEmptyWorkspace } from '../../utils/testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('ngrx', () => { diff --git a/packages/schematics/src/collection/upgrade-module/index.ts b/packages/schematics/src/collection/upgrade-module/index.ts index 2506e74eff..586ba7673d 100644 --- a/packages/schematics/src/collection/upgrade-module/index.ts +++ b/packages/schematics/src/collection/upgrade-module/index.ts @@ -12,7 +12,7 @@ import { url } from '@angular-devkit/schematics'; -import { names, toClassName, toFileName, toPropertyName } from '../../../../shared/name-utils'; +import { names, toClassName, toFileName, toPropertyName } from '../../utils/name-utils'; import * as path from 'path'; import * as ts from 'typescript'; import { @@ -26,12 +26,12 @@ import { insert, readBootstrapInfo, removeFromNgModule -} from '../../../../shared/ast-utils'; +} from '../../utils/ast-utils'; import { insertImport } from '@schematics/angular/utility/route-utils'; import { Schema } from './schema'; -import { angularJsVersion } from '../../../../shared/lib-versions'; -import { addUpgradeToPackageJson } from '../../../../shared/common'; -import {wrapIntoFormat} from '../../../../shared/tasks'; +import { angularJsVersion } from '../../lib-versions'; +import { addUpgradeToPackageJson } from '../../utils/common'; +import {wrapIntoFormat} from '../../utils/tasks'; function addImportsToModule(options: Schema): Rule { return (host: Tree) => { diff --git a/packages/schematics/src/collection/upgrade-module/upgrade-module.spec.ts b/packages/schematics/src/collection/upgrade-module/upgrade-module.spec.ts index b984ba751e..2b800d1709 100644 --- a/packages/schematics/src/collection/upgrade-module/upgrade-module.spec.ts +++ b/packages/schematics/src/collection/upgrade-module/upgrade-module.spec.ts @@ -1,7 +1,7 @@ import { SchematicTestRunner } from '@angular-devkit/schematics/testing'; import * as path from 'path'; import { Tree, VirtualTree } from '@angular-devkit/schematics'; -import { createApp, createEmptyWorkspace } from '../../../../shared/testing-utils'; +import { createApp, createEmptyWorkspace } from '../../utils/testing-utils'; import { getFileContent } from '@schematics/angular/utility/test'; describe('upgrade-module', () => { diff --git a/packages/schematics/src/collection/workspace/index.ts b/packages/schematics/src/collection/workspace/index.ts index 515e965402..6c226b05bb 100644 --- a/packages/schematics/src/collection/workspace/index.ts +++ b/packages/schematics/src/collection/workspace/index.ts @@ -10,14 +10,14 @@ import { ngrxStoreFreezeVersion, nxVersion, prettierVersion, routerStoreVersion, schematicsVersion, -} from '../../../../shared/lib-versions'; +} from '../../lib-versions'; import * as fs from 'fs'; -import { copyFile, serializeJson, updateJsonFile } from '../../../../shared/fileutils'; -import { toFileName } from '@nrwl/schematics'; -import { resolveUserExistingPrettierConfig, DEFAULT_NRWL_PRETTIER_CONFIG } from '../../../../shared/common'; +import { copyFile, serializeJson, updateJsonFile } from '../../utils/fileutils'; +import { resolveUserExistingPrettierConfig, DEFAULT_NRWL_PRETTIER_CONFIG } from '../../utils/common'; import { Observable } from 'rxjs/Observable'; import { fromPromise } from 'rxjs/observable/fromPromise' import { tap, map } from 'rxjs/operators'; +import {toFileName} from '../../utils/name-utils'; function updatePackageJson() { return (host: Tree) => { diff --git a/packages/shared/lib-versions.ts b/packages/schematics/src/lib-versions.ts similarity index 94% rename from packages/shared/lib-versions.ts rename to packages/schematics/src/lib-versions.ts index 950cc39b2d..b84da57dc9 100644 --- a/packages/shared/lib-versions.ts +++ b/packages/schematics/src/lib-versions.ts @@ -7,7 +7,7 @@ export const routerStoreVersion = '5.0.1'; export const nxVersion = '*'; export const schematicsVersion = '*'; export const angularCliSchema = './node_modules/@nrwl/schematics/src/schema.json'; -export const latestMigration = '20180227-cleanup-scripts'; +export const latestMigration = '20180313-add-tags'; export const prettierVersion = '1.10.2'; export const typescriptVersion = '2.6.2'; export const rxjsVersion = '^5.5.6'; diff --git a/packages/shared/ast-utils.ts b/packages/schematics/src/utils/ast-utils.ts similarity index 100% rename from packages/shared/ast-utils.ts rename to packages/schematics/src/utils/ast-utils.ts diff --git a/packages/shared/common.ts b/packages/schematics/src/utils/common.ts similarity index 94% rename from packages/shared/common.ts rename to packages/schematics/src/utils/common.ts index 3e1a6cb8be..c0c2691493 100644 --- a/packages/shared/common.ts +++ b/packages/schematics/src/utils/common.ts @@ -3,9 +3,9 @@ import { readdirSync, readFileSync } from 'fs'; import { Options } from 'prettier'; import * as cosmiconfig from 'cosmiconfig'; -import { angularJsVersion } from './lib-versions'; +import { angularJsVersion } from '../lib-versions'; import { serializeJson } from './fileutils'; -import { Schema } from '../schematics/src/collection/app/schema'; +import { Schema } from '../collection/app/schema'; export function addUpgradeToPackageJson(): Rule { return (host: Tree) => { diff --git a/packages/shared/fileutils.spec.ts b/packages/schematics/src/utils/fileutils.spec.ts similarity index 100% rename from packages/shared/fileutils.spec.ts rename to packages/schematics/src/utils/fileutils.spec.ts diff --git a/packages/shared/fileutils.ts b/packages/schematics/src/utils/fileutils.ts similarity index 100% rename from packages/shared/fileutils.ts rename to packages/schematics/src/utils/fileutils.ts diff --git a/packages/shared/name-utils.ts b/packages/schematics/src/utils/name-utils.ts similarity index 100% rename from packages/shared/name-utils.ts rename to packages/schematics/src/utils/name-utils.ts diff --git a/packages/shared/tasks.ts b/packages/schematics/src/utils/tasks.ts similarity index 100% rename from packages/shared/tasks.ts rename to packages/schematics/src/utils/tasks.ts diff --git a/packages/shared/testing-utils.ts b/packages/schematics/src/utils/testing-utils.ts similarity index 100% rename from packages/shared/testing-utils.ts rename to packages/schematics/src/utils/testing-utils.ts diff --git a/scripts/package.sh b/scripts/package.sh index cc7606325b..92c445d5d2 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -6,8 +6,8 @@ NX_VERSION=$2 ./scripts/build.sh cd build/packages -sed -i "" "s|exports.nxVersion = '\*';|exports.nxVersion = '$NX_VERSION';|g" schematics/src/collection/utility/lib-versions.js -sed -i "" "s|exports.schematicsVersion = '\*';|exports.schematicsVersion = '$SCHEMATICS_VERSION';|g" schematics/src/collection/utility/lib-versions.js +sed -i "" "s|exports.nxVersion = '\*';|exports.nxVersion = '$NX_VERSION';|g" schematics/src/lib-versions.js +sed -i "" "s|exports.schematicsVersion = '\*';|exports.schematicsVersion = '$SCHEMATICS_VERSION';|g" schematics/src/lib-versions.js tar -czf nx.tgz nx diff --git a/tsconfig.json b/tsconfig.json index fb94e5388f..d045a572b9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,6 +16,9 @@ "paths": { "@nrwl/schematics": [ "./packages/schematics" + ], + "@nrwl/schematics/*": [ + "./packages/schematics/*" ] } },