feature(uglify) update to latest version, temporarily remove tests until I have a chance to fix them

Author: danbucholtz

config/uglifyjs.config.js

@@ -12,13 +12,7 @@ module.exports = {
    * compress: uglify 2's compress option
    */
   compress: {
-    unused: true,
-    dead_code: true,
-    toplevel: true
-  },
-
-  /**
-   * comments: uglify 2's comments option
-   */
-  comments: true
+    toplevel: true,
+    pure_getters: true
+  }
 };

package-lock.json

@@ -57,7 +57,7 @@
     "tiny-lr": "1.0.4",
     "tslint": "^5.5.0",
     "tslint-eslint-rules": "4.1.1",
-    "uglify-js": "2.8.27",
+    "uglify-js": "^3.0.23",
     "webpack": "^3.1.0",
     "ws": "1.1.1",
     "xml2js": "0.4.17"
@@ -86,7 +86,6 @@
     "@types/node-sass": "^3.10.32",
     "@types/rewire": "^2.5.27",
     "@types/uglify-js": "^2.6.28",
-    "@types/webpack": "^1.12.36",
     "@types/ws": "^0.0.38",
     "conventional-changelog-cli": "^1.3.1",
     "github": "0.2.4",

package.json

@@ -8,6 +8,8 @@ declare module 'proxy-middleware';
 declare module 'rollup-pluginutils';
 declare module 'rollup';
 declare module 'tiny-lr';
+declare module 'uglify-js';
 declare module 'ws';
+declare module 'webpack';
 declare module 'webpack/*';
-declare module 'xml2js';
+declare module 'xml2js';

src/declarations.d.ts

@@ -1,9 +1,9 @@
-import * as uglify from 'uglify-js';
+import * as Uglify from 'uglify-js';
 
 import { Logger } from './logger/logger';
 import { fillConfigDefaults, generateContext, getUserConfigFile } from './util/config';
 import { BuildError } from './util/errors';
-import { writeFileAsync } from './util/helpers';
+import { readFileAsync, writeFileAsync } from './util/helpers';
 import { BuildContext, TaskInfo } from './util/interfaces';
 import { runWorker } from './worker-client';
 
@@ -31,37 +31,34 @@ export function uglifyjsWorker(context: BuildContext, configFile: string): Promi
   return uglifyjsWorkerImpl(context, uglifyJsConfig);
 }
 
-export function uglifyjsWorkerImpl(context: BuildContext, uglifyJsConfig: UglifyJsConfig) {
-  return Promise.resolve().then(() => {
+export async function uglifyjsWorkerImpl(context: BuildContext, uglifyJsConfig: UglifyJsConfig) {
+  try {
     const jsFilePaths = context.bundledFilePaths.filter(bundledFilePath => bundledFilePath.endsWith('.js'));
-    const promises: Promise<any>[] = [];
-    jsFilePaths.forEach(bundleFilePath => {
-      uglifyJsConfig.sourceFile = bundleFilePath;
-      uglifyJsConfig.inSourceMap = bundleFilePath + '.map';
-      uglifyJsConfig.destFileName = bundleFilePath;
-      uglifyJsConfig.outSourceMap = bundleFilePath + '.map';
-
-      const minifyOutput: uglify.MinifyOutput = runUglifyInternal(uglifyJsConfig);
-      promises.push(writeFileAsync(uglifyJsConfig.destFileName, minifyOutput.code.toString()));
-      if (minifyOutput.map) {
-        promises.push(writeFileAsync(uglifyJsConfig.outSourceMap, minifyOutput.map.toString()));
-      }
+    const promises = jsFilePaths.map(filePath => {
+      const sourceMapPath = filePath + '.map';
+      return runUglifyInternal(filePath, filePath, sourceMapPath, sourceMapPath, uglifyJsConfig);
     });
-    return Promise.all(promises);
-  }).catch((err: any) => {
+    return await Promise.all(promises);
+  } catch (ex) {
     // uglify has it's own strange error format
-    const errorString = `${err.message} in ${err.filename} at line ${err.line}, col ${err.col}, pos ${err.pos}`;
+    const errorString = `${ex.message} in ${ex.filename} at line ${ex.line}, col ${ex.col}, pos ${ex.pos}`;
     throw new BuildError(new Error(errorString));
-  });
+  }
 }
 
-function runUglifyInternal(uglifyJsConfig: UglifyJsConfig): uglify.MinifyOutput {
-  return uglify.minify(uglifyJsConfig.sourceFile, {
-    compress: uglifyJsConfig.compress,
-    mangle: uglifyJsConfig.mangle,
-    inSourceMap : uglifyJsConfig.inSourceMap,
-    outSourceMap: uglifyJsConfig.outSourceMap
+async function runUglifyInternal(sourceFilePath: string, destFilePath: string, sourceMapPath: string, destMapPath: string, configObject: any): Promise<any> {
+  const sourceFileContentPromise = readFileAsync(sourceFilePath);
+  const [sourceFileContent, sourceMapContent] = await Promise.all([readFileAsync(sourceFilePath), readFileAsync(sourceMapPath)]);
+  const uglifyConfig = Object.assign({}, configObject, {
+    sourceMap: {
+        content: sourceMapContent
+    }
   });
+  const result = Uglify.minify(sourceFileContent, uglifyConfig);
+  if (result.error) {
+    throw new BuildError(`Uglify failed: ${result.error.message}`);
+  }
+  return Promise.all([writeFileAsync(destFilePath, result.code), writeFileAsync(destMapPath, result.map)]);
 }
 
 export const taskInfo: TaskInfo = {
@@ -83,3 +80,8 @@ export interface UglifyJsConfig {
   compress?: boolean;
   comments?: boolean;
 }
+
+export interface UglifyResponse {
+  code?: string;
+  map?: any;
+}