@nx/workspace 22.7.0-pr.34971.73bed1f → 22.7.0-pr.35356.e1b62ce

package/assets.json

@@ -0,0 +1,36 @@
+{
+    "outDir": "dist/packages/workspace",
+    "assets": [
+        {
+            "glob": "**/files/**"
+        },
+        {
+            "glob": "**/files/**/.gitkeep"
+        },
+        {
+            "glob": "**/files-integrated-repo/**"
+        },
+        {
+            "glob": "**/files-integrated-repo/**/.gitkeep"
+        },
+        {
+            "glob": "**/files-package-based-repo/**"
+        },
+        {
+            "glob": "**/files-readme/**"
+        },
+        {
+            "glob": "**/files-root-app/**"
+        },
+        { "glob": "presets/*.json" },
+        { "glob": "package.json" },
+        { "glob": "executors.json" },
+        { "glob": "generators.json" },
+        { "glob": "migrations.json" },
+        { "glob": "src/**/schema.json" },
+        {
+            "glob": "src/**/schema.d.ts"
+        },
+        "LICENSE"
+    ]
+}

package/executors.json

@@ -1,11 +1,11 @@
 {
-  "executors": {
-    "counter": {
-      "implementation": "./src/executors/counter/counter.impl",
-      "batchImplementation": "./src/executors/counter/counter.impl#batchCounter",
-      "schema": "./src/executors/counter/schema.json",
-      "description": "A dummy executor useful for E2E tests.",
-      "hidden": true
+    "executors": {
+        "counter": {
+            "implementation": "./src/executors/counter/counter.impl",
+            "batchImplementation": "./src/executors/counter/counter.impl#batchCounter",
+            "schema": "./src/executors/counter/schema.json",
+            "description": "A dummy executor useful for E2E tests.",
+            "hidden": true
+        }
     }
-  }
 }

package/generators.json

@@ -1,64 +1,64 @@
 {
-  "name": "nx/workspace",
-  "version": "0.1",
-  "generators": {
-    "preset": {
-      "factory": "./src/generators/preset/preset#presetGenerator",
-      "schema": "./src/generators/preset/schema.json",
-      "description": "Create application in an empty workspace.",
-      "x-use-standalone-layout": true,
-      "hidden": true
-    },
-    "move": {
-      "factory": "./src/generators/move/move",
-      "schema": "./src/generators/move/schema.json",
-      "aliases": ["mv"],
-      "description": "Move an application or library to another folder."
-    },
-    "remove": {
-      "factory": "./src/generators/remove/remove#removeGenerator",
-      "schema": "./src/generators/remove/schema.json",
-      "aliases": ["rm"],
-      "description": "Remove an application or library."
-    },
-    "convert-to-monorepo": {
-      "factory": "./src/generators/convert-to-monorepo/convert-to-monorepo",
-      "schema": "./src/generators/convert-to-monorepo/schema.json",
-      "description": "Convert a Nx project to a monorepo."
-    },
-    "new": {
-      "factory": "./src/generators/new/new#newGenerator",
-      "schema": "./src/generators/new/schema.json",
-      "description": "Create a workspace.",
-      "hidden": true
-    },
-    "run-commands": {
-      "factory": "./src/generators/run-commands/run-commands#runCommandsGenerator",
-      "schema": "./src/generators/run-commands/schema.json",
-      "aliases": ["run-command", "target"],
-      "description": "Generates a target to run any command in the terminal."
-    },
-    "fix-configuration": {
-      "factory": "./src/generators/convert-to-nx-project/convert-to-nx-project#convertToNxProjectGenerator",
-      "schema": "./src/generators/convert-to-nx-project/schema.json",
-      "aliases": ["convert-to-nx-project"],
-      "description": "Fixes projects configuration"
-    },
-    "npm-package": {
-      "factory": "./src/generators/npm-package/npm-package#npmPackageGenerator",
-      "schema": "./src/generators/npm-package/schema.json",
-      "description": "Create a minimal NPM package.",
-      "x-type": "library"
-    },
-    "ci-workflow": {
-      "factory": "./src/generators/ci-workflow/ci-workflow#ciWorkflowGenerator",
-      "schema": "./src/generators/ci-workflow/schema.json",
-      "description": "Generate a CI workflow."
-    },
-    "infer-targets": {
-      "factory": "./src/generators/infer-targets/infer-targets",
-      "schema": "./src/generators/infer-targets/schema.json",
-      "description": "Convert Nx projects to use inferred targets."
+    "name": "nx/workspace",
+    "version": "0.1",
+    "generators": {
+        "preset": {
+            "factory": "./src/generators/preset/preset#presetGenerator",
+            "schema": "./src/generators/preset/schema.json",
+            "description": "Create application in an empty workspace.",
+            "x-use-standalone-layout": true,
+            "hidden": true
+        },
+        "move": {
+            "factory": "./src/generators/move/move",
+            "schema": "./src/generators/move/schema.json",
+            "aliases": ["mv"],
+            "description": "Move an application or library to another folder."
+        },
+        "remove": {
+            "factory": "./src/generators/remove/remove#removeGenerator",
+            "schema": "./src/generators/remove/schema.json",
+            "aliases": ["rm"],
+            "description": "Remove an application or library."
+        },
+        "convert-to-monorepo": {
+            "factory": "./src/generators/convert-to-monorepo/convert-to-monorepo",
+            "schema": "./src/generators/convert-to-monorepo/schema.json",
+            "description": "Convert a Nx project to a monorepo."
+        },
+        "new": {
+            "factory": "./src/generators/new/new#newGenerator",
+            "schema": "./src/generators/new/schema.json",
+            "description": "Create a workspace.",
+            "hidden": true
+        },
+        "run-commands": {
+            "factory": "./src/generators/run-commands/run-commands#runCommandsGenerator",
+            "schema": "./src/generators/run-commands/schema.json",
+            "aliases": ["run-command", "target"],
+            "description": "Generates a target to run any command in the terminal."
+        },
+        "fix-configuration": {
+            "factory": "./src/generators/convert-to-nx-project/convert-to-nx-project#convertToNxProjectGenerator",
+            "schema": "./src/generators/convert-to-nx-project/schema.json",
+            "aliases": ["convert-to-nx-project"],
+            "description": "Fixes projects configuration"
+        },
+        "npm-package": {
+            "factory": "./src/generators/npm-package/npm-package#npmPackageGenerator",
+            "schema": "./src/generators/npm-package/schema.json",
+            "description": "Create a minimal NPM package.",
+            "x-type": "library"
+        },
+        "ci-workflow": {
+            "factory": "./src/generators/ci-workflow/ci-workflow#ciWorkflowGenerator",
+            "schema": "./src/generators/ci-workflow/schema.json",
+            "description": "Generate a CI workflow."
+        },
+        "infer-targets": {
+            "factory": "./src/generators/infer-targets/infer-targets",
+            "schema": "./src/generators/infer-targets/schema.json",
+            "description": "Convert Nx projects to use inferred targets."
+        }
     }
-  }
 }

package/migrations.json

@@ -1,57 +1,57 @@
 {
-  "generators": {},
-  "packageJsonUpdates": {
-    "20.2.0": {
-      "version": "20.2.0-beta.5",
-      "x-prompt": "Do you want to update to TypeScript v5.6?",
-      "requires": {
-        "typescript": ">=5.5.0 <5.6.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.6.2",
-          "alwaysAddToPackageJson": false
+    "generators": {},
+    "packageJsonUpdates": {
+        "20.2.0": {
+            "version": "20.2.0-beta.5",
+            "x-prompt": "Do you want to update to TypeScript v5.6?",
+            "requires": {
+                "typescript": ">=5.5.0 <5.6.0"
+            },
+            "packages": {
+                "typescript": {
+                    "version": "~5.6.2",
+                    "alwaysAddToPackageJson": false
+                }
+            }
+        },
+        "20.4.0": {
+            "version": "20.4.0-beta.1",
+            "x-prompt": "Do you want to update to TypeScript v5.7?",
+            "requires": {
+                "typescript": ">=5.6.0 <5.7.0"
+            },
+            "packages": {
+                "typescript": {
+                    "version": "~5.7.2",
+                    "alwaysAddToPackageJson": false
+                }
+            }
+        },
+        "21.2.0": {
+            "version": "21.2.0-beta.0",
+            "x-prompt": "Do you want to update to TypeScript v5.8?",
+            "requires": {
+                "typescript": ">=5.7.0 <5.8.0"
+            },
+            "packages": {
+                "typescript": {
+                    "version": "~5.8.2",
+                    "alwaysAddToPackageJson": false
+                }
+            }
+        },
+        "21.5.0": {
+            "version": "21.5.0-beta.2",
+            "x-prompt": "Do you want to update to TypeScript v5.9?",
+            "requires": {
+                "typescript": ">=5.8.0 <5.9.0"
+            },
+            "packages": {
+                "typescript": {
+                    "version": "~5.9.2",
+                    "alwaysAddToPackageJson": false
+                }
+            }
         }
-      }
-    },
-    "20.4.0": {
-      "version": "20.4.0-beta.1",
-      "x-prompt": "Do you want to update to TypeScript v5.7?",
-      "requires": {
-        "typescript": ">=5.6.0 <5.7.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.7.2",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "21.2.0": {
-      "version": "21.2.0-beta.0",
-      "x-prompt": "Do you want to update to TypeScript v5.8?",
-      "requires": {
-        "typescript": ">=5.7.0 <5.8.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.8.2",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "21.5.0": {
-      "version": "21.5.0-beta.2",
-      "x-prompt": "Do you want to update to TypeScript v5.9?",
-      "requires": {
-        "typescript": ">=5.8.0 <5.9.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.9.2",
-          "alwaysAddToPackageJson": false
-        }
-      }
     }
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "22.7.0-pr.34971.73bed1f",
+  "version": "22.7.0-pr.35356.e1b62ce",
   "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": {
@@ -20,7 +20,8 @@
     "CLI"
   ],
   "main": "./index.js",
-  "typings": "./index.d.ts",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -38,22 +39,20 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0-pr.34971.73bed1f",
+    "@nx/devkit": "22.7.0-pr.35356.e1b62ce",
     "@zkochan/js-yaml": "0.0.7",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
-    "picomatch": "4.0.2",
+    "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "22.7.0-pr.34971.73bed1f"
+    "nx": "22.7.0-pr.35356.e1b62ce"
   },
   "devDependencies": {
-    "nx": "22.7.0-pr.34971.73bed1f"
+    "nx": "22.7.0-pr.35356.e1b62ce"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  }
 }

package/project.json

@@ -6,77 +6,8 @@
     "targets": {
         "build": {
             "outputs": ["{workspaceRoot}/dist/packages/workspace/README.md"],
-            "command": "node ./scripts/copy-readme.js workspace"
-        },
-        "legacy-post-build": {
-            "executor": "@nx/workspace-plugin:legacy-post-build",
-            "options": {
-                "tsConfig": "./tsconfig.lib.json",
-                "assets": [
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/files/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/files/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/files-integrated-repo/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/files-integrated-repo/**/.gitkeep",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/files-package-based-repo/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/files-readme/**",
-                        "output": "/"
-                    },
-                    {
-                        "glob": "**/files-packaged-based-repo/**/.gitkeep",
-                        "input": "packages/workspace",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/files-root-app/**",
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/*.json",
-                        "ignore": ["**/tsconfig*.json", "project.json", ".eslintrc.json"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/*.{js,css,html,svg}",
-                        "ignore": ["**/jest.config.js"],
-                        "output": "/"
-                    },
-                    {
-                        "input": "packages/workspace",
-                        "glob": "**/*.d.ts",
-                        "output": "/"
-                    },
-                    {
-                        "input": "",
-                        "glob": "LICENSE",
-                        "output": "/"
-                    }
-                ]
-            }
+            "command": "node ./scripts/copy-readme.js workspace",
+            "inputs": ["copyReadme"]
         },
         "add-extra-dependencies": {
             "command": "node ./scripts/add-dependency-to-build.js workspace nx"

package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__

@@ -48,7 +48,7 @@ jobs:
       - run: <%= packageManagerInstall %><% if(hasCypress){ %>
       - run: <%= packageManagerPrefix %> cypress install<% } %><% if(hasPlaywright){ %>
       - run: <%= packageManagerPrefix %> playwright install --with-deps<% } %><% if(!useRunMany){ %>
-      - uses: nrwl/nx-set-shas@v4<% } %>
+      - uses: nrwl/nx-set-shas@v5<% } %>
 
 <% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
       # <%- comment %><% } %><% } %><% if (command.command) { %>

package/src/generators/move/lib/update-imports.js

@@ -35,12 +35,12 @@ function updateImports(tree, schema, project) {
     if (tree.exists(tsConfigPath)) {
         tsConfig = (0, devkit_1.readJson)(tree, tsConfigPath);
         const sourceRoot = (0, project_config_1.getProjectSourceRoot)(project, tree);
-        mainEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot))));
-        secondaryEntryPointImportPaths = Object.keys(tsConfig.compilerOptions?.paths ?? {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(project.root)) &&
-            !x.startsWith(ensureTrailingSlash(sourceRoot))));
+        mainEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => stripDotSlash(x).startsWith(ensureTrailingSlash(sourceRoot))));
+        secondaryEntryPointImportPaths = Object.keys(tsConfig.compilerOptions?.paths ?? {}).filter((path) => tsConfig.compilerOptions.paths[path].some((x) => stripDotSlash(x).startsWith(ensureTrailingSlash(project.root)) &&
+            !stripDotSlash(x).startsWith(ensureTrailingSlash(sourceRoot))));
         // Next.js libs have a custom path for the server we need to update that as well
         // example "paths": { @acme/lib/server : ['libs/lib/src/server.ts'] }
-        serverEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => x.startsWith(ensureTrailingSlash(sourceRoot)) &&
+        serverEntryPointImportPath = Object.keys(tsConfig.compilerOptions?.paths ?? {}).find((path) => tsConfig.compilerOptions.paths[path].some((x) => stripDotSlash(x).startsWith(ensureTrailingSlash(sourceRoot)) &&
             x.includes('server') &&
             path.endsWith('server')));
     }
@@ -130,7 +130,11 @@ function updateTsConfigPaths(tsConfig, projectRef, tsConfigPath, projectRoot, sc
             `${tsConfigPath} compilerOptions.paths`,
         ].join(' '));
     }
-    const updatedPath = path.map((x) => (0, devkit_1.joinPathFragments)(projectRoot.to, (0, path_1.relative)(projectRoot.from, x)));
+    const updatedPath = path.map((x) => {
+        const hadDotSlash = x.startsWith('./');
+        const result = (0, devkit_1.joinPathFragments)(projectRoot.to, (0, path_1.relative)(projectRoot.from, stripDotSlash(x)));
+        return hadDotSlash && !result.startsWith('./') ? `./${result}` : result;
+    });
     if (schema.updateImportPath && projectRef.to) {
         tsConfig.compilerOptions.paths[projectRef.to] = updatedPath;
         if (projectRef.from !== projectRef.to) {
@@ -144,6 +148,9 @@ function updateTsConfigPaths(tsConfig, projectRef, tsConfigPath, projectRoot, sc
 function ensureTrailingSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }
+function stripDotSlash(path) {
+    return path.startsWith('./') ? path.slice(2) : path;
+}
 /**
  * Changes imports in a file from one import to another
  */

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;
+}

package/src/generators/remove/lib/update-tsconfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAQnC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAsC9D"}
+{"version":3,"file":"update-tsconfig.d.ts","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAQnC;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAoC9D"}

package/src/generators/remove/lib/update-tsconfig.js

@@ -31,7 +31,8 @@ async function updateTsconfig(tree, schema) {
             else {
                 for (const importPath in json.compilerOptions.paths) {
                     for (const path of json.compilerOptions.paths[importPath]) {
-                        const project = (0, find_project_for_path_1.findProjectForPath)((0, devkit_1.normalizePath)(path), projectMapping);
+                        const normalized = (0, devkit_1.normalizePath)(path).replace(/^\.\//, '');
+                        const project = (0, find_project_for_path_1.findProjectForPath)(normalized, projectMapping);
                         if (project === schema.projectName) {
                             delete json.compilerOptions.paths[importPath];
                             break;

package/jest-mocks/prettier.js

@@ -1,111 +0,0 @@
-const path = require('path');
-
-const prettierDir = path.dirname(
-  require.resolve('prettier', {
-    paths: [path.join(__dirname, '../../../node_modules')],
-  })
-);
-
-// Load standalone prettier (no dynamic imports)
-const standalone = require(path.join(prettierDir, 'standalone.js'));
-
-// Pre-load CJS parser plugins (no dynamic imports)
-const pluginNames = [
-  'babel',
-  'estree',
-  'typescript',
-  'html',
-  'postcss',
-  'markdown',
-  'angular',
-  'yaml',
-];
-const plugins = pluginNames.map((name) =>
-  require(path.join(prettierDir, 'plugins', `${name}.js`))
-);
-
-const prettierMock = {
-  ...standalone,
-  resolveConfig: async () => null,
-  resolveConfigFile: async () => null,
-  clearConfigCache: () => {},
-  getFileInfo: async (filePath) => {
-    const ext = path.extname(filePath);
-    const parserMap = {
-      '.ts': 'typescript',
-      '.tsx': 'typescript',
-      '.js': 'babel',
-      '.jsx': 'babel',
-      '.mjs': 'babel',
-      '.cjs': 'babel',
-      '.json': 'json',
-      '.css': 'css',
-      '.scss': 'scss',
-      '.less': 'less',
-      '.html': 'html',
-      '.md': 'markdown',
-      '.yaml': 'yaml',
-      '.yml': 'yaml',
-    };
-    return { ignored: false, inferredParser: parserMap[ext] || null };
-  },
-  async format(source, options = {}) {
-    try {
-      return await standalone.format(source, {
-        ...options,
-        plugins: [...plugins, ...(options.plugins || [])],
-      });
-    } catch (e) {
-      return source;
-    }
-  },
-  async check(source, options = {}) {
-    try {
-      return await standalone.check(source, {
-        ...options,
-        plugins: [...plugins, ...(options.plugins || [])],
-      });
-    } catch (e) {
-      return true;
-    }
-  },
-  async formatWithCursor(source, options = {}) {
-    try {
-      return await standalone.formatWithCursor(source, {
-        ...options,
-        plugins: [...plugins, ...(options.plugins || [])],
-      });
-    } catch (e) {
-      return { formatted: source, cursorOffset: options.cursorOffset || 0 };
-    }
-  },
-};
-
-const handler = {
-  get(target, prop) {
-    if (prop === '__esModule') return true;
-    if (prop === 'default') return prettierMock;
-    return prettierMock[prop];
-  },
-  has(target, prop) {
-    return prop === '__esModule' || prop === 'default' || prop in prettierMock;
-  },
-  ownKeys() {
-    return [...Object.keys(prettierMock), '__esModule', 'default'];
-  },
-  getOwnPropertyDescriptor(target, prop) {
-    if (prop === '__esModule')
-      return { configurable: true, enumerable: true, value: true };
-    if (prop === 'default')
-      return { configurable: true, enumerable: true, value: prettierMock };
-    if (prop in prettierMock)
-      return {
-        configurable: true,
-        enumerable: true,
-        value: prettierMock[prop],
-      };
-    return undefined;
-  },
-};
-
-module.exports = new Proxy({}, handler);