Merge pull request #250 from ember-cli/rename

Author: Robert Jackson

README.md

@@ -1,27 +1,27 @@
-[![Build Status](https://travis-ci.org/ember-cli/broccoli-uglify-sourcemap.svg?branch=master)](https://travis-ci.org/ember-cli/broccoli-uglify-sourcemap)
+[![Build Status](https://travis-ci.org/ember-cli/broccoli-terser-sourcemap.svg?branch=master)](https://travis-ci.org/ember-cli/broccoli-terser-sourcemap)
 
 A broccoli filter that applies [terser](https://github.com/terser/terser) to
-uglify code while properly generating or maintaining sourcemaps.
+minify code while properly generating or maintaining sourcemaps.
 
 ### installation
 
 ```sh
-npm install --save broccoli-uglify-sourcemap
+npm install --save broccoli-terser-sourcemap
 ```
 
 ### usage
 
 ```js
-const Uglify = require('broccoli-uglify-sourcemap');
+const Terser = require('broccoli-terser-sourcemap');
 
 // basic usage
-let uglified = new Uglify(input);
+let minified = new Terser(input);
 
 // advanced usage
-let uglified = new Uglify(input, {
+let minified = new Terser(input, {
   exclude: [..], // array of globs, to not minify
 
-  uglify: {
+  terser: {
     mangle: false,    // defaults to true
     compress: false,  // defaults to true
     sourceMap: false, // defaults to true

index.js

@@ -7,7 +7,7 @@ const path = require('path');
 const defaults = require('lodash.defaultsdeep');
 const symlinkOrCopy = require('symlink-or-copy');
 const MatcherCollection = require('matcher-collection');
-const debug = require('debug')('broccoli-uglify-sourcemap');
+const debug = require('debug')('broccoli-terser-sourcemap');
 const queue = require('async-promise-queue');
 const workerpool = require('workerpool');
 
@@ -23,7 +23,7 @@ const MatchNothing = {
   },
 };
 
-module.exports = class UglifyWriter extends Plugin {
+module.exports = class TerserWriter extends Plugin {
   constructor(_inputNodes, options = {}) {
     let inputNodes = Array.isArray(_inputNodes) ? _inputNodes : [_inputNodes];
 
@@ -34,7 +34,7 @@ module.exports = class UglifyWriter extends Plugin {
     });
 
     this.options = defaults(options, {
-      uglify: {
+      terser: {
         sourceMap: {},
       },
     });
@@ -75,8 +75,8 @@ module.exports = class UglifyWriter extends Plugin {
 
         if (this._isJSExt(relativePath) && !this.excludes.match(relativePath)) {
           // wrap this in a function so it doesn't actually run yet, and can be throttled
-          let uglifyOperation = () => this.processFile(inFile, outFile, relativePath, this.outputPath);
-          pendingWork.push(uglifyOperation);
+          let terserOperation = () => this.processFile(inFile, outFile, relativePath, this.outputPath);
+          pendingWork.push(terserOperation);
         } else if (relativePath.slice(-4) === '.map') {
           if (this.excludes.match(`${relativePath.slice(0, -4)}.{js,mjs}`)) {
             // ensure .map files for excluded JS paths are also copied forward

lib/get-sourcemap-content.js

@@ -20,7 +20,7 @@ module.exports = function getSourceMapContent(src, inFileDirname, relativePath,
     }
     if (!silent) {
       console.warn(
-        `[WARN] (broccoli-uglify-sourcemap) ${urls
+        `[WARN] (broccoli-terser-sourcemap) ${urls
           .map(u => `"${u}"`)
           .join(', ')} referenced in "${relativePath}" could not be found`
       );

lib/process-file.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const debug = require('debug')('broccoli-uglify-sourcemap');
+const debug = require('debug')('broccoli-terser-sourcemap');
 const defaults = require('lodash.defaultsdeep');
 const fs = require('fs');
 const path = require('path');
@@ -18,7 +18,7 @@ module.exports = async function processFile(inFile, outFile, relativePath, outDi
     mapDir = path.dirname(path.join(outDir, relativePath));
   }
 
-  let options = defaults({}, _options.uglify);
+  let options = defaults({}, _options.terser);
   if (options.sourceMap) {
     let filename = path.basename(inFile);
     let url = _options.sourceMapDir ? `/${path.join(_options.sourceMapDir, mapName)}` : mapName;
@@ -52,7 +52,7 @@ module.exports = async function processFile(inFile, outFile, relativePath, outDi
     let total = end - start;
 
     if (total > 20000 && !silent) {
-      console.warn(`[WARN] (broccoli-uglify-sourcemap) Minifying "${relativePath}" took: ${total}ms (more than 20,000ms)`);
+      console.warn(`[WARN] (broccoli-terser-sourcemap) Minifying "${relativePath}" took: ${total}ms (more than 20,000ms)`);
     }
 
     debug('[finished]: %s %dKB in %dms', relativePath, (result.code.length / 1000), total);
@@ -73,7 +73,7 @@ module.exports = async function processFile(inFile, outFile, relativePath, outDi
           // `//# sourceMappingURL=out.js.map` in `result.code`.
           // The value of `filename` is only used to set `file` attribute
           // in source map file.
-          // In broccoli-uglify-sourcemap we know in this case we are generating
+          // In broccoli-terser-sourcemap we know in this case we are generating
           // sourcemap for the file we are processing, changing 0 to the actual
           // file gives us the correct source.
           return relativePath;

package.json

@@ -1,14 +1,14 @@
 {
-  "name": "broccoli-uglify-sourcemap",
+  "name": "broccoli-terser-sourcemap",
   "version": "4.0.0",
-  "description": "Broccoli filter to uglify files while preserving their sourcemaps.",
-  "homepage": "https://github.com/ember-cli/broccoli-uglify-sourcemap#readme",
+  "description": "Broccoli filter to minify files with terser while preserving their sourcemaps.",
+  "homepage": "https://github.com/ember-cli/broccoli-terser-sourcemap#readme",
   "bugs": {
-    "url": "https://github.com/ember-cli/broccoli-uglify-sourcemap/issues"
+    "url": "https://github.com/ember-cli/broccoli-terser-sourcemap/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ember-cli/broccoli-uglify-sourcemap.git"
+    "url": "git+https://github.com/ember-cli/broccoli-terser-sourcemap.git"
   },
   "license": "MIT",
   "author": "Edward Faulkner <ef@alum.mit.edu>",
@@ -62,7 +62,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "changelog": {
-    "repo": "ember-cli/broccoli-uglify-sourcemap",
+    "repo": "ember-cli/broccoli-terser-sourcemap",
     "labels": {
       "breaking": ":boom: Breaking Change",
       "enhancement": ":rocket: Enhancement",

test/__snapshots__/test.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`broccoli-uglify-sourcemap can disable sourcemaps 1`] = `
+exports[`broccoli-terser-sourcemap can disable sourcemaps 1`] = `
 Object {
   "inside": Object {
     "with-upstream-sourcemap.js": "function meaningOfLife(){throw new Error(42)}function boom(){throw new Error(\\"boom\\")}function somethingElse(){throw new Error(\\"somethign else\\")}function fourth(){throw new Error(\\"fourth\\")}function third(){throw new Error(\\"oh no\\")}",
@@ -19,7 +19,7 @@ Object {
 }
 `;
 
-exports[`broccoli-uglify-sourcemap can exclude files from getting uglified 1`] = `
+exports[`broccoli-terser-sourcemap can exclude files from getting uglified 1`] = `
 Object {
   "inside": Object {
     "with-upstream-sourcemap.js": "/* This is my header. */
@@ -68,15 +68,15 @@ function third(){
 }
 `;
 
-exports[`broccoli-uglify-sourcemap can handle ES6 code 1`] = `
+exports[`broccoli-terser-sourcemap can handle ES6 code 1`] = `
 Object {
   "es6.js": "class Foo{bar(){console.log(this.baz)}}let{bar:bar}=Foo.prototype;
 //# sourceMappingURL=es6.map",
   "es6.map": "{\\"version\\":3,\\"sources\\":[\\"es6.js\\"],\\"names\\":[\\"Foo\\",\\"[object Object]\\",\\"console\\",\\"log\\",\\"this\\",\\"baz\\",\\"bar\\",\\"prototype\\"],\\"mappings\\":\\"AAAA,MAAMA,IACJC,MACEC,QAAQC,IAAIC,KAAKC,MAIrB,IAAIC,IAAEA,KAAQN,IAAIO\\",\\"file\\":\\"es6.js\\"}",
 }
 `;
 
-exports[`broccoli-uglify-sourcemap generates expected output 1`] = `
+exports[`broccoli-terser-sourcemap generates expected output 1`] = `
 Object {
   "inside": Object {
     "with-upstream-sourcemap.js": "function meaningOfLife(){throw new Error(42)}function boom(){throw new Error(\\"boom\\")}function somethingElse(){throw new Error(\\"somethign else\\")}function fourth(){throw new Error(\\"fourth\\")}function third(){throw new Error(\\"oh no\\")}
@@ -105,7 +105,7 @@ Object {
 }
 `;
 
-exports[`broccoli-uglify-sourcemap mjs can uglify .mjs files 1`] = `
+exports[`broccoli-terser-sourcemap mjs can minify .mjs files 1`] = `
 Object {
   "inside": Object {
     "with-upstream-sourcemap.js": "function meaningOfLife(){throw new Error(42)}function boom(){throw new Error(\\"boom\\")}function somethingElse(){throw new Error(\\"somethign else\\")}function fourth(){throw new Error(\\"fourth\\")}function third(){throw new Error(\\"oh no\\")}
@@ -134,11 +134,11 @@ Object {
 }
 `;
 
-exports[`broccoli-uglify-sourcemap on error rejects with BuildError 1`] = `Object {}`;
+exports[`broccoli-terser-sourcemap on error rejects with BuildError 1`] = `Object {}`;
 
-exports[`broccoli-uglify-sourcemap on error shuts down the workerpool 1`] = `Object {}`;
+exports[`broccoli-terser-sourcemap on error shuts down the workerpool 1`] = `Object {}`;
 
-exports[`broccoli-uglify-sourcemap shuts down the workerpool 1`] = `
+exports[`broccoli-terser-sourcemap shuts down the workerpool 1`] = `
 Object {
   "inside": Object {
     "with-upstream-sourcemap.js": "function meaningOfLife(){throw new Error(42)}function boom(){throw new Error(\\"boom\\")}function somethingElse(){throw new Error(\\"somethign else\\")}function fourth(){throw new Error(\\"fourth\\")}function third(){throw new Error(\\"oh no\\")}
@@ -167,7 +167,7 @@ Object {
 }
 `;
 
-exports[`broccoli-uglify-sourcemap supports alternate sourcemap location 1`] = `
+exports[`broccoli-terser-sourcemap supports alternate sourcemap location 1`] = `
 Object {
   "inside": Object {
     "with-upstream-sourcemap.js": "function meaningOfLife(){throw new Error(42)}function boom(){throw new Error(\\"boom\\")}function somethingElse(){throw new Error(\\"somethign else\\")}function fourth(){throw new Error(\\"fourth\\")}function third(){throw new Error(\\"oh no\\")}
@@ -198,7 +198,7 @@ Object {
 }
 `;
 
-exports[`broccoli-uglify-sourcemap supports hidden sourcemaps 1`] = `
+exports[`broccoli-terser-sourcemap supports hidden sourcemaps 1`] = `
 Object {
   "inside": Object {
     "with-upstream-sourcemap.js": "function meaningOfLife(){throw new Error(42)}function boom(){throw new Error(\\"boom\\")}function somethingElse(){throw new Error(\\"somethign else\\")}function fourth(){throw new Error(\\"fourth\\")}function third(){throw new Error(\\"oh no\\")}",
@@ -222,7 +222,7 @@ Object {
 }
 `;
 
-exports[`broccoli-uglify-sourcemap supports public URL for sourcemaps 1`] = `
+exports[`broccoli-terser-sourcemap supports public URL for sourcemaps 1`] = `
 Object {
   "inside": Object {
     "with-upstream-sourcemap.js": "function meaningOfLife(){throw new Error(42)}function boom(){throw new Error(\\"boom\\")}function somethingElse(){throw new Error(\\"somethign else\\")}function fourth(){throw new Error(\\"fourth\\")}function third(){throw new Error(\\"oh no\\")}

test/test.js

@@ -2,22 +2,22 @@
 
 /* global describe, afterEach, it, expect */
 
-const Uglify = require('..');
+const Terser = require('..');
 const path = require('path');
 const { createTempDir, createBuilder } = require('broccoli-test-helper');
 
 const fixtures = path.join(__dirname, 'fixtures');
 const fixturesError = path.join(__dirname, 'fixtures-error');
 
-describe('broccoli-uglify-sourcemap', function() {
+describe('broccoli-terser-sourcemap', function() {
   let input, builder;
 
   beforeEach(async function() {
     input = await createTempDir();
   });
 
   it('generates expected output', async function() {
-    builder = createBuilder(new Uglify(fixtures));
+    builder = createBuilder(new Terser(fixtures));
 
     await builder.build();
 
@@ -35,39 +35,39 @@ describe('broccoli-uglify-sourcemap', function() {
 let { bar } = Foo.prototype;`,
     });
 
-    builder = createBuilder(new Uglify(input.path()));
+    builder = createBuilder(new Terser(input.path()));
 
     await builder.build();
 
     expect(builder.read()).toMatchSnapshot();
   });
 
   it('can disable sourcemaps', async function() {
-    builder = createBuilder(new Uglify(fixtures, { uglify: { sourceMap: false } }));
+    builder = createBuilder(new Terser(fixtures, { terser: { sourceMap: false } }));
 
     await builder.build();
 
     expect(builder.read()).toMatchSnapshot();
   });
 
   it('supports hidden sourcemaps', async function() {
-    builder = createBuilder(new Uglify(fixtures, { hiddenSourceMap: true }));
+    builder = createBuilder(new Terser(fixtures, { hiddenSourceMap: true }));
 
     await builder.build();
 
     expect(builder.read()).toMatchSnapshot();
   });
 
   it('supports public URL for sourcemaps', async function() {
-    builder = createBuilder(new Uglify(fixtures, { publicUrl: 'https://example.com' }));
+    builder = createBuilder(new Terser(fixtures, { publicUrl: 'https://example.com' }));
 
     await builder.build();
 
     expect(builder.read()).toMatchSnapshot();
   });
 
   it('can exclude files from getting uglified', async function() {
-    builder = createBuilder(new Uglify(fixtures, {
+    builder = createBuilder(new Terser(fixtures, {
       exclude: ['inside/with-up*'],
     }));
 
@@ -78,26 +78,26 @@ let { bar } = Foo.prototype;`,
 
 
   it('supports alternate sourcemap location', async function() {
-    builder = createBuilder(new Uglify(fixtures, { sourceMapDir: 'maps' }));
+    builder = createBuilder(new Terser(fixtures, { sourceMapDir: 'maps' }));
 
     await builder.build();
 
     expect(builder.read()).toMatchSnapshot();
   });
 
   it('shuts down the workerpool', async function() {
-    let testUglify = new Uglify(fixtures);
-    builder = createBuilder(testUglify);
+    let testTerser = new Terser(fixtures);
+    builder = createBuilder(testTerser);
 
     await builder.build();
 
     expect(builder.read()).toMatchSnapshot();
-    expect(testUglify.pool.stats().totalWorkers).toEqual(0);
+    expect(testTerser.pool.stats().totalWorkers).toEqual(0);
   });
 
   describe('on error', function() {
     it('rejects with BuildError', async function() {
-      builder = createBuilder(new Uglify(fixturesError));
+      builder = createBuilder(new Terser(fixturesError));
 
       let shouldError;
       await builder.build()
@@ -110,13 +110,13 @@ let { bar } = Foo.prototype;`,
     });
 
     it('shuts down the workerpool', async function() {
-      let testUglify = new Uglify(fixturesError);
-      builder = createBuilder(testUglify);
+      let testTerser = new Terser(fixturesError);
+      builder = createBuilder(testTerser);
 
       await builder.build().catch(() => {});
 
       expect(builder.read()).toMatchSnapshot();
-      expect(testUglify.pool.stats().totalWorkers).toEqual(0);
+      expect(testTerser.pool.stats().totalWorkers).toEqual(0);
     });
   });
 
@@ -126,28 +126,28 @@ let { bar } = Foo.prototype;`,
     });
 
     it('defaults to CPUs-1 workers', async function() {
-      let testUglify = new Uglify(fixturesError);
+      let testTerser = new Terser(fixturesError);
 
-      expect(testUglify.concurrency).toEqual(require('os').cpus().length - 1);
+      expect(testTerser.concurrency).toEqual(require('os').cpus().length - 1);
     });
 
     it('sets concurrency using the option', async function() {
-      let testUglify = new Uglify(fixturesError, { concurrency: 145 });
+      let testTerser = new Terser(fixturesError, { concurrency: 145 });
 
-      expect(testUglify.concurrency).toEqual(145);
+      expect(testTerser.concurrency).toEqual(145);
     });
 
     it('overrides concurrency with JOBS env variable', async function() {
       process.env.JOBS = '7';
-      let testUglify = new Uglify(fixturesError, { concurrency: 145 });
+      let testTerser = new Terser(fixturesError, { concurrency: 145 });
 
-      expect(testUglify.concurrency).toEqual(7);
+      expect(testTerser.concurrency).toEqual(7);
     });
   });
 
   describe('mjs', function() {
-    it('can uglify .mjs files', async function() {
-      builder = createBuilder(new Uglify(fixtures));
+    it('can minify .mjs files', async function() {
+      builder = createBuilder(new Terser(fixtures));
 
       await builder.build();
 
@@ -159,7 +159,7 @@ let { bar } = Foo.prototype;`,
     it('deprecated async option', async function() {
       let shouldError;
       try {
-        builder = createBuilder(new Uglify(fixtures, { async: true }));
+        builder = createBuilder(new Terser(fixtures, { async: true }));
       } catch (err) {
         shouldError = err;
       }