diff --git a/packages/angular/src/schematics/init/init.ts b/packages/angular/src/schematics/init/init.ts index dc3604af27..afcc0483a5 100755 --- a/packages/angular/src/schematics/init/init.ts +++ b/packages/angular/src/schematics/init/init.ts @@ -10,6 +10,7 @@ import { addDepsToPackageJson, formatFiles, readJsonInTree, + setDefaultCollection, updateJsonInTree, updateWorkspace, } from '@nrwl/workspace'; @@ -22,7 +23,6 @@ import { import { Schema } from './schema'; import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners'; import { stripIndents } from '@angular-devkit/core/src/utils/literals'; -import { setDefaultCollection } from '@nrwl/workspace/src/utils/rules/workspace'; const updateDependencies = addDepsToPackageJson( { diff --git a/packages/express/src/schematics/init/init.ts b/packages/express/src/schematics/init/init.ts index 6ed3c9c978..44d347d89b 100644 --- a/packages/express/src/schematics/init/init.ts +++ b/packages/express/src/schematics/init/init.ts @@ -2,6 +2,7 @@ import { chain, noop, Rule } from '@angular-devkit/schematics'; import { addPackageWithInit, formatFiles, + setDefaultCollection, updateJsonInTree, } from '@nrwl/workspace'; import { @@ -10,7 +11,6 @@ import { nxVersion, } from '../../utils/versions'; import { Schema } from './schema'; -import { setDefaultCollection } from '@nrwl/workspace/src/utils/rules/workspace'; function updateDependencies(): Rule { return updateJsonInTree('package.json', (json) => { diff --git a/packages/nest/src/schematics/init/init.ts b/packages/nest/src/schematics/init/init.ts index 88eb2d200a..1bc2afa562 100644 --- a/packages/nest/src/schematics/init/init.ts +++ b/packages/nest/src/schematics/init/init.ts @@ -3,6 +3,7 @@ import { addDepsToPackageJson, addPackageWithInit, formatFiles, + setDefaultCollection, updateJsonInTree, } from '@nrwl/workspace'; import { Schema } from './schema'; @@ -12,7 +13,6 @@ import { nxVersion, reflectMetadataVersion, } from '../../utils/versions'; -import { setDefaultCollection } from '@nrwl/workspace/src/utils/rules/workspace'; export const updateDependencies = addDepsToPackageJson( { diff --git a/packages/next/src/schematics/init/init.ts b/packages/next/src/schematics/init/init.ts index a6b9db40ce..ef89aa6c06 100644 --- a/packages/next/src/schematics/init/init.ts +++ b/packages/next/src/schematics/init/init.ts @@ -1,8 +1,11 @@ import { chain, noop } from '@angular-devkit/schematics'; -import { addDepsToPackageJson, addPackageWithInit } from '@nrwl/workspace'; +import { + addDepsToPackageJson, + addPackageWithInit, + setDefaultCollection, +} from '@nrwl/workspace'; import { nextVersion } from '../../utils/versions'; import { Schema } from './schema'; -import { setDefaultCollection } from '@nrwl/workspace/src/utils/rules/workspace'; import { reactDomVersion, reactVersion, diff --git a/packages/node/src/schematics/init/init.ts b/packages/node/src/schematics/init/init.ts index 6460ff287f..b7b67d3873 100644 --- a/packages/node/src/schematics/init/init.ts +++ b/packages/node/src/schematics/init/init.ts @@ -2,11 +2,11 @@ import { chain, noop, Rule } from '@angular-devkit/schematics'; import { addPackageWithInit, formatFiles, + setDefaultCollection, updateJsonInTree, } from '@nrwl/workspace'; import { nxVersion } from '../../utils/versions'; import { Schema } from './schema'; -import { setDefaultCollection } from '@nrwl/workspace/src/utils/rules/workspace'; function updateDependencies(): Rule { return updateJsonInTree('package.json', (json) => { diff --git a/packages/react/src/schematics/init/init.ts b/packages/react/src/schematics/init/init.ts index 2589507dcb..a9b83acab4 100644 --- a/packages/react/src/schematics/init/init.ts +++ b/packages/react/src/schematics/init/init.ts @@ -1,6 +1,7 @@ import { chain, noop, Rule } from '@angular-devkit/schematics'; import { addPackageWithInit, + setDefaultCollection, updateJsonInTree, updateWorkspace, } from '@nrwl/workspace'; @@ -14,7 +15,6 @@ import { typesReactVersion, } from '../../utils/versions'; import { JsonObject } from '@angular-devkit/core'; -import { setDefaultCollection } from '@nrwl/workspace/src/utils/rules/workspace'; export function updateDependencies(): Rule { return updateJsonInTree('package.json', (json) => { diff --git a/packages/web/src/schematics/init/init.ts b/packages/web/src/schematics/init/init.ts index a9b79ee25a..6e7b5396ad 100644 --- a/packages/web/src/schematics/init/init.ts +++ b/packages/web/src/schematics/init/init.ts @@ -2,6 +2,7 @@ import { chain, noop, Rule } from '@angular-devkit/schematics'; import { addPackageWithInit, formatFiles, + setDefaultCollection, updateJsonInTree, } from '@nrwl/workspace'; import { Schema } from './schema'; @@ -9,7 +10,6 @@ import { documentRegisterElementVersion, nxVersion, } from '../../utils/versions'; -import { setDefaultCollection } from '@nrwl/workspace/src/utils/rules/workspace'; function updateDependencies(): Rule { return updateJsonInTree('package.json', (json) => { diff --git a/packages/workspace/index.ts b/packages/workspace/index.ts index 578354c53b..fde2a4b6e8 100644 --- a/packages/workspace/index.ts +++ b/packages/workspace/index.ts @@ -68,6 +68,7 @@ export { formatFiles } from './src/utils/rules/format-files'; export { deleteFile } from './src/utils/rules/deleteFile'; export * from './src/utils/rules/ng-add'; export { updateKarmaConf } from './src/utils/rules/update-karma-conf'; +export { setDefaultCollection } from './src/utils/rules/workspace'; import * as strings from './src/utils/strings'; export { checkAndCleanWithSemver } from './src/utils/version-utils'; export { updatePackagesInPackageJson } from './src/utils/update-packages-in-package-json';