cleanup(core): inline angular cli nested project migration logic into…

… nx init (#15396)

CODEOWNERS

@@ -121,6 +121,7 @@
 /packages/nx/src/adapter @AgentEnder @leosvelperez
 /packages/nx/src/native @vsavkin @FrozenPandaz @Cammisuli
 /packages/nx/src/lock-file @meeroslav @FrozenPandaz
+/packages/nx/src/nx-init/angular/** @Coly010 @leosvelperez @FrozenPandaz
 /e2e/nx*/** @FrozenPandaz @AgentEnder @vsavkin
 /packages/workspace/** @FrozenPandaz @AgentEnder @vsavkin
 /e2e/workspace-create/** @FrozenPandaz @AgentEnder @vsavkin

e2e/nx-init/src/nx-init-angular.test.ts

@@ -0,0 +1,65 @@
+import { PackageManager } from 'nx/src/utils/package-manager';
+import {
+  checkFilesDoNotExist,
+  checkFilesExist,
+  cleanupProject,
+  getPackageManagerCommand,
+  getPublishedVersion,
+  getSelectedPackageManager,
+  runCLI,
+  runCommand,
+  runNgNew,
+  uniq,
+} from '../../utils';
+
+describe('nx init (Angular CLI)', () => {
+  let project: string;
+  let packageManager: PackageManager;
+  let pmc: ReturnType<typeof getPackageManagerCommand>;
+
+  beforeEach(() => {
+    project = uniq('proj');
+    packageManager = getSelectedPackageManager();
+    // TODO: solve issues with pnpm and remove this fallback
+    packageManager = packageManager === 'pnpm' ? 'yarn' : packageManager;
+    pmc = getPackageManagerCommand({ packageManager });
+  });
+
+  afterEach(() => {
+    cleanupProject();
+  });
+
+  it('should successfully convert an Angular CLI workspace to an Nx workspace', () => {
+    runNgNew(project, packageManager);
+
+    const output = runCommand(
+      `${pmc.runUninstalledPackage} nx@${getPublishedVersion()} init -y`
+    );
+
+    expect(output).toContain('Nx is now enabled in your workspace!');
+    // angular.json should have been deleted
+    checkFilesDoNotExist('angular.json');
+    // check nx config files exist
+    checkFilesExist('nx.json', 'project.json');
+
+    // check build
+    const coldBuildOutput = runCLI(`build ${project} --outputHashing none`);
+    expect(coldBuildOutput).toContain(
+      `> nx run ${project}:build:production --outputHashing none`
+    );
+    expect(coldBuildOutput).toContain(
+      `Successfully ran target build for project ${project}`
+    );
+    checkFilesExist(`dist/${project}/main.js`);
+
+    // run build again to check is coming from cache
+    const cachedBuildOutput = runCLI(`build ${project} --outputHashing none`);
+    expect(cachedBuildOutput).toContain(
+      `> nx run ${project}:build:production --outputHashing none  [local cache]`
+    );
+    expect(cachedBuildOutput).toContain('Nx read the output from the cache');
+    expect(cachedBuildOutput).toContain(
+      `Successfully ran target build for project ${project}`
+    );
+  });
+});

e2e/utils/create-project-utils.ts

@@ -15,7 +15,7 @@ import {
 } from './get-env-info';
 import * as isCI from 'is-ci';
 
-import { angularCliVersion } from '@nrwl/workspace/src/utils/versions';
+import { angularCliVersion as defaultAngularCliVersion } from '@nrwl/workspace/src/utils/versions';
 import { dump } from '@zkochan/js-yaml';
 import { execSync, ExecSyncOptions } from 'child_process';
 
@@ -247,7 +247,8 @@ export function packageInstall(
 
 export function runNgNew(
   projectName: string,
-  packageManager = getSelectedPackageManager()
+  packageManager = getSelectedPackageManager(),
+  angularCliVersion = defaultAngularCliVersion
 ): string {
   projName = projectName;
 

packages/add-nx-to-monorepo/src/add-nx-to-monorepo.ts

@@ -101,8 +101,7 @@ async function addNxToMonorepo() {
     repoRoot,
     targetDefaults,
     cacheableOperations,
-    scriptOutputs,
-    undefined
+    scriptOutputs
   );
 
   addDepsToPackageJson(repoRoot, useCloud);
@@ -111,7 +110,7 @@ async function addNxToMonorepo() {
   runInstall(repoRoot);
 
   if (useCloud) {
-    initCloud(repoRoot);
+    initCloud(repoRoot, 'nx-init-monorepo');
   }
 
   printFinalMessage();

packages/nx/src/command-line/init.ts

@@ -1,12 +1,13 @@
 import { execSync } from 'child_process';
 import { existsSync } from 'fs';
+import { prerelease } from 'semver';
+import * as parser from 'yargs-parser';
 import { addNxToNest } from '../nx-init/add-nx-to-nest';
 import { addNxToNpmRepo } from '../nx-init/add-nx-to-npm-repo';
+import { addNxToAngularCliRepo } from '../nx-init/angular';
+import { generateEncapsulatedNxSetup } from '../nx-init/encapsulated/add-nx-scripts';
 import { directoryExists, readJsonFile } from '../utils/fileutils';
 import { PackageJson } from '../utils/package-json';
-import * as parser from 'yargs-parser';
-import { generateEncapsulatedNxSetup } from '../nx-init/encapsulated/add-nx-scripts';
-import { prerelease } from 'semver';
 
 export async function initHandler() {
   const args = process.argv.slice(2).join(' ');
@@ -43,10 +44,7 @@ export async function initHandler() {
   } else if (existsSync('package.json')) {
     const packageJson: PackageJson = readJsonFile('package.json');
     if (existsSync('angular.json')) {
-      // TODO(leo): remove make-angular-cli-faster
-      execSync(`npx --yes make-angular-cli-faster@${version} ${args}`, {
-        stdio: [0, 1, 2],
-      });
+      await addNxToAngularCliRepo();
     } else if (isCRA(packageJson)) {
       // TODO(jack): remove cra-to-nx
       execSync(`npx --yes cra-to-nx@${version} ${args}`, {

packages/nx/src/nx-init/add-nx-to-nest.ts

@@ -108,8 +108,7 @@ export async function addNxToNest(packageJson: PackageJson) {
     repoRoot,
     [],
     [...cacheableOperations, ...nestCacheableScripts],
-    {},
-    packageJson.name
+    {}
   );
 
   const pmc = getPackageManagerCommand();
@@ -136,7 +135,7 @@ export async function addNxToNest(packageJson: PackageJson) {
   runInstall(repoRoot);
 
   if (useCloud) {
-    initCloud(repoRoot);
+    initCloud(repoRoot, 'nx-init-nest');
   }
 
   printFinalMessage();

packages/nx/src/nx-init/add-nx-to-npm-repo.ts

@@ -76,7 +76,7 @@ export async function addNxToNpmRepo() {
     useCloud = false;
   }
 
-  createNxJsonFile(repoRoot, [], cacheableOperations, {}, packageJson.name);
+  createNxJsonFile(repoRoot, [], cacheableOperations, {});
 
   const pmc = getPackageManagerCommand();
 
@@ -93,7 +93,7 @@ export async function addNxToNpmRepo() {
   runInstall(repoRoot, pmc);
 
   if (useCloud) {
-    initCloud(repoRoot);
+    initCloud(repoRoot, 'nx-init-npm-repo');
   }
 
   printFinalMessage();