chore(repo): migrate to Nx 15 rc

LN-Zap · Oct 24, 2022 · 8ff832a · 8ff832a
1 parent d3df0fa
commit 8ff832a
Show file tree

Hide file tree

Showing 22 changed files with 1,262 additions and 1,303 deletions.
diff --git a/apps/docs-site/project.json b/apps/docs-site/project.json
@@ -10,7 +10,7 @@
       }
     },
     "prebuild": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "commands": ["echo"]
       }
@@ -22,7 +22,7 @@
       }
     },
     "deploy": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "commands": [
           "nx g @nx-dotnet/nxdoc:generate-docs",
@@ -33,5 +33,8 @@
       }
     }
   },
-  "tags": []
+  "tags": [],
+  "namedInputs": {
+    "projectSpecificFiles": ["{workspaceRoot}/docs/*"]
+  }
 }
diff --git a/demo/apps/web-frontend/jest.config.ts b/demo/apps/web-frontend/jest.config.ts
@@ -4,7 +4,7 @@ export default {
   preset: '../../../jest.preset.js',
   transform: {
     '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
-    '^.+\\.[tj]sx?$': 'babel-jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/react/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage//demo/apps/web-frontend',

diff --git a/demo/apps/web-frontend/project.json b/demo/apps/web-frontend/project.json
@@ -4,7 +4,7 @@
   "projectType": "application",
   "targets": {
     "build": {
-      "executor": "@nrwl/web:webpack",
+      "executor": "@nrwl/webpack:webpack",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
@@ -47,7 +47,7 @@
       }
     },
     "serve": {
-      "executor": "@nrwl/web:dev-server",
+      "executor": "@nrwl/webpack:dev-server",
       "options": {
         "buildTarget": "demo-web-frontend:build",
         "hmr": true
@@ -72,7 +72,7 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coveragedemo/apps/web-frontend"],
+      "outputs": ["{workspaceRoot}/coveragedemo/apps/web-frontend"],
       "options": {
         "jestConfig": "demo/apps/web-frontend/jest.config.ts",
         "passWithNoTests": true

diff --git a/demo/apps/webapi/project.json b/demo/apps/webapi/project.json
@@ -5,7 +5,7 @@
   "targets": {
     "build": {
       "executor": "@nx-dotnet/core:build",
-      "outputs": ["dist/demo/apps/webapi"],
+      "outputs": ["{workspaceRoot}/dist/demo/apps/webapi"],
       "options": {
         "configuration": "Debug",
         "noDependencies": true
@@ -32,7 +32,7 @@
     },
     "swagger": {
       "executor": "@nx-dotnet/core:update-swagger",
-      "outputs": ["options.output"],
+      "outputs": ["{workspaceRoot}/options.output"],
       "options": {
         "output": "demo/libs/generated/webapi-swagger/swagger.json"
       }

diff --git a/demo/libs/generated/webapi-swagger/project.json b/demo/libs/generated/webapi-swagger/project.json
@@ -3,11 +3,11 @@
   "targets": {
     "build": {
       "executor": "nx:noop",
-      "outputs": ["demo/libs/generated/webapi-swagger"]
+      "outputs": ["{projectRoot}"]
     },
     "codegen": {
       "executor": "@nx-dotnet/core:openapi-codegen",
-      "outputs": ["demo/libs/generated/webapi-types"],
+      "outputs": ["{workspaceRoot}/demo/libs/generated/webapi-types"],
       "options": {
         "openapiJsonPath": "demo/libs/generated/webapi-swagger/swagger.json",
         "outputProject": "demo-libs-generated-webapi-types"

diff --git a/demo/libs/generated/webapi-types/project.json b/demo/libs/generated/webapi-types/project.json
@@ -21,7 +21,7 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/demo/libs/generated/webapi-types"],
+      "outputs": ["{workspaceRoot}/coverage/demo/libs/generated/webapi-types"],
       "options": {
         "jestConfig": "demo/libs/generated/webapi-types/jest.config.ts",
         "passWithNoTests": true

diff --git a/nx.json b/nx.json
@@ -1,20 +1,9 @@
 {
+  "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "npmScope": "nx-dotnet",
   "affected": {
     "defaultBase": "master"
   },
-  "implicitDependencies": {
-    "workspace.json": "*",
-    "package.json": {
-      "dependencies": "*",
-      "devDependencies": "*"
-    },
-    "tsconfig.base.json": "*",
-    "tslint.json": "*",
-    ".eslintrc.json": "*",
-    "nx.json": "*",
-    "docs/*": ["docs-site"]
-  },
   "tasksRunnerOptions": {
     "default": {
       "runner": "@nrwl/nx-cloud",
@@ -39,66 +28,50 @@
     "appsDir": "",
     "libsDir": ""
   },
-  "targetDependencies": {
-    "build": [
-      {
-        "target": "build",
-        "projects": "dependencies"
-      },
-      {
-        "target": "prebuild",
-        "projects": "self"
-      },
-      {
-        "target": "prebuild",
-        "projects": "dependencies"
-      },
-      {
-        "target": "codegen",
-        "projects": "dependencies"
-      },
-      {
-        "target": "codegen",
-        "projects": "self"
-      }
-    ],
-    "codegen": [
-      {
-        "target": "swagger",
-        "projects": "dependencies"
-      },
-      {
-        "target": "swagger",
-        "projects": "self"
-      }
-    ],
-    "swagger": [
-      {
-        "target": "build",
-        "projects": "self"
-      }
-    ]
-  },
+  "plugins": ["@nx-dotnet/core"],
   "generators": {
     "@nx-dotnet/nxdoc:generate-docs": {
       "outputDirectory": "docs",
       "gettingStartedFile": "<src>/README.md"
+    }
+  },
+  "targetDefaults": {
+    "build": {
+      "dependsOn": ["^build", "prebuild", "^prebuild", "^codegen", "codegen"],
+      "inputs": ["production", "^production"]
     },
-    "@nrwl/react": {
-      "application": {
-        "style": "scss",
-        "linter": "eslint",
-        "babel": true
-      },
-      "component": {
-        "style": "scss"
-      },
-      "library": {
-        "style": "scss",
-        "linter": "eslint"
-      }
+    "codegen": {
+      "dependsOn": ["^swagger", "swagger"]
+    },
+    "swagger": {
+      "dependsOn": ["build"]
+    },
+    "test": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+    },
+    "smoke": {
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
+    },
+    "lint": {
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
     }
   },
-  "plugins": ["@nx-dotnet/core"],
-  "$schema": "./node_modules/nx/schemas/nx-schema.json"
+  "namedInputs": {
+    "default": ["{projectRoot}/**/*", "sharedGlobals", "projectSpecificFiles"],
+    "sharedGlobals": [
+      "{workspaceRoot}/workspace.json",
+      "{workspaceRoot}/tsconfig.base.json",
+      "{workspaceRoot}/tslint.json",
+      "{workspaceRoot}/nx.json",
+      "{workspaceRoot}/babel.config.json"
+    ],
+    "production": [
+      "default",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json",
+      "!{projectRoot}/jest.config.[jt]s",
+      "!{projectRoot}/.eslintrc.json"
+    ],
+    "projectSpecificFiles": []
+  }
 }
diff --git a/package.json b/package.json
@@ -31,8 +31,8 @@
     "fast-glob": "3.2.11",
     "inquirer": "^8.2.0",
     "prism-react-renderer": "^1.3.5",
-    "react": "18.1.0",
-    "react-dom": "18.1.0",
+    "react": "18.2.0",
+    "react-dom": "18.2.0",
     "regenerator-runtime": "0.13.9",
     "rimraf": "^3.0.2",
     "rxjs": "^7.4.0",
@@ -44,18 +44,18 @@
     "@commitlint/cli": "^16.2.1",
     "@commitlint/config-conventional": "^17.1.0",
     "@commitlint/types": "^16.2.1",
-    "@nrwl/cypress": "14.2.2",
-    "@nrwl/devkit": "14.2.2",
-    "@nrwl/eslint-plugin-nx": "14.2.2",
-    "@nrwl/jest": "14.2.2",
-    "@nrwl/js": "14.2.2",
-    "@nrwl/linter": "14.2.2",
-    "@nrwl/node": "14.2.2",
-    "@nrwl/nx-cloud": "14.6.0",
-    "@nrwl/nx-plugin": "14.2.2",
-    "@nrwl/react": "14.2.2",
-    "@nrwl/web": "14.2.2",
-    "@nrwl/workspace": "14.2.2",
+    "@nrwl/cypress": "15.0.0-rc1",
+    "@nrwl/devkit": "15.0.0-rc1",
+    "@nrwl/eslint-plugin-nx": "15.0.0-rc1",
+    "@nrwl/jest": "15.0.0-rc1",
+    "@nrwl/js": "15.0.0-rc1",
+    "@nrwl/linter": "15.0.0-rc1",
+    "@nrwl/node": "15.0.0-rc1",
+    "@nrwl/nx-cloud": "14.7.0",
+    "@nrwl/nx-plugin": "15.0.0-rc1",
+    "@nrwl/react": "15.0.0-rc1",
+    "@nrwl/web": "15.0.0-rc1",
+    "@nrwl/workspace": "15.0.0-rc1",
     "@nx-plus/docusaurus": "14.0.0",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/commit-analyzer": "^9.0.2",
@@ -65,48 +65,48 @@
     "@swc-node/register": "^1.4.2",
     "@swc/cli": "~0.1.55",
     "@swc/core": "^1.2.173",
-    "@testing-library/react": "13.1.1",
+    "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/fs-extra": "^9.0.13",
     "@types/inquirer": "^8.1.3",
     "@types/is-ci": "^3.0.0",
-    "@types/jest": "27.4.1",
-    "@types/node": "17.0.18",
+    "@types/jest": "28.1.8",
+    "@types/node": "18.7.18",
     "@types/node-fetch": "^2.6.2",
-    "@types/react": "18.0.8",
-    "@types/react-dom": "18.0.3",
+    "@types/react": "18.0.20",
+    "@types/react-dom": "18.0.6",
     "@types/rimraf": "^3.0.2",
     "@types/semver": "^7.3.9",
     "@types/tmp": "^0.2.3",
     "@types/yargs-parser": "^20.2.1",
-    "@typescript-eslint/eslint-plugin": "5.24.0",
-    "@typescript-eslint/parser": "5.24.0",
-    "babel-jest": "29.0.1",
+    "@typescript-eslint/eslint-plugin": "5.40.0",
+    "@typescript-eslint/parser": "5.40.0",
+    "babel-jest": "28.1.3",
     "cypress": "^9.1.0",
     "dotenv": "^16.0.1",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-cypress": "^2.10.3",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-jsx-a11y": "6.5.1",
-    "eslint-plugin-react": "7.31.1",
-    "eslint-plugin-react-hooks": "4.5.0",
+    "eslint-plugin-jsx-a11y": "6.6.1",
+    "eslint-plugin-react": "7.31.8",
+    "eslint-plugin-react-hooks": "4.6.0",
     "fs-extra": "^10.1.0",
     "husky": "^8.0.1",
-    "jest": "27.5.1",
+    "jest": "28.1.3",
     "jsonc-eslint-parser": "^2.1.0",
     "kill-port": "^1.6.1",
     "lint-staged": "^13.0.3",
     "node-fetch": "2.6.6",
-    "nx": "14.2.2",
+    "nx": "15.0.0-rc1",
     "openapi-types": "^11.0.1",
     "prettier": "2.7.1",
-    "react-test-renderer": "18.1.0",
+    "react-test-renderer": "18.2.0",
     "run-p": "*",
     "semantic-release": "^19.0.5",
-    "ts-jest": "27.1.4",
-    "ts-node": "10.8.1",
+    "ts-jest": "28.0.8",
+    "ts-node": "10.9.1",
     "tslib": "^2.3.1",
-    "typescript": "4.7.4",
+    "typescript": "4.8.4",
     "verdaccio": "^5.15.2"
   },
   "lint-staged": {

diff --git a/packages/core/project.json b/packages/core/project.json
@@ -18,14 +18,14 @@
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/packages/core"],
+      "outputs": ["{workspaceRoot}/coverage/packages/core"],
       "options": {
         "jestConfig": "packages/core/jest.config.ts",
         "passWithNoTests": true
       }
     },
     "prebuild": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "commands": [
           "npx ts-node tools/scripts/patch-package-versions --project core"
@@ -83,7 +83,7 @@
       }
     },
     "noop": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "command": "echo"
       }

diff --git a/packages/core/src/executors/build/schema.json b/packages/core/src/executors/build/schema.json
@@ -1,4 +1,5 @@
 {
+  "version": 2,
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "title": "NxDotnet Build",

diff --git a/packages/core/src/executors/format/schema.json b/packages/core/src/executors/format/schema.json
@@ -1,4 +1,5 @@
 {
+  "version": 2,
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "title": "Format executor",

diff --git a/packages/core/src/executors/openapi-codegen/schema.json b/packages/core/src/executors/openapi-codegen/schema.json
@@ -1,4 +1,5 @@
 {
+  "version": 2,
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "title": "OpenapiCodegen executor",

diff --git a/packages/core/src/executors/publish/schema.json b/packages/core/src/executors/publish/schema.json
@@ -1,4 +1,5 @@
 {
+  "version": 2,
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "title": "NxDotnet Publish",

diff --git a/packages/core/src/executors/serve/schema.json b/packages/core/src/executors/serve/schema.json
@@ -1,4 +1,5 @@
 {
+  "version": 2,
   "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "title": "NxDotnet Serve Executor",