@quilted/create 0.1.30 → 0.1.32

package/build/cjs/package.cjs

@@ -2,16 +2,15 @@
 
 var fs = require('node:fs');
 var path = require('node:path');
-var node_child_process = require('node:child_process');
 var index = require('./index.cjs');
-var packageManager = require('./package-manager.cjs');
+var packageManager = require('./shared/package-manager.cjs');
 require('node:tty');
-require('node:url');
 require('node:readline');
 require('node:events');
+require('node:child_process');
+require('node:url');
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
+function _interopNamespaceDefault(e) {
   var n = Object.create(null);
   if (e) {
     Object.keys(e).forEach(function (k) {
@@ -28,41 +27,32 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
-var path__namespace = /*#__PURE__*/_interopNamespace(path);
+var fs__namespace = /*#__PURE__*/_interopNamespaceDefault(fs);
+var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 
-let _ = t => t,
-    _t,
-    _t2,
-    _t3,
-    _t4;
 async function createProject() {
   const args = getArguments();
-
   if (args['--help']) {
-    var _args$PackageManag;
-
-    const additionalOptions = index.stripIndent(_t || (_t = _`
-      ${0}, ${0}
+    const additionalOptions = index.stripIndent`
+      ${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.
 
-      ${0}, ${0}
+      ${index.cyan_1(`--public`)}, ${index.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.
 
-      ${0}
+      ${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.
-    `), index.cyan_1(`--react`), index.cyan_1(`--no-react`), index.cyan_1(`--public`), index.cyan_1(`--private`), index.cyan_1(`--registry`));
+    `;
     index.printHelp({
       kind: 'package',
       options: additionalOptions,
-      packageManager: (_args$PackageManag = args['--package-manager']) === null || _args$PackageManag === void 0 ? void 0 : _args$PackageManag.toLowerCase()
+      packageManager: args['--package-manager']?.toLowerCase()
     });
     return;
   }
-
   const inWorkspace = fs__namespace.existsSync('quilt.workspace.ts');
   const name = await getName(args);
   const directory = await getDirectory(args, {
@@ -73,16 +63,16 @@ async function createProject() {
   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);
+  const packageManager$1 = await packageManager.getPackageManager(args, {
+    root: directory
+  });
   const setupExtras = await packageManager.getExtrasToSetup(args, {
     inWorkspace
   });
   const partOfMonorepo = inWorkspace || createAsMonorepo;
   const packageDirectory = createAsMonorepo ? path__namespace.join(directory, `packages/${packageManager.toValidPackageName(name.split('/').pop())}`) : directory;
-
   if (fs__namespace.existsSync(directory)) {
     await packageManager.emptyDirectory(directory);
-
     if (packageDirectory !== directory) {
       fs__namespace.mkdirSync(packageDirectory, {
         recursive: true
@@ -93,28 +83,29 @@ async function createProject() {
       recursive: true
     });
   }
-
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = packageManager.createOutputTarget(rootDirectory);
   const packageTemplate = packageManager.loadTemplate('package');
   const workspaceTemplate = packageManager.loadTemplate('workspace');
-  let quiltProject = await packageTemplate.read('quilt.project.ts'); // If we aren’t already in a workspace, copy the workspace files over, which
-  // are needed if we are making a monorepo or not.
+  let quiltProject = await packageTemplate.read('quilt.project.ts');
 
+  // 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 = packageManager.toValidPackageName(name);
-
-      if (packageManager$1 === 'pnpm') {
+      if (packageManager$1.type === 'pnpm') {
         await outputRoot.write('pnpm-workspace.yaml', await packageManager.format(`
               packages:
               - './packages/*'
@@ -124,7 +115,6 @@ async function createProject() {
       } else {
         workspacePackageJson.workspaces = ['packages/*'];
       }
-
       await outputRoot.write('package.json', await packageManager.format(JSON.stringify(workspacePackageJson), {
         as: 'json-stringify'
       }));
@@ -132,21 +122,20 @@ async function createProject() {
       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).
+      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, {
         name: packageManager.toValidPackageName(name),
         react: useReact,
@@ -164,26 +153,22 @@ async function createProject() {
         as: 'json'
       }));
     }
-
     if (setupExtras.has('github')) {
       await packageManager.loadTemplate('github').copy(directory);
     }
-
     if (setupExtras.has('vscode')) {
       await packageManager.loadTemplate('vscode').copy(directory);
     }
   }
-
   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 and Quilt config
-
+    }
 
+    // We need to make some adjustments the project’s package.json and Quilt config
     return file !== 'package.json' && file !== 'quilt.project.ts';
   });
-
   if (partOfMonorepo) {
     // Write the package’s package.json (the root one was already created)
     const projectPackageJson = JSON.parse(await packageTemplate.read('package.json'));
@@ -198,68 +183,61 @@ async function createProject() {
       as: 'json-stringify'
     }));
     await outputRoot.write(path__namespace.join(packageDirectory, 'quilt.project.ts'), quiltProject);
-    await Promise.all([packageManager.addToTsConfig(packageDirectory, outputRoot), packageManager.addToPackageManagerWorkspaces(packageDirectory, outputRoot, packageManager$1)]);
+    await Promise.all([packageManager.addToTsConfig(packageDirectory, outputRoot), packageManager.addToPackageManagerWorkspaces(packageDirectory, outputRoot, packageManager$1.type)]);
   }
-
   if (shouldInstall) {
-    process.stdout.write('\nInstalling dependencies...\n'); // TODO: better loading, handle errors
-
-    node_child_process.execSync(`${packageManager$1} install`, {
-      cwd: rootDirectory
-    });
+    process.stdout.write('\nInstalling dependencies...\n');
+    // 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(_t2 || (_t2 = _`
+  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 ${0}:
+    you should update the following fields in ${index.cyan_1(packageManager.relativeDirectoryForDisplay(path__namespace.relative(process.cwd(), path__namespace.join(packageDirectory, 'package.json'))))}:
 
-     - ${0}, where you provide a description of what your package does
-     - ${0}, where you should include the ${0} of your project’s repo
+     - ${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 ${0}
+    Before you publish your package, you will also want to update the ${index.bold_1(`"version"`)}
     field in the package.json file.
-  `), index.cyan_1(packageManager.relativeDirectoryForDisplay(path__namespace.relative(process.cwd(), path__namespace.join(packageDirectory, 'package.json')))), index.bold_1(`"description"`), index.bold_1(`"repository"`), index.bold_1(`"url"`), index.bold_1(`"version"`));
+  `;
   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(`pnpm install ${index.dim_1('# Install all your dependencies')}`);
+    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(_t3 || (_t3 = _`
-      After you update your package.json, there’s ${0} you’ll need to take
+    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:
-    `), 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 = index.stripIndent(_t4 || (_t4 = _`
+  const followUp = index.stripIndent`
     Quilt can help you build, test, lint, and type-check your new package. You
     can learn more about building packages with Quilt by reading the documentation:
-    ${0}
+    ${index.underline_1(index.magenta_1('https://github.com/lemonmade/quilt/tree/main/documentation'))}
 
     Have fun! 🎉
-  `), index.underline_1(index.magenta_1('https://github.com/lemonmade/quilt/tree/main/documentation')));
+  `;
   console.log();
   console.log(followUp);
-} // Argument handling
+}
+
+// Argument handling
 
 function getArguments() {
   const args = index.parseArguments({
@@ -286,12 +264,10 @@ function getArguments() {
   });
   return args;
 }
-
 async function getName(args) {
   let {
     '--name': name
   } = args;
-
   if (name == null) {
     name = await index.prompt({
       type: 'text',
@@ -299,16 +275,13 @@ async function getName(args) {
       initial: '@my-team/package'
     });
   }
-
   return name;
 }
-
 async function getDirectory(args, {
   name,
   inWorkspace
 }) {
   let directory = args['--directory'] ? path__namespace.resolve(args['--directory']) : undefined;
-
   if (directory == null) {
     const basePackageName = packageManager.toValidPackageName(name.split('/').pop());
     const defaultDirectory = inWorkspace ? `packages/${basePackageName}` : basePackageName;
@@ -318,7 +291,6 @@ async function getDirectory(args, {
       initial: defaultDirectory
     }));
   }
-
   while (!args['--yes']) {
     if (fs__namespace.existsSync(directory) && !(await packageManager.isEmpty(directory))) {
       const relativeDirectory = path__namespace.relative(process.cwd(), directory);
@@ -337,13 +309,10 @@ async function getDirectory(args, {
       break;
     }
   }
-
   return directory;
 }
-
 async function getPublic(args) {
   let isPublic;
-
   if (args['--public'] || args['--yes']) {
     isPublic = true;
   } else if (args['--private']) {
@@ -355,13 +324,10 @@ async function getPublic(args) {
       initial: true
     });
   }
-
   return isPublic;
 }
-
 async function getReact(args) {
   let useReact;
-
   if (args['--react'] || args['--yes']) {
     useReact = true;
   } else if (args['--no-react']) {
@@ -373,10 +339,8 @@ async function getReact(args) {
       initial: true
     });
   }
-
   return useReact;
 }
-
 function adjustPackageJson(packageJson, {
   name,
   react,
@@ -386,20 +350,17 @@ function adjustPackageJson(packageJson, {
   packageJson.name = name;
   const packageParts = name.split('/');
   const scope = packageParts[0].startsWith('@') ? packageParts[0] : undefined;
-  const finalRegistry = registry !== null && registry !== void 0 ? registry : 'https://registry.npmjs.org';
-
+  const finalRegistry = registry ?? 'https://registry.npmjs.org';
   if (scope) {
     packageJson.publishConfig[`${scope}/registry`] = finalRegistry;
   } else if (registry) {
     packageJson.publishConfig.registry = finalRegistry;
   }
-
   if (isPublic) {
     delete packageJson.private;
   } else {
     delete packageJson.publishConfig;
   }
-
   if (!react) {
     delete packageJson.dependencies['@types/react'];
     delete packageJson.devDependencies['react'];
@@ -407,7 +368,6 @@ function adjustPackageJson(packageJson, {
     delete packageJson.peerDependenciesMeta['react'];
     packageJson.eslintConfig.extends = packageJson.eslintConfig.extends.filter(extend => !extend.includes('react'));
   }
-
   return packageJson;
 }