fix asynchrony

Author: thymikee

packages/cli/src/commands/init/__tests__/editTemplate.test.js

@@ -16,20 +16,28 @@ const FIXTURE_DIR = path.resolve(
 const PLACEHOLDER_NAME = 'PlaceholderName';
 const PROJECT_NAME = 'ProjectName';
 
-function createTestEnv() {
+async function createTestEnv() {
   const TEST_DIR = `rncli-should-edit-template-${Date.now()}`;
   const tmpDir = os.tmpdir();
   const testPath = path.resolve(tmpDir, TEST_DIR);
 
   fs.mkdirSync(testPath);
-  copyFiles(FIXTURE_DIR, testPath);
+  await copyFiles(FIXTURE_DIR, testPath);
 
   return testPath;
 }
 
-test('should edit template', () => {
-  const testPath = createTestEnv();
+let testPath;
+
+beforeEach(async () => {
+  testPath = await createTestEnv();
+});
 
+afterEach(() => {
+  fs.removeSync(testPath);
+});
+
+test('should edit template', () => {
   jest.spyOn(process, 'cwd').mockImplementation(() => testPath);
 
   changePlaceholderInTemplate(PROJECT_NAME, PLACEHOLDER_NAME);
@@ -74,6 +82,4 @@ test('should edit template', () => {
   expect(
     snapshotDiff(fixtureTree, transformedTree, {contextLines: 1}),
   ).toMatchSnapshot();
-
-  fs.removeSync(testPath);
 });

packages/cli/src/commands/init/__tests__/template.test.js

@@ -56,15 +56,15 @@ test('getTemplateConfig', () => {
   );
 });
 
-test('copyTemplate', () => {
+test('copyTemplate', async () => {
   const TEMPLATE_DIR = 'some/dir';
   const CWD = '.';
 
   jest.spyOn(path, 'resolve').mockImplementationOnce((...e) => e.join('/'));
   jest.spyOn(copyFiles, 'default').mockImplementationOnce(() => {});
   jest.spyOn(process, 'cwd').mockImplementationOnce(() => CWD);
 
-  copyTemplate(TEMPLATE_NAME, TEMPLATE_DIR, TEMPLATE_SOURCE_DIR);
+  await copyTemplate(TEMPLATE_NAME, TEMPLATE_DIR, TEMPLATE_SOURCE_DIR);
 
   expect(path.resolve).toHaveBeenCalledWith(
     TEMPLATE_SOURCE_DIR,

packages/cli/src/commands/init/editTemplate.js

@@ -1,5 +1,5 @@
 // @flow
-import fs from 'fs-extra';
+import fs from 'fs';
 import path from 'path';
 import walk from '../../tools/walk';
 import {logger} from '@react-native-community/cli-tools';
@@ -30,7 +30,7 @@ function renameFile(filePath: string, oldName: string, newName: string) {
 
   logger.debug(`Renaming ${filePath} -> file:${newFileName}`);
 
-  fs.moveSync(filePath, newFileName);
+  fs.renameSync(filePath, newFileName);
 }
 
 function shouldRenameFile(filePath: string, nameToReplace: string) {

packages/cli/src/commands/init/init.js

@@ -63,7 +63,7 @@ async function createFromExternalTemplate(
 
     name = adjustNameIfUrl(name, templateSourceDir);
     const templateConfig = getTemplateConfig(name, templateSourceDir);
-    copyTemplate(name, templateConfig.templateDir, templateSourceDir);
+    await copyTemplate(name, templateConfig.templateDir, templateSourceDir);
 
     loader.succeed();
     loader.start('Preparing template');
@@ -121,7 +121,11 @@ async function createFromReactNativeTemplate(
     loader.start('Copying template');
 
     const templateConfig = getTemplateConfig(TEMPLATE_NAME, templateSourceDir);
-    copyTemplate(TEMPLATE_NAME, templateConfig.templateDir, templateSourceDir);
+    await copyTemplate(
+      TEMPLATE_NAME,
+      templateConfig.templateDir,
+      templateSourceDir,
+    );
 
     loader.succeed();
     loader.start('Processing template');

packages/cli/src/commands/init/template.js

@@ -40,7 +40,7 @@ export function getTemplateConfig(
   return require(configFilePath);
 }
 
-export function copyTemplate(
+export async function copyTemplate(
   templateName: string,
   templateDir: string,
   templateSourceDir: string,
@@ -54,7 +54,7 @@ export function copyTemplate(
 
   logger.debug(`Copying template from ${templatePath}`);
 
-  copyFiles(templatePath, process.cwd());
+  await copyFiles(templatePath, process.cwd());
 }
 
 export function executePostInitScript(

packages/cli/src/tools/copyFiles.js

@@ -14,11 +14,16 @@ import walk from './walk';
 /**
  * Copy files (binary included) recursively.
  */
-function copyFiles(srcPath: string, destPath: string) {
-  walk(srcPath).forEach(absoluteSrcFilePath => {
-    const relativeFilePath = path.relative(srcPath, absoluteSrcFilePath);
-    copyFile(absoluteSrcFilePath, path.resolve(destPath, relativeFilePath));
-  });
+async function copyFiles(srcPath: string, destPath: string) {
+  return Promise.all(
+    walk(srcPath).map(async absoluteSrcFilePath => {
+      const relativeFilePath = path.relative(srcPath, absoluteSrcFilePath);
+      await copyFile(
+        absoluteSrcFilePath,
+        path.resolve(destPath, relativeFilePath),
+      );
+    }),
+  );
 }
 
 /**
@@ -33,10 +38,13 @@ function copyFile(srcPath: string, destPath: string) {
     return;
   }
 
-  copyBinaryFile(srcPath, destPath, err => {
-    if (err) {
-      throw err;
-    }
+  return new Promise((resolve, reject) => {
+    copyBinaryFile(srcPath, destPath, err => {
+      if (err) {
+        reject(err);
+      }
+      resolve(destPath);
+    });
   });
 }
 
@@ -47,17 +55,15 @@ function copyBinaryFile(srcPath, destPath, cb) {
   let cbCalled = false;
   const {mode} = fs.statSync(srcPath);
   const readStream = fs.createReadStream(srcPath);
+  const writeStream = fs.createWriteStream(destPath);
   readStream.on('error', err => {
     done(err);
   });
-  const writeStream = fs.createWriteStream(destPath);
   writeStream.on('error', err => {
     done(err);
   });
-  writeStream.on('close', () => {
+  readStream.on('close', () => {
     done();
-  });
-  writeStream.on('ready', () => {
     fs.chmodSync(destPath, mode);
   });
   readStream.pipe(writeStream);