feat(angular): support migrating angular cli workspaces with library …

…projects (#9885)

docs/generated/packages/angular.json

@@ -1293,11 +1293,6 @@
             "description": "Preserve the Angular CLI layout instead of moving the app into apps. NOTE: only used if running the generator in an Angular CLI workspace.",
             "default": false
           },
-          "name": {
-            "type": "string",
-            "description": "Project name. NOTE: only used if running the generator in an Angular CLI workspace.",
-            "$default": { "$source": "projectName" }
-          },
           "unitTestRunner": {
             "type": "string",
             "enum": ["karma", "jest", "none"],

e2e/angular-core/src/ng-add.test.ts

@@ -285,7 +285,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {
     expect(() =>
       runNgAdd('@nrwl/angular', '--npm-scope projscope --skip-install')
     ).toThrow(
-      'An e2e project with Protractor was found but "e2e/protractor.conf.js" could not be found.'
+      'The "e2e" target is using a Protractor builder but the Protractor config file "e2e/protractor.conf.js" could not be found.'
     );
     // Restore e2e directory
     runCommand('mv e2e-bak e2e');
@@ -309,7 +309,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {
     expect(() =>
       runNgAdd('@nrwl/angular', '--npm-scope projscope --skip-install')
     ).toThrow(
-      'An e2e project with Cypress was found but "cypress.json" could not be found.'
+      'The "e2e" target is using a Cypress builder but the Cypress config file "cypress.json" could not be found.'
     );
     // Restore cypress.json
     runCommand('mv cypress.json.bak cypress.json');
@@ -319,7 +319,7 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {
     expect(() =>
       runNgAdd('@nrwl/angular', '--npm-scope projscope --skip-install')
     ).toThrow(
-      'An e2e project with Cypress was found but the "cypress" directory could not be found.'
+      'The "e2e" target is using a Cypress builder but the "cypress" directory could not be found.'
     );
     // Restore cypress.json
     runCommand('mv cypress-bak cypress');
@@ -429,6 +429,58 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {
     );
   });
 
+  it('should support a workspace with multiple libraries', () => {
+    // add some libraries
+    const lib1 = uniq('lib1');
+    const lib2 = uniq('lib2');
+    runCommand(`ng g @schematics/angular:library ${lib1}`);
+    runCommand(`ng g @schematics/angular:library ${lib2}`);
+
+    runNgAdd('@nrwl/angular', '--npm-scope projscope');
+
+    // check angular.json
+    expect(readJson('angular.json')).toStrictEqual({
+      version: 2,
+      projects: {
+        [project]: `apps/${project}`,
+        [lib1]: `libs/${lib1}`,
+        [lib2]: `libs/${lib2}`,
+      },
+    });
+
+    // check building lib1
+    let output = runCLI(`build ${lib1}`);
+    expect(output).toContain(`> nx run ${lib1}:build:production`);
+    expect(output).toContain(
+      `Successfully ran target build for project ${lib1}`
+    );
+    checkFilesExist(`dist/${lib1}/package.json`);
+
+    output = runCLI(`build ${lib1}`);
+    expect(output).toContain(
+      `> nx run ${lib1}:build:production  [existing outputs match the cache, left as is]`
+    );
+    expect(output).toContain(
+      `Successfully ran target build for project ${lib1}`
+    );
+
+    // check building lib2
+    output = runCLI(`build ${lib2}`);
+    expect(output).toContain(`> nx run ${lib2}:build:production`);
+    expect(output).toContain(
+      `Successfully ran target build for project ${lib2}`
+    );
+    checkFilesExist(`dist/${lib2}/package.json`);
+
+    output = runCLI(`build ${lib2}`);
+    expect(output).toContain(
+      `> nx run ${lib2}:build:production  [existing outputs match the cache, left as is]`
+    );
+    expect(output).toContain(
+      `Successfully ran target build for project ${lib2}`
+    );
+  });
+
   it('should support --preserve-angular-cli-layout', () => {
     // add another app and a library
     runCommand(`ng g @schematics/angular:application app2`);

packages/angular/ng-package.json

@@ -9,6 +9,7 @@
     "@angular-eslint/",
     "@schematics",
     "@phenomnomnominal/tsquery",
+    "chalk",
     "ignore",
     "jasmine-marbles",
     "rxjs-for-await",

packages/angular/package.json

@@ -43,8 +43,10 @@
     "@nrwl/jest": "*",
     "@nrwl/linter": "*",
     "@nrwl/storybook": "*",
+    "@nrwl/workspace": "*",
     "@schematics/angular": "~13.3.0",
     "@phenomnomnominal/tsquery": "4.1.1",
+    "chalk": "4.1.0",
     "ignore": "^5.0.4",
     "jasmine-marbles": "~0.8.4",
     "rxjs-for-await": "0.0.2",

packages/angular/src/generators/library/library.ts

@@ -1,5 +1,4 @@
 import {
-  addDependenciesToPackageJson,
   formatFiles,
   installPackagesTask,
   moveFilesToNewDirectory,
@@ -10,10 +9,10 @@ import { jestProjectGenerator } from '@nrwl/jest';
 import { Linter } from '@nrwl/linter';
 import { convertToNxProjectGenerator } from '@nrwl/workspace/generators';
 import init from '../../generators/init/init';
-import { postcssVersion } from '../../utils/versions';
 import addLintingGenerator from '../add-linting/add-linting';
 import karmaProjectGenerator from '../karma-project/karma-project';
 import setupTailwindGenerator from '../setup-tailwind/setup-tailwind';
+import { addBuildableLibrariesPostCssDependencies } from '../utils/dependencies';
 import { addModule } from './lib/add-module';
 import {
   enableStrictTypeChecking,
@@ -86,16 +85,7 @@ export async function libraryGenerator(host: Tree, schema: Partial<Schema>) {
   }
 
   if (options.buildable || options.publishable) {
-    addDependenciesToPackageJson(
-      host,
-      {},
-      {
-        postcss: postcssVersion,
-        'postcss-import': '^14.0.2',
-        'postcss-preset-env': '^6.7.0',
-        'postcss-url': '^10.1.1',
-      }
-    );
+    addBuildableLibrariesPostCssDependencies(host);
   }
 
   if (options.standaloneConfig) {

packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap

@@ -388,7 +388,7 @@ Object {
       "devDependencies": "*",
     },
   },
-  "npmScope": "my-app",
+  "npmScope": "my-org",
   "targetDependencies": Object {
     "build": Array [
       Object {