@quilted/create 0.1.36 → 0.1.38

package/build/cjs/package.cjs

@@ -34,6 +34,11 @@ async function createProject() {
   const args = getArguments();
   if (args['--help']) {
     const additionalOptions = index.stripIndent`
+      ${index.cyan_1(`--description`)}, ${index.cyan_1(`--no-description`)}
+      A short description of the package. If you don’t provide this option, the command will ask
+      you for a description later.
+      ${index.dim_1(`@see https://docs.npmjs.com/cli/v9/configuring-npm/package-json#description`)}
+
       ${index.cyan_1(`--react`)}, ${index.cyan_1(`--no-react`)}
       Whether this package will use React. If you don’t provide this option, the command
       will ask you about it later.
@@ -42,6 +47,11 @@ async function createProject() {
       Whether this package will be published for other projects to install. If you do not
       provide this option, the command will ask you about it later.
 
+      ${index.cyan_1(`--repository`)}, ${index.cyan_1(`--no-repository`)}
+      The URL of a git repository where your code lives. If you do not provide this option,
+      this command will try to guess the correct repository to use based on existing packages.
+      ${index.dim_1(`@see https://docs.npmjs.com/cli/v9/configuring-npm/package-json#repository`)}
+
       ${index.cyan_1(`--registry`)}
       The package registry to publish this package to. This option only applies if you create
       a public package. If you do not provide this option, it will use the default NPM registry.
@@ -53,22 +63,30 @@ async function createProject() {
     });
     return;
   }
-  const inWorkspace = fs__namespace.existsSync('quilt.workspace.ts');
   const name = await getName(args);
+  const description = await getDescription(args);
+  const inWorkspace = await packageManager.getInWorkspace(args);
   const directory = await getDirectory(args, {
     name,
     inWorkspace
   });
   const isPublic = await getPublic(args);
-  const useReact = await getReact(args);
-  const createAsMonorepo = !inWorkspace && (await packageManager.getCreateAsMonorepo(args));
-  const shouldInstall = await packageManager.getShouldInstall(args);
-  const packageManager$1 = await packageManager.getPackageManager(args, {
-    root: directory
+  const repository = await getRepository(args, {
+    inWorkspace
   });
+  const useReact = await getReact(args);
+  const createAsMonorepo = !inWorkspace && (await packageManager.getCreateAsMonorepo(args, {
+    type: 'package'
+  }));
   const setupExtras = await packageManager.getExtrasToSetup(args, {
     inWorkspace
   });
+  const shouldInstall = await packageManager.getShouldInstall(args, {
+    type: 'package'
+  });
+  const packageManager$1 = await packageManager.getPackageManager(args, {
+    root: directory
+  });
   const partOfMonorepo = inWorkspace || createAsMonorepo;
   const packageDirectory = createAsMonorepo ? path__namespace.join(directory, `packages/${packageManager.toValidPackageName(name.split('/').pop())}`) : directory;
   if (fs__namespace.existsSync(directory)) {
@@ -88,12 +106,15 @@ async function createProject() {
   const packageTemplate = packageManager.loadTemplate('package');
   const workspaceTemplate = packageManager.loadTemplate('workspace');
   let quiltProject = await packageTemplate.read('quilt.project.ts');
+  if (!useReact) {
+    quiltProject = quiltProject.replace('quiltPackage()', 'quiltPackage({react: false})');
+  }
 
   // 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.
+      // 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
@@ -103,41 +124,28 @@ async function createProject() {
     // If we are creating a monorepo, we need to add the root package.json and
     // package manager workspace configuration.
     if (createAsMonorepo) {
+      const packageRelativeToRoot = path__namespace.relative(rootDirectory, packageDirectory);
+      const packageGlobRelativeToRoot = packageManager.relativeDirectoryForDisplay(path__namespace.join(packageRelativeToRoot, '*'));
       const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
       workspacePackageJson.name = packageManager.toValidPackageName(name);
+      workspacePackageJson.workspaces = [packageGlobRelativeToRoot];
       if (packageManager$1.type === 'pnpm') {
         await outputRoot.write('pnpm-workspace.yaml', await packageManager.format(`
               packages:
-              - './packages/*'
+              - '${packageGlobRelativeToRoot}'
             `, {
           as: 'yaml'
         }));
-      } else {
-        workspacePackageJson.workspaces = ['packages/*'];
       }
       await outputRoot.write('package.json', await packageManager.format(JSON.stringify(workspacePackageJson), {
         as: 'json-stringify'
       }));
     } else {
       const [projectPackageJson, projectTSConfig, workspacePackageJson] = await Promise.all([packageTemplate.read('package.json').then(content => JSON.parse(content)), packageTemplate.read('tsconfig.json').then(content => JSON.parse(content)), workspaceTemplate.read('package.json').then(content => JSON.parse(content))]);
-      workspacePackageJson.eslintConfig = projectPackageJson.eslintConfig;
-      workspacePackageJson.browserslist = projectPackageJson.browserslist;
-      const newPackageJson = {};
-
-      // We want to put the project’s dependencies in the package.json, respecting
-      // the preferred ordering (dependencies, peer dependencies, dev dependencies).
-      for (const [key, value] of Object.entries(projectPackageJson)) {
-        if (key !== 'devDependencies') {
-          newPackageJson[key] = value;
-          continue;
-        }
-        newPackageJson.dependencies = projectPackageJson.dependencies;
-        newPackageJson.peerDependencies = projectPackageJson.peerDependencies;
-        newPackageJson.peerDependenciesMeta = projectPackageJson.peerDependenciesMeta;
-        newPackageJson.devDependencies = packageManager.mergeDependencies(workspacePackageJson.devDependencies, projectPackageJson.devDependencies);
-      }
-      adjustPackageJson(newPackageJson, {
+      const mergedPackageJson = packageManager.mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
+      adjustPackageJson(mergedPackageJson, {
         name: packageManager.toValidPackageName(name),
+        description,
         react: useReact,
         isPublic,
         registry: args['--registry']
@@ -146,7 +154,7 @@ async function createProject() {
       await outputRoot.write('quilt.project.ts', await packageManager.format(quiltProject, {
         as: 'typescript'
       }));
-      await outputRoot.write('package.json', await packageManager.format(JSON.stringify(newPackageJson), {
+      await outputRoot.write('package.json', await packageManager.format(JSON.stringify(mergedPackageJson), {
         as: 'json-stringify'
       }));
       await outputRoot.write('tsconfig.json', await packageManager.format(JSON.stringify(projectTSConfig), {
@@ -166,15 +174,36 @@ async function createProject() {
       return partOfMonorepo;
     }
 
-    // We need to make some adjustments the project’s package.json and Quilt config
-    return file !== 'package.json' && file !== 'quilt.project.ts';
+    // We need to make some adjustments the project’s package.json, README, and Quilt config
+    return file !== 'package.json' && file !== 'quilt.project.ts' && file !== 'README.md';
   });
+  await outputRoot.write(path__namespace.join(packageDirectory, 'package.json'), (await packageTemplate.read('README.md')).replaceAll('{{name}}', packageManager.toValidPackageName(name)));
   if (partOfMonorepo) {
     // Write the package’s package.json (the root one was already created)
     const projectPackageJson = JSON.parse(await packageTemplate.read('package.json'));
-    projectPackageJson.repository.directory = path__namespace.relative(rootDirectory, packageDirectory);
+    if (repository === false) {
+      delete projectPackageJson.repository;
+    } else {
+      const directory = path__namespace.relative(rootDirectory, packageDirectory);
+      if (typeof repository === 'string') {
+        projectPackageJson.repository = {
+          type: 'git',
+          url: repository,
+          directory
+        };
+      } else if (repository != null) {
+        projectPackageJson.repository = {
+          type: 'git',
+          ...repository,
+          directory
+        };
+      } else {
+        projectPackageJson.repository.directory = directory;
+      }
+    }
     adjustPackageJson(projectPackageJson, {
       name: packageManager.toValidPackageName(name),
+      description,
       react: useReact,
       isPublic,
       registry: args['--registry']
@@ -186,45 +215,58 @@ async function createProject() {
     await Promise.all([packageManager.addToTsConfig(packageDirectory, outputRoot), packageManager.addToPackageManagerWorkspaces(packageDirectory, outputRoot, packageManager$1.type)]);
   }
   if (shouldInstall) {
-    process.stdout.write('\nInstalling dependencies...\n');
+    console.log();
     // TODO: better loading, handle errors
     await packageManager$1.install();
-    process.stdout.moveCursor(0, -1);
-    process.stdout.clearLine(1);
-    console.log('Installed dependencies.');
   }
-  const packageJsonInstructions = index.stripIndent`
-    Your new package is ready to go! However, before you go too much further,
-    you should update the following fields in ${index.cyan_1(packageManager.relativeDirectoryForDisplay(path__namespace.relative(process.cwd(), path__namespace.join(packageDirectory, 'package.json'))))}:
-
-     - ${index.bold_1(`"description"`)}, where you provide a description of what your package does
-     - ${index.bold_1(`"repository"`)}, where you should include the ${index.bold_1(`"url"`)} of your project’s repo
-
-    Before you publish your package, you will also want to update the ${index.bold_1(`"version"`)}
-    field in the package.json file.
-  `;
   console.log();
-  console.log(packageJsonInstructions);
-  const commands = [];
-  if (!inWorkspace && directory !== process.cwd()) {
-    commands.push(`cd ${index.cyan_1(packageManager.relativeDirectoryForDisplay(path__namespace.relative(process.cwd(), directory)))} ${index.dim_1('# Move into your new package’s directory')}`);
-  }
-  if (!shouldInstall) {
-    commands.push(`${packageManager$1.commands.install()} ${index.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" ${index.dim_1('# Start your git history (optional)')}`);
-  }
-  if (commands.length > 0) {
-    const whatsNext = index.stripIndent`
-      After you update your package.json, there’s ${commands.length > 1 ? 'a few more steps' : 'one more step'} you’ll need to take
-      in order to start building:
-    `;
-    console.log();
-    console.log(whatsNext);
+  console.log(index.stripIndent`
+      Your new package, ${index.bold_1(name)}, is ready to go! You can edit the code
+      for your package in ${index.cyan_1(packageManager.relativeDirectoryForDisplay(path__namespace.relative(process.cwd(), path__namespace.join(packageDirectory, 'source'))))}.
+    `);
+  if (isPublic) {
+    const needsPackageJsonKeys = [];
+    if (!description) {
+      needsPackageJsonKeys.push({
+        field: 'description',
+        url: 'https://docs.npmjs.com/cli/v9/configuring-npm/package-json#description'
+      });
+    }
+    if (repository == null) {
+      needsPackageJsonKeys.push({
+        field: 'repository.url',
+        url: 'https://docs.npmjs.com/cli/v9/configuring-npm/package-json#repository'
+      });
+    }
     console.log();
-    console.log(commands.map(command => `  ${command}`).join('\n'));
+    const logPackageJsonField = (field, url) => {
+      console.log(`  ${index.bold_1(JSON.stringify(field))} ${index.dim_1(`(${index.underline_1(url)})`)}`);
+    };
+    if (needsPackageJsonKeys.length > 0) {
+      console.log(index.stripIndent`
+          Before you publish your package, you will need to add the following key${needsPackageJsonKeys.length > 1 ? 's' : ''}
+          to ${index.cyan_1(packageManager.relativeDirectoryForDisplay(path__namespace.relative(process.cwd(), path__namespace.join(packageDirectory, 'package.json'))))}:
+        `);
+      console.log();
+      for (const {
+        field,
+        url
+      } of needsPackageJsonKeys) {
+        logPackageJsonField(field, url);
+      }
+      console.log();
+      console.log('In that same file, make sure the contents of these fields are right for your package:');
+      console.log();
+    } else {
+      console.log(index.stripIndent`
+          Before you publish your package, make the following fields look right
+          in ${index.cyan_1(packageManager.relativeDirectoryForDisplay(path__namespace.relative(process.cwd(), path__namespace.join(packageDirectory, 'package.json'))))}:
+        `);
+      console.log();
+    }
+    logPackageJsonField('version', 'https://docs.npmjs.com/cli/v9/configuring-npm/package-json#version');
+    logPackageJsonField('license', 'https://docs.npmjs.com/cli/v9/configuring-npm/package-json#license');
+    logPackageJsonField('exports', 'https://nodejs.org/api/packages.html#package-entry-points');
   }
   const followUp = index.stripIndent`
     Quilt can help you build, test, lint, and type-check your new package. You
@@ -245,6 +287,10 @@ function getArguments() {
     '-y': '--yes',
     '--name': String,
     '--directory': String,
+    '--description': String,
+    '--no-description': Boolean,
+    '--repository': String,
+    '--no-repository': Boolean,
     '--install': Boolean,
     '--no-install': Boolean,
     '--monorepo': Boolean,
@@ -311,6 +357,36 @@ async function getDirectory(args, {
   }
   return directory;
 }
+async function getDescription(args) {
+  if (args['--description']) return args['--description'];
+  if (args['--no-description']) return false;
+  const description = await index.prompt({
+    type: 'text',
+    message: 'What is a short description of what this package will do?'
+  });
+  return description;
+}
+async function getRepository(args, {
+  inWorkspace = false
+} = {}) {
+  if (args['--repository']) return args['--repository'];
+  if (args['--no-repository']) return false;
+  if (!inWorkspace) return;
+  const {
+    globby
+  } = await Promise.resolve().then(function () { return require('./index4.cjs'); });
+  const files = await globby('**/package.json', {
+    ignore: ['**/node_modules']
+  });
+  for (const file of files) {
+    try {
+      const json = JSON.parse(await fs__namespace.promises.readFile(file, 'utf8'));
+      if (json.repository) return json.repository;
+    } catch {
+      // noop
+    }
+  }
+}
 async function getPublic(args) {
   let isPublic;
   if (args['--public'] || args['--yes']) {
@@ -343,6 +419,7 @@ async function getReact(args) {
 }
 function adjustPackageJson(packageJson, {
   name,
+  description,
   react,
   isPublic,
   registry
@@ -351,6 +428,11 @@ function adjustPackageJson(packageJson, {
   const packageParts = name.split('/');
   const scope = packageParts[0].startsWith('@') ? packageParts[0] : undefined;
   const finalRegistry = registry ?? 'https://registry.npmjs.org';
+  if (description) {
+    packageJson.description = description;
+  } else {
+    delete packageJson.description;
+  }
   if (scope) {
     packageJson.publishConfig[`${scope}/registry`] = finalRegistry;
   } else if (registry) {
@@ -359,7 +441,22 @@ function adjustPackageJson(packageJson, {
   if (isPublic) {
     delete packageJson.private;
   } else {
+    delete packageJson.license;
+    delete packageJson.repository;
     delete packageJson.publishConfig;
+
+    // in private packages, we just need to reference the source.
+    const newExports = {};
+    for (const [key, value] of Object.entries(packageJson.exports)) {
+      if (typeof value === 'string') {
+        newExports[key] = value;
+      }
+      const sourceEntry = value?.['quilt:source'];
+      if (typeof sourceEntry === 'string') {
+        newExports[key] = sourceEntry;
+      }
+    }
+    packageJson.exports = newExports;
   }
   if (!react) {
     delete packageJson.dependencies['@types/react'];

package/build/cjs/shared/package-manager.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
+var fs = require('node:fs');
 var require$$0 = require('node:tty');
 var index = require('../index.cjs');
-var fs = require('node:fs');
 var node_child_process = require('node:child_process');
 var path = require('node:path');
 var node_url = require('node:url');
@@ -175,7 +175,8 @@ async function format(content, {
   as: parser
 }) {
   const [{
-    format
+    format: rootFormat,
+    default: prettier
   }, {
     default: babel
   }, {
@@ -183,6 +184,9 @@ async function format(content, {
   }, {
     default: yaml
   }] = await Promise.all([Promise.resolve().then(function () { return require('../standalone.cjs'); }).then(function (n) { return n.standalone; }), Promise.resolve().then(function () { return require('../parser-babel.cjs'); }).then(function (n) { return n.parserBabel; }), Promise.resolve().then(function () { return require('../parser-typescript.cjs'); }).then(function (n) { return n.parserTypescript; }), Promise.resolve().then(function () { return require('../parser-yaml.cjs'); }).then(function (n) { return n.parserYaml; })]);
+
+  // CJS workaround
+  const format = rootFormat ?? prettier.format;
   return format(content, {
     arrowParens: 'always',
     bracketSpacing: false,
@@ -203,6 +207,42 @@ function mergeDependencies(first = {}, second = {}) {
   }
   return merged;
 }
+const PACKAGE_JSON_DEPENDENCY_KEYS = new Set(['dependencies', 'devDependencies', 'peerDependencies', 'peerDependenciesMeta']);
+
+// Merges a project and workspace package.json together, with the following nitpicky preferences:
+//
+// - Take all the project’s fields in the order they appear by default
+// - Merge the relevant dependencies together
+// - Projects don’t come with `scripts` by default, but that should go before the first dependency list
+// - If there are other keys in the workspace package.json, they should go last, in the order they appeared
+function mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson) {
+  const newPackageJson = {};
+  const seenKeys = new Set();
+  let hasHandledScriptsField = false;
+  for (const [key, value] of Object.entries(projectPackageJson)) {
+    seenKeys.add(key);
+    const isDependencyKey = PACKAGE_JSON_DEPENDENCY_KEYS.has(key);
+    if (key === 'scripts' || isDependencyKey && !hasHandledScriptsField) {
+      newPackageJson.scripts = {
+        ...workspacePackageJson.scripts,
+        ...projectPackageJson.scripts
+      };
+      hasHandledScriptsField = true;
+    }
+    if (isDependencyKey) {
+      newPackageJson[key] = mergeDependencies(value, workspacePackageJson[key]);
+    } else {
+      newPackageJson[key] = value;
+    }
+  }
+  for (const [key, value] of Object.entries(workspacePackageJson)) {
+    if (seenKeys.has(key)) continue;
+    // Merged workspace + project package.json means we are not in a monorepo
+    if (key === 'workspaces') continue;
+    newPackageJson[key] = value;
+  }
+  return newPackageJson;
+}
 
 var colorette = {};
 
@@ -420,7 +460,14 @@ colorette.whiteBright = whiteBright;
 colorette.yellow = yellow;
 colorette.yellowBright = yellowBright;
 
-async function getCreateAsMonorepo(argv) {
+async function getInWorkspace(argv) {
+  if (argv['--in-workspace']) return true;
+  if (argv['--not-in-workspace']) return false;
+  return fs__namespace.existsSync('quilt.workspace.ts');
+}
+async function getCreateAsMonorepo(argv, {
+  type
+}) {
   let createAsMonorepo;
   if (argv['--monorepo' ]) {
     createAsMonorepo = true;
@@ -429,13 +476,15 @@ async function getCreateAsMonorepo(argv) {
   } else {
     createAsMonorepo = await index.prompt({
       type: 'confirm',
-      message: 'Do you want to create this app as a monorepo, with room for more projects?',
+      message: `Do you want to create this ${type} as a monorepo, with room for more projects?`,
       initial: true
     });
   }
   return createAsMonorepo;
 }
-async function getShouldInstall(argv) {
+async function getShouldInstall(argv, {
+  type
+}) {
   let shouldInstall;
   if (argv['--install'] || argv['--yes']) {
     shouldInstall = true;
@@ -444,7 +493,7 @@ async function getShouldInstall(argv) {
   } else {
     shouldInstall = await index.prompt({
       type: 'confirm',
-      message: 'Do you want to install dependencies for this app after creating it?',
+      message: `Do you want to install dependencies for this ${type} after creating it?`,
       initial: true
     });
   }
@@ -604,12 +653,13 @@ exports.emptyDirectory = emptyDirectory;
 exports.format = format;
 exports.getCreateAsMonorepo = getCreateAsMonorepo;
 exports.getExtrasToSetup = getExtrasToSetup;
+exports.getInWorkspace = getInWorkspace;
 exports.getPackageManager = getPackageManager;
 exports.getShouldInstall = getShouldInstall;
 exports.isEmpty = isEmpty;
 exports.loadTemplate = loadTemplate;
 exports.magenta_1 = magenta_1;
-exports.mergeDependencies = mergeDependencies;
+exports.mergeWorkspaceAndProjectPackageJsons = mergeWorkspaceAndProjectPackageJsons;
 exports.relativeDirectoryForDisplay = relativeDirectoryForDisplay;
 exports.toValidPackageName = toValidPackageName;
 exports.underline_1 = underline_1;

package/build/esm/app.mjs

@@ -1,6 +1,6 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-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 { c as cyan_1, b as bold_1, g as getInWorkspace, a as getCreateAsMonorepo, d as getExtrasToSetup, e as getShouldInstall, f as getPackageManager, h as emptyDirectory, r as relativeDirectoryForDisplay, t as toValidPackageName, i as format, m as mergeWorkspaceAndProjectPackageJsons, l as loadTemplate, j as addToTsConfig, k as addToPackageManagerWorkspaces, n as dim_1, u as underline_1, o as magenta_1, p as isEmpty, q 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';
@@ -222,7 +222,7 @@ async function createApp() {
     });
     return;
   }
-  const inWorkspace = fs.existsSync('quilt.workspace.ts');
+  const inWorkspace = await getInWorkspace(argv);
   const name = await getName(argv, {
     inWorkspace
   });
@@ -230,14 +230,18 @@ async function createApp() {
     name
   });
   const template = await getTemplate(argv);
-  const createAsMonorepo = !inWorkspace && (await getCreateAsMonorepo(argv));
-  const shouldInstall = await getShouldInstall(argv);
-  const packageManager = await getPackageManager(argv, {
-    root: directory
-  });
+  const createAsMonorepo = !inWorkspace && (await getCreateAsMonorepo(argv, {
+    type: 'app'
+  }));
   const setupExtras = await getExtrasToSetup(argv, {
     inWorkspace
   });
+  const shouldInstall = await getShouldInstall(argv, {
+    type: 'app'
+  });
+  const packageManager = await getPackageManager(argv, {
+    root: directory
+  });
   const partOfMonorepo = inWorkspace || createAsMonorepo;
   const appDirectory = createAsMonorepo ? path.join(directory, 'app') : directory;
   if (fs.existsSync(directory)) {
@@ -271,33 +275,32 @@ async function createApp() {
     // If we are creating a monorepo, we need to add the root package.json and
     // package manager workspace configuration.
     if (createAsMonorepo) {
+      const appRelativeToRoot = relativeDirectoryForDisplay(path.relative(directory, appDirectory));
       const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
       workspacePackageJson.name = toValidPackageName(name);
+      workspacePackageJson.workspaces = [appRelativeToRoot, './packages/*'];
       if (packageManager.type === 'pnpm') {
         await outputRoot.write('pnpm-workspace.yaml', await format(`
               packages:
+              - '${appRelativeToRoot}'
               - './packages/*'
             `, {
           as: 'yaml'
         }));
-      } else {
-        workspacePackageJson.workspaces = ['packages/*'];
       }
       await outputRoot.write('package.json', await format(JSON.stringify(workspacePackageJson), {
         as: 'json-stringify'
       }));
     } else {
       const [projectPackageJson, projectTSConfig, workspacePackageJson] = await Promise.all([appTemplate.read('package.json').then(content => JSON.parse(content)), appTemplate.read('tsconfig.json').then(content => JSON.parse(content)), workspaceTemplate.read('package.json').then(content => JSON.parse(content))]);
-      workspacePackageJson.name = toValidPackageName(name);
-      workspacePackageJson.eslintConfig = projectPackageJson.eslintConfig;
-      workspacePackageJson.browserslist = projectPackageJson.browserslist;
-      workspacePackageJson.devDependencies = mergeDependencies(workspacePackageJson.devDependencies, projectPackageJson.devDependencies);
+      const combinedPackageJson = mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
+      combinedPackageJson.name = toValidPackageName(name);
       let quiltProject = await appTemplate.read('quilt.project.ts');
       quiltProject = quiltProject.replace('quiltApp', 'quiltWorkspace, quiltApp').replace('quiltApp(', 'quiltWorkspace(), quiltApp(');
       await outputRoot.write('quilt.project.ts', await format(quiltProject, {
         as: 'typescript'
       }));
-      await outputRoot.write('package.json', await format(JSON.stringify(workspacePackageJson), {
+      await outputRoot.write('package.json', await format(JSON.stringify(combinedPackageJson), {
         as: 'json-stringify'
       }));
       await outputRoot.write('tsconfig.json', await format(JSON.stringify(projectTSConfig), {
@@ -330,12 +333,9 @@ async function createApp() {
     await Promise.all([addToTsConfig(appDirectory, outputRoot), addToPackageManagerWorkspaces(appDirectory, outputRoot, packageManager.type)]);
   }
   if (shouldInstall) {
-    process.stdout.write('\nInstalling dependencies...\n');
+    console.log();
     // TODO: better loading, handle errors
     await packageManager.install();
-    process.stdout.moveCursor(0, -1);
-    process.stdout.clearLine(1);
-    console.log('Installed dependencies.');
   }
   const commands = [];
   if (!inWorkspace && directory !== process.cwd()) {
@@ -344,10 +344,6 @@ async function createApp() {
   if (!shouldInstall) {
     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(`${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