feat(core): nx 17 support (#778)

BREAKING CHANGE: Drops Nx v15 support

Author: AgentEnder

.github/workflows/main.yml

@@ -16,12 +16,10 @@ jobs:
     with:
       main-branch-name: 'master'
       parallel-commands: |
-        npx nx-cloud record npx nx workspace-lint
         npx nx-cloud record npx nx format:check
         npx nx-cloud record yarn documentation:check --verbose
-        yarn nx affected --target build --exclude='*,!demo/**/*'
       parallel-commands-on-agents: |
-        yarn nx affected --target lint build test --exclude='demo/**/*'
+        yarn nx affected --target lint build test
       final-commands: |
         yarn e2e
 

.github/workflows/pr.yml

@@ -18,13 +18,11 @@ jobs:
     with:
       main-branch-name: 'master'
       parallel-commands: |
-        npx nx-cloud record yarn nx workspace-lint
         npx nx-cloud record yarn nx format:check
         npx nx-cloud record yarn documentation:check --verbose
         npx nx-cloud record yarn commitlint --from ${{ github.event.pull_request.base.sha }} --to HEAD --verbose
-        yarn nx affected --target build --exclude='*,!demo/**/*'
       parallel-commands-on-agents: |
-        yarn nx affected --target lint build test --exclude 'demo/**/*'
+        yarn nx affected --target lint build test
       final-commands: |
         yarn e2e
 

.gitignore

@@ -46,4 +46,5 @@ Thumbs.db
 **/bin
 **/obj
 
-.vs
+.vs
+.nx/cache

.nx-dotnet.rc.json

@@ -3,4 +3,5 @@
 /dist
 /coverage
 .docusaurus/
-.yarn/
+.yarn/
+/.nx/cache

.prettierignore

@@ -66,7 +66,7 @@
       "defaultConfiguration": "development"
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["demo/apps/web-frontend/**/*.{ts,tsx,js,jsx}"]

demo/apps/web-frontend/project.json

@@ -1,5 +1,6 @@
 {
   "name": "@nx-dotnet/demo-libs-generated-webapi-types",
-  "version": "0.0.1",
-  "type": "commonjs"
+  "version": "1.24.0-beta.1",
+  "type": "commonjs",
+  "private": true
 }

demo/libs/generated/webapi-types/package.json

@@ -14,7 +14,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["demo/libs/generated/webapi-types/**/*.ts"]

demo/libs/generated/webapi-types/project.json

@@ -22,6 +22,7 @@ import { unlinkSync, writeFileSync } from 'fs';
 import { ensureDirSync } from 'fs-extra';
 import { join } from 'path';
 import { XmlDocument } from 'xmldoc';
+import * as logger from 'console';
 
 import { readDependenciesFromNxDepGraph } from '@nx-dotnet/utils/e2e';
 
@@ -516,7 +517,9 @@ function runNxCommandAsync(
 }
 
 function setupWorkspace() {
+  logger.log('Creating a sandbox project in ', e2eDir);
   ensureNxProject('@nx-dotnet/core', 'dist/packages/core');
+  logger.log('✅');
   // TODO: Update e2e tests and plugin generators to use the new workspace layout semantics.
   updateFile('nx.json', (contents) => {
     const nxJson: NxJsonConfiguration = JSON.parse(contents);
@@ -525,5 +528,7 @@ function setupWorkspace() {
     nxJson.workspaceLayout.libsDir = 'libs';
     return JSON.stringify(nxJson, null, 2);
   });
+  logger.log('Initializing git repo');
   initializeGitRepo(e2eDir);
+  logger.log('✅');
 }

e2e/core-e2e/tests/nx-dotnet.spec.ts

@@ -1,36 +1,23 @@
 {
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
-  "npmScope": "nx-dotnet",
   "affected": {
     "defaultBase": "master"
   },
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx-cloud",
-      "options": {
-        "cacheableOperations": [
-          "build",
-          "lint",
-          "test",
-          "e2e",
-          "prebuild",
-          "swagger",
-          "codegen",
-          "build:test"
-        ],
-        "accessToken": "ZTMwZjcyY2ItZWRjYS00NzZjLTg3ZmQtYzdjM2Y3OGIzNDdhfHJlYWQtd3JpdGU=",
-        "canTrackAnalytics": false,
-        "showUsageWarnings": true,
-        "parallel": 3,
-        "useLightClient": true
-      }
-    }
-  },
   "workspaceLayout": {
     "appsDir": "",
     "libsDir": ""
   },
-  "plugins": ["@nx-dotnet/core"],
+  "plugins": [
+    {
+      "plugin": "@nx-dotnet/core",
+      "options": {
+        "nugetPackages": {
+          "Swashbuckle.AspNetCore": "6.5.0"
+        },
+        "inferProjects": false
+      }
+    }
+  ],
   "generators": {
     "@nx-dotnet/nxdoc:generate-docs": {
       "outputDirectory": "docs",
@@ -40,7 +27,8 @@
   "targetDefaults": {
     "build": {
       "dependsOn": ["^build", "prebuild", "^prebuild", "^codegen", "codegen"],
-      "inputs": ["production", "^production"]
+      "inputs": ["production", "^production"],
+      "cache": true
     },
     "@nx-dotnet/core:build": {
       "dependsOn": ["^build", "prebuild", "^prebuild", "^codegen", "codegen"],
@@ -52,19 +40,43 @@
       ]
     },
     "codegen": {
-      "dependsOn": ["^swagger", "swagger"]
+      "dependsOn": ["^swagger", "swagger"],
+      "cache": true
     },
     "swagger": {
-      "dependsOn": ["build"]
+      "dependsOn": ["build"],
+      "cache": true
     },
     "test": {
-      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
+      "cache": true
     },
     "smoke": {
-      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+      "inputs": [
+        "default",
+        "^production",
+        "{workspaceRoot}/jest.preset.js",
+        {
+          "runtime": "npm show nx@latest version"
+        },
+        {
+          "runtime": "npm show @nx-dotnet/core@latest version"
+        }
+      ],
+      "cache": true
     },
     "lint": {
-      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
+      "cache": true
+    },
+    "e2e": {
+      "cache": true
+    },
+    "prebuild": {
+      "cache": true
+    },
+    "build:test": {
+      "cache": true
     }
   },
   "namedInputs": {
@@ -84,5 +96,7 @@
       "!{projectRoot}/src/test-setup.[jt]s"
     ],
     "projectSpecificFiles": []
-  }
+  },
+  "nxCloudAccessToken": "ZTMwZjcyY2ItZWRjYS00NzZjLTg3ZmQtYzdjM2Y3OGIzNDdhfHJlYWQtd3JpdGU=",
+  "parallel": 3
 }