Fix corrupt images

__mocks__/fs-extra.js

@@ -36,9 +36,6 @@ export default {
 
     return memfs.readFileSync(file, options);
   },
-  readFile(path, options) {
-    return Promise.resolve(this.readFileSync(path, options));
-  },
   outputFile: async (file, data, options) => {
     const dirname = path.dirname(file);
     const exists = memfs.existsSync(dirname);
@@ -68,8 +65,8 @@ export default {
     // read templates from actual fs
     const sourceFS = dontMock(src) ? fse : memfs;
 
+    memfs.mkdirSync(path.dirname(dest), { recursive: true });
     if (sourceFS.existsSync(src) && sourceFS.statSync(src).isDirectory(src)) {
-      memfs.mkdirSync(dest, { recursive: true });
       sourceFS.readdirSync(src).forEach((childItemName) => {
         this.copySync(
           path.join(src, childItemName),

package.json

@@ -60,7 +60,7 @@
     "npm-run-all": "^4.1.5",
     "tsup": "^7.2.0",
     "typescript": "^5.0.4",
-    "vitest": "^0.34.1"
+    "vitest": "^2.0.5"
   },
   "eslintConfig": {
     "extends": [

src/commands/__tests__/createApp.test.ts

@@ -42,7 +42,7 @@ test('prompts for app name if not supplied', async () => {
 test('exits if directory already exists', async () => {
   (print as Mock).mockReset();
   vi.spyOn(process, 'exit');
-  process.exit = vi.fn();
+  process.exit = vi.fn<typeof process.exit>();
 
   vol.fromJSON({ 'MyApp/package.json': '{}' }, './');
 
@@ -67,7 +67,7 @@ test('converts directory to camel case and strips special characters', async ()
 test('exits if app name does not start with a letter', async () => {
   (print as Mock).mockReset();
   vi.spyOn(process, 'exit');
-  process.exit = vi.fn();
+  process.exit = vi.fn<typeof process.exit>();
   vol.fromJSON({ 'MyApp/package.json': '{}' }, './');
 
   await createApp('555MyApp');

src/commands/__tests__/notifications.test.ts

@@ -4,6 +4,8 @@ import { Mock, expect, test, vi } from 'vitest';
 import addDependency from '../../util/addDependency';
 import { addNotifications } from '../notifications';
 
+vi.mock('../../util/print', () => ({ default: vi.fn() }));
+
 vi.mock('@inquirer/prompts', () => ({
   input: vi.fn(),
   confirm: vi.fn(),

src/commands/createApp.ts

@@ -29,44 +29,43 @@ export async function createApp(
 ) {
   const { interactive = true } = options;
   globals.interactive = interactive;
-
   const appName = await validateAndSanitizeAppName(name);
 
   await ensureDirectoryDoesNotExist(appName);
   await printIntro(appName);
-
   const spinner = ora('Creating app with Belt').start();
 
-  await exec(`mkdir ${appName}`);
-
-  await copyTemplateDirectory({
-    templateDir: 'boilerplate',
-    destinationDir: appName,
-    gitignore: await boilerplateIgnoreFiles(),
-    stringSubstitutions: {
-      'app.json': {
-        BELT_APP_NAME: appName,
+  try {
+    await exec(`mkdir ${appName}`);
+
+    await copyTemplateDirectory({
+      templateDir: 'boilerplate',
+      destinationDir: appName,
+      gitignore: await boilerplateIgnoreFiles(),
+      stringSubstitutions: {
+        'app.json': {
+          BELT_APP_NAME: appName,
+        },
+        'package.json': {
+          belt_app_name: _.kebabCase(appName),
+        },
       },
-      'package.json': {
-        belt_app_name: _.kebabCase(appName),
-      },
-    },
-  });
+    });
 
-  spinner.succeed('Created new Belt app with Expo');
+    spinner.succeed('Created new Belt app with Expo');
 
-  process.chdir(`./${appName}`);
+    process.chdir(`./${appName}`);
 
-  spinner.start('Installing dependencies');
-  const packageManager = getPackageManager(options);
-  await exec(`${packageManager} install`);
-  await exec('git init');
-  await commit('Initial commit');
-  spinner.succeed('Installed dependencies');
+    spinner.start('Installing dependencies');
+    const packageManager = getPackageManager(options);
+    await exec(`${packageManager} install`);
+    await exec('git init');
+    await commit('Initial commit');
+    spinner.succeed('Installed dependencies');
 
-  print(chalk.green(`\n\n👖 ${appName} successfully configured!`));
+    print(chalk.green(`\n\n👖 ${appName} successfully configured!`));
 
-  print(`
+    print(`
 Your pants are now secure! To get started with your new app:
 
 cd ${appName}
@@ -75,6 +74,13 @@ ${packageManager} run android
 
 For more information about Belt, visit https://github.com/thoughtbot/belt.
 `);
+  } catch (e) {
+    spinner.fail('An error occurred creating the app\n');
+    if (e instanceof Error) {
+      print(chalk.red(e.message));
+    }
+    process.exit(1);
+  }
 }
 
 /**

src/util/__tests__/validateAndSanitizeAppName.test.ts

@@ -47,7 +47,7 @@ describe('validateAndSanitizeAppName', () => {
   test('returns a warning when the application name does not start with a letter', async () => {
     (print as Mock).mockReset();
     vi.spyOn(process, 'exit');
-    process.exit = vi.fn();
+    process.exit = vi.fn<typeof process.exit>();
     (input as Mock).mockReturnValue('123MyApp');
     await validateAndSanitizeAppName(undefined);
 

src/util/copyTemplateDirectory.ts

@@ -5,6 +5,15 @@ import path from 'path';
 import { PACKAGE_ROOT } from '../constants';
 import writeFile from './writeFile';
 
+const UNSUPPORTED_EXTENSIONS = [
+  '.png',
+  '.jpg',
+  '.jpeg',
+  '.gif',
+  '.svg',
+  '.pdf',
+];
+
 type Substitutions = {
   [fileNamePattern: string]: Record<string, string>;
 };
@@ -49,32 +58,59 @@ export default async function copyTemplateDirectory({
   const filenames = await getFiles(srcDir, gitignore);
   await Promise.all(
     filenames.map(async (filename) => {
-      const destinationFilename = path.join(
-        destinationDir,
-        path.relative(srcDir, filename),
-      );
-
-      let contents = (await fs.readFile(filename)).toString();
-      const substitutions = substitutionsForFile(filename, stringSubstitutions);
-      if (Object.keys(substitutions).length > 0) {
-        contents = Object.entries(substitutions).reduce((acc, [key, value]) => {
-          return acc.replaceAll(new RegExp(key, 'g'), value);
-        }, contents);
+      const relativeFilename = path.relative(srcDir, filename);
+      const destinationFilename = path.join(destinationDir, relativeFilename);
+
+      if (substitutionsSupported(filename)) {
+        const contents = await makeFileSubstitutions(
+          filename,
+          stringSubstitutions,
+          variables,
+        );
+
+        return writeFile(destinationFilename.replace(/\.eta$/, ''), contents);
       }
 
-      if (filename.endsWith('.eta')) {
-        contents = eta.render(contents, variables);
+      try {
+        // file is binary or otherwise doesn't support substitutions, just copy
+        // it over instead of reading it to a string
+        return await fs.copy(filename, destinationFilename);
+      } catch (e) {
+        if (e instanceof Error) {
+          throw new Error(
+            `An error occurred copying file ${relativeFilename} to ${destinationFilename}: ${e.message}`,
+          );
+        }
       }
 
-      return writeFile(destinationFilename.replace(/\.eta$/, ''), contents);
+      return null;
     }),
   );
 }
 
+async function makeFileSubstitutions(
+  filename: string,
+  stringSubstitutions: Substitutions,
+  variables: object,
+): Promise<string> {
+  let contents = (await fs.readFile(filename)).toString();
+  const substitutions = substitutionsForFile(filename, stringSubstitutions);
+  if (Object.keys(substitutions).length > 0) {
+    contents = Object.entries(substitutions).reduce((acc, [key, value]) => {
+      return acc.replaceAll(new RegExp(key, 'g'), value);
+    }, contents);
+  }
+
+  if (filename.endsWith('.eta')) {
+    contents = eta.render(contents, variables);
+  }
+
+  return contents;
+}
+
 function substitutionsSupported(filename: string) {
-  const unsupportedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'svg', 'pdf'];
-  const extension = filename.split('.').pop()?.toLocaleLowerCase();
-  return !extension || !unsupportedExtensions.includes(extension);
+  const extension = path.extname(filename).toLocaleLowerCase();
+  return !extension || !UNSUPPORTED_EXTENSIONS.includes(extension);
 }
 
 function substitutionsForFile(

src/util/print/__tests__/copyTemplateDirectory.test.ts

@@ -5,18 +5,20 @@ import copyTemplateDirectory from '../../copyTemplateDirectory';
 
 vi.mock('../../print', () => ({ default: vi.fn() }));
 
-test('copies directory structure to destination', async () => {
+test('copies directory structure to destination, including binary files (based on the extension)', async () => {
   fse.mockTemplates();
   const json = {
     'templates/testing/jest.config.js': '1',
     'templates/testing/src/test/render.ts': '2',
+    'templates/testing/assets/splash.png': '3',
   };
   vol.fromJSON(json, './');
 
   await copyTemplateDirectory({ templateDir: 'testing', destinationDir: '.' });
 
   expect(fs.readFileSync('jest.config.js', 'utf8')).toEqual('1');
   expect(fs.readFileSync('src/test/render.ts', 'utf8')).toEqual('2');
+  expect(fs.readFileSync('assets/splash.png', 'utf8')).toEqual('3');
 });
 
 test('compiles files with .eta file extensions', async () => {