fix(core): fix migrations for projects in workspace.json (#13226)

nrwl · Nov 17, 2022 · bae31b2 · bae31b2 · vercel · Nov 17, 2022
1 parent b0b3b5c
commit bae31b2
Show file tree

Hide file tree

Showing 4 changed files with 127 additions and 27 deletions.
diff --git a/packages/nx/src/migrations/update-15-0-0/migrate-to-inputs.spec.ts b/packages/nx/src/migrations/update-15-0-0/migrate-to-inputs.spec.ts
@@ -1,4 +1,7 @@
-import { createTreeWithEmptyWorkspace } from '../../generators/testing-utils/create-tree-with-empty-workspace';
+import {
+  createTreeWithEmptyV1Workspace,
+  createTreeWithEmptyWorkspace,
+} from '../../generators/testing-utils/create-tree-with-empty-workspace';
 import type { Tree } from '../../generators/tree';
 import {
   addProjectConfiguration,
@@ -294,3 +297,48 @@ describe('15.0.0 migration (migrate-to-inputs)', () => {
     expect(updatedWorkspace.namedInputs).not.toBeDefined();
   });
 });
+
+describe('15.0.0 migration (migrate-to-inputs) (v1)', () => {
+  let tree: Tree;
+
+  beforeEach(() => {
+    tree = createTreeWithEmptyV1Workspace();
+  });
+
+  it('should add project specific implicit dependencies to project namedInputs', async () => {
+    updateWorkspaceConfiguration(tree, {
+      version: 2,
+      implicitDependencies: {
+        'tools/scripts/build-app.js': ['app1', 'app2'],
+      },
+    });
+    addProjectConfiguration(tree, 'app1', {
+      root: 'app1',
+    });
+    addProjectConfiguration(tree, 'app2', {
+      root: 'app2',
+    });
+    addProjectConfiguration(tree, 'lib1', {
+      root: 'lib1',
+    });
+
+    await migrateToInputs(tree);
+
+    const updated = readWorkspaceConfiguration(tree);
+    expect(updated.implicitDependencies).toBeUndefined();
+    expect(updated.namedInputs.projectSpecificFiles).toEqual([]);
+    expect(updated.namedInputs.default).toContain('projectSpecificFiles');
+
+    const app1 = readProjectConfiguration(tree, 'app1');
+    expect(app1.namedInputs.projectSpecificFiles).toContain(
+      '{workspaceRoot}/tools/scripts/build-app.js'
+    );
+    const app2 = readProjectConfiguration(tree, 'app2');
+    expect(app2.namedInputs.projectSpecificFiles).toContain(
+      '{workspaceRoot}/tools/scripts/build-app.js'
+    );
+
+    const lib = readProjectConfiguration(tree, 'lib1');
+    expect(lib.namedInputs).toBeUndefined();
+  });
+});
diff --git a/packages/nx/src/migrations/update-15-0-0/migrate-to-inputs.ts b/packages/nx/src/migrations/update-15-0-0/migrate-to-inputs.ts
@@ -83,21 +83,23 @@ export default async function (tree: Tree) {
             projectSpecificFileset
           );
 
-          if (tree.exists(join(project.root, 'project.json'))) {
+          try {
             updateProjectConfiguration(tree, dependent, project);
-          } else if (tree.exists(join(project.root, 'package.json'))) {
-            updateJson<PackageJson>(
-              tree,
-              join(project.root, 'package.json'),
-              (json) => {
-                json.nx ??= {};
-                json.nx.namedInputs ??= {};
-                json.nx.namedInputs.projectSpecificFiles ??=
-                  project.namedInputs.projectSpecificFiles;
-
-                return json;
-              }
-            );
+          } catch {
+            if (tree.exists(join(project.root, 'package.json'))) {
+              updateJson<PackageJson>(
+                tree,
+                join(project.root, 'package.json'),
+                (json) => {
+                  json.nx ??= {};
+                  json.nx.namedInputs ??= {};
+                  json.nx.namedInputs.projectSpecificFiles ??=
+                    project.namedInputs.projectSpecificFiles;
+
+                  return json;
+                }
+              );
+            }
           }
         }
       } else {

diff --git a/packages/nx/src/migrations/update-15-0-0/prefix-outputs.spec.ts b/packages/nx/src/migrations/update-15-0-0/prefix-outputs.spec.ts
@@ -1,4 +1,7 @@
-import { createTreeWithEmptyWorkspace } from '../../generators/testing-utils/create-tree-with-empty-workspace';
+import {
+  createTreeWithEmptyV1Workspace,
+  createTreeWithEmptyWorkspace,
+} from '../../generators/testing-utils/create-tree-with-empty-workspace';
 import type { Tree } from '../../generators/tree';
 import {
   addProjectConfiguration,
@@ -117,3 +120,48 @@ describe('15.0.0 migration (prefix-outputs)', () => {
     await prefixOutputs(tree);
   });
 });
+
+describe('15.0.0 migration (prefix-outputs) (v1)', () => {
+  let tree: Tree;
+
+  beforeEach(() => {
+    tree = createTreeWithEmptyV1Workspace();
+  });
+
+  it('should prefix project outputs', async () => {
+    addProjectConfiguration(tree, 'proj', {
+      root: 'proj',
+      targets: {
+        build: {
+          executor: 'nx:run-commands',
+          outputs: [
+            'dist',
+            'dist/{projectRoot}',
+            'dist/{projectRoot}/**/*.js',
+            'proj/coverage',
+            './test-results',
+            '{projectRoot}/build',
+            '{options.outputDirectory}',
+          ],
+          options: {},
+        },
+      },
+    });
+
+    await prefixOutputs(tree);
+
+    const updated = readProjectConfiguration(tree, 'proj');
+
+    expect(updated.targets.build.outputs).toEqual([
+      '{workspaceRoot}/dist',
+      '{workspaceRoot}/dist/{projectRoot}',
+      '{workspaceRoot}/dist/{projectRoot}/**/*.js',
+      '{projectRoot}/coverage',
+      '{projectRoot}/test-results',
+      '{projectRoot}/build',
+      '{options.outputDirectory}',
+    ]);
+
+    expect(() => validateOutputs(updated.targets.build.outputs)).not.toThrow();
+  });
+});
diff --git a/packages/nx/src/migrations/update-15-0-0/prefix-outputs.ts b/packages/nx/src/migrations/update-15-0-0/prefix-outputs.ts
@@ -39,19 +39,21 @@ export default async function (tree: Tree) {
         target.outputs = transformLegacyOutputs(project.root, e);
       }
     }
-    if (tree.exists(join(project.root, 'project.json'))) {
+    try {
       updateProjectConfiguration(tree, projectName, project);
-    } else if (tree.exists(join(project.root, 'package.json'))) {
-      updateJson<PackageJson>(
-        tree,
-        join(project.root, 'package.json'),
-        (json) => {
-          json.nx ??= {};
-          json.nx.targets ??= project.targets;
+    } catch {
+      if (tree.exists(join(project.root, 'package.json'))) {
+        updateJson<PackageJson>(
+          tree,
+          join(project.root, 'package.json'),
+          (json) => {
+            json.nx ??= {};
+            json.nx.targets ??= project.targets;
 
-          return json;
-        }
-      );
+            return json;
+          }
+        );
+      }
     }
   }