@digigov/cli-app 2.4.3-nextjs-16.27-07-26-15-19 → 2.5.0

package/CHANGELOG.md

@@ -1,24 +1,25 @@
 # Change Log - @digigov/cli-app
 
-<!-- This log was last generated on Mon, 27 Jul 2026 15:19:46 GMT and should not be manually modified. -->
+<!-- This log was last generated on Mon, 27 Jul 2026 17:23:56 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
-## 2.4.3-nextjs-16.27-07-26-15-19
+## 2.5.0
 
-Mon, 27 Jul 2026 15:19:46 GMT
+Mon, 27 Jul 2026 17:23:56 GMT
 
 ### Minor changes
 
-- Next.js 13.1.1 -> 16.2.12: builds now use static export (output: 'export', next export was removed in Next 14) while next dev keeps the regular dev server, and digigov app start serves out/ statically (-p/--port, -H/--hostname). Drop next-images/url-loader/babel-loader in favor of built-in static image imports, remove the rimraf peer dependency, and modernize the dev proxy to http-proxy-middleware v3 running in-process. (sangelopoulos@admin.grnet.gr)
-- Bump @digigov/cli-build to v2.4.3-nextjs-16.27-07-26-15-19
-- Bump @digigov/cli to v2.4.3-nextjs-16.27-07-26-15-19
-- Bump @digigov/cli-lint to v2.4.3-nextjs-16.27-07-26-15-19
-- Bump @digigov/css to v2.4.3-nextjs-16.27-07-26-15-19
+- Next.js 13.1.1 -> 16.2.12: builds now use static export (output: 'export', next export was removed in Next 14) while next dev keeps the regular dev server, and digigov app start serves out/ statically (-p/--port, -H/--hostname). Drop next-images/url-loader/babel-loader in favor of built-in static image imports, remove the rimraf peer dependency, and modernize the dev proxy to http-proxy-middleware v3 running in-process, arming websocket upgrades for ws: true proxy entries at startup so sockets reconnecting right after a restart are not dropped. (sangelopoulos@admin.grnet.gr)
+- Bump @digigov/cli-build to v2.5.0
+- Bump @digigov/cli to v2.5.0
+- Bump @digigov/cli-lint to v2.5.0
+- Bump @digigov/css to v2.5.0
 
 ### Patches
 
 - default images.unoptimized in dev as well as build so dev image rendering matches the exported artifact and @digigov/nextjs Image's basePath prepend behaves the same everywhere (sangelopoulos@admin.grnet.gr)
+- route dev proxy and Next config output through the @digigov/cli logger instead of bare console calls (sangelopoulos@admin.grnet.gr)
 
 ## 2.4.2
 

package/next.common.cjs

@@ -1,4 +1,5 @@
 const lib = require('@digigov/cli/lib');
+const { logger } = require('@digigov/cli/lib/logger');
 const { PHASE_DEVELOPMENT_SERVER } = require('next/constants');
 let aliases = lib.aliases(true);
 
@@ -23,7 +24,7 @@ function withStaticExport(config, phase) {
     ...common,
   };
   if (exported.output === 'export' && exported.i18n) {
-    console.warn(
+    logger.warn(
       'Built-in i18n routing is not supported with static export; ' +
         'dropping the `i18n` config for this build. Locale routing must be ' +
         'handled in userland (e.g. i18next without the Next.js `i18n` key).'
@@ -42,7 +43,7 @@ function makeBaseConfig(dir) {
       ...digigov.aliases,
     };
   }
-  console.log(`Creating aliases for ${Object.keys(aliases).join(', ')}`);
+  logger.info(`Creating aliases for ${Object.keys(aliases).join(', ')}`);
   return {
     poweredByHeader: false,
     trailingSlash: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/cli-app",
-  "version": "2.4.3-nextjs-16.27-07-26-15-19",
+  "version": "2.5.0",
   "description": "@digigov developer cli tool",
   "main": "./index.js",
   "type": "module",
@@ -13,7 +13,7 @@
     "commander": "12.1.0",
     "globby": "11.0.0",
     "publint": "0.1.8",
-    "@digigov/cli-build": "2.4.3-nextjs-16.27-07-26-15-19"
+    "@digigov/cli-build": "2.5.0"
   },
   "peerDependencies": {
     "typescript": "5.6.2",
@@ -22,8 +22,8 @@
     "autoprefixer": "10.4.16",
     "postcss": "8.4.4",
     "tailwindcss": "3.4.13",
-    "@digigov/cli": "2.4.3-nextjs-16.27-07-26-15-19",
-    "@digigov/css": "2.4.3-nextjs-16.27-07-26-15-19"
+    "@digigov/cli": "2.5.0",
+    "@digigov/css": "2.5.0"
   },
   "exports": {
     ".": "./index.js",
@@ -41,8 +41,8 @@
     "typescript": "5.6.2",
     "eslint": "9.16.0",
     "prettier": "3.4.2",
-    "@digigov/cli": "2.4.3-nextjs-16.27-07-26-15-19",
-    "@digigov/cli-lint": "2.4.3-nextjs-16.27-07-26-15-19"
+    "@digigov/cli": "2.5.0",
+    "@digigov/cli-lint": "2.5.0"
   },
   "scripts": {
     "publint": "publint",

package/subcommands/start.js

@@ -1,6 +1,8 @@
 import fs from 'fs';
+import { createRequire } from 'module';
 
 import express from 'express';
+import { PHASE_PRODUCTION_SERVER } from 'next/constants.js';
 import { DigigovCommand, resolveProject, logger } from '@digigov/cli/lib';
 import { EXEC_CONFIG } from '../common.js';
 import path from 'path';
@@ -19,12 +21,32 @@ startCommand
   )
   .option('-H, --hostname <hostname>', 'Hostname to bind to', '0.0.0.0')
   .action(async (options, ctx) => {
+    const port = parseInt(options.port, 10);
+    if (Number.isNaN(port)) {
+      logger.error(`Invalid port: ${options.port}`);
+      process.exit(1);
+    }
     const outDir = path.join(project.root, 'out');
     if (!fs.existsSync(outDir)) {
       await ctx.exec('next', ['build'], EXEC_CONFIG);
     }
+    // The exported HTML references pages and assets under `basePath`, so the
+    // static site must be mounted there — as `next start` used to do.
+    const configPath = path.join(project.root, 'next.config.js');
+    let conf = {};
+    if (fs.existsSync(configPath)) {
+      const confModule = createRequire(configPath)(configPath);
+      conf =
+        typeof confModule === 'function'
+          ? await confModule(PHASE_PRODUCTION_SERVER, { defaultConfig: {} })
+          : confModule;
+    }
+    const basePath = conf.basePath ?? '';
     const server = express();
-    server.use(express.static(outDir, { extensions: ['html'] }));
+    server.use(
+      basePath || '/',
+      express.static(outDir, { extensions: ['html'] })
+    );
     server.use((_req, res) => {
       const notFoundPage = path.join(outDir, '404.html');
       if (fs.existsSync(notFoundPage)) {
@@ -33,11 +55,16 @@ startCommand
         res.status(404).send('Not Found');
       }
     });
-    server.listen(parseInt(options.port, 10), options.hostname, () => {
-      logger.info(
-        `Serving ${outDir} on http://${options.hostname}:${options.port}`
-      );
-    });
+    server
+      .listen(port, options.hostname, () => {
+        logger.info(
+          `Serving ${outDir} on http://${options.hostname}:${port}${basePath}`
+        );
+      })
+      .on('error', (err) => {
+        logger.error(`Unable to start server: ${err.message}`);
+        process.exit(1);
+      });
   });
 
 export default startCommand;

package/utils/proxy-server.js

@@ -3,8 +3,14 @@ import next from 'next';
 import path from 'path';
 import { createRequire } from 'module';
 import { createProxyMiddleware } from 'http-proxy-middleware';
+// `next` publishes no `exports` map, so the subpath needs the explicit
+// extension to resolve under ESM.
+import {
+  PHASE_DEVELOPMENT_SERVER,
+  PHASE_PRODUCTION_SERVER,
+} from 'next/constants.js';
 
-import { resolveProject } from '@digigov/cli/lib';
+import { resolveProject, logger } from '@digigov/cli/lib';
 
 const port = parseInt(process.env['PORT'] ?? '3000', 10);
 const isDev = process.env.NODE_ENV !== 'production';
@@ -13,7 +19,17 @@ const project = resolveProject();
 const devProxy = project.digigov.proxy;
 
 const require = createRequire(import.meta.url);
-const conf = require(path.join(project.root, 'next.config.js'));
+const confModule = require(path.join(project.root, 'next.config.js'));
+
+// nextrc exports a phase → config function; `next({ conf })` spreads the
+// value without invoking it, so the phase must be resolved here.
+const conf =
+  typeof confModule === 'function'
+    ? await confModule(
+        isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_SERVER,
+        { defaultConfig: {} }
+      )
+    : confModule;
 
 // Next 16 removed the CJS `.default` interop export: `module.exports` itself is
 // the server factory (on 13 too), but the d.ts still types the module as a
@@ -34,20 +50,42 @@ try {
   const server = express();
 
   // Set up the proxy.
+  const wsProxies = [];
   if (isDev && devProxy) {
     for (const [pathFilter, options] of Object.entries(devProxy)) {
-      server.use(createProxyMiddleware({ pathFilter, ...options }));
+      const proxy = createProxyMiddleware({ pathFilter, ...options });
+      server.use(proxy);
+      if (options.ws) {
+        wsProxies.push(proxy);
+      }
     }
   }
 
   // Default catch-all handler to allow Next.js to handle all other routes
   server.use((req, res) => handle(req, res));
 
-  server.listen(port, () => {
-    console.log(`> Ready on port ${port}`);
+  const httpServer = server.listen(port, () => {
+    logger.info(`Ready on port ${port}`);
   });
+
+  // Next and http-proxy-middleware each register their own `upgrade` listener,
+  // but only lazily — on the first HTTP request they see. A websocket that
+  // connects right after a restart, before any HTTP request (e.g. an open tab
+  // reconnecting through a `ws: true` proxy), finds no listener and hangs.
+  // Arm the ws proxies up front: `upgrade` checks its own pathFilter and
+  // no-ops once the proxy's internal listener exists, so nothing is handled
+  // twice. Next needs no arming — its HMR socket always follows a page load.
+  if (wsProxies.length > 0) {
+    httpServer.on('upgrade', (req, socket, head) => {
+      for (const proxy of wsProxies) {
+        proxy.upgrade(req, socket, head);
+      }
+    });
+  }
 } catch (err) {
-  console.log('An error occurred, unable to start the server');
-  console.log(err);
+  logger.error(
+    'Unable to start the server:',
+    err instanceof Error ? err.stack : err
+  );
   process.exit(1);
 }