Revert back to v5 of execa due to ESM issues

Author: johnf

.gitignore

@@ -64,6 +64,7 @@ lib/
 
 # React Native Codegen
 android/generated
+ios/generated
 
 # Expo Example prebuild generated files
 ExpoExample/android

android/src/newarch/OwlSpec.kt

@@ -1,4 +1,4 @@
-package com.owl
+package com.formidable.reactnativeowl;
 
 import com.facebook.react.bridge.ReactApplicationContext
 

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)
 }

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"

src/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();

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: {

src/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();

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,

src/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();
 

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',