build: re-work upgrade-dependencies and refactor pdk to remove depend… (#34)

* build: re-work upgrade-dependencies and refactor pdk to remove dependency on exports

Author: agdimech

.eslintrc.json

@@ -222,50 +222,4 @@ Type 'import(".../aws-pdk/node_modules/aws-prototyping-sdk/node_modules/projen/l
 Types have separate declarations of a private property '_patterns'.
 ```
 
-This means there are two conflicting versions of a package in the monorepo. To resolve this, from the root directory run: `npx projen upgrade-deps`. This will bump all dependencies to be the same/latest versions and update the `yarn.lock` file accordingly.
-
-### Jest import issue
-
-If you run into an issue in Jest when importing from the aws-prototyping-sdk:
-
-```bash
-Cannot find module 'aws-prototyping-sdk/pipeline' from 'src/pipeline-stack.ts'
-```
-
-Make the following changes:
-
-1. Add a devDependency on `jest-node-exports-resolver`
-1. Add a resolver property to jest config, pointing to `jest-node-exports-resolver`
-
-Here is an illustrative example:
-
-```ts
-const myProjectWithJestImportErrors = new TypescriptProject({
-  ...,
-  devDeps: ["jest-node-exports-resolver"],
-});
-
-myProjectWithJestImportErrors.jest!.config.resolver = 'jest-node-exports-resolver'; // need this for exports
-```
-
-### ESLint `import/no-unresolved` error
-
-If you run into an issue with eslint that resembles the following:
-
-`error  Unable to resolve path to module 'aws-prototyping-sdk/pipeline'  import/no-unresolved`
-
-This is due to the fact that `aws-prototyping-sdk` is using a relatively new exports feature which is not natively supported by the eslint import resolver.
-
-To fix, add the following to your problematic projects' configuration:
-
-```ts
-const myProjectWithEsLintImportErrors = new TypescriptProject({
-  ...,
-});
-
-myProjectWithEsLintImportErrors.eslint?.addRules({
-  "import/no-unresolved": [
-    "off"
-  ]
-});
-```
+This means there are two conflicting versions of a package in the monorepo. To resolve this, from the root directory run: `npx projen upgrade-deps`. This will bump all dependencies to be the same/latest versions and update the `yarn.lock` file accordingly.

.projen/tasks.json

@@ -63,7 +63,7 @@
       }
     ],
     "import/no-unresolved": [
-      "off"
+      "error"
     ],
     "import/order": [
       "warn",

CONTRIBUTING.md

@@ -39,7 +39,7 @@
   "devDependencies": {
     "@aws-prototyping-sdk/nx-monorepo": "0.0.0",
     "@aws-prototyping-sdk/pipeline": "0.0.0",
-    "@types/jest": "^28.1.0",
+    "@types/jest": "^28.1.1",
     "@types/node": "^14",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5",
@@ -53,29 +53,29 @@
     "fs-extra": "^10.1.0",
     "jest": "^27",
     "jest-junit": "^13",
-    "jsii": "^1.59.0",
-    "jsii-diff": "^1.59.0",
-    "jsii-pacmak": "^1.59.0",
+    "jsii": "^1.60.1",
+    "jsii-diff": "^1.60.1",
+    "jsii-pacmak": "^1.60.1",
     "json-schema": "^0.4.0",
     "license-checker": "^25.0.1",
     "npm-check-updates": "^12",
     "oss-attribution-generator": "^1.7.1",
-    "prettier": "^2.6.2",
-    "projen": "^0.57.1",
+    "prettier": "^2.7.0",
+    "projen": "^0.58.15",
     "ts-jest": "^27",
-    "ts-node": "^10.8.0",
-    "typescript": "^4.7.2"
+    "ts-node": "^10.8.1",
+    "typescript": "^4.7.3"
   },
   "peerDependencies": {
-    "aws-cdk-lib": "^2.26.0",
-    "constructs": "^10.1.25",
-    "projen": "^0.57.1"
+    "aws-cdk-lib": "^2.28.1",
+    "constructs": "^10.1.42",
+    "projen": "^0.58.15"
   },
   "dependencies": {
-    "@nrwl/devkit": "^14.1.9",
-    "aws-cdk-lib": "^2.26.0",
-    "constructs": "^10.1.25",
-    "projen": "^0.57.1"
+    "@nrwl/devkit": "^14.3.5",
+    "aws-cdk-lib": "^2.28.1",
+    "constructs": "^10.1.42",
+    "projen": "^0.58.15"
   },
   "bundledDependencies": [
     "@nrwl/devkit"
@@ -86,7 +86,7 @@
     "pdk",
     "projen"
   ],
-  "main": "lib/index.js",
+  "main": "./index.js",
   "license": "Apache-2.0",
   "publishConfig": {
     "access": "public"
@@ -132,7 +132,7 @@
       }
     }
   },
-  "types": "lib/index.d.ts",
+  "types": "./index.d.ts",
   "stability": "stable",
   "jsii": {
     "outdir": "dist",
@@ -150,44 +150,35 @@
       }
     },
     "tsc": {
-      "outDir": "./lib",
-      "rootDir": "./lib"
+      "outDir": ".",
+      "rootDir": "."
     },
     "excludeTypescript": [
       "**/samples/**"
     ]
   },
+  "bundle": {
+    "exclude": true
+  },
+  "exports": {
+    ".": "./index.js",
+    "./package.json": "./package.json",
+    "./.jsii": "./.jsii",
+    "./.warnings.jsii.js": "./.warnings.jsii.js",
+    "./nx_monorepo": "./nx-monorepo/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"
   },
-  "bundle": {
-    "exclude": true
-  },
-  "exports": {
-    ".": "./lib/index.js",
-    "./package.json": "./package.json",
-    "./.jsii": "./.jsii",
-    "./.warnings.jsii.js": "./.warnings.jsii.js",
-    "./nx_monorepo": "./lib/nx-monorepo/lib/index.js",
-    "./pipeline": "./lib/pipeline/lib/index.js"
-  },
-  "typesVersions": {
-    "*": {
-      "nx_monorepo": [
-        "lib/nx-monorepo/lib/index.d.ts"
-      ],
-      "pipeline": [
-        "lib/pipeline/lib/index.d.ts"
-      ]
-    }
-  },
   "nx": {
     "targets": {
       "build": {

package.json

@@ -1,3 +1,2 @@
 #!/usr/bin/env ts-node
 export {};
-//# sourceMappingURL=bundle.d.ts.map

packages/aws-prototyping-sdk/.eslintrc.json

@@ -209,7 +209,7 @@ async function prepareSourceFiles(libraries: readonly LibraryReference[], packag
 
   const indexStatements = new Array<string>();
   for (const library of libraries) {
-    const libDir = path.join(libRoot, 'lib', library.shortName);
+    const libDir = path.join(libRoot, library.shortName);
     const copied = await transformPackage(library, packageJson, libDir, libraries);
 
     if (!copied) {
@@ -219,7 +219,7 @@ async function prepareSourceFiles(libraries: readonly LibraryReference[], packag
     indexStatements.push(`export * as ${library.shortName.replace(/-/g, '_')} from './${library.shortName}';`);
   }
 
-  await fs.writeFile(path.join(libRoot, 'lib', 'index.ts'), indexStatements.join('\n'), { encoding: 'utf8' });
+  await fs.writeFile(path.join(libRoot, 'index.ts'), indexStatements.join('\n'), { encoding: 'utf8' });
 
   console.log('\t🍺 Success!');
 }

packages/aws-prototyping-sdk/package.json

@@ -22,7 +22,9 @@
     "strictNullChecks": true,
     "strictPropertyInitialization": true,
     "stripInternal": true,
-    "target": "ES2019"
+    "target": "ES2019",
+    "outDir": ".",
+    "rootDir": "."
   },
   "include": [
     ".projenrc.js",

packages/aws-prototyping-sdk/scripts/bundle.d.ts

@@ -63,7 +63,7 @@
       }
     ],
     "import/no-unresolved": [
-      "off"
+      "error"
     ],
     "import/order": [
       "warn",