From ac26360fdc24a6535b15ec343ea0331245fb702d Mon Sep 17 00:00:00 2001
From: Geoffrey Booth <GeoffreyBooth@users.noreply.github.com>
Date: Mon, 28 Nov 2016 23:10:17 -0800
Subject: [PATCH] Replace Uglify.js with Google Closure Compiler, JS version;
 let NPM finally reformat package.json the way it likes (#4376)

---
 Cakefile     |  8 ++++++--
 package.json | 10 +++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Cakefile b/Cakefile
index 7d773812..8f763d0c 100644
--- a/Cakefile
+++ b/Cakefile
@@ -169,10 +169,14 @@ task 'build:browser', 'rebuild the merged script for inclusion in the browser',
     }(this));
   """
   unless process.env.MINIFY is 'false'
-    {code} = require('uglify-js').minify code, fromString: true
+    {compiledCode} = require('google-closure-compiler-js').compile
+      jsCode: [
+        src: code
+        languageOut: if majorVersion is 1 then 'ES5' else 'ES6'
+      ]
   outputFolder = "docs/v#{majorVersion}/browser-compiler"
   fs.mkdirSync outputFolder unless fs.existsSync outputFolder
-  fs.writeFileSync "#{outputFolder}/coffee-script.js", header + '\n' + code
+  fs.writeFileSync "#{outputFolder}/coffee-script.js", header + '\n' + compiledCode
   console.log "built ... running browser tests:"
   invoke 'test:browser'
 
diff --git a/package.json b/package.json
index db39a08c..ceed2e11 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   ],
   "preferGlobal": true,
   "scripts": {
-    "test":         "node ./bin/cake test",
+    "test": "node ./bin/cake test",
     "test-harmony": "node --harmony ./bin/cake test"
   },
   "homepage": "http://coffeescript.org",
@@ -39,10 +39,10 @@
     "url": "git://github.com/jashkenas/coffeescript.git"
   },
   "devDependencies": {
-    "uglify-js": "~2.7",
-    "jison": ">=0.4.17",
+    "docco": "~0.7.0",
+    "google-closure-compiler-js": "^20161024.0.0",
     "highlight.js": "~9.8.0",
-    "underscore": "~1.8.3",
-    "docco": "~0.7.0"
+    "jison": ">=0.4.17",
+    "underscore": "~1.8.3"
   }
 }