chore(nx-monorepo)!: improve nx project and target configs

- enable PDKProject direct nx project config - move default nx build target to workspace - remove legacy nx override logic - separate out aws-arch generate task and enable caching BREAKING CHANGE: modified nx-monorepo config settings for Nx 1. `WorkspaceConfig.nxConfig` type `NxConfig => Nx.WorkspaceConfig` 2. `overrideProjectTargets` removed in favor of `PDKProject.nx` config to manage Nx project See [PR 231](#231)
aws · Jan 16, 2023 · be8c6c8 · be8c6c8
1 parent 4cafb59
commit be8c6c8
Show file tree

Hide file tree

Showing 26 changed files with 465 additions and 551 deletions.
diff --git a/nx.json b/nx.json
diff --git a/packages/aws-arch/.projen/tasks.json b/packages/aws-arch/.projen/tasks.json
diff --git a/packages/aws-arch/package.json b/packages/aws-arch/package.json
@@ -167,40 +167,55 @@
     "NOTICE",
     "jsii"
   ],
-  "resolutions": {
-    "@types/prettier": "2.6.0",
-    "ansi-regex": "^5.0.1",
-    "underscore": "^1.12.1",
-    "deep-extend": "^0.5.1",
-    "argparse": "^1.0.10",
-    "debug": "^2.6.9",
-    "minimist": "^1.2.6",
-    "ejs": "^3.1.7",
-    "async": "^2.6.4",
-    "nth-check": "^2.0.1",
-    "got": "^11.8.5"
-  },
   "nx": {
     "targets": {
       "build": {
         "outputs": [
           "{projectRoot}/dist",
+          "{projectRoot}/lib",
           "{projectRoot}/build",
           "{projectRoot}/coverage",
-          "{projectRoot}/lib",
+          "{projectRoot}/test-reports",
           "{projectRoot}/target",
-          "{projectRoot}/.jsii",
-          "{projectRoot}/assets",
-          "{projectRoot}/src/generated"
+          "{projectRoot}/LICENSE_THIRD_PARTY",
+          "{projectRoot}/.jsii"
         ],
         "dependsOn": [
           {
             "target": "build",
             "projects": "dependencies"
+          },
+          {
+            "target": "generate",
+            "projects": "dependencies"
           }
         ]
+      },
+      "generate": {
+        "inputs": [
+          "{projectRoot}/scripts/**",
+          "!{projectRoot}/src/*",
+          "{projectRoot}/src/!(generated)/**"
+        ],
+        "outputs": [
+          "{projectRoot}/assets",
+          "{projectRoot}/src/generated"
+        ]
       }
     }
   },
+  "resolutions": {
+    "@types/prettier": "2.6.0",
+    "ansi-regex": "^5.0.1",
+    "underscore": "^1.12.1",
+    "deep-extend": "^0.5.1",
+    "argparse": "^1.0.10",
+    "debug": "^2.6.9",
+    "minimist": "^1.2.6",
+    "ejs": "^3.1.7",
+    "async": "^2.6.4",
+    "nth-check": "^2.0.1",
+    "got": "^11.8.5"
+  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }
diff --git a/packages/aws-prototyping-sdk/package.json b/packages/aws-prototyping-sdk/package.json
@@ -157,37 +157,17 @@
   "bundle": {
     "exclude": true
   },
-  "exports": {
-    ".": "./index.js",
-    "./package.json": "./package.json",
-    "./.jsii": "./.jsii",
-    "./.warnings.jsii.js": "./.warnings.jsii.js",
-    "./nx-monorepo": "./nx-monorepo/index.js",
-    "./pdk-nag": "./pdk-nag/index.js",
-    "./pipeline": "./pipeline/index.js"
-  },
-  "resolutions": {
-    "@types/prettier": "2.6.0",
-    "ansi-regex": "^5.0.1",
-    "underscore": "^1.12.1",
-    "deep-extend": "^0.5.1",
-    "argparse": "^1.0.10",
-    "debug": "^2.6.9",
-    "minimist": "^1.2.6",
-    "ejs": "^3.1.7",
-    "async": "^2.6.4",
-    "nth-check": "^2.0.1",
-    "got": "^11.8.5"
-  },
   "nx": {
     "targets": {
       "build": {
         "outputs": [
           "{projectRoot}/dist",
+          "{projectRoot}/lib",
           "{projectRoot}/build",
           "{projectRoot}/coverage",
-          "{projectRoot}/lib",
+          "{projectRoot}/test-reports",
           "{projectRoot}/target",
+          "{projectRoot}/LICENSE_THIRD_PARTY",
           "{projectRoot}/.jsii",
           "{projectRoot}/nx-monorepo",
           "{projectRoot}/pdk-nag",
@@ -202,5 +182,27 @@
       }
     }
   },
+  "exports": {
+    ".": "./index.js",
+    "./package.json": "./package.json",
+    "./.jsii": "./.jsii",
+    "./.warnings.jsii.js": "./.warnings.jsii.js",
+    "./nx-monorepo": "./nx-monorepo/index.js",
+    "./pdk-nag": "./pdk-nag/index.js",
+    "./pipeline": "./pipeline/index.js"
+  },
+  "resolutions": {
+    "@types/prettier": "2.6.0",
+    "ansi-regex": "^5.0.1",
+    "underscore": "^1.12.1",
+    "deep-extend": "^0.5.1",
+    "argparse": "^1.0.10",
+    "debug": "^2.6.9",
+    "minimist": "^1.2.6",
+    "ejs": "^3.1.7",
+    "async": "^2.6.4",
+    "nth-check": "^2.0.1",
+    "got": "^11.8.5"
+  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }
diff --git a/packages/cdk-graph-plugin-diagram/package.json b/packages/cdk-graph-plugin-diagram/package.json
@@ -210,25 +210,5 @@
     "nth-check": "^2.0.1",
     "got": "^11.8.5"
   },
-  "nx": {
-    "targets": {
-      "build": {
-        "outputs": [
-          "{projectRoot}/dist",
-          "{projectRoot}/build",
-          "{projectRoot}/coverage",
-          "{projectRoot}/lib",
-          "{projectRoot}/target",
-          "{projectRoot}/.jsii"
-        ],
-        "dependsOn": [
-          {
-            "target": "build",
-            "projects": "dependencies"
-          }
-        ]
-      }
-    }
-  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }
diff --git a/packages/cdk-graph/package.json b/packages/cdk-graph/package.json
@@ -184,25 +184,5 @@
     "nth-check": "^2.0.1",
     "got": "^11.8.5"
   },
-  "nx": {
-    "targets": {
-      "build": {
-        "outputs": [
-          "{projectRoot}/dist",
-          "{projectRoot}/build",
-          "{projectRoot}/coverage",
-          "{projectRoot}/lib",
-          "{projectRoot}/target",
-          "{projectRoot}/.jsii"
-        ],
-        "dependsOn": [
-          {
-            "target": "build",
-            "projects": "dependencies"
-          }
-        ]
-      }
-    }
-  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }
diff --git a/packages/cloudscape-react-ts-website/package.json b/packages/cloudscape-react-ts-website/package.json
@@ -149,25 +149,5 @@
     "nth-check": "^2.0.1",
     "got": "^11.8.5"
   },
-  "nx": {
-    "targets": {
-      "build": {
-        "outputs": [
-          "{projectRoot}/dist",
-          "{projectRoot}/build",
-          "{projectRoot}/coverage",
-          "{projectRoot}/lib",
-          "{projectRoot}/target",
-          "{projectRoot}/.jsii"
-        ],
-        "dependsOn": [
-          {
-            "target": "build",
-            "projects": "dependencies"
-          }
-        ]
-      }
-    }
-  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }
diff --git a/packages/cloudscape-react-ts-website/samples/package.json b/packages/cloudscape-react-ts-website/samples/package.json
@@ -86,24 +86,5 @@
     "nth-check": "^2.0.1",
     "got": "^11.8.5"
   },
-  "nx": {
-    "targets": {
-      "build": {
-        "outputs": [
-          "{projectRoot}/dist",
-          "{projectRoot}/build",
-          "{projectRoot}/coverage",
-          "{projectRoot}/lib",
-          "{projectRoot}/target"
-        ],
-        "dependsOn": [
-          {
-            "target": "build",
-            "projects": "dependencies"
-          }
-        ]
-      }
-    }
-  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }
diff --git a/packages/identity/package.json b/packages/identity/package.json
@@ -160,25 +160,5 @@
     "nth-check": "^2.0.1",
     "got": "^11.8.5"
   },
-  "nx": {
-    "targets": {
-      "build": {
-        "outputs": [
-          "{projectRoot}/dist",
-          "{projectRoot}/build",
-          "{projectRoot}/coverage",
-          "{projectRoot}/lib",
-          "{projectRoot}/target",
-          "{projectRoot}/.jsii"
-        ],
-        "dependsOn": [
-          {
-            "target": "build",
-            "projects": "dependencies"
-          }
-        ]
-      }
-    }
-  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }
diff --git a/packages/nx-monorepo/README.md b/packages/nx-monorepo/README.md
@@ -1,14 +1,17 @@
-The nx-monorepo package vends a NxMonorepoProject Projen construct that adds [NX](https://nx.dev/getting-started/intro) monorepo support and manages your yarn/npm/pnpm workspaces on your behalf. This construct enables polygot builds (and inter language build dependencies), build caching, dependency visualization and much, much more.
+The nx-monorepo package vends a NxMonorepoProject Projen construct that adds [NX](https://nx.dev/getting-started/intro) monorepo support and manages your yarn/npm/pnpm workspaces on your behalf. This construct enables polyglot builds (and inter language build dependencies), build caching, dependency visualization and much, much more.
 
-The PDK itself uses the nx-monorepo project itself and is a good reference for seeing how a complex, polygot monorepo can be set up.
+The PDK itself uses the nx-monorepo project itself and is a good reference for seeing how a complex, polyglot monorepo can be set up.
+
+> **BREAKING CHANGES** (pre-release)
+> - v0.13.0: `WorkspaceConfig.nxConfig` type `NxConfig => Nx.WorkspaceConfig`, and `overrideProjectTargets` removed in favor of `PDKProject.nx` config to manage Nx project configurations. See [PR 231](https://github.com/aws/aws-prototyping-sdk/pull/231).
 
 To get started simply run the following command in an empty directory:
 
 ```bash
 npx projen new --from aws-prototyping-sdk nx-monorepo
 ```
 
-This will boostrap a new Projen monorepo and contain the following in the .projenrc.ts:
+This will bootstrap a new Projen monorepo and contain the following in the .projenrc.ts:
 
 ```ts
 import { nx_monorepo } from "aws-prototyping-sdk";

diff --git a/packages/nx-monorepo/package.json b/packages/nx-monorepo/package.json
@@ -155,25 +155,5 @@
     "nth-check": "^2.0.1",
     "got": "^11.8.5"
   },
-  "nx": {
-    "targets": {
-      "build": {
-        "outputs": [
-          "{projectRoot}/dist",
-          "{projectRoot}/build",
-          "{projectRoot}/coverage",
-          "{projectRoot}/lib",
-          "{projectRoot}/target",
-          "{projectRoot}/.jsii"
-        ],
-        "dependsOn": [
-          {
-            "target": "build",
-            "projects": "dependencies"
-          }
-        ]
-      }
-    }
-  },
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"."
 }