From 6246e71c872ca51967a8397c0dae85e7a812514c Mon Sep 17 00:00:00 2001 From: Kit Cambridge Date: Thu, 26 Apr 2012 19:56:31 -0600 Subject: [PATCH] Use the Node `zlib` module instead of shelling out to `gzip`. Former-commit-id: f73339f6fd421ec4ddd1ec13ef13a18926419cdb --- build.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/build.js b/build.js index e95919b5d..4ddd662cb 100755 --- a/build.js +++ b/build.js @@ -2,9 +2,10 @@ ;(function() { 'use strict'; - /** The Node filesystem, path, and child process modules */ + /** The Node filesystem, path, `zlib`, and child process modules */ var fs = require('fs'), path = require('path'), + gzip = require('zlib').gzip, spawn = require('child_process').spawn; /** The build directory containing the build scripts */ @@ -34,9 +35,6 @@ '--warning_level=QUIET' ]; - /** Gzip command-line options */ - var gzipOptions = ['-9f', '-c']; - /** The pre-processed Lo-Dash source */ var source = preprocess(fs.readFileSync(path.join(__dirname, 'lodash.js'), 'utf8')); @@ -159,7 +157,7 @@ } // store the post-processed Closure Compiler result and gzip it accumulator.compiled.source = result = postprocess(result); - invoke('gzip', gzipOptions, result, 'binary', onClosureGzip); + gzip(result, onClosureGzip); } /** @@ -167,7 +165,7 @@ * * @private * @param {Object|Undefined} exception The error object. - * @param {String} result The resulting gzipped source. + * @param {Buffer} result The resulting gzipped source. */ function onClosureGzip(exception, result) { if (exception) { @@ -194,7 +192,7 @@ } // store the post-processed Uglified result and gzip it accumulator.uglified.source = result = postprocess(result); - invoke('gzip', gzipOptions, result, 'binary', onUglifyGzip); + gzip(result, onUglifyGzip); } /** @@ -202,7 +200,7 @@ * * @private * @param {Object|Undefined} exception The error object. - * @param {String} result The resulting gzipped source. + * @param {Buffer} result The resulting gzipped source. */ function onUglifyGzip(exception, result) { if (exception) { @@ -227,12 +225,11 @@ // save the Closure Compiled version to disk fs.writeFileSync(path.join(distPath, 'lodash.compiler.js'), compiled.source); - // explicit 'binary' is necessary to ensure the stream is written correctly - fs.writeFileSync(path.join(distPath, 'lodash.compiler.js.gz'), compiled.gzip, 'binary'); + fs.writeFileSync(path.join(distPath, 'lodash.compiler.js.gz'), compiled.gzip); // save the Uglified version to disk fs.writeFileSync(path.join(distPath, 'lodash.uglify.js'), uglified.source); - fs.writeFileSync(path.join(distPath, 'lodash.uglify.js.gz'), uglified.gzip, 'binary'); + fs.writeFileSync(path.join(distPath, 'lodash.uglify.js.gz'), uglified.gzip); // select the smallest gzipped file and use its minified counterpart as the // official minified release (ties go to Closure Compiler)