Revert back to v5 of execa due to ESM issues

johnf · johnf · commit b16e817b4045 · 2024-10-05T13:15:24.000+10:00
diff --git a/.gitignore b/.gitignore
@@ -64,6 +64,7 @@ lib/
 
 # React Native Codegen
 android/generated
+ios/generated
 
 # Expo Example prebuild generated files
 ExpoExample/android
diff --git a/android/src/newarch/OwlSpec.kt b/android/src/newarch/OwlSpec.kt
@@ -1,4 +1,4 @@
-package com.owl
+package com.formidable.reactnativeowl;
 
 import com.facebook.react.bridge.ReactApplicationContext
 
diff --git a/android/src/oldarch/OwlSpec.kt b/android/src/oldarch/OwlSpec.kt
@@ -1,11 +1,9 @@
-package com.owl
+package com.formidable.reactnativeowl;
 
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.Promise
 
 abstract class OwlSpec internal constructor(context: ReactApplicationContext) :
   ReactContextBaseJavaModule(context) {
-
-  abstract fun multiply(a: Double, b: Double, promise: Promise)
 }
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
   },
   "dependencies": {
     "ajv": "^7.2.4",
-    "execa": "^9.4.0",
+    "execa": "^5.1.1",
     "handlebars": "^4.7.8",
     "pixelmatch": "^6.0.0",
     "pngjs": "^7.0.0",
@@ -179,7 +179,8 @@
     "type": "all",
     "jsSrcsDir": "src",
     "outputDir": {
-      "android": "android/generated"
+      "android": "android/generated",
+      "ios": "ios/generated"
     },
     "android": {
       "javaPackageName": "com.formidable.reactnativeowl"
diff --git a/src/__tests__/cli/build.test.ts b/src/__tests__/cli/build.test.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import * as execa from 'execa';
+import execa from 'execa';
 
 import { buildAndroid, buildHandler, buildIOS, ENTRY_FILE } from '../../cli/build';
 import type { CliBuildOptions, Config, ConfigEnv } from '../../types';
@@ -8,7 +8,7 @@ import * as configHelpers from '../../cli/config';
 
 describe('build.ts', () => {
   const logger = new Logger();
-  const execMock = jest.spyOn(execa, 'execaCommand').mockImplementation();
+  const execMock = jest.spyOn(execa, 'command').mockImplementation();
 
   beforeEach(() => {
     execMock.mockReset();
diff --git a/src/__tests__/cli/run.test.ts b/src/__tests__/cli/run.test.ts
@@ -7,8 +7,7 @@ import type { CliRunOptions, Config } from '../../types';
 import * as run from '../../cli/run';
 import * as xcrun from '../../utils/xcrun';
 import * as adb from '../../utils/adb';
-import * as execa from 'execa';
-import { execaCommand } from 'execa';
+import execa from 'execa';
 import { Logger } from '../../logger';
 
 jest.mock('../../utils/xcrun');
@@ -22,9 +21,9 @@ describe('run.ts', () => {
   const mkdirMock = jest.spyOn(fs, 'mkdir');
   const execKillMock = {
     kill: jest.fn(),
-  } as unknown as ReturnType<typeof execaCommand>;
+  } as unknown as execa.ExecaChildProcess<any>;
 
-  const execMock = jest.spyOn(execa, 'execaCommand').mockReturnValue(execKillMock);
+  const execMock = jest.spyOn(execa, 'command').mockImplementation();
 
   beforeEach(() => {
     mkdirMock.mockReset();
@@ -154,7 +153,7 @@ describe('run.ts', () => {
       process.cwd()
     )} --runInBand`;
 
-    const commandSyncMock = jest.spyOn(execa, 'execaCommandSync');
+    const commandSyncMock = jest.spyOn(execa, 'commandSync');
     const mockGenerateReport = jest.spyOn(reportHelpers, 'generateReport');
 
     jest.spyOn(Logger.prototype, 'print').mockImplementation();
diff --git a/src/__tests__/screenshot.test.ts b/src/__tests__/screenshot.test.ts
@@ -1,4 +1,4 @@
-import * as execa from 'execa';
+import execa from 'execa';
 import path from 'path';
 import { promises as fs } from 'fs';
 
@@ -8,7 +8,7 @@ import * as fileExistsHelpers from '../utils/file-exists';
 const SCREENSHOT_FILENAME = 'screen';
 
 describe('screenshot.ts', () => {
-  const commandMock = jest.spyOn(execa, 'execaCommand');
+  const commandMock = jest.spyOn(execa, 'command');
   const mkdirMock = jest.spyOn(fs, 'mkdir').mockImplementation();
   const writeFileMock = jest.spyOn(fs, 'writeFile').mockImplementation();
 
diff --git a/src/__tests__/utils/adb.test.ts b/src/__tests__/utils/adb.test.ts
@@ -1,5 +1,4 @@
-import * as execa from 'execa';
-import { execaCommand } from 'execa';
+import execa from 'execa';
 
 import * as adb from '../../utils/adb';
 
@@ -10,8 +9,8 @@ describe('adb.ts', () => {
 
   const execKillMock = {
     kill: jest.fn(),
-  } as unknown as ReturnType<typeof execaCommand>;
-  const execMock = jest.spyOn(execa, 'execaCommand').mockReturnValue(execKillMock);
+  } as unknown as execa.ExecaChildProcess<any>;
+  const execMock = jest.spyOn(execa, 'command').mockReturnValue(execKillMock);
 
   beforeEach(() => {
     execMock.mockReset();
diff --git a/src/__tests__/utils/xcrun.test.ts b/src/__tests__/utils/xcrun.test.ts
@@ -1,5 +1,4 @@
-import * as execa from 'execa';
-import { execaCommand } from 'execa';
+import execa from 'execa';
 
 import * as xcrun from '../../utils/./xcrun';
 
@@ -10,9 +9,9 @@ describe('xcrun.ts', () => {
 
   const execKillMock = {
     kill: jest.fn(),
-  } as unknown as ReturnType<typeof execaCommand>;
-  const execMock = jest.spyOn(execa, 'execaCommand').mockReturnValue(execKillMock);
-
+    stdout: 'bundleId',
+  } as unknown as execa.ExecaChildProcess<any>;
+  const execMock = jest.spyOn(execa, 'command').mockReturnValue(execKillMock);
 
   beforeEach(() => {
     execMock.mockClear();
diff --git a/src/cli/build.ts b/src/cli/build.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { execaCommand } from 'execa';
+import execa from 'execa';
 
 import type { CliBuildOptions, Config } from '../types';
 import { Logger } from '../logger';
@@ -29,7 +29,7 @@ export const buildIOS = async (
 
   logger.info(`[OWL - CLI] Building the app with: ${buildCommand.join(' ')}.`);
 
-  await execaCommand(buildCommand.join(' '), {
+  await execa.command(buildCommand.join(' '), {
     stdio: 'inherit',
     env: {
       ENTRY_FILE,
@@ -65,7 +65,7 @@ export const buildAndroid = async (
 
   logger.info(`[OWL - CLI] Building the app with: ${buildCommand.join(' ')}.`);
 
-  await execaCommand(buildCommand.join(' '), {
+  await execa.command(buildCommand.join(' '), {
     stdio: 'inherit',
     cwd,
     env: {
diff --git a/src/cli/run.ts b/src/cli/run.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { execaCommand, execaCommandSync } from 'execa';
+import execa from 'execa';
 import { promises as fs } from 'fs';
 
 import { cleanupScreenshots } from '../screenshot';
@@ -102,7 +102,7 @@ export const runHandler = async (args: CliRunOptions) => {
   await cleanupScreenshots();
 
   logger.print(`[OWL - CLI] Starting websocket server.`);
-  const webSocketProcess = execaCommand('node scripts/websocket-server.js', {
+  const webSocketProcess = execa.command('node scripts/websocket-server.js', {
     stdio: 'inherit',
     cwd: path.join(__dirname, '..', '..', '..'),
     env: {
@@ -149,7 +149,7 @@ export const runHandler = async (args: CliRunOptions) => {
   logger.info(`[OWL - CLI] Will set the jest root to ${process.cwd()}.`);
 
   try {
-    await execaCommandSync(jestCommand, {
+    await execa.commandSync(jestCommand, {
       stdio: 'inherit',
       env: {
         OWL_PLATFORM: args.platform,
diff --git a/src/screenshot.ts b/src/screenshot.ts
@@ -1,4 +1,4 @@
-import { execaCommand } from 'execa';
+import execa from 'execa';
 import { promises as fs } from 'fs';
 import path from 'path';
 
@@ -60,7 +60,7 @@ export const takeScreenshot = async (filename: string): Promise<string> => {
   logger.info(
     `[OWL - CLI] Will run the screenshot command: ${screenshotCommand}.`
   );
-  await execaCommand(screenshotCommand, {
+  await execa.command(screenshotCommand, {
     stdio,
     cwd,
     shell: platform === 'android',
diff --git a/src/utils/adb.ts b/src/utils/adb.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { execaCommand } from 'execa';
+import execa from 'execa';
 import type { ConfigAndroid } from '../types';
 
 export const adbInstall = async ({
@@ -23,7 +23,7 @@ export const adbInstall = async ({
   const appPath = path.join(cwd, appFilename);
 
   const command = `adb install -r ${appPath}`;
-  await execaCommand(command, { stdio });
+  await execa.command(command, { stdio });
 };
 
 export const adbTerminate = async ({
@@ -36,7 +36,7 @@ export const adbTerminate = async ({
   const stdio = debug ? 'inherit' : 'ignore';
 
   const command = `adb shell am force-stop ${packageName}`;
-  await execaCommand(command, { stdio });
+  await execa.command(command, { stdio });
 };
 
 export const adbLaunch = async ({
@@ -49,5 +49,5 @@ export const adbLaunch = async ({
   const stdio = debug ? 'inherit' : 'ignore';
 
   const command = `adb shell monkey -p "${packageName}" -c android.intent.category.LAUNCHER 1`;
-  await execaCommand(command, { stdio });
+  await execa.command(command, { stdio });
 };
diff --git a/src/utils/xcrun.ts b/src/utils/xcrun.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { execaCommand } from 'execa';
+import execa from 'execa';
 import type { ConfigIOS } from '../types';
 import { waitFor } from './wait-for';
 
@@ -24,7 +24,7 @@ export const xcrunStatusBar = async ({
   const SIMULATOR_TIME = '9:41';
 
   const command = `xcrun simctl status_bar ${simulator} override --time ${SIMULATOR_TIME}`;
-  await execaCommand(command, { stdio, cwd });
+  await execa.command(command, { stdio, cwd });
 };
 
 export const xcrunInstall = async ({
@@ -51,7 +51,7 @@ export const xcrunInstall = async ({
   const simulator = device.replace(/([ /])/g, '\\$1');
 
   const command = `xcrun simctl install ${simulator} ${appFilename}`;
-  await execaCommand(command, { stdio, cwd });
+  await execa.command(command, { stdio, cwd });
 };
 
 export const xcrunTerminate = async ({
@@ -76,15 +76,15 @@ export const xcrunTerminate = async ({
   const appFilename = binaryPath ? path.basename(binaryPath) : `${scheme}.app`;
   const plistPath = path.join(cwd, appFilename, 'Info.plist');
 
-  const { stdout: bundleId } = await execaCommand(
+  const { stdout: bundleId } = await execa.command(
     `./PlistBuddy -c 'Print CFBundleIdentifier' ${plistPath}`,
     { shell: true, cwd: '/usr/libexec' }
   );
 
   const simulator = device.replace(/([ /])/g, '\\$1');
 
   const command = `xcrun simctl terminate ${simulator} ${bundleId}`;
-  await execaCommand(command, { stdio, cwd });
+  await execa.command(command, { stdio, cwd });
 };
 
 export const xcrunLaunch = async ({
@@ -109,15 +109,15 @@ export const xcrunLaunch = async ({
   const appFilename = binaryPath ? path.basename(binaryPath) : `${scheme}.app`;
   const plistPath = path.join(cwd, appFilename, 'Info.plist');
 
-  const { stdout: bundleId } = await execaCommand(
+  const { stdout: bundleId } = await execa.command(
     `./PlistBuddy -c 'Print CFBundleIdentifier' ${plistPath}`,
     { shell: true, cwd: '/usr/libexec' }
   );
 
   const simulator = device.replace(/([ /])/g, '\\$1');
 
   const command = `xcrun simctl launch ${simulator} ${bundleId}`;
-  await execaCommand(command, { stdio, cwd });
+  await execa.command(command, { stdio, cwd });
 };
 
 export const xcrunUi = async ({
@@ -140,9 +140,9 @@ export const xcrunUi = async ({
   const simulator = device.replace(/([ /])/g, '\\$1');
 
   const command = `xcrun simctl ui ${simulator} appearance`;
-  await execaCommand(`${command} dark`, { stdio, cwd });
+  await execa.command(`${command} dark`, { stdio, cwd });
   await waitFor(500);
-  await execaCommand(`${command} light`, { stdio, cwd });
+  await execa.command(`${command} light`, { stdio, cwd });
   await waitFor(500);
 };
 
@@ -166,5 +166,5 @@ export const xcrunRestore = async ({
   const simulator = device.replace(/([ /])/g, '\\$1');
 
   const command = `xcrun simctl status_bar ${simulator} clear`;
-  await execaCommand(command, { stdio, cwd });
+  await execa.command(command, { stdio, cwd });
 };
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.owl`
	`1`	`+package com.formidable.reactnativeowl;`
`2`	`2`
`3`	`3`	`import com.facebook.react.bridge.ReactApplicationContext`
`4`	`4`