From c8e89b7a0542a6ebf1c07f7d1cccbb01e7a52152 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 29 Jan 2018 09:46:35 -0500
Subject: [PATCH] Update @std/esm to v0.20.0

---
 build_data.js          | 15 +++++++--------
 data/update_locales.js |  7 +++----
 package.json           |  2 +-
 svg/spriteify.js       | 13 ++++++-------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/build_data.js b/build_data.js
index 64abfe5aa..7fe9f6f78 100644
--- a/build_data.js
+++ b/build_data.js
@@ -1,12 +1,11 @@
 /* eslint-disable no-console */
-require = require('@std/esm')(module, { esm: 'js' }); // eslint-disable-line no-global-assign
-
-const _cloneDeep = require('lodash-es/cloneDeep').default;
-const _extend = require('lodash-es/extend').default;
-const _forEach = require('lodash-es/forEach').default;
-const _isEmpty = require('lodash-es/isEmpty').default;
-const _merge = require('lodash-es/merge').default;
-const _toPairs = require('lodash-es/toPairs').default;
+const requireESM = require('@std/esm')(module, { esm: 'js' });
+const _cloneDeep = requireESM('lodash-es/cloneDeep').default;
+const _extend = requireESM('lodash-es/extend').default;
+const _forEach = requireESM('lodash-es/forEach').default;
+const _isEmpty = requireESM('lodash-es/isEmpty').default;
+const _merge = requireESM('lodash-es/merge').default;
+const _toPairs = requireESM('lodash-es/toPairs').default;
 
 const fs = require('fs');
 const glob = require('glob');
diff --git a/data/update_locales.js b/data/update_locales.js
index bba638a64..e464cf99e 100644
--- a/data/update_locales.js
+++ b/data/update_locales.js
@@ -1,9 +1,8 @@
 /* Downloads the latest translations from Transifex */
 
-require = require('@std/esm')(module, { esm: 'js' }); // eslint-disable-line no-global-assign
-
-const _isEmpty = require('lodash-es/isEmpty').default;
-const _merge = require('lodash-es/merge').default;
+const requireESM = require('@std/esm')(module, { esm: 'js' });
+const _isEmpty = requireESM('lodash-es/isEmpty').default;
+const _merge = requireESM('lodash-es/merge').default;
 
 var request = require('request').defaults({ maxSockets: 1 });
 var yaml = require('js-yaml');
diff --git a/package.json b/package.json
index 62c5e3fb1..b2781e9da 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   },
   "devDependencies": {
     "@mapbox/maki": "^4.0.0",
-    "@std/esm": "^0.18.0",
+    "@std/esm": "^0.20.0",
     "brfs": "1.4.3",
     "chai": "^4.1.0",
     "colors": "^1.1.2",
diff --git a/svg/spriteify.js b/svg/spriteify.js
index 207b883ae..19552ae36 100755
--- a/svg/spriteify.js
+++ b/svg/spriteify.js
@@ -1,17 +1,16 @@
 #!/usr/bin/env node
 'use strict';
 
-require = require('@std/esm')(module, { esm: 'js' }); // eslint-disable-line no-global-assign
+const requireESM = require('@std/esm')(module, { esm: 'js' });
+const _merge = requireESM('lodash-es/merge').default;
 
-var _merge = require('lodash-es/merge').default;
-
-var argv = require('minimist')(process.argv.slice(2));
+const argv = require('minimist')(process.argv.slice(2));
 if (argv.help || argv.h || !argv.svg) {
     return help();
 }
-var fs = require('fs');
-var json = (argv.json ? JSON.parse(fs.readFileSync(argv.json)) : {});
-var xml2js = require('xml2js');
+const fs = require('fs');
+const json = (argv.json ? JSON.parse(fs.readFileSync(argv.json)) : {});
+const xml2js = require('xml2js');
 
 xmlToJs(argv.svg, function (err, obj) {
     if (err) throw (err);