diff --git a/ghost/minifier/lib/minifier.js b/ghost/minifier/lib/minifier.js index f793bba22f..0169800434 100644 --- a/ghost/minifier/lib/minifier.js +++ b/ghost/minifier/lib/minifier.js @@ -1,8 +1,8 @@ const errors = require('@tryghost/errors'); -const debug = require('@tryghost/debug')('affsfdfsdfsdfsdffsdsdfsd'); +const debug = require('@tryghost/debug')('minifier'); const tpl = require('@tryghost/tpl'); const csso = require('csso'); -const uglify = require('uglify-js'); +const terser = require('terser'); const glob = require('tiny-glob'); const path = require('path'); const fs = require('fs').promises; @@ -49,7 +49,7 @@ class Minifier { } async minifyCSS(contents) { - const result = csso.minify(contents); + const result = await csso.minify(contents); if (result && result.css) { return result.css; } @@ -57,11 +57,10 @@ class Minifier { } async minifyJS(contents) { - const result = uglify.minify(contents); + const result = await terser.minify(contents); if (result && result.code) { return result.code; } - return null; } @@ -112,7 +111,7 @@ class Minifier { const result = await this.writeFile(minifiedContents, dest); if (result) { - minifiedFiles.push(result); + minifiedFiles.push(dest); } } diff --git a/ghost/minifier/package.json b/ghost/minifier/package.json index c0bf4876cc..ba081e1a48 100644 --- a/ghost/minifier/package.json +++ b/ghost/minifier/package.json @@ -29,7 +29,7 @@ "@tryghost/errors": "^0.2.16", "@tryghost/tpl": "^0.1.7", "csso": "4.2.0", - "tiny-glob": "^0.2.9", - "uglify-js": "3.14.2" + "terser": "^5.9.0", + "tiny-glob": "^0.2.9" } } diff --git a/ghost/minifier/test/minifier.test.js b/ghost/minifier/test/minifier.test.js index eab5495244..c848c18e94 100644 --- a/ghost/minifier/test/minifier.test.js +++ b/ghost/minifier/test/minifier.test.js @@ -15,12 +15,12 @@ describe('Minifier', function () { minifier = new Minifier({ src: path.join(__dirname, 'fixtures', 'basic-cards'), - dest: path.join(os.tmpdir(), 'minifier-tests') + dest: testDir }); }); after(async function () { - await fs.rmdir(testDir); + await fs.rmdir(testDir, {recursive: true, force: true}); }); describe('getMatchingFiles expands globs correctly', function () {