From ce9c5d22fe5dd80ce59397bd4d99389d256b0e9f Mon Sep 17 00:00:00 2001
From: nicktrn <55853254+nicktrn@users.noreply.github.com>
Date: Mon, 18 Mar 2024 16:01:18 +0000
Subject: [PATCH] fix provider build and dev

---
 apps/docker-provider/package.json     |  2 +-
 apps/kubernetes-provider/package.json |  6 ++++--
 apps/kubernetes-provider/src/index.ts | 10 +++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/docker-provider/package.json b/apps/docker-provider/package.json
index 1b39e0026..59a1d522b 100644
--- a/apps/docker-provider/package.json
+++ b/apps/docker-provider/package.json
@@ -6,7 +6,7 @@
   "main": "dist/index.cjs",
   "scripts": {
     "build": "npm run build:bundle",
-    "build:bundle": "esbuild src/index.ts --bundle --outfile=dist/index.mjs --platform=node --format=esm --target=esnext --banner:js=\"const require = createRequire(import.meta.url);\"",
+    "build:bundle": "esbuild src/index.ts --bundle --outfile=dist/index.mjs --platform=node --format=esm --target=esnext --banner:js=\"import { createRequire } from 'module';const require = createRequire(import.meta.url);\"",
     "build:image": "docker build -f Containerfile . -t docker-provider",
     "dev": "tsx --no-warnings=ExperimentalWarning --require dotenv/config --watch src/index.ts",
     "start": "tsx src/index.ts",
diff --git a/apps/kubernetes-provider/package.json b/apps/kubernetes-provider/package.json
index 92526c07c..f36a6c098 100644
--- a/apps/kubernetes-provider/package.json
+++ b/apps/kubernetes-provider/package.json
@@ -4,10 +4,12 @@
   "version": "0.0.1",
   "description": "",
   "main": "dist/index.cjs",
-  "type": "module",
   "scripts": {
     "build": "npm run build:bundle",
-    "build:bundle": "esbuild src/index.ts --bundle --outfile=dist/index.mjs --platform=node --format=esm --target=esnext --banner:js=\"const require = createRequire(import.meta.url);\"",
+    "build:bundle": "esbuild src/index.ts --bundle --outfile=dist/index.mjs --platform=node --format=esm --target=esnext --banner:js=\"import { createRequire } from 'module';const require = createRequire(import.meta.url);\"",
+    "build:image": "docker build -f Containerfile . -t kubernetes-provider",
+    "dev": "tsx --no-warnings=ExperimentalWarning --require dotenv/config --watch src/index.ts",
+    "start": "tsx src/index.ts",
     "typecheck": "tsc --noEmit"
   },
   "keywords": [],
diff --git a/apps/kubernetes-provider/src/index.ts b/apps/kubernetes-provider/src/index.ts
index c790497b4..df328011a 100644
--- a/apps/kubernetes-provider/src/index.ts
+++ b/apps/kubernetes-provider/src/index.ts
@@ -1,5 +1,5 @@
 import { randomUUID } from "node:crypto";
-import k8s, { BatchV1Api, CoreV1Api, V1Job, V1Pod } from "@kubernetes/client-node";
+import * as k8s from "@kubernetes/client-node";
 import { Machine } from "@trigger.dev/core/v3";
 import { ProviderShell, SimpleLogger, TaskOperations } from "@trigger.dev/core-apps";
 
@@ -22,8 +22,8 @@ type Namespace = {
 class KubernetesTaskOperations implements TaskOperations {
   #namespace: Namespace;
   #k8sApi: {
-    core: CoreV1Api;
-    batch: BatchV1Api;
+    core: k8s.CoreV1Api;
+    batch: k8s.BatchV1Api;
   };
 
   constructor(namespace = "default") {
@@ -330,7 +330,7 @@ class KubernetesTaskOperations implements TaskOperations {
     };
   }
 
-  async #createPod(pod: V1Pod, namespace: Namespace) {
+  async #createPod(pod: k8s.V1Pod, namespace: Namespace) {
     try {
       const res = await this.#k8sApi.core.createNamespacedPod(namespace.metadata.name, pod);
       logger.debug(res.body);
@@ -373,7 +373,7 @@ class KubernetesTaskOperations implements TaskOperations {
     }
   }
 
-  async #createJob(job: V1Job, namespace: Namespace) {
+  async #createJob(job: k8s.V1Job, namespace: Namespace) {
     try {
       const res = await this.#k8sApi.batch.createNamespacedJob(namespace.metadata.name, job);
       logger.debug(res.body);