fix(core): automatically add root to the project.json projects

nrwl · Apr 24, 2022 · f528315 · f528315
1 parent 8c38b86
commit f528315
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap b/packages/angular/src/generators/ng-add/__snapshots__/migrate-from-angular-cli.spec.ts.snap
@@ -468,7 +468,6 @@ Object {
 
 exports[`workspace move to nx layout should update project configuration 1`] = `
 Object {
-  "root": "apps/myApp",
   "sourceRoot": "apps/myApp/src",
   "targets": Object {
     "build": Object {

diff --git a/packages/devkit/src/generators/project-configuration.ts b/packages/devkit/src/generators/project-configuration.ts
@@ -399,10 +399,10 @@ function inlineProjectConfigurationsWithTree(
   Object.entries(workspaceJson.projects || {}).forEach(([project, config]) => {
     if (typeof config === 'string') {
       const configFileLocation = joinPathFragments(config, 'project.json');
-      workspaceJson.projects[project] = readJson<ProjectConfiguration>(
-        tree,
-        configFileLocation
-      );
+      workspaceJson.projects[project] = {
+        root: config,
+        ...readJson<ProjectConfiguration>(tree, configFileLocation),
+      };
     }
   });
   return workspaceJson as WorkspaceJsonConfiguration;

diff --git a/packages/devkit/src/utils/invoke-nx-generator.ts b/packages/devkit/src/utils/invoke-nx-generator.ts
@@ -3,7 +3,7 @@ import type { FileChange, Tree, TreeWriteOptions } from 'nx/src/config/tree';
 import { toNewFormat, toOldFormatOrNull } from 'nx/src/config/workspaces';
 import { Generator, GeneratorCallback } from 'nx/src/config/misc-interfaces';
 import { parseJson, serializeJson } from 'nx/src/utils/json';
-import { join, relative } from 'path';
+import { join, relative, dirname } from 'path';
 
 class RunCallbackTask {
   constructor(private callback: GeneratorCallback) {}
@@ -167,9 +167,12 @@ class DevkitTreeFromAngularDevkitTree implements Tree {
       ? this.tree.read(filePath).toString(encoding)
       : this.tree.read(filePath);
     if (isWorkspaceJsonChange(filePath)) {
-      const formatted = toNewFormat(
-        parseJson(Buffer.isBuffer(rawResult) ? rawResult.toString() : rawResult)
-      );
+      const formatted = toNewFormat({
+        root: dirname(filePath),
+        ...parseJson(
+          Buffer.isBuffer(rawResult) ? rawResult.toString() : rawResult
+        ),
+      });
       return encoding ? serializeJson(formatted) : serializeJson(formatted);
     }
     return rawResult;
@@ -192,9 +195,10 @@ class DevkitTreeFromAngularDevkitTree implements Tree {
       const w = parseJson(content.toString());
       for (const [project, configuration] of Object.entries(w.projects)) {
         if (typeof configuration === 'string') {
-          w.projects[project] = parseJson(
-            this.tree.read(`${configuration}/project.json`)
-          );
+          w.projects[project] = {
+            root: configuration,
+            ...parseJson(this.tree.read(`${configuration}/project.json`)),
+          };
           w.projects[project].configFilePath = `${configuration}/project.json`;
         }
       }

diff --git a/packages/nx/src/adapter/ngcli-adapter.ts b/packages/nx/src/adapter/ngcli-adapter.ts
@@ -539,6 +539,7 @@ export class NxScopedHost extends virtualFs.ScopedHost<any> {
             map((x) => ({
               project,
               projectConfig: {
+                root: dirname(configFilePath),
                 ...parseJson(Buffer.from(x).toString()),
                 configFilePath,
               },
@@ -600,9 +601,10 @@ export class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
         const nxJsonInTree = nxJsonChange
           ? parseJson(nxJsonChange.content.toString())
           : parseJson(this.host.read('nx.json').toString());
-        const readJsonWithHost = (file) =>
-          parseJson(this.host.read(file).toString());
-
+        const readJsonWithHost = (file) => ({
+          root: dirname(file),
+          ...parseJson(this.host.read(file).toString()),
+        });
         const staticProjects = buildWorkspaceConfigurationFromGlobs(
           nxJsonInTree,
           globForProjectFiles(this.host.root).filter(

diff --git a/packages/nx/src/config/workspaces.ts b/packages/nx/src/config/workspaces.ts
@@ -637,6 +637,9 @@ export function buildWorkspaceConfigurationFromGlobs(
       // directory as a package.json should overwrite the inferred package.json
       // project configuration.
       const configuration = readJson(file);
+
+      configuration.root = directory;
+
       let name = configuration.name;
       if (!configuration.name) {
         name = toProjectName(file, nxJson);

diff --git a/packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.spec.ts b/packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.spec.ts
@@ -85,6 +85,7 @@ describe('convert-to-nx-project', () => {
       getProjectConfigurationPath(config)
     );
 
+    delete config.root;
     expect(config).toEqual(newConfigFile);
   });
 
@@ -112,6 +113,7 @@ describe('convert-to-nx-project', () => {
         tree,
         getProjectConfigurationPath(config)
       );
+      delete config.root;
       expect(config).toEqual(newConfigFile);
     }
   });

diff --git a/packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts b/packages/workspace/src/generators/convert-to-nx-project/convert-to-nx-project.ts
@@ -68,6 +68,8 @@ To upgrade change the version number at the top of ${getWorkspacePath(
       continue;
     }
 
+    delete configuration.root;
+
     writeJson(host, configPath, configuration);
 
     updateJson(host, getWorkspacePath(host), (value) => {