@quilted/create 0.1.36 → 0.1.38

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @quilted/create
 
+## 0.1.38
+
+### Patch Changes
+
+- [`36b00358`](https://github.com/lemonmade/quilt/commit/36b00358f47008300d96a5b672242be74163c4d7) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix some package creation issues
+
+## 0.1.37
+
+### Patch Changes
+
+- [`c931b6b4`](https://github.com/lemonmade/quilt/commit/c931b6b4bee464a4f6c16c6410bd727a5210469c) Thanks [@lemonmade](https://github.com/lemonmade)! - Improve create workflow
+
 ## 0.1.36
 
 ### Patch Changes

package/build/cjs/app.cjs

@@ -244,7 +244,7 @@ async function createApp() {
     });
     return;
   }
-  const inWorkspace = fs__namespace.existsSync('quilt.workspace.ts');
+  const inWorkspace = await packageManager.getInWorkspace(argv);
   const name = await getName(argv, {
     inWorkspace
   });
@@ -252,14 +252,18 @@ async function createApp() {
     name
   });
   const template = await getTemplate(argv);
-  const createAsMonorepo = !inWorkspace && (await packageManager.getCreateAsMonorepo(argv));
-  const shouldInstall = await packageManager.getShouldInstall(argv);
-  const packageManager$1 = await packageManager.getPackageManager(argv, {
-    root: directory
-  });
+  const createAsMonorepo = !inWorkspace && (await packageManager.getCreateAsMonorepo(argv, {
+    type: 'app'
+  }));
   const setupExtras = await packageManager.getExtrasToSetup(argv, {
     inWorkspace
   });
+  const shouldInstall = await packageManager.getShouldInstall(argv, {
+    type: 'app'
+  });
+  const packageManager$1 = await packageManager.getPackageManager(argv, {
+    root: directory
+  });
   const partOfMonorepo = inWorkspace || createAsMonorepo;
   const appDirectory = createAsMonorepo ? path__namespace.join(directory, 'app') : directory;
   if (fs__namespace.existsSync(directory)) {
@@ -293,33 +297,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 = packageManager.relativeDirectoryForDisplay(path__namespace.relative(directory, appDirectory));
       const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
       workspacePackageJson.name = packageManager.toValidPackageName(name);
+      workspacePackageJson.workspaces = [appRelativeToRoot, './packages/*'];
       if (packageManager$1.type === 'pnpm') {
         await outputRoot.write('pnpm-workspace.yaml', await packageManager.format(`
               packages:
+              - '${appRelativeToRoot}'
               - './packages/*'
             `, {
           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([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 = packageManager.toValidPackageName(name);
-      workspacePackageJson.eslintConfig = projectPackageJson.eslintConfig;
-      workspacePackageJson.browserslist = projectPackageJson.browserslist;
-      workspacePackageJson.devDependencies = packageManager.mergeDependencies(workspacePackageJson.devDependencies, projectPackageJson.devDependencies);
+      const combinedPackageJson = packageManager.mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
+      combinedPackageJson.name = packageManager.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 packageManager.format(quiltProject, {
         as: 'typescript'
       }));
-      await outputRoot.write('package.json', await packageManager.format(JSON.stringify(workspacePackageJson), {
+      await outputRoot.write('package.json', await packageManager.format(JSON.stringify(combinedPackageJson), {
         as: 'json-stringify'
       }));
       await outputRoot.write('tsconfig.json', await packageManager.format(JSON.stringify(projectTSConfig), {
@@ -352,12 +355,9 @@ async function createApp() {
     await Promise.all([packageManager.addToTsConfig(appDirectory, outputRoot), packageManager.addToPackageManagerWorkspaces(appDirectory, 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 commands = [];
   if (!inWorkspace && directory !== process.cwd()) {
@@ -366,10 +366,6 @@ async function createApp() {
   if (!shouldInstall) {
     commands.push(`${packageManager$1.commands.install()} ${packageManager.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" ${packageManager.dim_1('# Start your git history (optional)')}`);
-  }
   commands.push(`${packageManager$1.commands.run('develop')} ${packageManager.dim_1('# Start the development server')}`);
   const whatsNext = index.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