@nrwl/angular 14.8.7 → 14.9.0-beta.1

package/src/generators/ng-add/schema.json

@@ -8,21 +8,19 @@
   "properties": {
     "npmScope": {
       "type": "string",
-      "description": "Npm scope for importing libs. NOTE: only used if running the generator in an Angular CLI workspace."
+      "description": "Npm scope for importing libs. NOTE: only used if running the generator in an Angular CLI workspace.",
+      "x-priority": "important"
     },
     "defaultBase": {
       "type": "string",
-      "description": "Default base branch for affected. NOTE: only used if running the generator in an Angular CLI workspace."
+      "description": "Default base branch for affected. NOTE: only used if running the generator in an Angular CLI workspace.",
+      "x-priority": "important"
     },
     "skipInstall": {
       "type": "boolean",
       "description": "Skip installing added packages.",
-      "default": false
-    },
-    "preserveAngularCliLayout": {
-      "type": "boolean",
-      "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
+      "default": false,
+      "x-priority": "internal"
     },
 
     "unitTestRunner": {
@@ -40,7 +38,8 @@
     "skipFormat": {
       "description": "Skip formatting files. NOTE: only used if running the generator in an Nx workspace.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     },
     "linter": {
       "description": "The tool to use for running lint checks. NOTE: only used if running the generator in an Nx workspace.",
@@ -57,13 +56,16 @@
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
-      "description": "Do not add dependencies to `package.json`. NOTE: only used if running the generator in an Nx workspace."
+      "description": "Do not add dependencies to `package.json`. NOTE: only used if running the generator in an Nx workspace.",
+      "x-priority": "internal"
     },
     "skipPostInstall": {
       "type": "boolean",
       "default": false,
-      "description": "Do not add or append `ngcc` to the `postinstall` script in `package.json`. NOTE: only used if running the generator in an Nx workspace."
+      "description": "Do not add or append `ngcc` to the `postinstall` script in `package.json`. NOTE: only used if running the generator in an Nx workspace.",
+      "x-priority": "internal"
     }
   },
-  "additionalProperties": false
+  "additionalProperties": false,
+  "examplesFile": "../../../docs/ng-add-examples.md"
 }

package/src/generators/ng-add/utilities/dependencies.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nrwl/devkit';
+export declare function ensureAngularDevKitPeerDependenciesAreInstalled(tree: Tree): void;

package/src/generators/ng-add/utilities/dependencies.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureAngularDevKitPeerDependenciesAreInstalled = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const version_utils_1 = require("../../../utils/version-utils");
+const version_utils_2 = require("../../utils/version-utils");
+function ensureAngularDevKitPeerDependenciesAreInstalled(tree) {
+    var _a;
+    const packagesToInstall = [
+        '@angular-devkit/core',
+        '@angular-devkit/schematics',
+        '@schematics/angular',
+    ];
+    const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
+    let angularCliVersion = (_a = devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies['@angular/cli']) !== null && _a !== void 0 ? _a : dependencies === null || dependencies === void 0 ? void 0 : dependencies['@angular/cli'];
+    if (!angularCliVersion) {
+        const angularMajorVersion = (0, version_utils_2.getInstalledAngularMajorVersion)(tree);
+        const angularDevkitVersion = (0, version_utils_1.getPkgVersionForAngularMajorVersion)('angularDevkitVersion', angularMajorVersion);
+        angularCliVersion = angularDevkitVersion;
+    }
+    const filteredPackages = packagesToInstall
+        .filter((pkg) => !(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[pkg]) && !(dependencies === null || dependencies === void 0 ? void 0 : dependencies[pkg]))
+        .reduce((allPkgs, pkg) => {
+        allPkgs[pkg] = angularCliVersion;
+        return allPkgs;
+    }, {});
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, filteredPackages);
+}
+exports.ensureAngularDevKitPeerDependenciesAreInstalled = ensureAngularDevKitPeerDependenciesAreInstalled;
+//# sourceMappingURL=dependencies.js.map

package/src/generators/ng-add/utilities/dependencies.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/dependencies.ts"],"names":[],"mappings":";;;AAAA,yCAA4E;AAC5E,gEAAmF;AACnF,6DAA4E;AAE5E,SAAgB,+CAA+C,CAC7D,IAAU;;IAEV,MAAM,iBAAiB,GAAG;QACxB,sBAAsB;QACtB,4BAA4B;QAC5B,qBAAqB;KACtB,CAAC;IAEF,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACzE,IAAI,iBAAiB,GACnB,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,cAAc,CAAC,mCAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,cAAc,CAAC,CAAC;IAEtE,IAAI,CAAC,iBAAiB,EAAE;QACtB,MAAM,mBAAmB,GAAG,IAAA,+CAA+B,EAAC,IAAI,CAAC,CAAC;QAClE,MAAM,oBAAoB,GAAG,IAAA,mDAAmC,EAC9D,sBAAsB,EACtB,mBAAmB,CACpB,CAAC;QACF,iBAAiB,GAAG,oBAAoB,CAAC;KAC1C;IAED,MAAM,gBAAgB,GAAG,iBAAiB;SACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,GAAG,CAAC,CAAA,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,GAAG,CAAC,CAAA,CAAC;SAChE,MAAM,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC;QACjC,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,EAA4B,CAAC,CAAC;IAEnC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,CAAC;AAC3D,CAAC;AA9BD,0GA8BC"}

package/src/generators/ng-add/utilities/format-files-task.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nrwl/devkit';
+export declare function formatFilesTask(tree: Tree): void;

package/src/generators/ng-add/utilities/format-files-task.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatFilesTask = void 0;
+const child_process_1 = require("nx/src/utils/child-process");
+function formatFilesTask(tree) {
+    if (!tree
+        .listChanges()
+        .some((change) => change.type === 'CREATE' || change.type === 'UPDATE')) {
+        return;
+    }
+    try {
+        (0, child_process_1.runNxSync)(`format`, { cwd: tree.root, stdio: [0, 1, 2] });
+    }
+    catch (_a) { }
+}
+exports.formatFilesTask = formatFilesTask;
+//# sourceMappingURL=format-files-task.js.map

package/src/generators/ng-add/utilities/format-files-task.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"format-files-task.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/format-files-task.ts"],"names":[],"mappings":";;;AAEA,8DAAuD;AAEvD,SAAgB,eAAe,CAAC,IAAU;IACxC,IACE,CAAC,IAAI;SACF,WAAW,EAAE;SACb,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,EACzE;QACA,OAAO;KACR;IAED,IAAI;QACF,IAAA,yBAAS,EAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;KAC3D;IAAC,WAAM,GAAE;AACZ,CAAC;AAZD,0CAYC"}

package/src/generators/ng-add/utilities/index.d.ts

@@ -0,0 +1,8 @@
+export * from './dependencies';
+export * from './format-files-task';
+export * from './logger';
+export * from './normalize-options';
+export * from './projects';
+export * from './types';
+export * from './validation-logging';
+export * from './workspace';

package/src/generators/ng-add/utilities/index.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./dependencies"), exports);
+tslib_1.__exportStar(require("./format-files-task"), exports);
+tslib_1.__exportStar(require("./logger"), exports);
+tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./projects"), exports);
+tslib_1.__exportStar(require("./types"), exports);
+tslib_1.__exportStar(require("./validation-logging"), exports);
+tslib_1.__exportStar(require("./workspace"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/ng-add/utilities/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,8DAAoC;AACpC,mDAAyB;AACzB,8DAAoC;AACpC,qDAA2B;AAC3B,kDAAwB;AACxB,+DAAqC;AACrC,sDAA4B"}

package/src/generators/ng-add/utilities/normalize-options.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from '@nrwl/devkit';
-import { GeneratorOptions } from '../schema';
-import { WorkspaceProjects } from './types';
+import type { Tree } from '@nrwl/devkit';
+import type { GeneratorOptions } from '../schema';
+import type { WorkspaceProjects } from './types';
 export declare function normalizeOptions(tree: Tree, options: GeneratorOptions, projects: WorkspaceProjects): GeneratorOptions;

package/src/generators/ng-add/utilities/normalize-options.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AAItB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyB,EACzB,QAA2B;IAE3B,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChC,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,mDAAmD;QACnD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC/B,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,cAAc,CACf,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;gBACjC,SAAS;aACV;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CACnD,CAAC;YACF,QAAQ,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;YACtC,IAAI,QAAQ,EAAE;gBACZ,MAAM;aACP;SACF;KACF;IAED,0DAA0D;IAC1D,QAAQ;QACN,QAAQ,IAAI,IAAA,6BAAoB,EAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC;IAExE,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AAnCD,4CAmCC"}
+{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/normalize-options.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AAItB,SAAgB,gBAAgB,CAC9B,IAAU,EACV,OAAyB,EACzB,QAA2B;IAE3B,IAAI,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAChC,IAAI,QAAQ,EAAE;QACZ,QAAQ,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC;KACrC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,mDAAmD;QACnD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE;YAC/B,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,cAAc,CACf,CAAC;YACF,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;gBACjC,SAAS;aACV;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iBAAQ,EACvB,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,cAAc,CAAC,CACnD,CAAC;YACF,QAAQ,GAAG,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;YACtC,IAAI,QAAQ,EAAE;gBACZ,MAAM;aACP;SACF;KACF;IAED,0DAA0D;IAC1D,QAAQ;QACN,QAAQ,IAAI,IAAA,6BAAoB,EAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC;IAExE,uCAAY,OAAO,KAAE,QAAQ,IAAG;AAClC,CAAC;AAnCD,4CAmCC"}

package/src/generators/ng-add/utilities/projects.d.ts

@@ -0,0 +1,4 @@
+import { Tree } from '@nrwl/devkit';
+import type { WorkspaceProjects } from './types';
+export declare function getAllProjects(tree: Tree): WorkspaceProjects;
+export declare function convertToNxProject(tree: Tree, projectName: string): void;

package/src/generators/ng-add/utilities/projects.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToNxProject = exports.getAllProjects = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const angular_json_1 = require("nx/src/adapter/angular-json");
+function getAllProjects(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    const result = {
+        apps: [],
+        libs: [],
+    };
+    for (const [name, project] of projects) {
+        const migrationProject = {
+            config: project,
+            name,
+        };
+        if (project.projectType === 'library') {
+            result.libs.push(migrationProject);
+        }
+        else {
+            result.apps.push(migrationProject);
+        }
+    }
+    return result;
+}
+exports.getAllProjects = getAllProjects;
+function convertToNxProject(tree, projectName) {
+    const angularJson = (0, devkit_1.readJson)(tree, 'angular.json');
+    const project = (0, angular_json_1.toNewFormat)(angularJson).projects[projectName];
+    project.name = projectName;
+    (0, devkit_1.addProjectConfiguration)(tree, projectName, project);
+    delete angularJson.projects[projectName];
+    (0, devkit_1.writeJson)(tree, 'angular.json', Object.assign(Object.assign({}, angularJson), { version: 1 }));
+}
+exports.convertToNxProject = convertToNxProject;
+//# sourceMappingURL=projects.js.map

package/src/generators/ng-add/utilities/projects.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projects.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/projects.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,8DAA0D;AAG1D,SAAgB,cAAc,CAAC,IAAU;IACvC,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACnC,MAAM,MAAM,GAAsB;QAChC,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,EAAE;KACT,CAAC;IAEF,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,QAAQ,EAAE;QACtC,MAAM,gBAAgB,GAAkC;YACtD,MAAM,EAAE,OAAO;YACf,IAAI;SACL,CAAC;QAEF,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpC;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,wCAqBC;AAED,SAAgB,kBAAkB,CAAC,IAAU,EAAE,WAAmB;IAChE,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAA,0BAAW,EAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/D,OAAO,CAAC,IAAI,GAAG,WAAW,CAAC;IAC3B,IAAA,gCAAuB,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACzC,IAAA,kBAAS,EAAC,IAAI,EAAE,cAAc,kCAAO,WAAW,KAAE,OAAO,EAAE,CAAC,IAAG,CAAC;AAClE,CAAC;AAPD,gDAOC"}

package/src/generators/ng-add/utilities/types.d.ts

@@ -1,17 +1,22 @@
-import { ProjectConfiguration } from '@nrwl/devkit';
-export declare type MigrationProjectConfiguration = {
+import type { ProjectConfiguration } from '@nrwl/devkit';
+export type MigrationProjectConfiguration = {
     config: ProjectConfiguration;
     name: string;
 };
-export declare type WorkspaceProjects = {
+export type WorkspaceProjects = {
     apps: MigrationProjectConfiguration[];
     libs: MigrationProjectConfiguration[];
 };
-export declare type WorkspaceCapabilities = {
-    karma: boolean;
-    eslint: boolean;
+export type ProjectMigrationInfo = {
+    name: string;
+    oldRoot: string;
+    oldSourceRoot: string;
+    newRoot: string;
+    newSourceRoot: string;
 };
-export declare type ValidationError = {
+export type WorkspaceRootFileType = 'karma' | 'eslint';
+export type WorkspaceRootFileTypesInfo = Record<WorkspaceRootFileType, boolean>;
+export type ValidationError = {
     message?: string;
     messageGroup?: {
         title: string;
@@ -19,8 +24,8 @@ export declare type ValidationError = {
     };
     hint?: string;
 };
-export declare type ValidationResult = ValidationError[] | null;
-export declare type Target = {
+export type ValidationResult = ValidationError[] | null;
+export type Target = {
     builders: string[];
     acceptMultipleDefinitions?: boolean;
 };

package/src/generators/ng-add/utilities/validation-logging.d.ts

@@ -1,2 +1,3 @@
-export declare const workspaceMigrationErrorHeading = "The workspace cannot be migrated because of the following issues:";
+import type { ValidationError } from './types';
 export declare function arrayToString(array: string[]): string;
+export declare function getProjectValidationResultMessage(validationResult: ValidationError[]): string;

package/src/generators/ng-add/utilities/validation-logging.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.arrayToString = exports.workspaceMigrationErrorHeading = void 0;
-exports.workspaceMigrationErrorHeading = 'The workspace cannot be migrated because of the following issues:';
+exports.getProjectValidationResultMessage = exports.arrayToString = void 0;
+const chalk = require("chalk");
 function arrayToString(array) {
     if (array.length === 0) {
         return '';
@@ -14,6 +14,25 @@ function arrayToString(array) {
     return `${rest.map(quote).join(', ')} and ${quote(last)}`;
 }
 exports.arrayToString = arrayToString;
+function getProjectValidationResultMessage(validationResult) {
+    return `${chalk.bold('Validation results')}:
+
+  ${validationResult
+        .map((error) => getValidationErrorText(error))
+        .join('\n\n  ')}`;
+}
+exports.getProjectValidationResultMessage = getProjectValidationResultMessage;
+function getValidationErrorText({ message, messageGroup, hint, }) {
+    let lines = message
+        ? [`- ${message}`, ...(hint ? [chalk.dim(chalk.italic(`  ${hint}`))] : [])]
+        : [
+            `- ${messageGroup.title}:`,
+            '  - Errors:',
+            ...messageGroup.messages.map((message) => `    - ${message}`),
+            ...(hint ? [chalk.dim(chalk.italic(`  - ${hint}`))] : []),
+        ];
+    return lines.join('\n  ');
+}
 function quote(str) {
     return `"${str}"`;
 }

package/src/generators/ng-add/utilities/validation-logging.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation-logging.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/validation-logging.ts"],"names":[],"mappings":";;;AAAa,QAAA,8BAA8B,GACzC,mEAAmE,CAAC;AAEtE,SAAgB,aAAa,CAAC,KAAe;IAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxB;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9C,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AAC5D,CAAC;AAZD,sCAYC;AAED,SAAS,KAAK,CAAC,GAAW;IACxB,OAAO,IAAI,GAAG,GAAG,CAAC;AACpB,CAAC"}
+{"version":3,"file":"validation-logging.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/validation-logging.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAG/B,SAAgB,aAAa,CAAC,KAAe;IAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxB;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9C,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;AAC5D,CAAC;AAZD,sCAYC;AAED,SAAgB,iCAAiC,CAC/C,gBAAmC;IAEnC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;;IAExC,gBAAgB;SACf,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;SAC7C,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;AACtB,CAAC;AARD,8EAQC;AAED,SAAS,sBAAsB,CAAC,EAC9B,OAAO,EACP,YAAY,EACZ,IAAI,GACY;IAChB,IAAI,KAAK,GAAG,OAAO;QACjB,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3E,CAAC,CAAC;YACE,KAAK,YAAY,CAAC,KAAK,GAAG;YAC1B,aAAa;YACb,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,OAAO,EAAE,CAAC;YAC7D,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,CAAC;IAEN,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,KAAK,CAAC,GAAW;IACxB,OAAO,IAAI,GAAG,GAAG,CAAC;AACpB,CAAC"}

package/src/generators/ng-add/utilities/workspace.d.ts

@@ -1,9 +1,9 @@
-import { Tree } from '@nrwl/devkit';
-import { GeneratorOptions } from '../schema';
-import { WorkspaceCapabilities, WorkspaceProjects } from './types';
+import type { Tree } from '@nrwl/devkit';
+import type { ProjectMigrator } from '../migrators';
+import type { GeneratorOptions } from '../schema';
+import type { WorkspaceRootFileTypesInfo } from './types';
 export declare function validateWorkspace(tree: Tree): void;
-export declare function createNxJson(tree: Tree, options: GeneratorOptions, setWorkspaceLayoutAsNewProjectRoot?: boolean): void;
-export declare function decorateAngularCli(tree: Tree): void;
+export declare function createNxJson(tree: Tree, options: GeneratorOptions, defaultProject: string | undefined): void;
 export declare function updateWorkspaceConfigDefaults(tree: Tree): void;
 export declare function updateRootTsConfig(tree: Tree): void;
 export declare function updatePackageJson(tree: Tree): void;
@@ -11,4 +11,7 @@ export declare function updateRootEsLintConfig(tree: Tree, existingEsLintConfig:
 export declare function cleanupEsLintPackages(tree: Tree): void;
 export declare function createWorkspaceFiles(tree: Tree): Promise<void>;
 export declare function createRootKarmaConfig(tree: Tree): void;
-export declare function getWorkspaceCapabilities(tree: Tree, projects: WorkspaceProjects): WorkspaceCapabilities;
+export declare function getWorkspaceRootFileTypesInfo(tree: Tree, migrators: ProjectMigrator[]): WorkspaceRootFileTypesInfo;
+export declare function updateVsCodeRecommendedExtensions(tree: Tree): void;
+export declare function deleteAngularJson(tree: Tree): void;
+export declare function deleteGitKeepFilesIfNotNeeded(tree: Tree): void;

package/src/generators/ng-add/utilities/workspace.js

@@ -1,19 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWorkspaceCapabilities = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.decorateAngularCli = exports.createNxJson = exports.validateWorkspace = void 0;
+exports.deleteGitKeepFilesIfNotNeeded = exports.deleteAngularJson = exports.updateVsCodeRecommendedExtensions = exports.getWorkspaceRootFileTypesInfo = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.createNxJson = exports.validateWorkspace = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
-const workspace_1 = require("@nrwl/workspace/src/generators/workspace/workspace");
-const default_base_1 = require("@nrwl/workspace/src/utilities/default-base");
-const prettier_1 = require("@nrwl/workspace/src/utilities/prettier");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
-const versions_1 = require("@nrwl/workspace/src/utils/versions");
-const fs_1 = require("fs");
-const package_json_1 = require("nx/src/utils/package-json");
-const path_1 = require("path");
+const js_1 = require("@nrwl/js");
+const default_base_1 = require("nx/src/utils/default-base");
+const versions_1 = require("@nrwl/js/src/utils/versions");
+const angular_json_1 = require("nx/src/adapter/angular-json");
 const versions_2 = require("../../../utils/versions");
-const validation_logging_1 = require("./validation-logging");
 function validateWorkspace(tree) {
     const errors = [];
     if (!tree.exists('package.json')) {
@@ -25,74 +20,99 @@ function validateWorkspace(tree) {
     if (!errors.length) {
         return;
     }
-    throw new Error(`${validation_logging_1.workspaceMigrationErrorHeading}
+    throw new Error(`The workspace cannot be migrated because of the following issues:
 
   - ${errors.join('\n  ')}`);
 }
 exports.validateWorkspace = validateWorkspace;
-function createNxJson(tree, options, setWorkspaceLayoutAsNewProjectRoot = false) {
+function createNxJson(tree, options, defaultProject) {
     var _a;
-    const { newProjectRoot = '' } = (0, devkit_1.readJson)(tree, 'angular.json');
     const { npmScope } = options;
+    const targets = getWorkspaceCommonTargets(tree);
     (0, devkit_1.writeJson)(tree, 'nx.json', Object.assign(Object.assign({}, (npmScope ? { npmScope } : {})), { affected: {
             defaultBase: (_a = options.defaultBase) !== null && _a !== void 0 ? _a : (0, default_base_1.deduceDefaultBase)(),
-        }, implicitDependencies: {
-            'package.json': {
-                dependencies: '*',
-                devDependencies: '*',
-            },
-            '.eslintrc.json': '*',
         }, tasksRunnerOptions: {
             default: {
                 runner: 'nx/tasks-runners/default',
                 options: {
-                    cacheableOperations: ['build', 'lint', 'test', 'e2e'],
+                    cacheableOperations: [
+                        'build',
+                        targets.test ? 'test' : undefined,
+                        targets.lint ? 'lint' : undefined,
+                        targets.e2e ? 'e2e' : undefined,
+                    ].filter(Boolean),
                 },
             },
+        }, namedInputs: {
+            sharedGlobals: [],
+            default: ['{projectRoot}/**/*', 'sharedGlobals'],
+            production: [
+                'default',
+                ...(targets.test
+                    ? [
+                        '!{projectRoot}/tsconfig.spec.json',
+                        '!{projectRoot}/**/*.spec.[jt]s',
+                        '!{projectRoot}/karma.conf.js',
+                    ]
+                    : []),
+                targets.lint ? '!{projectRoot}/.eslintrc.json' : undefined,
+            ].filter(Boolean),
         }, targetDefaults: {
-            build: { dependsOn: ['^build'] },
-        }, workspaceLayout: setWorkspaceLayoutAsNewProjectRoot
-            ? { appsDir: newProjectRoot, libsDir: newProjectRoot }
-            : undefined }));
+            build: {
+                dependsOn: ['^build'],
+                inputs: ['production', '^production'],
+            },
+            test: targets.test
+                ? {
+                    inputs: ['default', '^production', '{workspaceRoot}/karma.conf.js'],
+                }
+                : undefined,
+            lint: targets.lint
+                ? {
+                    inputs: ['default', '{workspaceRoot}/.eslintrc.json'],
+                }
+                : undefined,
+            e2e: targets.e2e
+                ? {
+                    inputs: ['default', '^production'],
+                }
+                : undefined,
+        }, defaultProject }));
 }
 exports.createNxJson = createNxJson;
-function decorateAngularCli(tree) {
-    const nrwlWorkspacePath = (0, package_json_1.readModulePackageJson)('@nrwl/workspace').path;
-    const decorateCli = (0, fs_1.readFileSync)((0, path_1.join)((0, path_1.dirname)(nrwlWorkspacePath), 'src/generators/utils/decorate-angular-cli.js__tmpl__'), 'utf-8');
-    tree.write('decorate-angular-cli.js', decorateCli);
-    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
-        if (json.scripts &&
-            json.scripts.postinstall &&
-            !json.scripts.postinstall.includes('decorate-angular-cli.js')) {
-            // if exists, add execution of this script
-            json.scripts.postinstall += ' && node ./decorate-angular-cli.js';
+function getWorkspaceCommonTargets(tree) {
+    var _a, _b, _c;
+    const targets = { e2e: false, lint: false, test: false };
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [, project] of projects) {
+        if (!targets.e2e && ((_a = project.targets) === null || _a === void 0 ? void 0 : _a.e2e)) {
+            targets.e2e = true;
         }
-        else {
-            if (!json.scripts)
-                json.scripts = {};
-            // if doesn't exist, set to execute this script
-            json.scripts.postinstall = 'node ./decorate-angular-cli.js';
+        if (!targets.lint && ((_b = project.targets) === null || _b === void 0 ? void 0 : _b.lint)) {
+            targets.lint = true;
         }
-        if (json.scripts.ng) {
-            json.scripts.ng = 'nx';
+        if (!targets.test && ((_c = project.targets) === null || _c === void 0 ? void 0 : _c.test)) {
+            targets.test = true;
         }
-        return json;
-    });
+        if (targets.e2e && targets.lint && targets.test) {
+            return targets;
+        }
+    }
+    return targets;
 }
-exports.decorateAngularCli = decorateAngularCli;
 function updateWorkspaceConfigDefaults(tree) {
-    const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(tree);
-    delete workspaceConfig.newProjectRoot;
-    if (workspaceConfig.cli) {
-        delete workspaceConfig.defaultCollection;
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    delete nxJson.newProjectRoot;
+    if (nxJson.cli) {
+        delete nxJson.defaultCollection;
     }
-    (0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfig);
+    (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 exports.updateWorkspaceConfigDefaults = updateWorkspaceConfigDefaults;
 function updateRootTsConfig(tree) {
     var _a, _b;
     var _c;
-    const tsconfig = (0, devkit_1.readJson)(tree, (0, typescript_1.getRootTsConfigPathInTree)(tree));
+    const tsconfig = (0, devkit_1.readJson)(tree, (0, js_1.getRootTsConfigPathInTree)(tree));
     (_a = (_c = tsconfig.compilerOptions).paths) !== null && _a !== void 0 ? _a : (_c.paths = {});
     tsconfig.compilerOptions.baseUrl = '.';
     tsconfig.compilerOptions.rootDir = '.';
@@ -199,11 +219,11 @@ exports.cleanupEsLintPackages = cleanupEsLintPackages;
 function createWorkspaceFiles(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         updateVsCodeRecommendedExtensions(tree);
-        yield updatePrettierConfig(tree);
+        yield (0, js_1.initGenerator)(tree, {});
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/root'), '.', {
             tmpl: '',
             dot: '.',
-            rootTsConfigPath: (0, typescript_1.getRootTsConfigPathInTree)(tree),
+            rootTsConfigPath: (0, js_1.getRootTsConfigPathInTree)(tree),
         });
     });
 }
@@ -214,36 +234,33 @@ function createRootKarmaConfig(tree) {
     });
 }
 exports.createRootKarmaConfig = createRootKarmaConfig;
-function getWorkspaceCapabilities(tree, projects) {
-    var _a, _b;
-    const capabilities = { eslint: false, karma: false };
+function getWorkspaceRootFileTypesInfo(tree, migrators) {
+    const workspaceRootFileTypesInfo = {
+        eslint: false,
+        karma: false,
+    };
     if (tree.exists('.eslintrc.json')) {
-        capabilities.eslint = true;
+        workspaceRootFileTypesInfo.eslint = true;
     }
     if (tree.exists('karma.conf.js')) {
-        capabilities.karma = true;
+        workspaceRootFileTypesInfo.karma = true;
     }
-    if (capabilities.eslint && capabilities.karma) {
-        return capabilities;
+    if (workspaceRootFileTypesInfo.eslint && workspaceRootFileTypesInfo.karma) {
+        return workspaceRootFileTypesInfo;
     }
-    for (const project of [...projects.apps, ...projects.libs]) {
-        if (!capabilities.eslint &&
-            (((_a = project.config.targets) === null || _a === void 0 ? void 0 : _a.lint) ||
-                tree.exists(`${project.config.root}/.eslintrc.json`))) {
-            capabilities.eslint = true;
-        }
-        if (!capabilities.karma &&
-            (((_b = project.config.targets) === null || _b === void 0 ? void 0 : _b.test) ||
-                tree.exists(`${project.config.root}/karma.conf.js`))) {
-            capabilities.karma = true;
-        }
-        if (capabilities.eslint && capabilities.karma) {
-            return capabilities;
+    for (const migrator of migrators) {
+        const projectInfo = migrator.getWorkspaceRootFileTypesInfo();
+        workspaceRootFileTypesInfo.eslint =
+            workspaceRootFileTypesInfo.eslint || projectInfo.eslint;
+        workspaceRootFileTypesInfo.karma =
+            workspaceRootFileTypesInfo.karma || projectInfo.karma;
+        if (workspaceRootFileTypesInfo.eslint && workspaceRootFileTypesInfo.karma) {
+            return workspaceRootFileTypesInfo;
         }
     }
-    return capabilities;
+    return workspaceRootFileTypesInfo;
 }
-exports.getWorkspaceCapabilities = getWorkspaceCapabilities;
+exports.getWorkspaceRootFileTypesInfo = getWorkspaceRootFileTypesInfo;
 function updateVsCodeRecommendedExtensions(tree) {
     const recommendations = [
         'nrwl.angular-console',
@@ -268,15 +285,21 @@ function updateVsCodeRecommendedExtensions(tree) {
         });
     }
 }
-function updatePrettierConfig(tree) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const existingPrettierConfig = yield (0, prettier_1.resolveUserExistingPrettierConfig)();
-        if (!existingPrettierConfig) {
-            (0, devkit_1.writeJson)(tree, '.prettierrc', workspace_1.DEFAULT_NRWL_PRETTIER_CONFIG);
-        }
-        if (!tree.exists('.prettierignore')) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/prettier'), '.', { tmpl: '', dot: '.' });
-        }
-    });
+exports.updateVsCodeRecommendedExtensions = updateVsCodeRecommendedExtensions;
+function deleteAngularJson(tree) {
+    const projects = (0, angular_json_1.toNewFormat)((0, devkit_1.readJson)(tree, 'angular.json')).projects;
+    if (!Object.keys(projects).length) {
+        tree.delete('angular.json');
+    }
+}
+exports.deleteAngularJson = deleteAngularJson;
+function deleteGitKeepFilesIfNotNeeded(tree) {
+    if (tree.children('apps').length > 1 && tree.exists('apps/.gitkeep')) {
+        tree.delete('apps/.gitkeep');
+    }
+    if (tree.children('libs').length > 1 && tree.exists('libs/.gitkeep')) {
+        tree.delete('libs/.gitkeep');
+    }
 }
+exports.deleteGitKeepFilesIfNotNeeded = deleteGitKeepFilesIfNotNeeded;
 //# sourceMappingURL=workspace.js.map