From e75f017302c70a83ea4fe8fa9275c26c71e81916 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Mon, 7 May 2018 10:53:29 -0400
Subject: [PATCH 1/2] Fix #9866 by passing safari10:true in uglify-es mangle
 options.

---
 packages/minifier-js/minifier.js         | 5 +++++
 packages/minifier-js/package.js          | 2 +-
 packages/standard-minifier-js/package.js | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/minifier-js/minifier.js b/packages/minifier-js/minifier.js
index 17568025ff..06e75ca83d 100644
--- a/packages/minifier-js/minifier.js
+++ b/packages/minifier-js/minifier.js
@@ -15,6 +15,11 @@ meteorJsMinify = function (source) {
         global_defs: {
           "process.env.NODE_ENV": NODE_ENV
         }
+      },
+      mangle: {
+        // Fix issue #9866, as explained in this comment:
+        // https://github.com/mishoo/UglifyJS2/issues/1753#issuecomment-324814782
+        safari10: true
       }
     });
 
diff --git a/packages/minifier-js/package.js b/packages/minifier-js/package.js
index db20e7eec3..dc5f3e2696 100644
--- a/packages/minifier-js/package.js
+++ b/packages/minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.3.4"
+  version: "2.3.5"
 });
 
 Npm.depends({
diff --git a/packages/standard-minifier-js/package.js b/packages/standard-minifier-js/package.js
index 2b069eff3e..6087e1d1c4 100644
--- a/packages/standard-minifier-js/package.js
+++ b/packages/standard-minifier-js/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '2.3.3',
+  version: '2.3.4',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });

From 9fc0251eeeaea096113743e9ebd68fe50a714118 Mon Sep 17 00:00:00 2001
From: ochicf <oscarchicfarre@gmail.com>
Date: Mon, 7 May 2018 17:02:25 +0200
Subject: [PATCH 2/2] Fix this.toHTMLAsync call in boilerplate-generator
 (#9838)

---
 packages/boilerplate-generator/generator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/boilerplate-generator/generator.js b/packages/boilerplate-generator/generator.js
index ecfc99880c..e3c536bf0c 100644
--- a/packages/boilerplate-generator/generator.js
+++ b/packages/boilerplate-generator/generator.js
@@ -44,7 +44,7 @@ export class Boilerplate {
     }
 
     // Calling .await() requires a Fiber.
-    return toHTMLAsync(extraData).await();
+    return this.toHTMLAsync(extraData).await();
   }
 
   // Returns a Promise that resolves to a string of HTML.