feat: add support for NextJS in SST & remove CJS support

.eslintrc.json

@@ -46,6 +46,7 @@
         }
       }
     ],
+    "@typescript-eslint/no-explicit-any": "off",
     "@typescript-eslint/ban-ts-comment": "warn",
     "@typescript-eslint/no-this-alias": "warn",
     "@typescript-eslint/explicit-member-accessibility": [

.github/actions/build/action.yml

@@ -11,7 +11,7 @@ runs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: "18"
+        node-version: "20"
         cache: "pnpm"
 
     - run: pnpm install --frozen-lockfile

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/build
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v3-node20
         with:
           role-to-assume: arn:aws:iam::593491530938:role/githubActionStack-githubactionroleA106E4DC-14SHKLVA61IN4
           aws-region: us-east-1
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/build
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v3-node20
         with:
           role-to-assume: arn:aws:iam::593491530938:role/githubActionStack-githubactionroleA106E4DC-14SHKLVA61IN4
           aws-region: us-east-1
@@ -64,7 +64,7 @@ jobs:
       - run: |
           echo "TEST_ROLE_ARN=$(node -p 'JSON.parse(require("fs").readFileSync("${{ steps.deployment-output.outputs.download-path }}/outputs.json"))["eventual-tests"].roleArn')" >> $GITHUB_ENV
       - name: Configure Test Role Credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v3-node20
         with:
           role-to-assume: ${{ env.TEST_ROLE_ARN }}
           aws-region: us-east-1
@@ -88,7 +88,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/build
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v3-node20
         with:
           role-to-assume: arn:aws:iam::593491530938:role/githubActionStack-githubactionroleA106E4DC-14SHKLVA61IN4
           aws-region: us-east-1
@@ -102,7 +102,7 @@ jobs:
       - run: |
           echo "TEST_ROLE_ARN=$(node -p 'JSON.parse(require("fs").readFileSync("${{ steps.deployment-output.outputs.download-path }}/outputs.json"))["eventual-tests"].roleArn')" >> $GITHUB_ENV
       - name: Configure Test Role Credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v3-node20
         with:
           role-to-assume: ${{ env.TEST_ROLE_ARN }}
           aws-region: us-east-1
@@ -126,7 +126,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/build
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v3-node20
         with:
           role-to-assume: arn:aws:iam::593491530938:role/githubActionStack-githubactionroleA106E4DC-14SHKLVA61IN4
           aws-region: us-east-1
@@ -140,7 +140,7 @@ jobs:
       - run: |
           echo "TEST_ROLE_ARN=$(node -p 'JSON.parse(require("fs").readFileSync("${{ steps.deployment-output.outputs.download-path }}/outputs.json"))["eventual-tests"].roleArn')" >> $GITHUB_ENV
       - name: Configure Test Role Credentials
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@v3-node20
         with:
           role-to-assume: ${{ env.TEST_ROLE_ARN }}
           aws-region: us-east-1

apps/test-app-runtime/package.json

@@ -25,14 +25,11 @@
   "devDependencies": {
     "@eventual/cli": "workspace:^",
     "@types/aws-lambda": "^8.10.115",
-    "@types/jest": "^29.5.1",
     "@types/ms": "^0.7.31",
-    "@types/node": "^18",
     "aws-embedded-metrics": "^4.1.0",
     "jest": "^29",
     "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "ts-node": "^10.9.1"
   },
   "jest": {
     "preset": "ts-jest",

apps/test-app-runtime/src/my-workflow.ts

@@ -2,7 +2,6 @@ import { task, workflow } from "@eventual/core";
 
 export default workflow("my-workflow", async ({ name }: { name: string }) => {
   const result = await Promise.all([hello(name), hello2(name)]);
-  console.log(result);
   const result2 = await hello(name);
   return `you said ${result2} ${result}`;
 });

apps/test-app-runtime/src/parent-child-com.ts

@@ -11,8 +11,6 @@ export const workflow1 = workflow("workflow1", async () => {
   while (true) {
     const n = await mySignal.expectSignal();
 
-    console.log(n);
-
     if (n > 10) {
       child.sendSignal(doneSignal);
       break;
@@ -32,7 +30,7 @@ export const workflow1 = workflow("workflow1", async () => {
  */
 export const workflow2 = workflow(
   "workflow2",
-  async (input: { name: string }, { execution: { parentId } }) => {
+  async (_input: { name: string }, { execution: { parentId } }) => {
     let block = false;
     let done = false;
     let last = 0;
@@ -41,8 +39,6 @@ export const workflow2 = workflow(
       throw new Error("I need an adult");
     }
 
-    console.log(`Hi, I am ${input.name}`);
-
     mySignal.onSignal((n) => {
       last = n;
       block = false;

apps/test-app-sst/package.json

@@ -16,11 +16,11 @@
     "@serverless-stack/cli": "^1.18.4",
     "@serverless-stack/core": "^1.18.4",
     "@serverless-stack/resources": "^1.18.4",
-    "@tsconfig/node18": "^1.0.1",
-    "aws-cdk-lib": "2.102.0",
+    "@tsconfig/node20": "^1.0.1",
+    "aws-cdk-lib": "2.110.1",
     "chalk": "^5.2.0",
     "fs-extra": "^11.1.0",
-    "typescript": "^5",
+    "typescript": "^5.3.3",
     "vitest": "^0.26.2"
   },
   "dependencies": {

apps/test-app-sst/services/functions/service.ts

@@ -13,7 +13,7 @@ api.post("/work", async (request) => {
 });
 
 export const myWorkflow = workflow("myWorkflow", async (items: string[]) => {
-  const results = await Promise.all(items.map(doWork));
+  const results = await Promise.all(items.map((item) => doWork(item)));
 
   await workDone.emit({
     outputs: results,
@@ -23,8 +23,6 @@ export const myWorkflow = workflow("myWorkflow", async (items: string[]) => {
 });
 
 export const doWork = task("work", async (work: string) => {
-  console.log("Doing Work", work);
-
   return work.length;
 });
 

apps/test-app-sst/tsconfig.json

@@ -1,4 +1,4 @@
 {
-  "extends": "@tsconfig/node18/tsconfig.json",
+  "extends": "@tsconfig/node20/tsconfig.json",
   "include": ["stacks"]
 }

apps/test-app/cdk.json

@@ -1,4 +1,4 @@
 {
-  "app": "ts-node ./src/app.ts",
+  "app": "tsx ./src/app.ts",
   "watch": "."
 }

apps/test-app/package.json

@@ -2,7 +2,8 @@
   "name": "test-app",
   "private": true,
   "version": "0.0.0",
-  "main": "lib/index.js",
+  "type": "module",
+  "module": "lib/index.js",
   "scripts": {
     "test": "cdk synth",
     "cdk": "cdk",
@@ -14,20 +15,18 @@
   },
   "dependencies": {
     "@eventual/aws-cdk": "workspace:^",
-    "aws-cdk-lib": "2.102.0",
-    "constructs": "10.1.154"
+    "aws-cdk-lib": "2.110.1",
+    "constructs": "10.3.0"
   },
   "devDependencies": {
     "@eventual/cli": "workspace:^",
-    "@types/jest": "^29.5.1",
-    "@types/node": "^18",
-    "aws-cdk": "2.102.0",
+    "aws-cdk": "2.110.1",
     "esbuild": "^0.17.4",
     "jest": "^29",
     "test-app-runtime": "workspace:^",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "tsx": "^4.7.0"
   },
   "jest": {
     "preset": "ts-jest",

apps/test-app/src/app.ts

@@ -5,6 +5,9 @@ import { App, CfnOutput, Duration, Stack } from "aws-cdk-lib/core";
 
 import * as eventual from "@eventual/aws-cdk";
 import { ServiceDashboard } from "@eventual/aws-cdk";
+import { createRequire } from "module";
+
+const require = createRequire(import.meta.url);
 
 const app = new App();
 

apps/test-app/tsconfig.json

@@ -1,13 +1,14 @@
 {
-  "extends": "../../tsconfig-base.cjs",
+  "extends": "../../tsconfig-base",
   "include": ["src"],
   "exclude": ["lib", "node_modules"],
   "compilerOptions": {
     "outDir": "lib",
-    "rootDir": "src"
+    "rootDir": "src",
+    "esModuleInterop": true
   },
   "references": [
-    { "path": "../../packages/@eventual/aws-cdk" },
+    { "path": "../../packages/@eventual/aws-cdk/tsconfig.json" },
     { "path": "../test-app-runtime" }
   ]
 }

apps/tests/aws-runtime-cdk/cdk.json

@@ -1,4 +1,4 @@
 {
-  "app": "ts-node --esm ./src/app.mts",
+  "app": "tsx ./src/app.mts",
   "watch": "."
 }

apps/tests/aws-runtime-cdk/eventual.json

@@ -1,5 +1,5 @@
 {
   "projectType": "aws-cdk",
-  "synth": "npx cdk synth --app \"ts-node --esm ./src/app.mts\"",
+  "synth": "npx cdk synth --app \"tsx ./src/app.mts\"",
   "deploy": "../aws-runtime/scripts/deploy"
 }

apps/tests/aws-runtime-cdk/package.json

@@ -6,28 +6,25 @@
   "main": "lib/index.js",
   "scripts": {
     "cdk": "cdk",
-    "nag": "ts-node-esm ./scripts/report-violations.ts"
+    "nag": "tsx ./scripts/report-violations.ts"
   },
   "dependencies": {
-    "@aws-cdk/aws-apigatewayv2-alpha": "^2.102.0-alpha.0",
-    "aws-cdk-lib": "2.102.0",
+    "@aws-cdk/aws-apigatewayv2-alpha": "^2.110.1-alpha.0",
+    "aws-cdk-lib": "2.110.1",
     "cdk-nag": "^2.27.164",
-    "constructs": "10.1.154"
+    "constructs": "10.3.0"
   },
   "devDependencies": {
     "@aws-sdk/client-sts": "3.341.0",
     "@eventual/aws-cdk": "workspace:^",
     "@eventual/cli": "workspace:^",
     "@eventual/core": "workspace:^",
-    "@types/jest": "^29.5.1",
-    "@types/node": "^18",
-    "aws-cdk": "^2.102.0",
+    "aws-cdk": "^2.110.1",
     "esbuild": "^0.17.4",
     "jest": "^29",
     "tests-runtime": "workspace:^",
     "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "tsx": "^4.7.0"
   },
   "jest": {
     "preset": "ts-jest",

apps/tests/aws-runtime/eventual.json

@@ -1,5 +1,5 @@
 {
   "projectType": "aws-cdk",
-  "synth": "npx cdk synth --app \"ts-node --esm ../aws-runtime-cdk/src/app.mts\"",
+  "synth": "npx cdk synth --app \"tsx ../aws-runtime-cdk/src/app.mts\"",
   "deploy": "./scripts/deploy"
 }

apps/tests/aws-runtime/package.json

@@ -30,18 +30,16 @@
     "@aws-sdk/types": "^3.341.0",
     "@jest/globals": "^29.5.0",
     "@types/aws-lambda": "^8.10.115",
-    "@types/jest": "^29.5.1",
-    "@types/node": "^18",
     "@types/uuid": "^9.0.4",
     "@types/ws": "^8.5.5",
-    "aws-cdk": "^2.102.0",
+    "aws-cdk": "^2.110.1",
     "esbuild": "^0.17.4",
     "jest": "^29",
     "node-fetch": "^3.3.0",
     "openapi3-ts": "^3.1.2",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.0.4"
+    "tsx": "^4.7.0"
   },
   "jest": {
     "displayName": "workspace",
@@ -55,6 +53,11 @@
     "extensionsToTreatAsEsm": [
       ".ts"
     ],
+    "transformIgnorePatterns": [
+      "node_modules/",
+      "node_modules/@eventual/core/lib/",
+      "node_modules/@eventual/client/lib/"
+    ],
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.js$": "$1"
     },

apps/tests/aws-runtime/scripts/deploy

@@ -2,4 +2,4 @@
 
 set -ex
 
-npx cdk deploy --app "ts-node --esm ../aws-runtime-cdk/src/app.mts" --hotswap-fallback ${CI:+false} --require-approval never --outputs-file ${OUTPUTS_FILE:-/dev/null}
+npx cdk deploy --app "tsx ../aws-runtime-cdk/src/app.mts" --hotswap-fallback ${CI:+false} --require-approval never --outputs-file ${OUTPUTS_FILE:-/dev/null}

apps/tests/aws-runtime/scripts/test-create

@@ -12,17 +12,17 @@ cd ./.eventual
 echo "Testing Create-Eventual with AWS CDK"
 
 PROJECT_NAME="testme"
-EVENTUAL_PACKAGES=("@eventual/core" "@eventual/core-runtime" "@eventual/aws-client" "@eventual/cli" "@eventual/client" "@eventual/aws-runtime" "@eventual/testing" "@eventual/compiler" "@eventual/integrations-slack" "@eventual/aws-cdk" "@eventual/timeline" "@eventual/project")
+EVENTUAL_PACKAGES=("@eventual/core" "@eventual/core-runtime" "@eventual/aws-client" "@eventual/cli" "@eventual/client" "@eventual/aws-runtime" "@eventual/testing" "@eventual/compiler" "@eventual/integrations-slack" "@eventual/aws-cdk" "@eventual/project" "@eventual/sst")
 
 rm -rf $PROJECT_NAME
-../../../../packages/create-eventual/bin/index.js $PROJECT_NAME --target aws-cdk --serviceName test-service --skip-install --no-git --package-manager pnpm
+../../../../packages/create-eventual/bin/index.mjs $PROJECT_NAME --target aws-cdk --serviceName test-service --skip-install --no-git --package-manager pnpm
 cd $PROJECT_NAME
 
 pnpm link ${EVENTUAL_PACKAGES[@]/"@"/"../../../../../packages/@"}
 
 # CDK doesn't like mis-matched versions...
 cd ./infra
-pnpm install aws-cdk@2.79.1 aws-cdk-lib@2.79.1 constructs@10.1.154
+pnpm install aws-cdk@2.110.1 aws-cdk-lib@2.110.1 constructs@10.3.0
 pnpm link ${EVENTUAL_PACKAGES[@]/"@"/"../../../../../../packages/@"}
 cd ..
 
@@ -42,7 +42,7 @@ cd ../
 echo "Testing Create-Eventual with AWS SST"
 
 rm -rf $PROJECT_NAME
-../../../../packages/create-eventual/bin/index.js $PROJECT_NAME --target sst --serviceName test-service
+../../../../packages/create-eventual/bin/index.mjs $PROJECT_NAME --target sst --serviceName test-service
 
 # sst's "build" also bootstraps and needs permissions to get parameters.
 # There seems to be no good way to test the build/synth without network/account access :(.