chore: changes required in order to deploy with internal tools (#36)

Align a few dependencies to the library versions available in the Amazon internal repositories so we can deploy construct hub. Additionally, move tests under `src/__tests__` so that they are executed as JavaScript and not TypeScript. This is required in order for `NodejsFunction` to be able to find the entry point.
cdklabs · May 5, 2021 · 5910c1f · 5910c1f
1 parent 6da4469
commit 5910c1f
Show file tree

Hide file tree

Showing 20 changed files with 920 additions and 980 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,7 @@ node_modules/
 npm-debug.log*
 pids
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-test/devapp/cdk.out
+src/__tests__/devapp/cdk.out
 tsconfig.json
 yarn-debug.log*
 yarn-error.log*
@@ -40,13 +40,13 @@ yarn-error.log*
 !/.github/workflows/release.yml
 !/.npmignore
 !/.projen/deps.json
+!/.projen/jest-snapshot-resolver.js
 !/.projen/tasks.json
 !/.projenrc.js
 !/.versionrc.json
 !/API.md
 !/LICENSE
 !/package.json
 !/src
-!/test
+!/src/__tests__
 !/tsconfig.eslint.json
-!/tsconfig.jest.json
diff --git a/.npmignore b/.npmignore
diff --git a/.projen/deps.json b/.projen/deps.json
@@ -2,7 +2,7 @@
   "dependencies": [
     {
       "name": "@aws-cdk/assert",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "build"
     },
     {
@@ -24,7 +24,7 @@
     },
     {
       "name": "aws-cdk",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "build"
     },
     {
@@ -78,18 +78,14 @@
     },
     {
       "name": "projen",
-      "version": "^0.17.75",
+      "version": "^0.17.78",
       "type": "build"
     },
     {
       "name": "standard-version",
       "version": "^9",
       "type": "build"
     },
-    {
-      "name": "ts-jest",
-      "type": "build"
-    },
     {
       "name": "ts-node",
       "type": "build"
@@ -104,46 +100,47 @@
     },
     {
       "name": "@aws-cdk/aws-certificatemanager",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "peer"
     },
     {
       "name": "@aws-cdk/aws-cloudwatch",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "peer"
     },
     {
       "name": "@aws-cdk/aws-lambda-nodejs",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "peer"
     },
     {
       "name": "@aws-cdk/aws-lambda",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "peer"
     },
     {
       "name": "@aws-cdk/aws-route53",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "peer"
     },
     {
       "name": "@aws-cdk/aws-sns",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "peer"
     },
     {
       "name": "@aws-cdk/core",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "peer"
     },
     {
       "name": "@aws-cdk/cx-api",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "peer"
     },
     {
       "name": "cdk-watchful",
+      "version": "^0.5.129",
       "type": "peer"
     },
     {
@@ -153,46 +150,47 @@
     },
     {
       "name": "@aws-cdk/aws-certificatemanager",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "runtime"
     },
     {
       "name": "@aws-cdk/aws-cloudwatch",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "runtime"
     },
     {
       "name": "@aws-cdk/aws-lambda-nodejs",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "runtime"
     },
     {
       "name": "@aws-cdk/aws-lambda",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "runtime"
     },
     {
       "name": "@aws-cdk/aws-route53",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "runtime"
     },
     {
       "name": "@aws-cdk/aws-sns",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "runtime"
     },
     {
       "name": "@aws-cdk/core",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "runtime"
     },
     {
       "name": "@aws-cdk/cx-api",
-      "version": "^1.101.0",
+      "version": "^1.100.0",
       "type": "runtime"
     },
     {
       "name": "cdk-watchful",
+      "version": "^0.5.129",
       "type": "runtime"
     }
   ],

diff --git a/.projen/jest-snapshot-resolver.js b/.projen/jest-snapshot-resolver.js
diff --git a/.projen/tasks.json b/.projen/tasks.json
@@ -73,21 +73,13 @@
     "test:compile": {
       "name": "test:compile",
       "category": "10.test",
-      "description": "compiles the test code",
-      "steps": [
-        {
-          "exec": "tsc --noEmit --project tsconfig.jest.json"
-        }
-      ]
+      "description": "compiles the test code"
     },
     "test": {
       "name": "test",
       "category": "10.test",
       "description": "Run tests",
       "steps": [
-        {
-          "exec": "rm -fr lib/"
-        },
         {
           "spawn": "test:compile"
         },
@@ -108,10 +100,10 @@
           "exec": "npx projen"
         },
         {
-          "spawn": "test"
+          "spawn": "compile"
         },
         {
-          "spawn": "compile"
+          "spawn": "test"
         },
         {
           "spawn": "package"
@@ -185,7 +177,7 @@
       "description": "Runs eslint against the codebase",
       "steps": [
         {
-          "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test build-tools .projenrc.js"
+          "exec": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src src/__tests__ build-tools .projenrc.js"
         }
       ]
     },
@@ -217,7 +209,7 @@
           "exec": "npx cdk bootstrap"
         }
       ],
-      "cwd": "test/devapp"
+      "cwd": "src/__tests__/devapp"
     },
     "dev:synth": {
       "name": "dev:synth",
@@ -227,7 +219,7 @@
           "exec": "npx cdk synth"
         }
       ],
-      "cwd": "test/devapp"
+      "cwd": "src/__tests__/devapp"
     },
     "dev:diff": {
       "name": "dev:diff",
@@ -237,7 +229,7 @@
           "exec": "npx cdk diff"
         }
       ],
-      "cwd": "test/devapp"
+      "cwd": "src/__tests__/devapp"
     },
     "dev:deploy": {
       "name": "dev:deploy",
@@ -247,7 +239,7 @@
           "exec": "npx cdk deploy"
         }
       ],
-      "cwd": "test/devapp"
+      "cwd": "src/__tests__/devapp"
     }
   },
   "env": {