diff --git a/src/commands/prettier.ts b/src/commands/prettier.ts index 96750fc..c6960a2 100755 --- a/src/commands/prettier.ts +++ b/src/commands/prettier.ts @@ -1,12 +1,12 @@ import { log } from 'console'; -import fs from 'fs-extra'; import path from 'path'; -import chalk from 'chalk'; import { fileURLToPath, URL } from 'url'; +import chalk from 'chalk'; import * as eta from 'eta'; -import isPrettierConfigured from '../util/isPrettierConfigured'; +import fs from 'fs-extra'; import addDependency from '../util/addDependency'; import getProjectDir from '../util/getProjectDir'; +import isPrettierConfigured from '../util/isPrettierConfigured'; import writeFile from '../util/writeFile'; const dirname = fileURLToPath(new URL('.', import.meta.url)); diff --git a/src/commands/typescript.ts b/src/commands/typescript.ts index 275644a..c96c748 100755 --- a/src/commands/typescript.ts +++ b/src/commands/typescript.ts @@ -1,18 +1,18 @@ -import chalk from "chalk"; -import { log } from "console"; -import * as eta from "eta"; -import fs from "fs-extra"; -import path from "path"; -import { fileURLToPath, URL } from "url"; -import addDependency from "../util/addDependency"; -import getProjectDir from "../util/getProjectDir"; -import getProjectType from "../util/getProjectType"; -import writeFile from "../util/writeFile"; +import { log } from 'console'; +import path from 'path'; +import { fileURLToPath, URL } from 'url'; +import chalk from 'chalk'; +import * as eta from 'eta'; +import fs from 'fs-extra'; +import addDependency from '../util/addDependency'; +import getProjectDir from '../util/getProjectDir'; +import getProjectType from '../util/getProjectType'; +import writeFile from '../util/writeFile'; // for manual testing, change this to another name so doesn't conflict // with project's tsconfig.json -const tsConfig = "tsconfig.json"; -const dirname = fileURLToPath(new URL(".", import.meta.url)); +const tsConfig = 'tsconfig.json'; +const dirname = fileURLToPath(new URL('.', import.meta.url)); export default async function addTypescript() { const projectDir = await getProjectDir(); @@ -20,20 +20,20 @@ export default async function addTypescript() { if (await fs.exists(path.join(projectDir, tsConfig))) { log( chalk.yellow( - "tsconfig.json already exists, exiting.\nIf you would like to perform a fresh TypeScript install, delete this file and rerun the script.\n" - ) + 'tsconfig.json already exists, exiting.\nIf you would like to perform a fresh TypeScript install, delete this file and rerun the script.\n', + ), ); return; } - await addDependency("typescript @types/react", { dev: true }); + await addDependency('typescript @types/react', { dev: true }); const projectType = await getProjectType(); const template = await fs.readFile( - path.join(dirname, "templates", "tsconfig.json.eta") + path.join(dirname, 'templates', 'tsconfig.json.eta'), ); const fileContents = eta.render(template.toString(), { - expo: projectType === "expo-bare" || projectType === "expo-managed", + expo: projectType === 'expo-bare' || projectType === 'expo-managed', }); await writeFile(path.join(projectDir, tsConfig), fileContents, { @@ -42,7 +42,7 @@ export default async function addTypescript() { log( chalk.green( - "\nšŸŽ‰ TypeScript successfully configured\nConsider renaming your existing JS files as .ts or .tsx.\n" - ) + '\nšŸŽ‰ TypeScript successfully configured\nConsider renaming your existing JS files as .ts or .tsx.\n', + ), ); } diff --git a/src/util/addDependency.ts b/src/util/addDependency.ts index b68ebe0..2ea12ee 100644 --- a/src/util/addDependency.ts +++ b/src/util/addDependency.ts @@ -1,14 +1,14 @@ -import { exec } from "child_process"; -import * as fs from "fs-extra"; -import * as path from "path"; -import getProjectDir from "./getProjectDir"; +import { exec } from 'child_process'; +import * as path from 'path'; +import * as fs from 'fs-extra'; +import getProjectDir from './getProjectDir'; export default async function addDependency(deps: string, { dev = false }) { - const isYarn = await fs.exists(path.join(await getProjectDir(), "yarn.lock")); + const isYarn = await fs.exists(path.join(await getProjectDir(), 'yarn.lock')); if (isYarn) { - exec(`yarn add ${dev ? "--dev" : ""} ${deps}`); + exec(`yarn add ${dev ? '--dev' : ''} ${deps}`); } else { - exec(`npm install ${dev ? "--save-dev" : "--save"} ${deps}`); + exec(`npm install ${dev ? '--save-dev' : '--save'} ${deps}`); } } diff --git a/src/util/getPackageManager.ts b/src/util/getPackageManager.ts deleted file mode 100644 index b13dd7e..0000000 --- a/src/util/getPackageManager.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { select } from '@inquirer/prompts'; - -export default async function pickPackageManager() { - const packageManager = await select({ - message: 'Preferred package manager', - choices: [ - { - name: 'yarn', - value: 'yarn', - }, - { - name: 'npm', - value: 'npm', - }, - ], - }); - - console.log(packageManager); - return packageManager; -} diff --git a/src/util/getProjectDir.ts b/src/util/getProjectDir.ts index 19e43c6..4686433 100644 --- a/src/util/getProjectDir.ts +++ b/src/util/getProjectDir.ts @@ -1,5 +1,5 @@ -import fs from 'fs-extra'; import path from 'path'; +import fs from 'fs-extra'; export default async function getProjectDir( base: string = process.cwd(), diff --git a/src/util/isPrettierConfigured.ts b/src/util/isPrettierConfigured.ts index eb16730..ce9c10f 100644 --- a/src/util/isPrettierConfigured.ts +++ b/src/util/isPrettierConfigured.ts @@ -1,7 +1,7 @@ -import fsExtra from "fs-extra"; -import path from "path"; -import getProjectDir from "./getProjectDir"; -import readPackageJson from "./readPackageJson"; +import path from 'path'; +import fsExtra from 'fs-extra'; +import getProjectDir from './getProjectDir'; +import readPackageJson from './readPackageJson'; export default async function isPrettierConfigured() { const packageJson = await readPackageJson(); @@ -10,19 +10,19 @@ export default async function isPrettierConfigured() { const hasPrettierConfigInPackageJson = Object.prototype.hasOwnProperty.call( packageJson, - "prettier" + 'prettier', ); const hasPrettierrcJsFile = await fsExtra.exists( - path.join(projectDir, "prettierrc.js") + path.join(projectDir, 'prettierrc.js'), ); const hasPrettierrcFile = await fsExtra.exists( - path.join(projectDir, ".prettierrc") + path.join(projectDir, '.prettierrc'), ); const hasPrettierrcJsonFile = await fsExtra.exists( - path.join(projectDir, ".prettierrc.json") + path.join(projectDir, '.prettierrc.json'), ); const hasPrettierConfigFile = await fsExtra.exists( - path.join(projectDir, ".prettier.config.js") + path.join(projectDir, '.prettier.config.js'), ); return ( diff --git a/src/util/readPackageJson.ts b/src/util/readPackageJson.ts index 936f2f6..89252d4 100644 --- a/src/util/readPackageJson.ts +++ b/src/util/readPackageJson.ts @@ -1,10 +1,10 @@ -import fs from "fs-extra"; -import path from "path"; -import { PackageJson } from "../types"; -import getProjectDir from "./getProjectDir"; +import path from 'path'; +import fs from 'fs-extra'; +import { PackageJson } from '../types'; +import getProjectDir from './getProjectDir'; export default async function readPackageJson() { const rootDir = await getProjectDir(); - const pkg = await fs.readFile(path.join(rootDir, "package.json")); + const pkg = await fs.readFile(path.join(rootDir, 'package.json')); return JSON.parse(pkg.toString()) as PackageJson; }