fix(web,build): consume packages/db + shared via dist; bind web to LAN
Two related fixes:
1. Phone (and any LAN client) couldn't reach the web container because
the dev compose mapped 127.0.0.1:WEB_PORT instead of binding all
interfaces. Drop the loopback prefix.
2. Turbopack and NodeNext disagree on extension handling: bot's tsc
needs `.js` extensions in source imports; Turbopack's transpilePackages
path can't resolve those `.js` requests back to `.ts` source. Switch
to consuming the workspace packages via their compiled dist instead:
- packages/db + packages/shared point `main`/`exports` at ./dist/*
- drop transpilePackages from next.config.ts; web picks up the
compiled `.js` files directly
- dev compose command for web builds shared+db before running
`next dev` so dist is fresh when Turbopack starts
- put the `.js` extensions back in packages/db source so NodeNext
compilers (bot's tsc, packages/db's own tsc) are happy
This commit is contained in:
parent
3d470069d3
commit
e45bcb581a
@ -1,27 +1,24 @@
|
||||
import type { NextConfig } from "next";
|
||||
import { join } from "node:path";
|
||||
|
||||
// In a pnpm workspace + Turbopack setup, Next can't always infer the monorepo
|
||||
// root (it walks up looking for next/package.json). Pin it explicitly so both
|
||||
// dev and production builds resolve files correctly inside the Docker image.
|
||||
// Pin Turbopack's workspace root explicitly — pnpm + Turbopack can't always
|
||||
// infer it inside Docker bind mounts.
|
||||
const workspaceRoot = join(import.meta.dirname, "..", "..");
|
||||
|
||||
// We consume @cmbot/db and @cmbot/shared via their compiled dist (their
|
||||
// package.json `main` points at ./dist/index.js). The dist is built at
|
||||
// container start (see docker-compose.dev.yml) and during the production
|
||||
// Docker build (see docker/web.Dockerfile). This sidesteps Turbopack's
|
||||
// inability to resolve NodeNext-style `.js` extensions to `.ts` source.
|
||||
const nextConfig: NextConfig = {
|
||||
reactStrictMode: true,
|
||||
output: "standalone",
|
||||
outputFileTracingRoot: workspaceRoot,
|
||||
transpilePackages: ["@cmbot/db", "@cmbot/shared"],
|
||||
experimental: {
|
||||
typedRoutes: true,
|
||||
},
|
||||
turbopack: {
|
||||
root: workspaceRoot,
|
||||
resolveExtensions: [".tsx", ".ts", ".jsx", ".js", ".mjs", ".json"],
|
||||
resolveAlias: {
|
||||
// Turbopack doesn't strip the `.js` extension alias that NodeNext requires.
|
||||
// Map the compiled-style paths back to the real TS source files.
|
||||
"@cmbot/db/schema.js": `${workspaceRoot}/packages/db/src/schema.ts`,
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@ -43,13 +43,16 @@ services:
|
||||
container_name: cmbot-web
|
||||
user: "${HOST_UID:-1000}:${HOST_GID:-1000}"
|
||||
working_dir: /app
|
||||
command: ["pnpm", "--filter", "@cmbot/web", "dev"]
|
||||
command:
|
||||
- sh
|
||||
- -c
|
||||
- "pnpm --filter @cmbot/shared build && pnpm --filter @cmbot/db build && pnpm --filter @cmbot/web dev"
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- .:/app
|
||||
- ./dev-data:/data
|
||||
ports:
|
||||
- "127.0.0.1:${WEB_PORT}:3000"
|
||||
- "${WEB_PORT}:3000"
|
||||
environment:
|
||||
NODE_ENV: development
|
||||
DATABASE_URL: ${DATABASE_URL}
|
||||
|
||||
@ -3,11 +3,17 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
"types": "./src/index.ts",
|
||||
"main": "./dist/index.js",
|
||||
"types": "./dist/index.d.ts",
|
||||
"exports": {
|
||||
".": "./src/index.ts",
|
||||
"./schema": "./src/schema.ts"
|
||||
".": {
|
||||
"types": "./dist/index.d.ts",
|
||||
"default": "./dist/index.js"
|
||||
},
|
||||
"./schema": {
|
||||
"types": "./dist/schema.d.ts",
|
||||
"default": "./dist/schema.js"
|
||||
}
|
||||
},
|
||||
"scripts": {
|
||||
"build": "tsc -p tsconfig.json",
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
import { drizzle, type NodePgDatabase } from "drizzle-orm/node-postgres";
|
||||
import { Pool } from "pg";
|
||||
import * as schema from "./schema";
|
||||
import * as schema from "./schema.js";
|
||||
|
||||
export * from "./schema";
|
||||
export * from "./schema.js";
|
||||
|
||||
export type DB = NodePgDatabase<typeof schema>;
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { migrate } from "drizzle-orm/node-postgres/migrator";
|
||||
import { createClient } from "./index";
|
||||
import { createClient } from "./index.js";
|
||||
|
||||
const databaseUrl = process.env.DATABASE_URL;
|
||||
if (!databaseUrl) {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import { createClient, operators } from "./index";
|
||||
import { createClient, operators } from "./index.js";
|
||||
|
||||
const databaseUrl = process.env.DATABASE_URL;
|
||||
const operatorTelegramId = process.env.SEED_OPERATOR_TELEGRAM_ID;
|
||||
|
||||
@ -2,9 +2,7 @@
|
||||
"extends": "../../tsconfig.base.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "./dist",
|
||||
"rootDir": "./src",
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "Bundler"
|
||||
"rootDir": "./src"
|
||||
},
|
||||
"include": ["src/**/*"]
|
||||
}
|
||||
|
||||
@ -3,10 +3,13 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"main": "./src/index.ts",
|
||||
"types": "./src/index.ts",
|
||||
"main": "./dist/index.js",
|
||||
"types": "./dist/index.d.ts",
|
||||
"exports": {
|
||||
".": "./src/index.ts"
|
||||
".": {
|
||||
"types": "./dist/index.d.ts",
|
||||
"default": "./dist/index.js"
|
||||
}
|
||||
},
|
||||
"scripts": {
|
||||
"build": "tsc -p tsconfig.json",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user