From e9dd20fef7a77c9fc080f21b4c10b9973247f13f Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Tue, 10 Nov 2020 19:49:15 -0800
Subject: [PATCH 1/3] fix: add helper.js for older Node.js versions

---
 helpers.js   | 15 +++++++++++++++
 package.json |  1 +
 yargs        |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 helpers.js

diff --git a/helpers.js b/helpers.js
new file mode 100644
index 000000000..1bcbeb4bc
--- /dev/null
+++ b/helpers.js
@@ -0,0 +1,15 @@
+// TODO: remove this file once Node 10 is EOL:
+const {
+  applyExtends,
+  cjsPlatformShim,
+  Parser,
+  processArgv,
+} = require('./build/index.cjs');
+
+module.exports = {
+  applyExtends: (config, cwd, mergeExtends) => {
+    return applyExtends(config, cwd, mergeExtends, cjsPlatformShim);
+  },
+  hideBin: processArgv.hideBin,
+  Parser,
+};
diff --git a/package.json b/package.json
index 8a344687d..38e2254b5 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "browser.mjs",
     "index.cjs",
     "helpers.mjs",
+    "helpers.js",
     "index.mjs",
     "yargs",
     "build",
diff --git a/yargs b/yargs
index 4281fdd54..8460d10a6 100644
--- a/yargs
+++ b/yargs
@@ -1,5 +1,5 @@
 // TODO: consolidate on using a helpers file at some point in the future, which
-// is the approach currently used to export Parser and  applyExtends for ESM:
+// is the approach currently used to export Parser and applyExtends for ESM:
 const {applyExtends, cjsPlatformShim, Parser, Yargs, processArgv} = require('./build/index.cjs')
 Yargs.applyExtends = (config, cwd, mergeExtends) => {
   return applyExtends(config, cwd, mergeExtends, cjsPlatformShim)

From 1b398802f249922d5f3d2748b5f03655f1d74093 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Tue, 10 Nov 2020 19:55:26 -0800
Subject: [PATCH 2/3] chore: test fix

---
 helpers.js => helpers | 0
 package.json          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename helpers.js => helpers (100%)

diff --git a/helpers.js b/helpers
similarity index 100%
rename from helpers.js
rename to helpers
diff --git a/package.json b/package.json
index 38e2254b5..c67ea74a3 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "browser.mjs",
     "index.cjs",
     "helpers.mjs",
-    "helpers.js",
+    "helpers",
     "index.mjs",
     "yargs",
     "build",

From b3d7824a36039c2c590336cf6183a20385511740 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sun, 15 Nov 2020 09:37:04 -0800
Subject: [PATCH 3/3] refactor: move helpers into helpers folder

---
 .eslintignore               |  1 +
 helpers.mjs                 | 10 ----------
 helpers/helpers.mjs         | 10 ++++++++++
 helpers => helpers/index.js |  3 +--
 helpers/package.json        |  3 +++
 package.json                |  9 +++++----
 test/esm/helpers.mjs        |  2 +-
 7 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 helpers.mjs
 create mode 100644 helpers/helpers.mjs
 rename helpers => helpers/index.js (75%)
 create mode 100644 helpers/package.json

diff --git a/.eslintignore b/.eslintignore
index 9f61ad74d..7e21e213d 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,3 +1,4 @@
 build/
 test/
 example/
+helpers/
diff --git a/helpers.mjs b/helpers.mjs
deleted file mode 100644
index 6fd79c501..000000000
--- a/helpers.mjs
+++ /dev/null
@@ -1,10 +0,0 @@
-import {applyExtends as _applyExtends} from './build/lib/utils/apply-extends.js';
-import {hideBin} from './build/lib/utils/process-argv.js';
-import Parser from 'yargs-parser';
-import shim from './lib/platform-shims/esm.mjs';
-
-const applyExtends = (config, cwd, mergeExtends) => {
-  return _applyExtends(config, cwd, mergeExtends, shim);
-};
-
-export {applyExtends, hideBin, Parser};
diff --git a/helpers/helpers.mjs b/helpers/helpers.mjs
new file mode 100644
index 000000000..3f96b3db8
--- /dev/null
+++ b/helpers/helpers.mjs
@@ -0,0 +1,10 @@
+import {applyExtends as _applyExtends} from '../build/lib/utils/apply-extends.js';
+import {hideBin} from '../build/lib/utils/process-argv.js';
+import Parser from 'yargs-parser';
+import shim from '../lib/platform-shims/esm.mjs';
+
+const applyExtends = (config, cwd, mergeExtends) => {
+  return _applyExtends(config, cwd, mergeExtends, shim);
+};
+
+export {applyExtends, hideBin, Parser};
diff --git a/helpers b/helpers/index.js
similarity index 75%
rename from helpers
rename to helpers/index.js
index 1bcbeb4bc..8ab79a337 100644
--- a/helpers
+++ b/helpers/index.js
@@ -1,10 +1,9 @@
-// TODO: remove this file once Node 10 is EOL:
 const {
   applyExtends,
   cjsPlatformShim,
   Parser,
   processArgv,
-} = require('./build/index.cjs');
+} = require('../build/index.cjs');
 
 module.exports = {
   applyExtends: (config, cwd, mergeExtends) => {
diff --git a/helpers/package.json b/helpers/package.json
new file mode 100644
index 000000000..5bbefffba
--- /dev/null
+++ b/helpers/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}
diff --git a/package.json b/package.json
index c67ea74a3..46dfcf9b6 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
       "./index.cjs"
     ],
     "./helpers": {
-      "import": "./helpers.mjs",
-      "require": "./yargs"
+      "import": "./helpers/helpers.mjs",
+      "require": "./helpers/index.js"
     },
     "./yargs": [
       {
@@ -33,8 +33,8 @@
   "files": [
     "browser.mjs",
     "index.cjs",
-    "helpers.mjs",
-    "helpers",
+    "helpers/*.js",
+    "helpers/*",
     "index.mjs",
     "yargs",
     "build",
@@ -100,6 +100,7 @@
   "standardx": {
     "ignore": [
       "build",
+      "helpers",
       "**/example/**",
       "**/platform-shims/esm.mjs"
     ]
diff --git a/test/esm/helpers.mjs b/test/esm/helpers.mjs
index 00c0b0c16..4f110ac0e 100644
--- a/test/esm/helpers.mjs
+++ b/test/esm/helpers.mjs
@@ -1,7 +1,7 @@
 'use strict';
 
 import * as assert from 'assert';
-import {applyExtends, hideBin, Parser} from '../../helpers.mjs';
+import {applyExtends, hideBin, Parser} from '../../helpers/helpers.mjs';
 import {describe, it} from 'mocha';
 
 describe('helpers', () => {