npm - @nrwl/angular - Versions diffs - 15.0.1-beta.3 → 15.0.2 - Mend

@nrwl/angular 15.0.1-beta.3 → 15.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (54) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-## [15.0.1-beta.3](https://github.com/nrwl/nx/compare/15.0.0...15.0.1-beta.3) (2022-10-21)
+## [15.0.2](https://github.com/nrwl/nx/compare/15.0.1...15.0.2) (2022-10-24)
 **Note:** Version bump only for package @nrwl/angular

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.0.1-beta.3",
+  "version": "15.0.2",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -67,13 +67,13 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~14.2.0",
-    "@nrwl/cypress": "15.0.1-beta.3",
-    "@nrwl/devkit": "15.0.1-beta.3",
-    "@nrwl/jest": "15.0.1-beta.3",
-    "@nrwl/linter": "15.0.1-beta.3",
-    "@nrwl/storybook": "15.0.1-beta.3",
-    "@nrwl/webpack": "15.0.1-beta.3",
-    "@nrwl/workspace": "15.0.1-beta.3",
+    "@nrwl/cypress": "15.0.2",
+    "@nrwl/devkit": "15.0.2",
+    "@nrwl/jest": "15.0.2",
+    "@nrwl/linter": "15.0.2",
+    "@nrwl/storybook": "15.0.2",
+    "@nrwl/webpack": "15.0.2",
+    "@nrwl/workspace": "15.0.2",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@schematics/angular": "~14.2.0",
     "chalk": "4.1.0",
@@ -99,5 +99,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "507f890b6b8188e4db1f4e49545e1758a6577d80"
+  "gitHead": "6d95f0d8f6eef34984b8545d991aaeda41535f94"
 }

package/src/generators/ng-add/migrate-from-angular-cli.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import { Tree } from '@nrwl/devkit';
+import type { Tree } from '@nrwl/devkit';
 import type { GeneratorOptions } from './schema';
 export declare function migrateFromAngularCli(tree: Tree, rawOptions: GeneratorOptions): Promise<() => void>;

package/src/generators/ng-add/migrate-from-angular-cli.js CHANGED Viewed

@@ -4,34 +4,30 @@ exports.migrateFromAngularCli = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const versions_1 = require("../../utils/versions");
-const app_migrator_1 = require("./utilities/app.migrator");
-const get_all_projects_1 = require("./utilities/get-all-projects");
-const lib_migrator_1 = require("./utilities/lib.migrator");
-const normalize_options_1 = require("./utilities/normalize-options");
-const validate_projects_1 = require("./utilities/validate-projects");
-const workspace_1 = require("./utilities/workspace");
+const migrators_1 = require("./migrators");
+const utilities_1 = require("./utilities");
 function migrateFromAngularCli(tree, rawOptions) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, workspace_1.validateWorkspace)(tree);
-        const projects = (0, get_all_projects_1.getAllProjects)(tree);
-        const options = (0, normalize_options_1.normalizeOptions)(tree, rawOptions, projects);
+        (0, utilities_1.validateWorkspace)(tree);
+        const projects = (0, utilities_1.getAllProjects)(tree);
+        const options = (0, utilities_1.normalizeOptions)(tree, rawOptions, projects);
         const defaultProject = projects.apps.find((app) => app.config.root === '');
         if (options.preserveAngularCliLayout) {
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
                 nx: versions_1.nxVersion,
                 '@nrwl/workspace': versions_1.nxVersion,
             });
-            (0, workspace_1.createNxJson)(tree, options, true);
-            (0, workspace_1.decorateAngularCli)(tree);
+            (0, utilities_1.createNxJson)(tree, options, true);
+            (0, utilities_1.decorateAngularCli)(tree);
         }
         else {
             const migrators = [
-                ...projects.apps.map((app) => new app_migrator_1.AppMigrator(tree, options, app)),
-                ...projects.libs.map((lib) => new lib_migrator_1.LibMigrator(tree, options, lib)),
+                ...projects.apps.map((app) => new migrators_1.AppMigrator(tree, options, app)),
+                ...projects.libs.map((lib) => new migrators_1.LibMigrator(tree, options, lib)),
             ];
             // validate all projects
-            (0, validate_projects_1.validateProjects)(migrators);
-            const workspaceCapabilities = (0, workspace_1.getWorkspaceCapabilities)(tree, projects);
+            (0, utilities_1.validateProjects)(migrators);
+            const workspaceCapabilities = (0, utilities_1.getWorkspaceCapabilities)(tree, projects);
             /**
              * Keep a copy of the root eslint config to restore it later. We need to
              * do this because the root config can also be the config for the app at
@@ -43,12 +39,12 @@ function migrateFromAngularCli(tree, rawOptions) {
                 : undefined;
             // create and update root files and configurations
             (0, devkit_1.updateJson)(tree, 'angular.json', (json) => (Object.assign(Object.assign({}, json), { version: 2, $schema: undefined })));
-            (0, workspace_1.createNxJson)(tree, options);
-            (0, workspace_1.updateWorkspaceConfigDefaults)(tree);
-            (0, workspace_1.updateRootTsConfig)(tree);
-            (0, workspace_1.updatePackageJson)(tree);
-            (0, workspace_1.decorateAngularCli)(tree);
-            yield (0, workspace_1.createWorkspaceFiles)(tree);
+            (0, utilities_1.createNxJson)(tree, options);
+            (0, utilities_1.updateWorkspaceConfigDefaults)(tree);
+            (0, utilities_1.updateRootTsConfig)(tree);
+            (0, utilities_1.updatePackageJson)(tree);
+            (0, utilities_1.decorateAngularCli)(tree);
+            yield (0, utilities_1.createWorkspaceFiles)(tree);
             // migrate all projects
             for (const migrator of migrators) {
                 yield migrator.migrate();
@@ -59,11 +55,11 @@ function migrateFromAngularCli(tree, rawOptions) {
              * those root config files are moved when the projects are migrated.
              */
             if (workspaceCapabilities.karma) {
-                (0, workspace_1.createRootKarmaConfig)(tree);
+                (0, utilities_1.createRootKarmaConfig)(tree);
             }
             if (workspaceCapabilities.eslint) {
-                (0, workspace_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
-                (0, workspace_1.cleanupEsLintPackages)(tree);
+                (0, utilities_1.updateRootEsLintConfig)(tree, eslintConfig, options.unitTestRunner);
+                (0, utilities_1.cleanupEsLintPackages)(tree);
             }
             yield (0, devkit_1.formatFiles)(tree);
         }

package/src/generators/ng-add/migrate-from-angular-cli.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;~~AAAA~~,~~yCASsB~~;AACtB,mDAAiD;AAEjD,~~2DAAuD~~;~~AACvD~~,~~mEAA8D~~;~~AAC9D~~,~~2DAAuD;AACvD,qEAAiE;AAEjE,qEAAiE;AACjE,qDAY+B;AAE/B,~~SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAA,~~iCAAc~~,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,~~oCAAgB~~,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;QAE3E,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;aAC7B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,~~0BAAW~~,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,~~0BAAW~~,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;aACnE,CAAC;YAEF,wBAAwB;YACxB,IAAA,~~oCAAgB~~,EAAC,SAAS,CAAC,CAAC;YAE5B,MAAM,qBAAqB,GAAG,IAAA,oCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEvE;;;;;eAKG;YACH,IAAI,YAAY,GACd,qBAAqB,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAC3D,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEhB,kDAAkD;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED;;;;eAIG;YACH,IAAI,qBAAqB,CAAC,KAAK,EAAE;gBAC/B,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YACD,IAAI,qBAAqB,CAAC,MAAM,EAAE;gBAChC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;gBACnE,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,IAAI,cAAc,EAAE;YAClB,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;YACzD,IAAA,qCAA4B,EAAC,IAAI,kCAC5B,eAAe,KAClB,cAAc,EAAE,cAAc,CAAC,IAAI,IACnC,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AA1FD,sDA0FC"}
1	+ {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import type { Logger, ProjectMigrationInfo, ValidationResult } from '../../utilities';
+import { BuilderMigrator } from './builder.migrator';
+export declare class AngularDevkitNgPackagrMigrator extends BuilderMigrator {
+    constructor(tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
+    migrate(): void;
+    validate(): ValidationResult;
+    private updateTargetConfiguration;
+    private updateNgPackageJson;
+    private updateTsConfigs;
+}

package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js ADDED Viewed

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AngularDevkitNgPackagrMigrator = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const path_1 = require("path");
+const dependencies_1 = require("../../../utils/dependencies");
+const utilities_1 = require("../../utilities");
+const builder_migrator_1 = require("./builder.migrator");
+class AngularDevkitNgPackagrMigrator extends builder_migrator_1.BuilderMigrator {
+    constructor(tree, project, projectConfig, logger) {
+        super(tree, '@angular-devkit/build-angular:ng-packagr', project, projectConfig, logger);
+    }
+    migrate() {
+        if (!this.targets.size) {
+            this.logger.warn(`There is no target in the project configuration using the ${this.builderName} builder. This might not be an issue. ` +
+                `Skipping updating the build configuration.`);
+            return;
+        }
+        for (const [name, target] of this.targets) {
+            this.updateTargetConfiguration(name, target);
+            this.updateNgPackageJson(name, target);
+            this.updateTsConfigs(name, target);
+            this.updateCacheableOperations([name]);
+            (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(this.tree);
+        }
+    }
+    validate() {
+        const errors = [];
+        // TODO(leo): keeping restriction until the full refactor is done and we start
+        // expanding what's supported.
+        if (this.targets.size > 1) {
+            errors.push({
+                message: `There is more than one target using a builder that is used to build the project (${(0, utilities_1.arrayToString)([...this.targets.keys()])}).`,
+                hint: `Make sure the project only has one target with a builder that is used to build the project.`,
+            });
+        }
+        return errors.length ? errors : null;
+    }
+    updateTargetConfiguration(targetName, target) {
+        target.executor = '@nrwl/angular:package';
+        if (!target.options &&
+            (!target.configurations || !Object.keys(target.configurations).length)) {
+            this.logger.warn(`The target "${targetName}" is not specifying any options or configurations. Skipping updating the target configuration.`);
+            return;
+        }
+        ['project', 'tsConfig'].forEach((option) => {
+            var _a, _b;
+            if ((_a = target.options) === null || _a === void 0 ? void 0 : _a[option]) {
+                target.options[option] = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(target.options[option]));
+            }
+            for (const configuration of Object.values((_b = target.configurations) !== null && _b !== void 0 ? _b : {})) {
+                configuration[option] =
+                    configuration[option] &&
+                        (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configuration[option]));
+            }
+        });
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+    }
+    updateNgPackageJson(targetName, target) {
+        var _a;
+        if (!((_a = target.options) === null || _a === void 0 ? void 0 : _a.project)) {
+            this.logger.warn(`The "${targetName}" target does not have the "project" option configured. Skipping updating the ng-packagr project file ("ng-package.json").`);
+            return;
+        }
+        else if (!this.tree.exists(target.options.project)) {
+            this.logger.warn(`The ng-packagr project file "${this.originalProjectConfig.targets[targetName].options.project}" specified in the "${targetName}" ` +
+                `target could not be found. Skipping updating the ng-packagr project file.`);
+            return;
+        }
+        (0, devkit_1.updateJson)(this.tree, target.options.project, (ngPackageJson) => {
+            const offset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
+            ngPackageJson.$schema =
+                ngPackageJson.$schema &&
+                    `${offset}node_modules/ng-packagr/ng-package.schema.json`;
+            ngPackageJson.dest = `${offset}dist/${this.project.name}`;
+            return ngPackageJson;
+        });
+    }
+    updateTsConfigs(targetName, target) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        const tsConfigPath = (_b = (_a = target.options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = target.configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
+        if (!tsConfigPath) {
+            this.logger.warn(`The "${targetName}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
+            return;
+        }
+        else if (!this.tree.exists(tsConfigPath)) {
+            const originalTsConfigPath = ((_e = target.options) === null || _e === void 0 ? void 0 : _e.tsConfig)
+                ? this.originalProjectConfig.targets[targetName].options.tsConfig
+                : (_g = (_f = this.originalProjectConfig.targets[targetName].configurations) === null || _f === void 0 ? void 0 : _f.development) === null || _g === void 0 ? void 0 : _g.tsConfig;
+            this.logger.warn(`The tsConfig file "${originalTsConfigPath}" specified in the "${targetName}" target could not be found. Skipping updating the tsConfig file.`);
+            return;
+        }
+        const rootTsConfigFile = (0, typescript_1.getRootTsConfigPathInTree)(this.tree);
+        const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(this.projectConfig.root);
+        this.updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot);
+        (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
+            var _a, _b;
+            if (!((_a = json.include) === null || _a === void 0 ? void 0 : _a.length) && !((_b = json.files) === null || _b === void 0 ? void 0 : _b.length)) {
+                json.include = ['**/*.ts'];
+            }
+            return json;
+        });
+    }
+}
+exports.AngularDevkitNgPackagrMigrator = AngularDevkitNgPackagrMigrator;
+//# sourceMappingURL=angular-devkit-ng-packagr.migrator.js.map

package/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"angular-devkit-ng-packagr.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-devkit-ng-packagr.migrator.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/migrators/builders/builder-migrator-class.type.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import type { Logger, ProjectMigrationInfo } from '../../utilities';
+import type { BuilderMigrator } from './builder.migrator';
+export declare type BuilderMigratorClassType = {
+    new (tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger): BuilderMigrator;
+};

package/src/generators/ng-add/migrators/builders/builder-migrator-class.type.js ADDED Viewed

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=builder-migrator-class.type.js.map

package/src/generators/ng-add/migrators/builders/builder-migrator-class.type.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"builder-migrator-class.type.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/builder-migrator-class.type.ts"],"names":[],"mappings":""}

package/src/generators/ng-add/migrators/builders/builder.migrator.d.ts ADDED Viewed

@@ -0,0 +1,9 @@
+import type { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
+import type { Logger, ProjectMigrationInfo } from '../../utilities';
+import { Migrator } from '../migrator';
+export declare abstract class BuilderMigrator extends Migrator {
+    readonly builderName: string;
+    protected targets: Map<string, TargetConfiguration>;
+    constructor(tree: Tree, builderName: string, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
+    protected collectBuilderTargets(): void;
+}

package/src/generators/ng-add/migrators/builders/builder.migrator.js ADDED Viewed

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BuilderMigrator = void 0;
+const migrator_1 = require("../migrator");
+class BuilderMigrator extends migrator_1.Migrator {
+    constructor(tree, builderName, project, projectConfig, logger) {
+        super(tree, projectConfig, logger);
+        this.builderName = builderName;
+        this.targets = new Map();
+        this.project = project;
+        this.projectConfig = projectConfig;
+        this.collectBuilderTargets();
+    }
+    collectBuilderTargets() {
+        var _a;
+        for (const [name, target] of Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {})) {
+            if (target.executor === this.builderName) {
+                this.targets.set(name, target);
+            }
+        }
+    }
+}
+exports.BuilderMigrator = BuilderMigrator;
+//# sourceMappingURL=builder.migrator.js.map

package/src/generators/ng-add/migrators/builders/builder.migrator.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"builder.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/builder.migrator.ts"],"names":[],"mappings":";;;AAMA,0CAAuC;AAEvC,MAAsB,eAAgB,SAAQ,mBAAQ;IAGpD,YACE,IAAU,EACM,WAAmB,EACnC,OAA6B,EAC7B,aAAmC,EACnC,MAAc;QAEd,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QALnB,gBAAW,GAAX,WAAW,CAAQ;QAJ3B,YAAO,GAAqC,IAAI,GAAG,EAAE,CAAC;QAW9D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAES,qBAAqB;;QAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CACzC,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,mCAAI,EAAE,CACjC,EAAE;YACD,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,WAAW,EAAE;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAChC;SACF;IACH,CAAC;CACF;AA3BD,0CA2BC"}

package/src/generators/ng-add/migrators/builders/index.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export * from './angular-devkit-ng-packagr.migrator';
+export * from './builder-migrator-class.type';
+export * from './builder.migrator';

package/src/generators/ng-add/migrators/builders/index.js ADDED Viewed

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./angular-devkit-ng-packagr.migrator"), exports);
+tslib_1.__exportStar(require("./builder-migrator-class.type"), exports);
+tslib_1.__exportStar(require("./builder.migrator"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/ng-add/migrators/builders/index.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/index.ts"],"names":[],"mappings":";;;AAAA,+EAAqD;AACrD,wEAA8C;AAC9C,6DAAmC"}

package/src/generators/ng-add/migrators/index.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export * from './builders';
2	+ export * from './projects';

package/src/generators/ng-add/migrators/index.js ADDED Viewed

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./builders"), exports);
+tslib_1.__exportStar(require("./projects"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/ng-add/migrators/index.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/migrators/index.ts"],"names":[],"mappings":";;;AAAA,qDAA2B;AAC3B,qDAA2B"}

package/src/generators/ng-add/migrators/migrator.d.ts ADDED Viewed

@@ -0,0 +1,15 @@
+import type { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import type { Logger } from '../utilities/logger';
+import type { ProjectMigrationInfo, ValidationResult } from '../utilities/types';
+export declare abstract class Migrator {
+    protected readonly tree: Tree;
+    protected projectConfig: ProjectConfiguration;
+    protected readonly logger: Logger;
+    protected project: ProjectMigrationInfo;
+    protected readonly originalProjectConfig: ProjectConfiguration;
+    constructor(tree: Tree, projectConfig: ProjectConfiguration, logger: Logger);
+    abstract migrate(): Promise<void> | void;
+    abstract validate(): ValidationResult;
+    protected updateCacheableOperations(targetNames: string[]): void;
+    protected updateTsConfigFile(tsConfigPath: string, rootTsConfigFile: string, projectOffsetFromRoot: string): void;
+}

package/src/generators/ng-add/migrators/migrator.js ADDED Viewed

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Migrator = void 0;
+const devkit_1 = require("@nrwl/devkit");
+class Migrator {
+    constructor(tree, projectConfig, logger) {
+        this.tree = tree;
+        this.projectConfig = projectConfig;
+        this.logger = logger;
+        this.originalProjectConfig = Object.freeze(JSON.parse(JSON.stringify(this.projectConfig)));
+    }
+    // TODO(leo): This should be moved to BuilderMigrator once everything is split into builder migrators.
+    updateCacheableOperations(targetNames) {
+        var _a;
+        if (!targetNames.length) {
+            return;
+        }
+        const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(this.tree);
+        Object.keys((_a = workspaceConfig.tasksRunnerOptions) !== null && _a !== void 0 ? _a : {}).forEach((taskRunnerName) => {
+            var _a;
+            const taskRunner = workspaceConfig.tasksRunnerOptions[taskRunnerName];
+            taskRunner.options.cacheableOperations = Array.from(new Set([
+                ...((_a = taskRunner.options.cacheableOperations) !== null && _a !== void 0 ? _a : []),
+                ...targetNames,
+            ]));
+        });
+        (0, devkit_1.updateWorkspaceConfiguration)(this.tree, workspaceConfig);
+    }
+    // TODO(leo): This should be moved to BuilderMigrator once everything is split into builder migrators.
+    updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot) {
+        (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
+            var _a;
+            json.extends = `${projectOffsetFromRoot}${rootTsConfigFile}`;
+            json.compilerOptions = (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {};
+            json.compilerOptions.outDir = `${projectOffsetFromRoot}dist/out-tsc`;
+            return json;
+        });
+    }
+}
+exports.Migrator = Migrator;
+//# sourceMappingURL=migrator.js.map

package/src/generators/ng-add/migrators/migrator.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/migrators/migrator.ts"],"names":[],"mappings":";;;AACA,yCAIsB;AAOtB,MAAsB,QAAQ;IAI5B,YACqB,IAAU,EACnB,aAAmC,EAC1B,MAAc;QAFd,SAAI,GAAJ,IAAI,CAAM;QACnB,kBAAa,GAAb,aAAa,CAAsB;QAC1B,WAAM,GAAN,MAAM,CAAQ;QAEjC,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,MAAM,CACxC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAC/C,CAAC;IACJ,CAAC;IAKD,sGAAsG;IAC5F,yBAAyB,CAAC,WAAqB;;QACvD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;YACvB,OAAO;SACR;QAED,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE9D,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,CAAC,kBAAkB,mCAAI,EAAE,CAAC,CAAC,OAAO,CAC3D,CAAC,cAAc,EAAE,EAAE;;YACjB,MAAM,UAAU,GAAG,eAAe,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;YACtE,UAAU,CAAC,OAAO,CAAC,mBAAmB,GAAG,KAAK,CAAC,IAAI,CACjD,IAAI,GAAG,CAAC;gBACN,GAAG,CAAC,MAAA,UAAU,CAAC,OAAO,CAAC,mBAAmB,mCAAI,EAAE,CAAC;gBACjD,GAAG,WAAW;aACf,CAAC,CACH,CAAC;QACJ,CAAC,CACF,CAAC;QAEF,IAAA,qCAA4B,EAAC,IAAI,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IAC3D,CAAC;IAED,sGAAsG;IAC5F,kBAAkB,CAC1B,YAAoB,EACpB,gBAAwB,EACxB,qBAA6B;QAE7B,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;;YAC3C,IAAI,CAAC,OAAO,GAAG,GAAG,qBAAqB,GAAG,gBAAgB,EAAE,CAAC;YAC7D,IAAI,CAAC,eAAe,GAAG,MAAA,IAAI,CAAC,eAAe,mCAAI,EAAE,CAAC;YAClD,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,GAAG,qBAAqB,cAAc,CAAC;YACrE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AArDD,4BAqDC"}

package/src/generators/ng-add/{utilities → migrators/projects}/app.migrator.d.ts RENAMED Viewed

@@ -1,8 +1,7 @@
-import { Tree } from '@nrwl/devkit';
-import { GeneratorOptions } from '../schema';
-import { Logger } from './logger';
+import type { Tree } from '@nrwl/devkit';
+import type { GeneratorOptions } from '../../schema';
+import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
 import { ProjectMigrator } from './project.migrator';
-import { MigrationProjectConfiguration, ValidationResult } from './types';
 declare type SupportedTargets = 'build' | 'e2e' | 'i18n' | 'lint' | 'prerender' | 'serve' | 'server' | 'serveSsr' | 'test';
 export declare class AppMigrator extends ProjectMigrator<SupportedTargets> {
     private e2eMigrator;

package/src/generators/ng-add/{utilities → migrators/projects}/app.migrator.js RENAMED Viewed

File without changes

package/src/generators/ng-add/migrators/projects/app.migrator.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/{utilities → migrators/projects}/e2e.migrator.d.ts RENAMED Viewed

@@ -1,8 +1,7 @@
-import { Tree } from '@nrwl/devkit';
-import { GeneratorOptions } from '../schema';
-import { Logger } from './logger';
+import type { Tree } from '@nrwl/devkit';
+import type { GeneratorOptions } from '../../schema';
+import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
 import { ProjectMigrator } from './project.migrator';
-import { MigrationProjectConfiguration, ValidationResult } from './types';
 declare type SupportedTargets = 'e2e';
 export declare class E2eMigrator extends ProjectMigrator<SupportedTargets> {
     private lintTargetName;

package/src/generators/ng-add/{utilities → migrators/projects}/e2e.migrator.js RENAMED Viewed

@@ -12,7 +12,7 @@ const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const path_1 = require("path");
 const typescript_2 = require("typescript");
-const file_change_recorder_1 = require("./file-change-recorder");
+const utilities_1 = require("../../utilities");
 const project_migrator_1 = require("./project.migrator");
 const supportedTargets = {
     e2e: {
@@ -343,7 +343,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         this.cypressPreset = (0, cypress_preset_1.nxE2EPreset)(configFilePath);
         const fileContent = this.tree.read(configFilePath, 'utf-8');
         let sourceFile = tsquery_1.tsquery.ast(fileContent);
-        const recorder = new file_change_recorder_1.FileChangeRecorder(this.tree, configFilePath);
+        const recorder = new utilities_1.FileChangeRecorder(this.tree, configFilePath);
         const defineConfigExpression = tsquery_1.tsquery.query(sourceFile, 'CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression')[0];
         if (!defineConfigExpression) {
             this.logger.warn(`Could not find a "defineConfig" expression in "${configFilePath}". Skipping updating the Cypress configuration.`);

package/src/generators/ng-add/migrators/projects/e2e.migrator.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"e2e.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/e2e.migrator.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/migrators/projects/index.d.ts ADDED Viewed

@@ -0,0 +1,4 @@
+export * from './app.migrator';
+export * from './e2e.migrator';
+export * from './lib.migrator';
+export * from './project.migrator';

package/src/generators/ng-add/migrators/projects/index.js ADDED Viewed

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./app.migrator"), exports);
+tslib_1.__exportStar(require("./e2e.migrator"), exports);
+tslib_1.__exportStar(require("./lib.migrator"), exports);
+tslib_1.__exportStar(require("./project.migrator"), exports);
+//# sourceMappingURL=index.js.map

package/src/generators/ng-add/migrators/projects/index.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,yDAA+B;AAC/B,yDAA+B;AAC/B,6DAAmC"}