fix: use nx run-many vs nx affected in postinstall script

Author: bbaia

packages/nx-dotnet-core/migrations.json

@@ -0,0 +1,9 @@
+{
+  "schematics": {
+    "update-restore-postinstall": {
+      "version": "1.1.1",
+      "description": "Use 'nx run-many' instead of 'nx affected' to restore .NET core projects when using Angular CLI",
+      "factory": "./src/migrations/update-1-1-1/update-restore-postinstall"
+    }
+  }
+}

packages/nx-dotnet-core/package.json

@@ -9,6 +9,10 @@
   "typings": "./src/index.d.ts",
   "generators": "./generators.json",
   "executors": "./executors.json",
+  "ng-update": {
+    "requirements": {},
+    "migrations": "./migrations.json"
+  },
   "homepage": "https://github.com/bbaia/nx-dotnet-core",
   "bugs": {
     "url": "https://github.com/bbaia/nx-dotnet-core/issues"

packages/nx-dotnet-core/src/generators/new/generator.spec.ts

@@ -4,6 +4,7 @@ import {
   readJson,
   readProjectConfiguration,
   Tree,
+  updateJson,
   writeJson,
 } from '@nrwl/devkit';
 
@@ -145,19 +146,6 @@ describe('new generator', () => {
         'my-app': { tags: [] },
       });
     });
-
-    it('should update package.json', async () => {
-      const options: NewGeneratorSchema = {
-        type: 'app',
-        template: 'webapi',
-        name: 'my-app',
-      };
-
-      await generator(tree, options);
-
-      const packageJson = readJson(tree, '/package.json');
-      expect(packageJson.scripts.postinstall).toEqual('nx restore --all');
-    });
   });
 
   describe('library', () => {
@@ -269,19 +257,6 @@ describe('new generator', () => {
         'my-lib': { tags: [] },
       });
     });
-
-    it('should update package.json', async () => {
-      const options: NewGeneratorSchema = {
-        type: 'lib',
-        template: 'classlib',
-        name: 'my-lib',
-      };
-
-      await generator(tree, options);
-
-      const packageJson = readJson(tree, '/package.json');
-      expect(packageJson.scripts.postinstall).toEqual('nx restore --all');
-    });
   });
 
   describe('--unitTestTemplate', () => {
@@ -382,6 +357,37 @@ describe('new generator', () => {
     });
   });
 
+  describe('should update postinstall script in package.json', () => {
+    const options: NewGeneratorSchema = {
+      type: 'app',
+      template: 'webapi',
+      name: 'my-app',
+    };
+
+    it('Nx workspace', async () => {
+      await generator(tree, options);
+
+      const packageJson = readJson(tree, '/package.json');
+      expect(packageJson.scripts.postinstall).toEqual('nx restore --all');
+    });
+
+    it('Angular CLI powered workspace', async () => {
+      // fake Angular CLI powered workspace
+      updateJson(tree, '/package.json', json => {
+        console.log(json);
+        json.scripts = { ng: 'nx' };
+        return json;
+      });
+
+      await generator(tree, options);
+
+      const packageJson = readJson(tree, '/package.json');
+      expect(packageJson.scripts.postinstall).toEqual(
+        'nx run-many --target=restore --all',
+      );
+    });
+  });
+
   describe('Visual Studio Code extension', () => {
     const options: NewGeneratorSchema = {
       type: 'app',

packages/nx-dotnet-core/src/generators/new/generator.ts

@@ -186,7 +186,7 @@ function addPostInstall(host: Tree) {
   updateJson(host, 'package.json', json => {
     json.scripts = json.scripts || {};
     const command = json.scripts.ng
-      ? 'nx affected --target=restore --all'
+      ? 'nx run-many --target=restore --all'
       : 'nx restore --all';
     if (!json.scripts.postinstall) {
       json.scripts.postinstall = command;

packages/nx-dotnet-core/src/migrations/update-1-1-1/update-restore-postinstall.spec.ts

@@ -0,0 +1,45 @@
+import { join } from 'path';
+import { Tree } from '@angular-devkit/schematics';
+import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
+import { createEmptyWorkspace } from '@nrwl/workspace/testing';
+
+describe('Should replace "nx affected" with "nx run-many" in postinstall script', () => {
+  const migrationTestRunner = new SchematicTestRunner(
+    '@bbaia/nx-dotnet-core',
+    join(__dirname, '../../../migrations.json'),
+  );
+
+  [
+    {
+      test: 'nx affected --target=restore --all',
+      expected: 'nx run-many --target=restore --all',
+    },
+    {
+      test: 'echo "hi" && nx affected --target=restore --all',
+      expected: 'echo "hi" && nx run-many --target=restore --all',
+    },
+    {
+      test: 'nx restore --all',
+      expected: 'nx restore --all',
+    },
+  ].forEach(testEntry => {
+    it(`for: "${testEntry.test}"`, async () => {
+      const tree = createEmptyWorkspace(Tree.empty());
+      tree.overwrite(
+        '/package.json',
+        JSON.stringify({
+          scripts: {
+            postinstall: testEntry.test,
+          },
+        }),
+      );
+
+      const result = await migrationTestRunner
+        .runSchematicAsync('update-restore-postinstall', {}, tree)
+        .toPromise();
+
+      const packageJson = JSON.parse(result.read('/package.json').toString());
+      expect(packageJson.scripts.postinstall).toEqual(testEntry.expected);
+    });
+  });
+});

packages/nx-dotnet-core/src/migrations/update-1-1-1/update-restore-postinstall.ts

@@ -0,0 +1,26 @@
+import { chain, SchematicContext, Tree } from '@angular-devkit/schematics';
+import { updateJsonInTree } from '@nrwl/workspace';
+import { formatFiles } from '@nrwl/workspace';
+
+const udpateRestorePostinstallScript = (
+  host: Tree,
+  context: SchematicContext,
+) => {
+  updateJsonInTree('package.json', json => {
+    if (
+      json.scripts &&
+      json.scripts.postinstall &&
+      json.scripts.postinstall.includes('nx affected --target=restore --all')
+    ) {
+      json.scripts.postinstall = json.scripts.postinstall.replace(
+        /(.*)(nx affected --target=restore --all)(.*)/,
+        '$1nx run-many --target=restore --all$3',
+      );
+    }
+    return json;
+  })(host, context);
+};
+
+export default function () {
+  return chain([udpateRestorePostinstallScript, formatFiles()]);
+}

workspace.json

@@ -44,6 +44,11 @@
                 "input": "./packages/nx-dotnet-core",
                 "glob": "executors.json",
                 "output": "."
+              },
+              {
+                "input": "./packages/nx-dotnet-core",
+                "glob": "migrations.json",
+                "output": "."
               }
             ]
           }