@quilted/create 0.1.30 → 0.1.32

package/build/esm/app.mjs

@@ -1,9 +1,9 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { execSync } from 'node:child_process';
-import { c as cyan_1, b as bold_1, g as getCreateAsMonorepo, a as getShouldInstall, d as getPackageManager, e as getExtrasToSetup, f as emptyDirectory, t as toValidPackageName, h as format, m as mergeDependencies, l as loadTemplate, i as addToTsConfig, j as addToPackageManagerWorkspaces, r as relativeDirectoryForDisplay, k as dim_1, u as underline_1, n as magenta_1, o as isEmpty, p as createOutputTarget } from './package-manager.mjs';
+import { c as cyan_1, b as bold_1, g as getCreateAsMonorepo, a as getShouldInstall, d as getPackageManager, e as getExtrasToSetup, f as emptyDirectory, t as toValidPackageName, h as format, m as mergeDependencies, l as loadTemplate, i as addToTsConfig, j as addToPackageManagerWorkspaces, r as relativeDirectoryForDisplay, k as dim_1, u as underline_1, n as magenta_1, o as isEmpty, p as createOutputTarget } from './shared/package-manager.mjs';
 import { s as stripIndent, p as printHelp, a as prompt } from './index.mjs';
 import 'node:tty';
+import 'node:child_process';
 import 'node:url';
 import 'node:readline';
 import 'node:events';
@@ -204,32 +204,24 @@ arg.ArgError = ArgError;
 
 var arg_1 = arg;
 
-let _ = t => t,
-    _t,
-    _t2,
-    _t3;
 async function createApp() {
   const argv = getArgv();
-
   if (argv['--help']) {
-    var _argv$PackageManag;
-
-    const additionalOptions = stripIndent(_t || (_t = _`
-      ${0}
+    const additionalOptions = stripIndent`
+      ${cyan_1(`--template`)}
       The template to use for your new application. If you don’t specify a template,
       this command will ask you for one instead. Must be one of the following:
 
-       - ${0}, a web app with a minimal file structure
-       - ${0}, an entire web app in a single file
-    `), cyan_1(`--template`), bold_1('basic'), bold_1('single-file'));
+       - ${bold_1('basic')}, a web app with a minimal file structure
+       - ${bold_1('single-file')}, an entire web app in a single file
+    `;
     printHelp({
       kind: 'app',
       options: additionalOptions,
-      packageManager: (_argv$PackageManag = argv['--package-manager']) === null || _argv$PackageManag === void 0 ? void 0 : _argv$PackageManag.toLowerCase()
+      packageManager: argv['--package-manager']?.toLowerCase()
     });
     return;
   }
-
   const inWorkspace = fs.existsSync('quilt.workspace.ts');
   const name = await getName(argv, {
     inWorkspace
@@ -240,16 +232,16 @@ async function createApp() {
   const template = await getTemplate(argv);
   const createAsMonorepo = !inWorkspace && (await getCreateAsMonorepo(argv));
   const shouldInstall = await getShouldInstall(argv);
-  const packageManager = await getPackageManager(argv);
+  const packageManager = await getPackageManager(argv, {
+    root: directory
+  });
   const setupExtras = await getExtrasToSetup(argv, {
     inWorkspace
   });
   const partOfMonorepo = inWorkspace || createAsMonorepo;
   const appDirectory = createAsMonorepo ? path.join(directory, 'app') : directory;
-
   if (fs.existsSync(directory)) {
     await emptyDirectory(directory);
-
     if (appDirectory !== directory) {
       fs.mkdirSync(appDirectory, {
         recursive: true
@@ -260,27 +252,28 @@ async function createApp() {
       recursive: true
     });
   }
-
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = createOutputTarget(rootDirectory);
   const appTemplate = loadTemplate(template === 'basic' ? 'app-basic' : 'app-single-file');
-  const workspaceTemplate = loadTemplate('workspace'); // If we aren’t already in a workspace, copy the workspace files over, which
-  // are needed if we are making a monorepo or not.
+  const workspaceTemplate = loadTemplate('workspace');
 
+  // If we aren’t already in a workspace, copy the workspace files over, which
+  // are needed if we are making a monorepo or not.
   if (!inWorkspace) {
     await workspaceTemplate.copy(directory, file => {
       // When this is a single project, we use the project’s Quilt  configuration as the base.
-      if (file === 'quilt.workspace.ts') return createAsMonorepo; // We need to make some adjustments to the root package.json
+      if (file === 'quilt.workspace.ts') return createAsMonorepo;
 
+      // We need to make some adjustments to the root package.json
       return file !== 'package.json';
-    }); // If we are creating a monorepo, we need to add the root package.json and
-    // package manager workspace configuration.
+    });
 
+    // If we are creating a monorepo, we need to add the root package.json and
+    // package manager workspace configuration.
     if (createAsMonorepo) {
       const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
       workspacePackageJson.name = toValidPackageName(name);
-
-      if (packageManager === 'pnpm') {
+      if (packageManager.type === 'pnpm') {
         await outputRoot.write('pnpm-workspace.yaml', await format(`
               packages:
               - './packages/*'
@@ -290,7 +283,6 @@ async function createApp() {
       } else {
         workspacePackageJson.workspaces = ['packages/*'];
       }
-
       await outputRoot.write('package.json', await format(JSON.stringify(workspacePackageJson), {
         as: 'json-stringify'
       }));
@@ -312,26 +304,22 @@ async function createApp() {
         as: 'json'
       }));
     }
-
     if (setupExtras.has('github')) {
       await loadTemplate('github').copy(directory);
     }
-
     if (setupExtras.has('vscode')) {
       await loadTemplate('vscode').copy(directory);
     }
   }
-
   await appTemplate.copy(appDirectory, file => {
     // If we are in a monorepo, we can use all the template files as they are
     if (file === 'quilt.project.ts' || file === 'tsconfig.json') {
       return partOfMonorepo;
-    } // We need to make some adjustments the project’s package.json
-
+    }
 
+    // We need to make some adjustments the project’s package.json
     return file !== 'package.json';
   });
-
   if (partOfMonorepo) {
     // Write the app’s package.json (the root one was already created)
     const projectPackageJson = JSON.parse(await appTemplate.read('package.json'));
@@ -339,56 +327,48 @@ async function createApp() {
     await outputRoot.write(path.join(appDirectory, 'package.json'), await format(JSON.stringify(projectPackageJson), {
       as: 'json-stringify'
     }));
-    await Promise.all([addToTsConfig(appDirectory, outputRoot), addToPackageManagerWorkspaces(appDirectory, outputRoot, packageManager)]);
+    await Promise.all([addToTsConfig(appDirectory, outputRoot), addToPackageManagerWorkspaces(appDirectory, outputRoot, packageManager.type)]);
   }
-
   if (shouldInstall) {
-    process.stdout.write('\nInstalling dependencies...\n'); // TODO: better loading, handle errors
-
-    execSync(`${packageManager} install`, {
-      cwd: rootDirectory
-    });
+    process.stdout.write('\nInstalling dependencies...\n');
+    // TODO: better loading, handle errors
+    await packageManager.install();
     process.stdout.moveCursor(0, -1);
     process.stdout.clearLine(1);
     console.log('Installed dependencies.');
   }
-
   const commands = [];
-
-  const packageManagerRun = command => packageManager === 'npm' ? `npm run ${command}` : `pnpm ${command}`;
-
   if (!inWorkspace && directory !== process.cwd()) {
     commands.push(`cd ${cyan_1(relativeDirectoryForDisplay(path.relative(process.cwd(), directory)))} ${dim_1('# Move into your new app’s directory')}`);
   }
-
   if (!shouldInstall) {
-    commands.push(`${packageManager} install ${dim_1('# Install all your dependencies')}`);
+    commands.push(`${packageManager.commands.install()} ${dim_1('# Install all your dependencies')}`);
   }
-
   if (!inWorkspace) {
     // TODO: change this condition to check if git was initialized already
     commands.push(`git init && git add -A && git commit -m "Initial commit" ${dim_1('# Start your git history (optional)')}`);
   }
-
-  commands.push(`${packageManagerRun('develop')} ${dim_1('# Start the development server')}`);
-  const whatsNext = stripIndent(_t2 || (_t2 = _`
-    Your new app is ready to go! There’s just ${0} you’ll need to take
+  commands.push(`${packageManager.commands.run('develop')} ${dim_1('# Start the development server')}`);
+  const whatsNext = stripIndent`
+    Your new app is ready to go! There’s just ${commands.length > 1 ? 'a few more steps' : 'one more step'} you’ll need to take
     in order to start developing:
-  `), commands.length > 1 ? 'a few more steps' : 'one more step');
+  `;
   console.log();
   console.log(whatsNext);
   console.log();
   console.log(commands.map(command => `  ${command}`).join('\n'));
-  const followUp = stripIndent(_t3 || (_t3 = _`
+  const followUp = stripIndent`
     Quilt can also help you build, test, lint, and type-check your new application.
     You can learn more about building apps with Quilt by reading the documentation:
-    ${0}
+    ${underline_1(magenta_1('https://github.com/lemonmade/quilt/tree/main/documentation'))}
 
     Have fun! 🎉
-  `), underline_1(magenta_1('https://github.com/lemonmade/quilt/tree/main/documentation')));
+  `;
   console.log();
   console.log(followUp);
-} // Argument handling
+}
+
+// Argument handling
 
 function getArgv() {
   const argv = arg_1({
@@ -411,14 +391,12 @@ function getArgv() {
   });
   return argv;
 }
-
 async function getName(argv, {
   inWorkspace
 }) {
   let {
     '--name': name
   } = argv;
-
   if (name == null) {
     name = await prompt({
       type: 'text',
@@ -426,17 +404,12 @@ async function getName(argv, {
       initial: inWorkspace ? 'app' : 'my-quilt-app'
     });
   }
-
   return name;
 }
-
 async function getDirectory(argv, {
   name
 }) {
-  var _argv$Directory;
-
-  let directory = path.resolve((_argv$Directory = argv['--directory']) !== null && _argv$Directory !== void 0 ? _argv$Directory : toValidPackageName(name));
-
+  let directory = path.resolve(argv['--directory'] ?? toValidPackageName(name));
   while (!argv['--yes']) {
     if (fs.existsSync(directory) && !(await isEmpty(directory))) {
       const relativeDirectory = path.relative(process.cwd(), directory);
@@ -455,17 +428,13 @@ async function getDirectory(argv, {
       break;
     }
   }
-
   return directory;
 }
-
 const VALID_TEMPLATES = new Set(['basic', 'single-file']);
-
 async function getTemplate(argv) {
   if (argv['--template'] && VALID_TEMPLATES.has(argv['--template'])) {
     return argv['--template'];
   }
-
   const template = await prompt({
     type: 'select',
     message: 'What template would you like to use?',
@@ -476,9 +445,11 @@ async function getTemplate(argv) {
     }, {
       title: `${bold_1('Itty-bitty')}, an entire web app in a single file`,
       value: 'single-file'
-    } // TODO: GraphQL API
+    }
+    // TODO: GraphQL API
     ]
   });
+
   return template;
 }