From e41dd0e7477815327d4a4af749d0263d1f32605c Mon Sep 17 00:00:00 2001 From: Clark Fischer Date: Thu, 21 Mar 2013 13:36:02 -0700 Subject: [PATCH] Removed any-beautify. Changed to official js-beautify package. --- lib/beautifiers/js-beautify.js | 4 ++-- package.json | 2 +- test/beautifiers/js-beautify.js | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/beautifiers/js-beautify.js b/lib/beautifiers/js-beautify.js index 80ca061..3d623b2 100644 --- a/lib/beautifiers/js-beautify.js +++ b/lib/beautifiers/js-beautify.js @@ -1,4 +1,4 @@ -var beautify = require('any-beautify'); +var beautify = require('js-beautify'); exports = module.exports = function jsBeautify(stream, options, cb) { var code = ""; stream.on('data', function (d) { @@ -7,7 +7,7 @@ exports = module.exports = function jsBeautify(stream, options, cb) { stream.on('end', function () { try { - code = beautify.js(code); + code = beautify.js_beautify(code); } catch (e) { cb(e); } diff --git a/package.json b/package.json index 10dc6ae..6fe2708 100755 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "uglify-js": "~2.2", "yuicompressor": "~2.4", "closure-compiler": "~0.2", - "any-beautify": "~0.8", + "js-beautify": "~0.4", "optimist": "~0.3" }, "devDependencies": { diff --git a/test/beautifiers/js-beautify.js b/test/beautifiers/js-beautify.js index d313b47..17ee9db 100644 --- a/test/beautifiers/js-beautify.js +++ b/test/beautifiers/js-beautify.js @@ -2,7 +2,7 @@ var expect = require('expect.js'), sinon = require('sinon'), fs = require('fs'), minify = require('../../'), - beautify = require('any-beautify'); + beautify = require('js-beautify'); function fixture(name) { var path = __dirname + "/../fixtures/" + name; @@ -12,7 +12,7 @@ function fixture(name) { describe("MinifyJS", function () { describe("`js-beautify` beautifier", function () { it("should return the code", function (done) { - sinon.spy(beautify, 'js'); + sinon.spy(beautify, 'js_beautify'); minify.beautify(fixture("valid.js"), { engine: 'js-beautify' }, function (err, data) { @@ -20,8 +20,8 @@ describe("MinifyJS", function () { throw err; expect(data).to.be.a('string'); - expect(beautify.js.called).to.be(true); - beautify.js.restore(); + expect(beautify.js_beautify.called).to.be(true); + beautify.js_beautify.restore(); done(); }) });