fix: type references in package.json

sam-goodwin · Jan 3, 2024 · e1c30c3 · e1c30c3
1 parent 5a30095
commit e1c30c3
Show file tree

Hide file tree

Showing 25 changed files with 93 additions and 240 deletions.
diff --git a/apps/test-app-runtime/package.json b/apps/test-app-runtime/package.json
@@ -29,8 +29,7 @@
     "aws-embedded-metrics": "^4.1.0",
     "jest": "^29",
     "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
+    "ts-node": "^10.9.1"
   },
   "jest": {
     "preset": "ts-jest",

diff --git a/apps/test-app/package.json b/apps/test-app/package.json
@@ -26,8 +26,7 @@
     "test-app-runtime": "workspace:^",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "tsx": "^4.7.0",
-    "typescript": "^5.3.3"
+    "tsx": "^4.7.0"
   },
   "jest": {
     "preset": "ts-jest",

diff --git a/apps/tests/aws-runtime-cdk/eventual.json b/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"
 }
diff --git a/apps/tests/aws-runtime-cdk/package.json b/apps/tests/aws-runtime-cdk/package.json
@@ -24,8 +24,7 @@
     "jest": "^29",
     "tests-runtime": "workspace:^",
     "ts-jest": "^29.1.0",
-    "tsx": "^4.7.0",
-    "typescript": "^5.3.3"
+    "tsx": "^4.7.0"
   },
   "jest": {
     "preset": "ts-jest",

diff --git a/apps/tests/aws-runtime/eventual.json b/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"
 }
diff --git a/apps/tests/aws-runtime/package.json b/apps/tests/aws-runtime/package.json
@@ -39,8 +39,7 @@
     "openapi3-ts": "^3.1.2",
     "ts-jest": "^29.1.0",
     "ts-node": "^10.9.1",
-    "tsx": "^4.7.0",
-    "typescript": "^5.3.3"
+    "tsx": "^4.7.0"
   },
   "jest": {
     "displayName": "workspace",
@@ -54,6 +53,11 @@
     "extensionsToTreatAsEsm": [
       ".ts"
     ],
+    "transformIgnorePatterns": [
+      "node_modules/",
+      "node_modules/@eventual/core/lib/",
+      "node_modules/@eventual/client/lib/"
+    ],
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.js$": "$1"
     },

diff --git a/apps/tests/aws-runtime/tsconfig.json b/apps/tests/aws-runtime/tsconfig.json
@@ -1,15 +1,16 @@
 {
-  "extends": "../../../tsconfig-base",
+  "extends": "../../../tsconfig-base.test.json",
   "include": ["test"],
   "exclude": ["lib", "node_modules"],
   "compilerOptions": {
     "rootDir": "test",
     "outDir": "lib",
-    "module": "Node16",
     "target": "ESNext",
-    "moduleResolution": "Node16",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
     "noUnusedLocals": false,
-    "noUnusedParameters": false
+    "noUnusedParameters": false,
+    "allowJs": true
   },
   "references": [
     { "path": "../../../packages/@eventual/core" },

diff --git a/examples/sst-nextjs/src/app/api/start/route.tsx b/examples/sst-nextjs/src/app/api/start/route.tsx
@@ -1,12 +1,12 @@
-import { client } from "@/server/client";
 import { NextRequest, NextResponse } from "next/server";
+import { tickTock } from "@/server/workflow";
 
 export async function POST(req: NextRequest) {
-  const executionHandle = await client.tickTock.startExecution();
+  const executionHandle = await tickTock.startExecution();
 
   return new NextResponse(
     JSON.stringify({
-      executionId: "",
+      executionId: executionHandle.executionId,
     })
   );
 }
diff --git a/examples/sst-nextjs/src/server/client.ts b/examples/sst-nextjs/src/server/client.ts
diff --git a/packages/@eventual/aws-cdk/package.json b/packages/@eventual/aws-cdk/package.json
@@ -3,6 +3,7 @@
   "version": "0.57.0",
   "type": "module",
   "module": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "exports": {
     ".": {
       "import": "./lib/index.js",
@@ -41,10 +42,7 @@
     "constructs": "10.3.0",
     "esbuild": "^0.17.4",
     "jest": "^29",
-    "openapi3-ts": "^3.1.2",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
+    "openapi3-ts": "^3.1.2"
   },
   "jest": {
     "preset": "ts-jest",

diff --git a/packages/@eventual/aws-client/package.json b/packages/@eventual/aws-client/package.json
@@ -1,13 +1,14 @@
 {
   "name": "@eventual/aws-client",
+  "version": "0.57.0",
+  "type": "module",
+  "module": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "exports": {
     ".": {
       "import": "./lib/index.js"
     }
   },
-  "type": "module",
-  "module": "./lib/index.js",
-  "version": "0.57.0",
   "scripts": {
     "test": "jest --passWithNoTests"
   },
@@ -24,8 +25,7 @@
     "@eventual/core": "workspace:^"
   },
   "devDependencies": {
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
+    "ts-node": "^10.9.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/@eventual/aws-client/src/aws-service-client.ts b/packages/@eventual/aws-client/src/aws-service-client.ts
@@ -1,5 +1,4 @@
 import {
-  HttpEventualClient,
   HttpServiceClient,
   HttpServiceClientProps,
   proxyServiceClient,
@@ -20,18 +19,12 @@ export const AWSServiceClient: {
   new <Service>(props: HttpServiceClientProps): ServiceClient<Service>;
 } = class AWSServiceClient {
   public readonly httpClient: HttpServiceClient;
-  // @ts-ignore
-  public readonly httpEventualClient: HttpEventualClient;
   constructor(props: AWSHttpEventualClientProps) {
     const signer = createAwsHttpRequestSigner(props);
     this.httpClient = new HttpServiceClient({
       serviceUrl: props.serviceUrl,
       beforeRequest: signer,
     });
-    // this.httpEventualClient = new HttpEventualClient({
-    //   serviceUrl: props.serviceUrl,
-    //   beforeRequest: signer,
-    // });
 
     return proxyServiceClient.call(this);
   }

diff --git a/packages/@eventual/aws-runtime/package.json b/packages/@eventual/aws-runtime/package.json
@@ -1,13 +1,15 @@
 {
   "name": "@eventual/aws-runtime",
+  "version": "0.57.0",
+  "type": "module",
+  "module": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "exports": {
     ".": {
-      "import": "./lib/index.js"
+      "import": "./lib/index.js",
+      "types": "./lib/index.d.ts"
     }
   },
-  "type": "module",
-  "module": "./lib/index.js",
-  "version": "0.57.0",
   "scripts": {
     "test": "jest --passWithNoTests"
   },
@@ -39,8 +41,7 @@
     "@types/express": "^4.17.17",
     "jest": "^29",
     "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
+    "ts-node": "^10.9.1"
   },
   "jest": {
     "extensionsToTreatAsEsm": [

diff --git a/packages/@eventual/cli/bin/eventual.mjs b/packages/@eventual/cli/bin/eventual.mjs
@@ -6,7 +6,7 @@ tsNode.register({
   esm: true,
 });
 
-import { cli } from "../lib/esm/cli.js";
+import { cli } from "../lib/cli.js";
 
 //Get rid of experimental fetch warning
 process.removeAllListeners("warning");

diff --git a/packages/@eventual/cli/package.json b/packages/@eventual/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@eventual/cli",
-  "type": "module",
   "version": "0.57.0",
+  "type": "module",
   "bin": {
     "eventual": "bin/eventual.mjs"
   },
@@ -52,9 +52,7 @@
     "@types/ws": "^8.5.5",
     "@types/yargs": "^17.0.24",
     "jest": "^29",
-    "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
+    "ts-jest": "^29.1.0"
   },
   "jest": {
     "transform": {

diff --git a/packages/@eventual/client/package.json b/packages/@eventual/client/package.json
@@ -1,13 +1,15 @@
 {
   "name": "@eventual/client",
+  "version": "0.57.0",
+  "type": "module",
+  "module": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "exports": {
     ".": {
-      "import": "./lib/index.js"
+      "import": "./lib/index.js",
+      "types": "./lib/index.d.ts"
     }
   },
-  "type": "module",
-  "module": "./lib/index.js",
-  "version": "0.57.0",
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests"
   },
@@ -17,8 +19,7 @@
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "esbuild": "0.19.11",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
+    "ts-node": "^10.9.1"
   },
   "jest": {
     "preset": "ts-jest/presets/default-esm",