chore: pr feedback

__e2e__/config.test.ts

@@ -4,7 +4,7 @@ import {wrap} from 'jest-snapshot-serializer-raw';
 import {
  runCLI,
  getTempDirectory,
- cleanup,
+ cleanupSync,
  writeFiles,
  spawnScript,
  replaceProjectRootInOutput,
@@ -44,7 +44,7 @@ beforeAll(() => {
  }
 
  // Clean up folder and re-create a new project
- cleanup(DIR, false);
+ cleanupSync(DIR);
  writeFiles(DIR, {});
 
  // Initialise React Native project
@@ -63,7 +63,7 @@ beforeAll(() => {
 });
 
 afterAll(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
 });
 
 test('shows up current config without unnecessary output', () => {

__e2e__/default.test.ts

@@ -1,13 +1,18 @@
-import {runCLI, getTempDirectory, cleanup, writeFiles} from '../jest/helpers';
+import {
+ runCLI,
+ getTempDirectory,
+ cleanupSync,
+ writeFiles,
+} from '../jest/helpers';
 
 const DIR = getTempDirectory('test_default_behavior');
 
 beforeEach(async () => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
  writeFiles(DIR, {});
 });
 afterEach(async () => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
 });
 
 test('shows up help information without passing in any args', () => {

__e2e__/init.test.ts

@@ -1,6 +1,11 @@
 import fs from 'fs';
 import path from 'path';
-import {runCLI, getTempDirectory, cleanup, writeFiles} from '../jest/helpers';
+import {
+ runCLI,
+ getTempDirectory,
+ cleanupSync,
+ writeFiles,
+} from '../jest/helpers';
 
 const DIR = getTempDirectory('command-init');
 
@@ -27,11 +32,11 @@ const customTemplateCopiedFiles = [
 ];
 
 beforeEach(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
  writeFiles(DIR, {});
 });
 afterEach(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
 });
 
 test('init --template fails without package name', () => {

__e2e__/install.test.ts

@@ -1,17 +1,22 @@
 import path from 'path';
-import {runCLI, getTempDirectory, cleanup, writeFiles} from '../jest/helpers';
+import {
+ runCLI,
+ getTempDirectory,
+ cleanupSync,
+ writeFiles,
+} from '../jest/helpers';
 
 const DIR = getTempDirectory('command-install-test');
 const pkg = 'react-native-config';
 
 beforeEach(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
  writeFiles(DIR, {
  'node_modules/react-native/package.json': '{}',
  'package.json': '{}',
  });
 });
-afterEach(() => cleanup(DIR, false));
+afterEach(() => cleanupSync(DIR));
 
 test.each(['yarn', 'npm'])('install module with %s', pm => {
  if (pm === 'yarn') {

__e2e__/legacyInit.test.ts

@@ -2,16 +2,16 @@ import fs from 'fs';
 import path from 'path';
 // @ts-ignore
 import execa from 'execa';
-import {getTempDirectory, cleanup, writeFiles} from '../jest/helpers';
+import {getTempDirectory, cleanupSync, writeFiles} from '../jest/helpers';
 
 const DIR = getTempDirectory('command-legacy-init');
 
 beforeEach(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
  writeFiles(DIR, {});
 });
 afterEach(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
 });
 
 // We skip this test, because it's flaky and we don't really update

__e2e__/root.test.ts

@@ -4,7 +4,7 @@ import {
  spawnScript,
  runCLI,
  getTempDirectory,
- cleanup,
+ cleanupSync,
  writeFiles,
 } from '../jest/helpers';
 
@@ -19,7 +19,7 @@ beforeAll(() => {
  }
 
  // Clean up folder and re-create a new project
- cleanup(cwd, false);
+ cleanupSync(cwd);
  writeFiles(cwd, {});
 
  // Initialise React Native project
@@ -37,7 +37,7 @@ beforeAll(() => {
 });
 
 afterAll(() => {
- cleanup(cwd, false);
+ cleanupSync(cwd);
 });
 
 test('works when Gradle is run outside of the project hierarchy', () => {

__e2e__/uninstall.test.ts

@@ -1,10 +1,15 @@
-import {runCLI, getTempDirectory, cleanup, writeFiles} from '../jest/helpers';
+import {
+ runCLI,
+ getTempDirectory,
+ cleanupSync,
+ writeFiles,
+} from '../jest/helpers';
 
 const DIR = getTempDirectory('command-uninstall-test');
 const pkg = 'react-native-config';
 
 beforeEach(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
  writeFiles(DIR, {
  'node_modules/react-native/package.json': '{}',
  'node_modules/react-native-config/package.json': '{}',
@@ -15,7 +20,7 @@ beforeEach(() => {
  }`,
  });
 });
-afterEach(() => cleanup(DIR, false));
+afterEach(() => cleanupSync(DIR));
 
 test('uninstall fails when package is not defined', () => {
  writeFiles(DIR, {

__e2e__/unknown.test.ts

@@ -1,13 +1,18 @@
-import {runCLI, getTempDirectory, cleanup, writeFiles} from '../jest/helpers';
+import {
+ runCLI,
+ getTempDirectory,
+ cleanupSync,
+ writeFiles,
+} from '../jest/helpers';
 
 const DIR = getTempDirectory('test_unknown');
 
 beforeEach(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
  writeFiles(DIR, {});
 });
 afterEach(() => {
- cleanup(DIR, false);
+ cleanupSync(DIR);
 });
 
 test('warn for passing in unknown commands', () => {

jest/helpers.ts

@@ -80,12 +80,12 @@ export const makeTemplate = (
  return values[number - 1];
  });
 
-export const cleanup = (directory: string, async = true) => {
- if (!async) {
- return rimraf.sync(directory);
- } else {
- return rimrafAsync(directory);
- }
+export const cleanup = (directory: string) => {
+ return rimrafAsync(directory);
+};
+
+export const cleanupSync = (directory: string) => {
+ rimraf.sync(directory);
 };
 
 /**