support execa esm

kellyselden · Nov 6, 2023 · 4dcad3b · 4dcad3b
1 parent 7ee06d2
commit 4dcad3b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/get-start-and-end-commands.js b/src/get-start-and-end-commands.js
@@ -2,7 +2,6 @@
 
 const path = require('path');
 const utils = require('./utils');
-const execa = require('execa');
 const getTimes = require('boilerplate-update/src/get-times');
 const getVersionAsOf = require('boilerplate-update/src/get-version-as-of');
 
@@ -45,7 +44,7 @@ function createProjectFromCache({
   options
 }) {
   return async function createProject(cwd) {
-    await execa.node(path.join(packageRoot, 'index.js'), [
+    await utils.execaNode(path.join(packageRoot, 'index.js'), [
       options.projectName,
       '--scripts-version',
       options.reactScriptsVersion
@@ -64,8 +63,10 @@ function createProjectFromRemote({
   options
 }) {
   return async function createProject(cwd) {
+    let execa = await import('execa');
+
     // create-react-app doesn't work well with async npx
-    utils.npxSync([`create-react-app@${options.packageVersion}`, options.projectName, '--scripts-version', options.reactScriptsVersion], { cwd });
+    utils.npxSync.call(execa, [`create-react-app@${options.packageVersion}`, options.projectName, '--scripts-version', options.reactScriptsVersion], { cwd });
 
     return await postCreateProject({
       cwd,

diff --git a/src/run-sync.js b/src/run-sync.js
@@ -1,11 +1,10 @@
 'use strict';
 
-const execa = require('execa');
 const debug = require('./debug');
 
 module.exports = function runSync() {
   debug(...arguments);
-  let { stdout } = execa.sync(...arguments);
+  let { stdout } = this.execaSync(...arguments);
   debug(stdout);
   return stdout;
 };
diff --git a/src/utils.js b/src/utils.js
@@ -12,5 +12,11 @@ module.exports.npxSync = function npxSync(args, options) {
   //   ...options
   // });
 
-  return require('./run-sync')('node', [path.join(path.dirname(require.resolve('npm')), 'bin/npx-cli.js'), ...args], options);
+  return require('./run-sync').call(this, 'node', [path.join(path.dirname(require.resolve('npm')), 'bin/npx-cli.js'), ...args], options);
+};
+
+module.exports.execaNode = async function execaNode() {
+  let { execaNode } = await import('execa');
+
+  return execaNode(...arguments);
 };
diff --git a/test/unit/get-start-and-end-commands-test.js b/test/unit/get-start-and-end-commands-test.js
@@ -6,7 +6,6 @@ const sinon = require('sinon');
 const path = require('path');
 const _getStartAndEndCommands = require('../../src/get-start-and-end-commands');
 const utils = require('../../src/utils');
-const execa = require('execa');
 
 const projectName = 'my-custom-app';
 const createReactAppStartVersion = '0.0.1';
@@ -29,7 +28,7 @@ describe(_getStartAndEndCommands, function() {
 
   beforeEach(function() {
     npxSyncStub = sinon.stub(utils, 'npxSync');
-    execaNodeStub = sinon.stub(execa, 'node').resolves();
+    execaNodeStub = sinon.stub(utils, 'execaNode').resolves();
     ejectStub = sinon.stub(utils, 'eject').resolves();
   });