From c3bf2e712c03b53bdd2520a9d433b00b74483761 Mon Sep 17 00:00:00 2001
From: Teddy Katz <teddy.katz@gmail.com>
Date: Wed, 13 Mar 2019 15:44:24 -0400
Subject: [PATCH 1/2] Build: compile deps to ES5 when generating browser file
 (fixes #11504)

---
 Makefile.js       | 19 ++++++++++++++++---
 webpack.config.js |  5 ++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Makefile.js b/Makefile.js
index e2ddd2ab259..bd6f4652461 100644
--- a/Makefile.js
+++ b/Makefile.js
@@ -25,7 +25,8 @@ const lodash = require("lodash"),
     semver = require("semver"),
     ejs = require("ejs"),
     loadPerf = require("load-perf"),
-    yaml = require("js-yaml");
+    yaml = require("js-yaml"),
+    CLIEngine = require("./lib/cli-engine");
 
 const { cat, cd, cp, echo, exec, exit, find, ls, mkdir, pwd, rm, test } = require("shelljs");
 
@@ -440,8 +441,7 @@ function lintMarkdown(files) {
  * @returns {Object} Output from each formatter
  */
 function getFormatterResults() {
-    const CLIEngine = require("./lib/cli-engine"),
-        stripAnsi = require("strip-ansi");
+    const stripAnsi = require("strip-ansi");
 
     const formatterFiles = fs.readdirSync("./lib/formatters/"),
         cli = new CLIEngine({
@@ -580,6 +580,19 @@ target.test = function() {
 
     target.webpack();
 
+    const browserFileLintOutput = new CLIEngine({
+        useEslintrc: false,
+        ignore: false,
+        allowInlineConfig: false,
+        baseConfig: { parserOptions: { ecmaVersion: 5 } }
+    }).executeOnFiles([`${BUILD_DIR}/eslint.js`]);
+
+    if (browserFileLintOutput.errorCount > 0) {
+        echo(`error: Failed to lint ${BUILD_DIR}/eslint.js as ES5 code`);
+        echo(CLIEngine.getFormatter("stylish")(browserFileLintOutput.results));
+        errors++;
+    }
+
     lastReturn = exec(`${getBinFile("karma")} start karma.conf.js`);
     if (lastReturn.code !== 0) {
         errors++;
diff --git a/webpack.config.js b/webpack.config.js
index 4ba329837f4..e5ea593a81c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -15,12 +15,11 @@ module.exports = {
     module: {
         rules: [
             {
-                test: /\.js$/u,
+                test: /\.m?js$/u,
                 loader: "babel-loader",
                 options: {
                     presets: ["@babel/preset-env"]
-                },
-                exclude: /node_modules/u
+                }
             }
         ]
     },

From 6685a48226a12163d2ca98187ec51f49b7eebf4b Mon Sep 17 00:00:00 2001
From: Teddy Katz <teddy.katz@gmail.com>
Date: Wed, 13 Mar 2019 20:30:47 -0400
Subject: [PATCH 2/2] Don't compile lodash

---
 webpack.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index e5ea593a81c..1a6a2986a01 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,7 +19,8 @@ module.exports = {
                 loader: "babel-loader",
                 options: {
                     presets: ["@babel/preset-env"]
-                }
+                },
+                exclude: /node_modules\/lodash/u
             }
         ]
     },