@open-mercato/cli 0.7.1-develop.7131.1.20abf9e885 → 0.7.1-develop.7136.1.0f76137a1d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cli",
-  "version": "0.7.1-develop.7131.1.20abf9e885",
+  "version": "0.7.1-develop.7136.1.0f76137a1d",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,9 +60,9 @@
     "@mikro-orm/decorators": "^7.1.8",
     "@mikro-orm/migrations": "^7.1.8",
     "@mikro-orm/postgresql": "^7.1.8",
-    "@open-mercato/queue": "0.7.1-develop.7131.1.20abf9e885",
-    "@open-mercato/shared": "0.7.1-develop.7131.1.20abf9e885",
-    "@open-mercato/telemetry": "0.7.1-develop.7131.1.20abf9e885",
+    "@open-mercato/queue": "0.7.1-develop.7136.1.0f76137a1d",
+    "@open-mercato/shared": "0.7.1-develop.7136.1.0f76137a1d",
+    "@open-mercato/telemetry": "0.7.1-develop.7136.1.0f76137a1d",
     "cross-spawn": "^7.0.6",
     "pg": "8.22.0",
     "semver": "^7.8.5",
@@ -73,10 +73,10 @@
     "typescript-js": "npm:typescript@6.0.3"
   },
   "peerDependencies": {
-    "@open-mercato/shared": "0.7.1-develop.7131.1.20abf9e885"
+    "@open-mercato/shared": "0.7.1-develop.7136.1.0f76137a1d"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.7.1-develop.7131.1.20abf9e885",
+    "@open-mercato/shared": "0.7.1-develop.7136.1.0f76137a1d",
     "@types/jest": "^30.0.0",
     "jest": "^30.4.2",
     "ts-jest": "^29.4.12"

package/src/lib/__tests__/next-dev-bundler.test.ts

@@ -0,0 +1,27 @@
+import { buildNextDevArgs, resolveNextDevBundler } from '../next-dev-bundler'
+
+describe('Next.js dev bundler selection', () => {
+  it('uses Turbopack by default', () => {
+    expect(resolveNextDevBundler({})).toBe('turbopack')
+    expect(buildNextDevArgs('/app/node_modules/next/dist/bin/next', {}).args).toEqual([
+      '/app/node_modules/next/dist/bin/next',
+      'dev',
+      '--turbopack',
+    ])
+  })
+
+  it('supports the Webpack fallback for constrained Linux environments', () => {
+    const result = buildNextDevArgs('/app/node_modules/next/dist/bin/next', {
+      OM_DEV_BUNDLER: 'webpack',
+    })
+
+    expect(result).toEqual({
+      args: ['/app/node_modules/next/dist/bin/next', 'dev', '--webpack'],
+      bundler: 'webpack',
+    })
+  })
+
+  it('falls back to the safe default for unknown values', () => {
+    expect(resolveNextDevBundler({ OM_DEV_BUNDLER: 'unknown' })).toBe('turbopack')
+  })
+})

package/src/lib/next-dev-bundler.ts

@@ -0,0 +1,19 @@
+export type NextDevBundler = 'turbopack' | 'webpack'
+
+export function resolveNextDevBundler(environment: NodeJS.ProcessEnv = process.env): NextDevBundler {
+  const raw = environment.OM_DEV_BUNDLER?.trim().toLowerCase()
+  return raw === 'webpack'
+    ? 'webpack'
+    : 'turbopack'
+}
+
+export function buildNextDevArgs(
+  nextBinary: string,
+  environment: NodeJS.ProcessEnv = process.env,
+): { args: string[]; bundler: NextDevBundler } {
+  const bundler = resolveNextDevBundler(environment)
+  return {
+    args: [nextBinary, 'dev', bundler === 'webpack' ? '--webpack' : '--turbopack'],
+    bundler,
+  }
+}

package/src/mercato.ts

@@ -44,6 +44,7 @@ import { assertSingleInstanceStrategies } from './lib/single-instance-strategy-g
 import { createDevEnvReloader, watchDevEnvFiles } from './lib/dev-env-reload'
 import { quotePostgresIdentifier } from './lib/db/identifiers'
 import { getRegisteredDevSupervisorManifest } from './lib/dev-supervisor-manifest'
+import { buildNextDevArgs } from './lib/next-dev-bundler'
 // Lazy-imported to avoid pulling in `testcontainers` (devDependency) at startup
 const lazyIntegration = () => import('./lib/testing/integration')
 import type { ChildProcess } from 'node:child_process'
@@ -2140,12 +2141,14 @@ export async function run(argv = process.argv) {
               readyResolve = resolve
             })
             const exitPromise = new Promise<ManagedProcessExitResult>((resolve) => {
+              const nextDevCommand = buildNextDevArgs(nextBin, runtimeEnv)
+              const bundlerLabel = nextDevCommand.bundler === 'webpack' ? 'Webpack' : 'Turbopack'
               writeDevSplashRuntimeStarting(
                 lastRestartReason
-                  ? `Restarting Next.js dev server. Reason: ${lastRestartReason}`
-                  : 'Starting Next.js dev server',
+                  ? `Restarting Next.js dev server (${bundlerLabel}). Reason: ${lastRestartReason}`
+                  : `Starting Next.js dev server (${bundlerLabel})`,
               )
-              const nextProcess = spawn('node', [nextBin, 'dev', '--turbopack'], {
+              const nextProcess = spawn('node', nextDevCommand.args, {
                 stdio: ['inherit', 'pipe', 'pipe'],
                 env: runtimeEnv,
                 cwd: appDir,