@quilted/create 0.1.22 → 0.1.25

package/build/esm/app.mjs

@@ -1,12 +1,12 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import { execSync } from 'child_process';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { execSync } from 'node:child_process';
 import { s as stripIndent, c as cyan_1, b as bold_1, p as printHelp, g as getCreateAsMonorepo, a as getShouldInstall, d as getPackageManager, e as getExtrasToSetup, f as dim_1, u as underline_1, m as magenta_1, h as arg_1, i as prompt } from './index.mjs';
-import { e as emptyDirectory, t as toValidPackageName, f as format, l as loadTemplate, a as addToTsConfig, b as addToPackageManagerWorkspaces, r as relativeDirectoryForDisplay, i as isEmpty, c as createOutputTarget } from './package-manager.mjs';
-import 'tty';
-import 'url';
-import 'readline';
-import 'events';
+import { e as emptyDirectory, t as toValidPackageName, f as format, m as mergeDependencies, l as loadTemplate, a as addToTsConfig, b as addToPackageManagerWorkspaces, r as relativeDirectoryForDisplay, i as isEmpty, c as createOutputTarget } from './package-manager.mjs';
+import 'node:tty';
+import 'node:url';
+import 'node:readline';
+import 'node:events';
 
 let _ = t => t,
     _t,
@@ -103,6 +103,7 @@ async function createApp() {
       workspacePackageJson.name = toValidPackageName(name);
       workspacePackageJson.eslintConfig = projectPackageJson.eslintConfig;
       workspacePackageJson.browserslist = projectPackageJson.browserslist;
+      workspacePackageJson.devDependencies = mergeDependencies(workspacePackageJson.devDependencies, projectPackageJson.devDependencies);
       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, {
@@ -158,12 +159,14 @@ async function createApp() {
 
   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(`pnpm install ${dim_1('# Install all your dependencies')}`);
+    commands.push(`${packageManager} install ${dim_1('# Install all your dependencies')}`);
   }
 
   if (!inWorkspace) {
@@ -171,7 +174,7 @@ async function createApp() {
     commands.push(`git init && git add -A && git commit -m "Initial commit" ${dim_1('# Start your git history (optional)')}`);
   }
 
-  commands.push(`pnpm develop ${dim_1('# Start the development server')}`);
+  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
     in order to start developing:

package/build/esm/index.mjs

@@ -1,9 +1,9 @@
-import require$$0 from 'tty';
-import * as fs from 'fs';
-import 'path';
-import 'url';
-import require$$0$1 from 'readline';
-import require$$2 from 'events';
+import require$$0 from 'node:tty';
+import * as fs from 'node:fs';
+import 'node:path';
+import 'node:url';
+import require$$0$1 from 'node:readline';
+import require$$2 from 'node:events';
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 

package/build/esm/index2.mjs

@@ -1,7 +1,7 @@
-import path from 'node:path';
+import path__default from 'node:path';
 import { fileURLToPath } from 'node:url';
 import process from 'node:process';
-import fs, { promises } from 'node:fs';
+import fs__default, { promises } from 'node:fs';
 
 /*
 How it works:
@@ -219,7 +219,7 @@ async function locatePath(
 
 	return pLocate(paths, async path_ => {
 		try {
-			const stat = await statFunction(path.resolve(cwd, path_));
+			const stat = await statFunction(path__default.resolve(cwd, path_));
 			return matchType(type, stat);
 		} catch {
 			return false;
@@ -238,11 +238,11 @@ function locatePathSync(
 	checkType(type);
 	cwd = toPath$1(cwd);
 
-	const statFunction = allowSymlinks ? fs.statSync : fs.lstatSync;
+	const statFunction = allowSymlinks ? fs__default.statSync : fs__default.lstatSync;
 
 	for (const path_ of paths) {
 		try {
-			const stat = statFunction(path.resolve(cwd, path_));
+			const stat = statFunction(path__default.resolve(cwd, path_));
 
 			if (matchType(type, stat)) {
 				return path_;
@@ -256,9 +256,9 @@ const toPath = urlOrPath => urlOrPath instanceof URL ? fileURLToPath(urlOrPath)
 const findUpStop = Symbol('findUpStop');
 
 async function findUpMultiple(name, options) {
-	let directory = path.resolve(toPath(options.cwd) || '');
-	const {root} = path.parse(directory);
-	const stopAt = path.resolve(directory, options.stopAt || root);
+	let directory = path__default.resolve(toPath(options.cwd) || '');
+	const {root} = path__default.parse(directory);
+	const stopAt = path__default.resolve(directory, options.stopAt || root);
 	const limit = options.limit || Number.POSITIVE_INFINITY;
 	const paths = [name].flat();
 
@@ -286,22 +286,22 @@ async function findUpMultiple(name, options) {
 		}
 
 		if (foundPath) {
-			matches.push(path.resolve(directory, foundPath));
+			matches.push(path__default.resolve(directory, foundPath));
 		}
 
 		if (directory === stopAt || matches.length >= limit) {
 			break;
 		}
 
-		directory = path.dirname(directory);
+		directory = path__default.dirname(directory);
 	}
 
 	return matches;
 }
 
 function findUpMultipleSync(name, options) {
-	let directory = path.resolve(toPath(options.cwd) || '');
-	const {root} = path.parse(directory);
+	let directory = path__default.resolve(toPath(options.cwd) || '');
+	const {root} = path__default.parse(directory);
 	const stopAt = options.stopAt || root;
 	const limit = options.limit || Number.POSITIVE_INFINITY;
 	const paths = [name].flat();
@@ -329,14 +329,14 @@ function findUpMultipleSync(name, options) {
 		}
 
 		if (foundPath) {
-			matches.push(path.resolve(directory, foundPath));
+			matches.push(path__default.resolve(directory, foundPath));
 		}
 
 		if (directory === stopAt || matches.length >= limit) {
 			break;
 		}
 
-		directory = path.dirname(directory);
+		directory = path__default.dirname(directory);
 	}
 
 	return matches;
@@ -354,12 +354,12 @@ function findUpSync(name, options) {
 
 async function packageDirectory({cwd} = {}) {
 	const filePath = await findUp('package.json', {cwd});
-	return filePath && path.dirname(filePath);
+	return filePath && path__default.dirname(filePath);
 }
 
 function packageDirectorySync({cwd} = {}) {
 	const filePath = findUpSync('package.json', {cwd});
-	return filePath && path.dirname(filePath);
+	return filePath && path__default.dirname(filePath);
 }
 
 export { packageDirectory, packageDirectorySync };

package/build/esm/package-manager.mjs

@@ -1,7 +1,7 @@
-import * as path from 'path';
-import { relative } from 'path';
-import * as fs from 'fs';
-import { fileURLToPath } from 'url';
+import * as path from 'node:path';
+import { relative } from 'node:path';
+import * as fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
 import './index.mjs';
 
 function loadTemplate(name) {
@@ -130,18 +130,32 @@ async function format(content, {
     format
   }, {
     default: babel
+  }, {
+    default: typescript
   }, {
     default: yaml
-  }] = await Promise.all([import('./standalone.mjs').then(function (n) { return n.s; }), import('./parser-babel.mjs').then(function (n) { return n.p; }), import('./parser-yaml.mjs').then(function (n) { return n.p; })]);
+  }] = await Promise.all([import('./standalone.mjs').then(function (n) { return n.s; }), import('./parser-babel.mjs').then(function (n) { return n.p; }), import('./parser-typescript.mjs').then(function (n) { return n.p; }), import('./parser-yaml.mjs').then(function (n) { return n.p; })]);
   return format(content, {
     arrowParens: 'always',
     bracketSpacing: false,
     singleQuote: true,
     trailingComma: 'all',
     parser,
-    plugins: [babel, yaml]
+    plugins: [babel, typescript, yaml]
   });
 }
+function mergeDependencies(first = {}, second = {}) {
+  const all = { ...first,
+    ...second
+  };
+  const merged = {};
+
+  for (const [key, value] of Object.entries(all).sort(([keyOne], [keyTwo]) => keyOne.localeCompare(keyTwo))) {
+    merged[key] = value;
+  }
+
+  return merged;
+}
 
 const ENDS_WITH_TSCONFIG = /[/]?tsconfig[.a-z0-9]*[.]json/i;
 async function addToTsConfig(directory, output) {
@@ -282,4 +296,4 @@ async function addToWorkspaces(relative, workspaces) {
   return [...workspaces, pretty ? relativeDirectoryForDisplay(relative) : relative].sort((patternOne, patternTwo) => patternOne.localeCompare(patternTwo));
 }
 
-export { addToTsConfig as a, addToPackageManagerWorkspaces as b, createOutputTarget as c, emptyDirectory as e, format as f, isEmpty as i, loadTemplate as l, relativeDirectoryForDisplay as r, toValidPackageName as t };
+export { addToTsConfig as a, addToPackageManagerWorkspaces as b, createOutputTarget as c, emptyDirectory as e, format as f, isEmpty as i, loadTemplate as l, mergeDependencies as m, relativeDirectoryForDisplay as r, toValidPackageName as t };

package/build/esm/package.mjs

@@ -1,12 +1,12 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import { execSync } from 'child_process';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { execSync } from 'node:child_process';
 import { s as stripIndent, c as cyan_1, p as printHelp, g as getCreateAsMonorepo, a as getShouldInstall, d as getPackageManager, e as getExtrasToSetup, b as bold_1, f as dim_1, u as underline_1, m as magenta_1, h as arg_1, i as prompt } from './index.mjs';
-import { t as toValidPackageName, e as emptyDirectory, f as format, l as loadTemplate, a as addToTsConfig, b as addToPackageManagerWorkspaces, r as relativeDirectoryForDisplay, i as isEmpty, c as createOutputTarget } from './package-manager.mjs';
-import 'tty';
-import 'url';
-import 'readline';
-import 'events';
+import { t as toValidPackageName, e as emptyDirectory, f as format, m as mergeDependencies, l as loadTemplate, a as addToTsConfig, b as addToPackageManagerWorkspaces, r as relativeDirectoryForDisplay, i as isEmpty, c as createOutputTarget } from './package-manager.mjs';
+import 'node:tty';
+import 'node:url';
+import 'node:readline';
+import 'node:events';
 
 let _ = t => t,
     _t,
@@ -75,14 +75,9 @@ async function createProject() {
   const outputRoot = createOutputTarget(rootDirectory);
   const packageTemplate = loadTemplate('package');
   const workspaceTemplate = loadTemplate('workspace');
-  let quiltProject = await packageTemplate.read('quilt.project.ts');
-
-  if (useReact) {
-    quiltProject = quiltProject.replace('react: false', 'react: true');
-  } // If we aren’t already in a workspace, copy the workspace files over, which
+  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.
@@ -126,9 +121,7 @@ async function createProject() {
         newPackageJson.dependencies = projectPackageJson.dependencies;
         newPackageJson.peerDependencies = projectPackageJson.peerDependencies;
         newPackageJson.peerDependenciesMeta = projectPackageJson.peerDependenciesMeta;
-        newPackageJson.devDependencies = sortKeys({ ...workspacePackageJson.devDependencies,
-          ...projectPackageJson.devDependencies
-        });
+        newPackageJson.devDependencies = mergeDependencies(workspacePackageJson.devDependencies, projectPackageJson.devDependencies);
       }
 
       adjustPackageJson(newPackageJson, {
@@ -395,15 +388,4 @@ function adjustPackageJson(packageJson, {
   return packageJson;
 }
 
-function sortKeys(object) {
-  const newObject = {};
-  const sortedEntries = Object.entries(object).sort(([keyOne], [keyTwo]) => keyOne.localeCompare(keyTwo));
-
-  for (const [key, value] of sortedEntries) {
-    newObject[key] = value;
-  }
-
-  return newObject;
-}
-
 export { createProject };