@nitro/app 11.0.4 → 11.0.5

package/app/core/config.js

@@ -39,6 +39,7 @@ const defaultConfig = {
 	},
 	server: {
 		port: 8080,
+		hmrPort: 3000,
 		host: 'localhost',
 		production: !!(process.env.NODE_ENV && process.env.NODE_ENV.replace(/\s/g, '') === 'production'),
 		compression: true,

package/app/core/listen.js

@@ -1,14 +1,15 @@
 'use strict';
 
 const config = require('config');
+const utils = require('./utils');
+
 const mode = config.get('server.production') ? 'production' : 'development';
 const port = config.get('server.port');
+const hmrPort = config.get('server.hmrPort');
 
 /* eslint-disable no-console */
-module.exports = function (app, opts = {}) {
-	const rawHost = (config.has('server.host')) ? config.get('server.host') : 'localhost';
-	const host = ['0.0.0.0', '::', '::0'].includes(String(rawHost)) ? 'localhost' : rawHost;
-	const url = `http://${host}:${port}`;
+module.exports = function (app, hmrApp, opts = {}) {
+	const url = utils.getServerBaseUrl(port);
 	const openBrowser = opts.open; // true | false | string (URL)
 
 	const server = app
@@ -37,6 +38,19 @@ module.exports = function (app, opts = {}) {
 			process.exit(1);
 		});
 
+	if (hmrApp && mode === 'development') {
+		hmrApp
+			.listen(hmrPort)
+			.on('error', (err) => {
+				if (err && err.errno === 'EADDRINUSE') {
+					console.error('Proxy Port *:%s already in use.', hmrPort);
+				} else {
+					console.error(err);
+				}
+				process.exit(1);
+			});
+	}
+
 	return server;
 };
 /* eslint-enable no-console */

package/app/core/utils.js

@@ -4,6 +4,13 @@ const fs = require('fs');
 const path = require('path');
 const config = require('config');
 
+function getServerBaseUrl(port) {
+	port = port || config.get('server.port');
+	const rawHost = (config.has('server.host')) ? config.get('server.host') : 'localhost';
+	const host = ['0.0.0.0', '::', '::0'].includes(String(rawHost)) ? 'localhost' : rawHost;
+	return `http://${host}:${port}`;
+}
+
 function getLayoutName(layoutPath) {
 	const layoutPathWithoutViewPath = config
 		.get('nitro.viewLayoutsDirectory')
@@ -27,6 +34,7 @@ function layoutExists(layoutName) {
 }
 
 module.exports = {
+	getServerBaseUrl,
 	getLayoutName,
 	getLayoutPath,
 	layoutExists,

package/app/core/webpack.js

@@ -5,6 +5,9 @@ const webpack = require('webpack');
 const webpackMiddleware = require('webpack-dev-middleware');
 const webpackHotMiddleware = require('webpack-hot-middleware');
 const config = require('config');
+const utils = require('./utils');
+
+const url = utils.getServerBaseUrl();
 const webpackConfig = require(process.env.WEBPACK_CONFIG
 	? path.join(config.get('nitro.basePath'), process.env.WEBPACK_CONFIG)
 	: path.normalize(path.join(config.get('nitro.basePath'), 'config', 'webpack', 'webpack.config.dev')));
@@ -18,9 +21,13 @@ const wphm = webpackHotMiddleware(webpackCompiler, {
 	heartbeat: 10 * 1000,
 });
 
-module.exports = function (app) {
+module.exports = function (app, hmrApp) {
 	app.use(wpm);
-	if (config.get('nitro.mode.livereload')) {
-		app.use(wphm);
+	if (hmrApp && config.get('nitro.mode.livereload')) {
+		hmrApp.use((req, res, next) => {
+			res.setHeader('Access-Control-Allow-Origin', url);
+			next();
+		});
+		hmrApp.use(wphm);
 	}
 };

package/app/scripts/server.js

@@ -15,11 +15,13 @@ const isProduction = config.get('server.production');
 const useCompression = config.get('server.compression');
 const isTwig = config.get('nitro.templateEngine') === 'twig';
 
+let hmrApp;
 let engine;
 
 // webpack
 if (!isProduction) {
-	require('../core/webpack')(app);
+	hmrApp = express();
+	require('../core/webpack')(app, hmrApp);
 }
 
 if (isTwig) {
@@ -52,4 +54,4 @@ if (isTwig) {
 	app.engine(config.get('nitro.viewFileExtension'), engine.__express);
 }
 
-require('../core/listen')(app, { open });
+require('../core/listen')(app, hmrApp, { open });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitro/app",
-  "version": "11.0.4",
+  "version": "11.0.5",
   "description": "Nitro server",
   "license": "MIT",
   "repository": {
@@ -45,7 +45,7 @@
     "hbs": "4.2.0",
     "hbs-utils": "0.0.4",
     "html-validate": "7.18.1",
-    "i18next": "25.8.13",
+    "i18next": "25.8.14",
     "i18next-http-middleware": "3.9.2",
     "i18next-fs-backend": "2.6.1",
     "i18next-sprintf-postprocessor": "0.2.2",
@@ -63,7 +63,7 @@
     "@merkle-open/eslint-config": "4.0.1",
     "eslint": "8.57.1",
     "eslint-plugin-import": "2.32.0",
-    "webpack": "5.105.3"
+    "webpack": "5.105.4"
   },
   "publishConfig": {
     "access": "public"