diff --git a/d.scout.dockerfile b/d.scout.dockerfile index 9e1d0af..c143455 100644 --- a/d.scout.dockerfile +++ b/d.scout.dockerfile @@ -1,10 +1,10 @@ -FROM node:20 as base +FROM node:20 AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" WORKDIR /app -RUN corepack enable && corepack prepare pnpm@9.2.0 --activate +RUN corepack enable && corepack prepare pnpm@9.5.0 --activate -FROM base as build +FROM base AS build WORKDIR /app RUN mkdir -p /app/packages/scout && mkdir /app/packages/taco && mkdir -p /prod/scout @@ -31,14 +31,17 @@ COPY ./packages/temporal-worker/ ./packages/temporal-worker/ COPY ./packages/types/ ./packages/types/ COPY ./packages/utils/ ./packages/utils/ +RUN ls -la ./packages/image + ## Transpile TS into JS +RUN pnpm --filter=@futureporn/image build RUN pnpm --filter=@futureporn/temporal-workflows build RUN pnpm --filter=!@futureporn/temporal-workflows -r build ## Deploy (copy all production code into one place) RUN pnpm deploy --filter=scout --prod /prod/scout -FROM base as scout +FROM base AS scout COPY --from=build /prod/scout . RUN ls -la . ENTRYPOINT ["pnpm", "start"] diff --git a/packages/image/package.json b/packages/image/package.json index 0654f03..852b60a 100644 --- a/packages/image/package.json +++ b/packages/image/package.json @@ -3,9 +3,10 @@ "type": "module", "version": "1.0.0", "description": "", - "main": "index.js", + "main": "dist/index.js", "scripts": { "test": "mocha", + "build": "tsc --build", "clean": "rm -rf dist", "superclean": "rm -rf node_modules && rm -rf pnpm-lock.yaml && rm -rf dist" }, diff --git a/packages/image/tsconfig.json b/packages/image/tsconfig.json index 4ed6c69..a8e6701 100644 --- a/packages/image/tsconfig.json +++ b/packages/image/tsconfig.json @@ -21,10 +21,10 @@ }, // Include the necessary files for your project "include": [ - "**/*.ts", - "**/*.tsx" + "src/**/*.ts", ], "exclude": [ - "node_modules" + "node_modules", + "src/**/*.spec.ts" ] } \ No newline at end of file diff --git a/packages/temporal-workflows/package.json b/packages/temporal-workflows/package.json index eeb8623..3772fcc 100644 --- a/packages/temporal-workflows/package.json +++ b/packages/temporal-workflows/package.json @@ -19,8 +19,8 @@ "@temporalio/workflow": "^1.10.1", "@types/qs": "^6.9.15", "date-fns": "^3.6.0", - "@futureporn/image": "workspace:*", "qs": "^6.12.3", + "@futureporn/image": "workspace:*", "@futureporn/scout": "workspace:*", "@futureporn/storage": "workspace:*", "@futureporn/types": "workspace:*",