alchemymvc 1.3.13 → 1.3.14

package/lib/class/conduit.js

@@ -1824,7 +1824,7 @@ Conduit.setMethod(function end(message) {
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.10
+ * @version  1.3.14
  */
 Conduit.setMethod(function _end(message, encoding = 'utf-8') {
 
@@ -1862,6 +1862,11 @@ Conduit.setMethod(function _end(message, encoding = 'utf-8') {
 
 	for (key in this.response_headers) {
 		value = this.response_headers[key];
+
+		if (value == null) {
+			continue;
+		}
+
 		this.response.setHeader(key, value);
 	}
 
@@ -2126,7 +2131,7 @@ Conduit.setTypedMethod([Types.Stream, Types.Object.optional()], function serveFi
  *
  * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.13
+ * @version  1.3.14
  *
  * @param    {Stream}   stream    The stream to send
  * @param    {Object}   options   Options, including headers
@@ -2182,11 +2187,6 @@ Conduit.setMethod(function _sendStream(stream, options) {
 		this.setHeader('content-disposition', disposition);
 	}
 
-	// Set the content-length response header when not compressing
-	if (!options.compress && options.content_length != null) {
-		this.setHeader('content-length', options.content_length);
-	}
-
 	// Set all the headers
 	for (key in options.headers) {
 		this.setHeader(key, options.headers[key]);
@@ -2204,9 +2204,13 @@ Conduit.setMethod(function _sendStream(stream, options) {
 		// Set the gzip header
 		this.setHeader('content-encoding', 'gzip');
 		this.setHeader('vary', 'accept-encoding');
+		this.setHeader('transfer-encoding', 'chunked');
+		this.setHeader('content-length', null);
 
 		// Create the gzip stream
 		out_stream = out_stream.pipe(zlib.createGzip());
+	} else if (options.content_length != null) {
+		this.setHeader('content-length', options.content_length);
 	}
 
 	if (options.cleanup_stream) {
@@ -2229,7 +2233,13 @@ Conduit.setMethod(function _sendStream(stream, options) {
 
 	// Set the response headers
 	for (key in this.response_headers) {
-		response.setHeader(key, this.response_headers[key]);
+		let value = this.response_headers[key];
+
+		if (value == null) {
+			continue;
+		}
+
+		response.setHeader(key, value);
 	}
 
 	if (this.new_cookie_header.length) {

package/lib/core/middleware.js

@@ -444,9 +444,10 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 			};
 
 			if (alchemy.settings.debug && alchemy.settings.source_map) {
-				minify_options.sourceMap = {
+				console.warn('Source maps have been disabled because alchemy.settings.minify_js is true');
+				/*minify_options.sourceMap = {
 					url: 'inline'
-				};
+				};*/
 			}
 
 			result = await Terser.minify(data, minify_options);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.3.13",
+	"version": "1.3.14",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",
@@ -36,7 +36,7 @@
 		"socket.io"        : "~4.6.0",
 		"@11ways/socket.io-stream" : "~0.9.2",
 		"sputnik"          : "~0.1.0",
-		"terser"           : "~5.16.3",
+		"terser"           : "~5.18.1",
 		"toobusy-js"       : "~0.5.1",
 		"useragent"        : "~2.3.0"
 	},