Merge pull request #2117 from activepieces/fix/code-piece-logs

fix: code piece logs
activepieces · Aug 22, 2023 · e13ce4c · e13ce4c
2 parents 71ab936 + 0ac5d44
commit e13ce4c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 30 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -34,8 +34,6 @@ COPY default.cf /usr/local/etc/isolate
 RUN npm i -g pnpm@7.28.0
 
 RUN pnpm store add \
-  @tsconfig/node18@1.0.1 \
-  ts-loader@9.4.2 \
-  typescript@4.8.4 \
-  webpack@5.74.0 \
-  webpack-cli@4.10.0
+  @tsconfig/node18@1.0.0 \
+  @types/node@18.16.1 \
+  typescript@4.8.4
diff --git a/ap-base.dockerfile b/ap-base.dockerfile
@@ -19,8 +19,6 @@ RUN npm i -g \
   pnpm@7.28.0
 
 RUN pnpm store add \
-  @tsconfig/node18@1.0.1 \
-  ts-loader@9.4.2 \
-  typescript@4.8.4 \
-  webpack@5.74.0 \
-  webpack-cli@4.10.0
+  @tsconfig/node18@1.0.0 \
+  @types/node@18.16.1 \
+  typescript@4.8.4
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -7,10 +7,9 @@
 version: '3.0'
 
 services:
-
   app:
     image: activepieces/ap-base:3
-    container_name: app
+    container_name: ap
     environment:
       AP_DB_TYPE: POSTGRES
       AP_ENCRYPTION_KEY: 7e19fad4c13eaea8f657afb12e8f9c40
@@ -28,17 +27,16 @@ services:
     user: 1000:1000
     ports:
      - "3000:3000"
+     - "4200:4200"
      - "9229:9229"
     networks:
       - activepieces_dev
     volumes:
      - ./:/usr/src/app
     working_dir: /usr/src/app
     entrypoint:
-      - npx
-      - nx
-      - build-watch
-      - backend
+      - npm
+      - start
     depends_on:
      - postgres
      - redis
@@ -47,7 +45,7 @@ services:
     image: postgres:14.4
     ports:
       - "5432:5432"
-    container_name: postgres
+    container_name: pg
     environment:
       POSTGRES_DB: activepieces
       POSTGRES_USER: postgres
@@ -60,7 +58,7 @@ services:
 
   redis:
     image: redis:7.0.7
-    container_name: redis
+    container_name: rd
     ports:
       - "6379:6379"
     volumes:

diff --git a/packages/backend/src/app/workers/code-worker/code-builder.ts b/packages/backend/src/app/workers/code-worker/code-builder.ts
@@ -101,10 +101,7 @@ async function addCodeDependencies(codePath: string): Promise<void> {
             version: '1.0.0',
         },
         '@types/node': {
-            version: '20.5.1',
-        },
-        'ts-loader': {
-            version: '9.4.2',
+            version: '18.16.1',
         },
         typescript: {
             version: '4.8.4',

diff --git a/tools/setup-dev.js b/tools/setup-dev.js
@@ -17,11 +17,6 @@ if (requiredVersions.some(version=>nodeVersion.startsWith(version))) {
 execSync('rm -rf node_modules');
 execSync('npm ci');
 execSync('npx pnpm store add \
-  @tsconfig/node18@1.0.1 \
-  ts-loader@9.4.2 \
-  typescript@4.8.4 \
-  webpack@5.74.0 \
-  webpack-cli@4.10.0');
-
-
-
+  @tsconfig/node18@1.0.0 \
+  @types/node@18.16.1 \
+  typescript@4.8.4');