@nx/workspace 22.7.0-beta.4 → 22.7.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "22.7.0-beta.4",
+  "version": "22.7.0-beta.5",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -38,7 +38,7 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-beta.4",
+    "@nx/devkit": "22.7.0-beta.5",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
@@ -46,10 +46,10 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "22.7.0-beta.4"
+    "nx": "22.7.0-beta.5"
   },
   "devDependencies": {
-    "nx": "22.7.0-beta.4"
+    "nx": "22.7.0-beta.5"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/move/lib/update-owners-and-conformance.d.ts

@@ -0,0 +1,4 @@
+import { Tree } from '@nx/devkit';
+import { NormalizedSchema } from '../schema';
+export declare function updateOwnersAndConformance(tree: Tree, schema: NormalizedSchema): void;
+//# sourceMappingURL=update-owners-and-conformance.d.ts.map

package/src/generators/move/lib/update-owners-and-conformance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-owners-and-conformance.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-owners-and-conformance.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,IAAI,EAEL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gBAAgB,QA4BzB"}

package/src/generators/move/lib/update-owners-and-conformance.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateOwnersAndConformance = updateOwnersAndConformance;
+const devkit_1 = require("@nx/devkit");
+function updateOwnersAndConformance(tree, schema) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let changed = false;
+    if (renameProjectInConformanceRules(nxJson, schema.projectName, schema.newProjectName)) {
+        changed = true;
+    }
+    if (renameProjectInOwnersPatterns(nxJson, schema.projectName, schema.newProjectName)) {
+        changed = true;
+    }
+    if (changed) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+}
+function renameProjectInConformanceRules(nxJson, oldName, newName) {
+    const conformance = nxJson['conformance'];
+    if (!conformance?.rules) {
+        return false;
+    }
+    let changed = false;
+    for (const rule of conformance.rules) {
+        if (!rule.projects) {
+            continue;
+        }
+        for (let i = 0; i < rule.projects.length; i++) {
+            const entry = rule.projects[i];
+            if (typeof entry === 'string' && entry === oldName) {
+                rule.projects[i] = newName;
+                changed = true;
+            }
+            else if (typeof entry === 'object' && entry.matcher === oldName) {
+                entry.matcher = newName;
+                changed = true;
+            }
+        }
+    }
+    return changed;
+}
+function renameProjectInOwnersPatterns(nxJson, oldName, newName) {
+    const owners = nxJson['owners'];
+    if (typeof owners !== 'object' || !owners) {
+        return false;
+    }
+    let changed = false;
+    if (owners.patterns) {
+        if (renameInPatternsList(owners.patterns, oldName, newName)) {
+            changed = true;
+        }
+    }
+    if (owners.sections) {
+        for (const section of owners.sections) {
+            if (section.patterns) {
+                if (renameInPatternsList(section.patterns, oldName, newName)) {
+                    changed = true;
+                }
+            }
+        }
+    }
+    return changed;
+}
+function renameInPatternsList(patterns, oldName, newName) {
+    let changed = false;
+    for (const pattern of patterns) {
+        if (!pattern.projects) {
+            continue;
+        }
+        for (let i = 0; i < pattern.projects.length; i++) {
+            if (pattern.projects[i] === oldName) {
+                pattern.projects[i] = newName;
+                changed = true;
+            }
+        }
+    }
+    return changed;
+}

package/src/generators/move/move.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"move.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/move/move.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAwBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,8BA6DhE;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"move.d.ts","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/move/move.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAyBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,8BA8DhE;AAED,eAAe,aAAa,CAAC"}

package/src/generators/move/move.js

@@ -16,6 +16,7 @@ const update_default_project_1 = require("./lib/update-default-project");
 const update_eslint_config_1 = require("./lib/update-eslint-config");
 const update_implicit_dependencies_1 = require("./lib/update-implicit-dependencies");
 const update_imports_1 = require("./lib/update-imports");
+const update_owners_and_conformance_1 = require("./lib/update-owners-and-conformance");
 const update_jest_config_1 = require("./lib/update-jest-config");
 const update_package_json_1 = require("./lib/update-package-json");
 const update_project_root_files_1 = require("./lib/update-project-root-files");
@@ -46,6 +47,7 @@ async function moveGenerator(tree, rawSchema) {
     (0, update_build_targets_1.updateBuildTargets)(tree, schema);
     (0, update_default_project_1.updateDefaultProject)(tree, schema);
     (0, update_implicit_dependencies_1.updateImplicitDependencies)(tree, schema);
+    (0, update_owners_and_conformance_1.updateOwnersAndConformance)(tree, schema);
     if (projectConfig.root === '.') {
         // we want to migrate eslint config once the root project files are moved
         (0, extract_base_configs_1.maybeMigrateEslintConfigIfRootProject)(tree, projectConfig);

package/src/generators/remove/lib/remove-project-references-in-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remove-project-references-in-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-references-in-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAGL,IAAI,EAGL,MAAM,YAAY,CAAC;AAEpB,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAsBzE"}
+{"version":3,"file":"remove-project-references-in-config.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-references-in-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAIL,IAAI,EAGL,MAAM,YAAY,CAAC;AAEpB,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAsCzE"}

package/src/generators/remove/lib/remove-project-references-in-config.js

@@ -3,10 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeProjectReferencesInConfig = removeProjectReferencesInConfig;
 const devkit_1 = require("@nx/devkit");
 function removeProjectReferencesInConfig(tree, schema) {
-    // Unset default project if deleting the default project
     const nxJson = (0, devkit_1.readNxJson)(tree);
+    let nxJsonChanged = false;
+    // Unset default project if deleting the default project
     if (nxJson.defaultProject && nxJson.defaultProject === schema.projectName) {
         delete nxJson.defaultProject;
+        nxJsonChanged = true;
+    }
+    // Remove project from conformance rules
+    if (removeProjectFromConformanceRules(nxJson, schema.projectName)) {
+        nxJsonChanged = true;
+    }
+    // Remove project from owners patterns
+    if (removeProjectFromOwnersPatterns(nxJson, schema.projectName)) {
+        nxJsonChanged = true;
+    }
+    if (nxJsonChanged) {
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     // Remove implicit dependencies onto removed project
@@ -18,3 +30,77 @@ function removeProjectReferencesInConfig(tree, schema) {
         }
     });
 }
+function removeProjectFromConformanceRules(nxJson, projectName) {
+    const conformance = nxJson['conformance'];
+    if (!conformance?.rules) {
+        return false;
+    }
+    let changed = false;
+    // Iterate backwards so that splicing doesn't shift unvisited indices
+    for (let i = conformance.rules.length - 1; i >= 0; i--) {
+        const rule = conformance.rules[i];
+        if (!rule.projects) {
+            continue;
+        }
+        const originalLength = rule.projects.length;
+        rule.projects = rule.projects.filter((entry) => {
+            if (typeof entry === 'string') {
+                return entry !== projectName;
+            }
+            if (typeof entry === 'object' && entry.matcher) {
+                return entry.matcher !== projectName;
+            }
+            return true;
+        });
+        if (rule.projects.length !== originalLength) {
+            changed = true;
+            if (rule.projects.length === 0) {
+                conformance.rules.splice(i, 1);
+            }
+        }
+    }
+    return changed;
+}
+function removeProjectFromOwnersPatterns(nxJson, projectName) {
+    const owners = nxJson['owners'];
+    if (typeof owners !== 'object' || !owners) {
+        return false;
+    }
+    let changed = false;
+    // Filter top-level patterns
+    if (owners.patterns) {
+        if (filterOwnersPatternsList(owners.patterns, projectName)) {
+            changed = true;
+        }
+    }
+    // Filter section-level patterns (GitLab)
+    if (owners.sections) {
+        for (const section of owners.sections) {
+            if (section.patterns) {
+                if (filterOwnersPatternsList(section.patterns, projectName)) {
+                    changed = true;
+                }
+            }
+        }
+    }
+    return changed;
+}
+function filterOwnersPatternsList(patterns, projectName) {
+    let changed = false;
+    // Iterate backwards so that splicing doesn't shift unvisited indices
+    for (let i = patterns.length - 1; i >= 0; i--) {
+        const pattern = patterns[i];
+        if (!pattern.projects) {
+            continue;
+        }
+        const originalLength = pattern.projects.length;
+        pattern.projects = pattern.projects.filter((entry) => entry !== projectName);
+        if (pattern.projects.length !== originalLength) {
+            changed = true;
+            if (pattern.projects.length === 0) {
+                patterns.splice(i, 1);
+            }
+        }
+    }
+    return changed;
+}