@quilted/create 0.1.84 → 0.1.86

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @quilted/create
 
+## 0.1.86
+
+### Patch Changes
+
+- [`d3e5cc05`](https://github.com/lemonmade/quilt/commit/d3e5cc058cabcf4ad373d79daaf8bc39470a0791) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix creation of packages in simple workspaces
+
+## 0.1.85
+
+### Patch Changes
+
+- [`25413301`](https://github.com/lemonmade/quilt/commit/25413301513cdee72156a70ff14095e145cafb91) Thanks [@lemonmade](https://github.com/lemonmade)! - Add simpler package template
+
 ## 0.1.84
 
 ### Patch Changes

package/build/cjs/package.cjs

@@ -50,15 +50,11 @@ async function createProject() {
   const args = getArguments();
   if (args['--help']) {
     const additionalOptions = stripIndent["default"]`
-      ${index.cyan(`--description`)}, ${index.cyan(`--no-description`)}
+      ${index.cyan(`--description [description]`)}, ${index.cyan(`--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(`@see https://docs.npmjs.com/cli/v9/configuring-npm/package-json#description`)}
 
-      ${index.cyan(`--react`)}, ${index.cyan(`--no-react`)}
-      Whether this package will use React. If you don’t provide this option, the command
-      will ask you about it later.
-
       ${index.cyan(`--public`)}, ${index.cyan(`--private`)}
       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.
@@ -68,9 +64,12 @@ async function createProject() {
       this command will try to guess the correct repository to use based on existing packages.
       ${index.dim(`@see https://docs.npmjs.com/cli/v9/configuring-npm/package-json#repository`)}
 
-      ${index.cyan(`--registry`)}
+      ${index.cyan(`--registry [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.
+
+      ${index.cyan(`--react`)}
+      Whether this package will use React. Defaults to false.
     `;
     help.printHelp({
       kind: 'package',
@@ -117,86 +116,36 @@ async function createProject() {
   }
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = shared.createOutputTarget(rootDirectory);
-  const packageTemplate = shared.loadTemplate('package');
-  const workspaceTemplate = shared.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) {
+  const packageTemplate = shared.loadTemplate('package-simple');
+  const workspaceTemplate = shared.loadTemplate('workspace-simple');
+  if (createAsMonorepo) {
     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 === 'package.json') return false;
-      return true;
+      // We will adjust the package.json before writing it
+      return file !== 'package.json';
     });
-
-    // 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 = shared.relativeDirectoryForDisplay(path__namespace.join(packageRelativeToRoot, '*'));
-      const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
-      workspacePackageJson.name = shared.toValidPackageName(name);
-      workspacePackageJson.workspaces = [packageGlobRelativeToRoot];
-      if (packageManager$1.type === 'pnpm') {
-        await outputRoot.write('pnpm-workspace.yaml', await shared.format(`
-              packages:
-              - '${packageGlobRelativeToRoot}'
-            `, {
-          as: 'yaml'
-        }));
-      }
-      await outputRoot.write('package.json', await shared.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))]);
-      const mergedPackageJson = shared.mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
-      delete mergedPackageJson.workspaces;
-      adjustPackageJson(mergedPackageJson, {
-        name: shared.toValidPackageName(name),
-        description,
-        react: useReact,
-        isPublic,
-        registry: args['--registry']
-      });
-      await outputRoot.write('package.json', await shared.format(JSON.stringify(mergedPackageJson), {
-        as: 'json-stringify'
-      }));
-      await outputRoot.write('tsconfig.json', await shared.format(JSON.stringify(projectTSConfig), {
-        as: 'json'
+    const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
+    workspacePackageJson.name = shared.toValidPackageName(name);
+    if (packageManager$1.type === 'pnpm') {
+      await outputRoot.write('pnpm-workspace.yaml', await shared.format(`
+            packages:
+            - './packages/*'
+          `, {
+        as: 'yaml'
       }));
     }
-    if (setupExtras.has('github')) {
-      await shared.loadTemplate('github').copy(directory);
-    }
-    if (setupExtras.has('vscode')) {
-      await shared.loadTemplate('vscode').copy(directory);
-    }
+    await outputRoot.write('package.json', await shared.format(JSON.stringify(workspacePackageJson), {
+      as: 'json-stringify'
+    }));
   }
   await packageTemplate.copy(packageDirectory, file => {
-    // If we are in a monorepo, we can use all the template files as they are
-    if (file === 'tsconfig.json') {
-      return partOfMonorepo;
-    }
-
-    // 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';
+    // We will adjust the package.json and README.md before writing them
+    return file !== 'package.json' && file !== 'README.md';
   });
-  let quiltProject = await packageTemplate.read('quilt.project.ts');
-  if (!partOfMonorepo) {
-    quiltProject = quiltProject.replace('quiltPackage', 'quiltWorkspace, quiltPackage').replace('quiltPackage(', 'quiltWorkspace(), quiltPackage(');
-  }
-  if (!useReact) {
-    quiltProject = quiltProject.replace('quiltPackage()', 'quiltPackage({react: false})');
-  }
-  await outputRoot.write(path__namespace.join(packageDirectory, 'quilt.project.ts'), await shared.format(quiltProject, {
-    as: 'typescript'
-  }));
   await outputRoot.write(path__namespace.join(packageDirectory, 'README.md'), (await packageTemplate.read('README.md')).replaceAll('{{name}}', shared.toValidPackageName(name)));
   if (partOfMonorepo) {
+    // Add the package to the workspace configuration files
+    await Promise.all([tsconfig.addToTsConfig(packageDirectory, outputRoot), packageManager.addToPackageManagerWorkspaces(packageDirectory, outputRoot, packageManager$1.type)]);
+
     // Write the package’s package.json (the root one was already created)
     const projectPackageJson = JSON.parse(await packageTemplate.read('package.json'));
     if (repository === false) {
@@ -229,7 +178,29 @@ async function createProject() {
     await outputRoot.write(path__namespace.join(packageDirectory, 'package.json'), await shared.format(JSON.stringify(projectPackageJson), {
       as: 'json-stringify'
     }));
-    await Promise.all([tsconfig.addToTsConfig(packageDirectory, outputRoot), packageManager.addToPackageManagerWorkspaces(packageDirectory, outputRoot, packageManager$1.type)]);
+  } else {
+    // Write the package’s package.json by combining elements of the root and
+    // package templates
+    const [projectPackageJson, workspacePackageJson] = await Promise.all([packageTemplate.read('package.json').then(content => JSON.parse(content)), workspaceTemplate.read('package.json').then(content => JSON.parse(content))]);
+    const mergedPackageJson = shared.mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
+    adjustPackageJson(mergedPackageJson, {
+      name: shared.toValidPackageName(name),
+      description,
+      react: useReact,
+      isPublic,
+      registry: args['--registry']
+    });
+    await outputRoot.write('package.json', await shared.format(JSON.stringify(mergedPackageJson), {
+      as: 'json-stringify'
+    }));
+  }
+  if (!inWorkspace) {
+    if (setupExtras.has('github')) {
+      await shared.loadTemplate('github').copy(directory);
+    }
+    if (setupExtras.has('vscode')) {
+      await shared.loadTemplate('vscode').copy(directory);
+    }
   }
   if (shouldInstall) {
     console.log();
@@ -316,7 +287,6 @@ function getArguments() {
     '--extras': [String],
     '--no-extras': Boolean,
     '--react': Boolean,
-    '--no-react': Boolean,
     '--public': Boolean,
     '--private': Boolean,
     '--registry': String,
@@ -328,9 +298,11 @@ function getArguments() {
   return args;
 }
 async function getName(args) {
-  let {
-    '--name': name
+  const {
+    _,
+    '--name': nameArgument
   } = args;
+  let name = nameArgument ?? _[0];
   if (name == null) {
     name = await prompt.prompt({
       type: 'text',
@@ -420,19 +392,7 @@ async function getPublic(args) {
   return isPublic;
 }
 async function getReact(args) {
-  let useReact;
-  if (args['--react'] || args['--yes']) {
-    useReact = true;
-  } else if (args['--no-react']) {
-    useReact = false;
-  } else {
-    useReact = await prompt.prompt({
-      type: 'confirm',
-      message: 'Will this package depend on React?',
-      initial: true
-    });
-  }
-  return useReact;
+  return Boolean(args['--react']);
 }
 function adjustPackageJson(packageJson, {
   name,
@@ -480,7 +440,6 @@ function adjustPackageJson(packageJson, {
     delete packageJson.devDependencies['react'];
     delete packageJson.peerDependencies['react'];
     delete packageJson.peerDependenciesMeta['react'];
-    packageJson.eslintConfig.extends = packageJson.eslintConfig.extends.filter(extend => !extend.includes('react'));
   }
   return packageJson;
 }

package/build/cjs/shared/prompts.cjs

@@ -27,7 +27,7 @@ var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
 async function getInWorkspace(argv) {
   if (argv['--in-workspace']) return true;
   if (argv['--not-in-workspace']) return false;
-  return fs__namespace.existsSync('quilt.workspace.ts');
+  return fs__namespace.existsSync('pnpm-workspace.yaml');
 }
 async function getCreateAsMonorepo(argv, {
   type,
@@ -52,7 +52,7 @@ async function getShouldInstall(argv) {
 }
 async function getPackageManager(argv, options) {
   const packageManager$1 = await packageManager.getPackageManager(argv['--package-manager']);
-  return packageManager.createPackageManagerRunner(packageManager$1 ?? 'npm', options);
+  return packageManager.createPackageManagerRunner(packageManager$1 ?? 'pnpm', options);
 }
 const VALID_EXTRAS = new Set(['github', 'vscode']);
 async function getExtrasToSetup(argv, {

package/build/esm/package.mjs

@@ -1,7 +1,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { printHelp } from './help.mjs';
-import { toValidPackageName, emptyDirectory, relativeDirectoryForDisplay, format, mergeWorkspaceAndProjectPackageJsons, loadTemplate, isEmpty, createOutputTarget } from './shared.mjs';
+import { toValidPackageName, emptyDirectory, format, mergeWorkspaceAndProjectPackageJsons, loadTemplate, relativeDirectoryForDisplay, isEmpty, createOutputTarget } from './shared.mjs';
 import { getInWorkspace, getCreateAsMonorepo, getExtrasToSetup, getShouldInstall, getPackageManager } from './shared/prompts.mjs';
 import { addToTsConfig } from './shared/tsconfig.mjs';
 import { addToPackageManagerWorkspaces } from './shared/package-manager.mjs';
@@ -28,15 +28,11 @@ async function createProject() {
   const args = getArguments();
   if (args['--help']) {
     const additionalOptions = stripIndent`
-      ${cyan_1(`--description`)}, ${cyan_1(`--no-description`)}
+      ${cyan_1(`--description [description]`)}, ${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.
       ${dim_1(`@see https://docs.npmjs.com/cli/v9/configuring-npm/package-json#description`)}
 
-      ${cyan_1(`--react`)}, ${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.
-
       ${cyan_1(`--public`)}, ${cyan_1(`--private`)}
       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.
@@ -46,9 +42,12 @@ async function createProject() {
       this command will try to guess the correct repository to use based on existing packages.
       ${dim_1(`@see https://docs.npmjs.com/cli/v9/configuring-npm/package-json#repository`)}
 
-      ${cyan_1(`--registry`)}
+      ${cyan_1(`--registry [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.
+
+      ${cyan_1(`--react`)}
+      Whether this package will use React. Defaults to false.
     `;
     printHelp({
       kind: 'package',
@@ -95,86 +94,36 @@ async function createProject() {
   }
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = createOutputTarget(rootDirectory);
-  const packageTemplate = loadTemplate('package');
-  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) {
+  const packageTemplate = loadTemplate('package-simple');
+  const workspaceTemplate = loadTemplate('workspace-simple');
+  if (createAsMonorepo) {
     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 === 'package.json') return false;
-      return true;
+      // We will adjust the package.json before writing it
+      return file !== 'package.json';
     });
-
-    // If we are creating a monorepo, we need to add the root package.json and
-    // package manager workspace configuration.
-    if (createAsMonorepo) {
-      const packageRelativeToRoot = path.relative(rootDirectory, packageDirectory);
-      const packageGlobRelativeToRoot = relativeDirectoryForDisplay(path.join(packageRelativeToRoot, '*'));
-      const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
-      workspacePackageJson.name = toValidPackageName(name);
-      workspacePackageJson.workspaces = [packageGlobRelativeToRoot];
-      if (packageManager.type === 'pnpm') {
-        await outputRoot.write('pnpm-workspace.yaml', await format(`
-              packages:
-              - '${packageGlobRelativeToRoot}'
-            `, {
-          as: 'yaml'
-        }));
-      }
-      await outputRoot.write('package.json', await 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))]);
-      const mergedPackageJson = mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
-      delete mergedPackageJson.workspaces;
-      adjustPackageJson(mergedPackageJson, {
-        name: toValidPackageName(name),
-        description,
-        react: useReact,
-        isPublic,
-        registry: args['--registry']
-      });
-      await outputRoot.write('package.json', await format(JSON.stringify(mergedPackageJson), {
-        as: 'json-stringify'
-      }));
-      await outputRoot.write('tsconfig.json', await format(JSON.stringify(projectTSConfig), {
-        as: 'json'
+    const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
+    workspacePackageJson.name = toValidPackageName(name);
+    if (packageManager.type === 'pnpm') {
+      await outputRoot.write('pnpm-workspace.yaml', await format(`
+            packages:
+            - './packages/*'
+          `, {
+        as: 'yaml'
       }));
     }
-    if (setupExtras.has('github')) {
-      await loadTemplate('github').copy(directory);
-    }
-    if (setupExtras.has('vscode')) {
-      await loadTemplate('vscode').copy(directory);
-    }
+    await outputRoot.write('package.json', await format(JSON.stringify(workspacePackageJson), {
+      as: 'json-stringify'
+    }));
   }
   await packageTemplate.copy(packageDirectory, file => {
-    // If we are in a monorepo, we can use all the template files as they are
-    if (file === 'tsconfig.json') {
-      return partOfMonorepo;
-    }
-
-    // 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';
+    // We will adjust the package.json and README.md before writing them
+    return file !== 'package.json' && file !== 'README.md';
   });
-  let quiltProject = await packageTemplate.read('quilt.project.ts');
-  if (!partOfMonorepo) {
-    quiltProject = quiltProject.replace('quiltPackage', 'quiltWorkspace, quiltPackage').replace('quiltPackage(', 'quiltWorkspace(), quiltPackage(');
-  }
-  if (!useReact) {
-    quiltProject = quiltProject.replace('quiltPackage()', 'quiltPackage({react: false})');
-  }
-  await outputRoot.write(path.join(packageDirectory, 'quilt.project.ts'), await format(quiltProject, {
-    as: 'typescript'
-  }));
   await outputRoot.write(path.join(packageDirectory, 'README.md'), (await packageTemplate.read('README.md')).replaceAll('{{name}}', toValidPackageName(name)));
   if (partOfMonorepo) {
+    // Add the package to the workspace configuration files
+    await Promise.all([addToTsConfig(packageDirectory, outputRoot), addToPackageManagerWorkspaces(packageDirectory, outputRoot, packageManager.type)]);
+
     // Write the package’s package.json (the root one was already created)
     const projectPackageJson = JSON.parse(await packageTemplate.read('package.json'));
     if (repository === false) {
@@ -207,7 +156,29 @@ async function createProject() {
     await outputRoot.write(path.join(packageDirectory, 'package.json'), await format(JSON.stringify(projectPackageJson), {
       as: 'json-stringify'
     }));
-    await Promise.all([addToTsConfig(packageDirectory, outputRoot), addToPackageManagerWorkspaces(packageDirectory, outputRoot, packageManager.type)]);
+  } else {
+    // Write the package’s package.json by combining elements of the root and
+    // package templates
+    const [projectPackageJson, workspacePackageJson] = await Promise.all([packageTemplate.read('package.json').then(content => JSON.parse(content)), workspaceTemplate.read('package.json').then(content => JSON.parse(content))]);
+    const mergedPackageJson = mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
+    adjustPackageJson(mergedPackageJson, {
+      name: toValidPackageName(name),
+      description,
+      react: useReact,
+      isPublic,
+      registry: args['--registry']
+    });
+    await outputRoot.write('package.json', await format(JSON.stringify(mergedPackageJson), {
+      as: 'json-stringify'
+    }));
+  }
+  if (!inWorkspace) {
+    if (setupExtras.has('github')) {
+      await loadTemplate('github').copy(directory);
+    }
+    if (setupExtras.has('vscode')) {
+      await loadTemplate('vscode').copy(directory);
+    }
   }
   if (shouldInstall) {
     console.log();
@@ -294,7 +265,6 @@ function getArguments() {
     '--extras': [String],
     '--no-extras': Boolean,
     '--react': Boolean,
-    '--no-react': Boolean,
     '--public': Boolean,
     '--private': Boolean,
     '--registry': String,
@@ -306,9 +276,11 @@ function getArguments() {
   return args;
 }
 async function getName(args) {
-  let {
-    '--name': name
+  const {
+    _,
+    '--name': nameArgument
   } = args;
+  let name = nameArgument ?? _[0];
   if (name == null) {
     name = await prompt({
       type: 'text',
@@ -398,19 +370,7 @@ async function getPublic(args) {
   return isPublic;
 }
 async function getReact(args) {
-  let useReact;
-  if (args['--react'] || args['--yes']) {
-    useReact = true;
-  } else if (args['--no-react']) {
-    useReact = false;
-  } else {
-    useReact = await prompt({
-      type: 'confirm',
-      message: 'Will this package depend on React?',
-      initial: true
-    });
-  }
-  return useReact;
+  return Boolean(args['--react']);
 }
 function adjustPackageJson(packageJson, {
   name,
@@ -458,7 +418,6 @@ function adjustPackageJson(packageJson, {
     delete packageJson.devDependencies['react'];
     delete packageJson.peerDependencies['react'];
     delete packageJson.peerDependenciesMeta['react'];
-    packageJson.eslintConfig.extends = packageJson.eslintConfig.extends.filter(extend => !extend.includes('react'));
   }
   return packageJson;
 }

package/build/esm/shared/prompts.mjs

@@ -6,7 +6,7 @@ import { getPackageManager as getPackageManager$1, createPackageManagerRunner }
 async function getInWorkspace(argv) {
   if (argv['--in-workspace']) return true;
   if (argv['--not-in-workspace']) return false;
-  return fs.existsSync('quilt.workspace.ts');
+  return fs.existsSync('pnpm-workspace.yaml');
 }
 async function getCreateAsMonorepo(argv, {
   type,
@@ -31,7 +31,7 @@ async function getShouldInstall(argv) {
 }
 async function getPackageManager(argv, options) {
   const packageManager = await getPackageManager$1(argv['--package-manager']);
-  return createPackageManagerRunner(packageManager ?? 'npm', options);
+  return createPackageManagerRunner(packageManager ?? 'pnpm', options);
 }
 const VALID_EXTRAS = new Set(['github', 'vscode']);
 async function getExtrasToSetup(argv, {