@quilted/create 0.1.23 → 0.1.26

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @quilted/create
 
+## 0.1.26
+
+### Patch Changes
+
+- [`9ad07bf7`](https://github.com/lemonmade/quilt/commit/9ad07bf727208151b81030858eb65643040b994d) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix package.json git.directory for packages
+
+## 0.1.25
+
+### Patch Changes
+
+- [#390](https://github.com/lemonmade/quilt/pull/390) [`15cf0022`](https://github.com/lemonmade/quilt/commit/15cf00222e8109d9076b4e90c438429628c86095) Thanks [@lemonmade](https://github.com/lemonmade)! - Switch from binary => executable
+
+## 0.1.24
+
+### Patch Changes
+
+- [`dae904fe`](https://github.com/lemonmade/quilt/commit/dae904fe489f7b869bcc2fa2398b3826651e75b9) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix non-monorepo app creation issues
+
 ## 0.1.23
 
 ### Patch Changes

package/README.md

@@ -2,7 +2,7 @@
 
 This package provides a command line tool for generating new Quilt projects.
 
-When run inside an existing [Quilt workspace](../../documentation/projects.md), this command will add additional [apps](../../documentation/projects.md#apps) or [packages](../../documentation/projects.md#packages) to the same workspace.
+When run inside an existing [Quilt workspace](../../documentation/projects.md), this command will add additional [apps](../../documentation/projects/apps) or [packages](../../documentation/projects.md#packages) to the same workspace.
 
 You can also run it outside an existing repository, and it will create a new repository with a Quilt app or package. This new repo can be configured either as a “monorepo”, with room for additional projects, or as a repo just focused on a single project.
 

package/build/cjs/app.cjs

@@ -1,14 +1,14 @@
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
-var child_process = require('child_process');
+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');
-require('tty');
-require('url');
-require('readline');
-require('events');
+require('node:tty');
+require('node:url');
+require('node:readline');
+require('node:events');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -126,6 +126,7 @@ async function createApp() {
       workspacePackageJson.name = packageManager.toValidPackageName(name);
       workspacePackageJson.eslintConfig = projectPackageJson.eslintConfig;
       workspacePackageJson.browserslist = projectPackageJson.browserslist;
+      workspacePackageJson.devDependencies = packageManager.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 packageManager.format(quiltProject, {
@@ -171,7 +172,7 @@ async function createApp() {
   if (shouldInstall) {
     process.stdout.write('\nInstalling dependencies...\n'); // TODO: better loading, handle errors
 
-    child_process.execSync(`${packageManager$1} install`, {
+    node_child_process.execSync(`${packageManager$1} install`, {
       cwd: rootDirectory
     });
     process.stdout.moveCursor(0, -1);
@@ -181,12 +182,14 @@ async function createApp() {
 
   const commands = [];
 
+  const packageManagerRun = command => packageManager$1 === 'npm' ? `npm run ${command}` : `pnpm ${command}`;
+
   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 app’s directory')}`);
   }
 
   if (!shouldInstall) {
-    commands.push(`pnpm install ${index.dim_1('# Install all your dependencies')}`);
+    commands.push(`${packageManager$1} install ${index.dim_1('# Install all your dependencies')}`);
   }
 
   if (!inWorkspace) {
@@ -194,7 +197,7 @@ async function createApp() {
     commands.push(`git init && git add -A && git commit -m "Initial commit" ${index.dim_1('# Start your git history (optional)')}`);
   }
 
-  commands.push(`pnpm develop ${index.dim_1('# Start the development server')}`);
+  commands.push(`${packageManagerRun('develop')} ${index.dim_1('# Start the development server')}`);
   const whatsNext = index.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/cjs/index.cjs

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var require$$0 = require('tty');
-var fs = require('fs');
-require('path');
-require('url');
-var require$$0$1 = require('readline');
-var require$$2 = require('events');
+var require$$0 = require('node:tty');
+var fs = require('node:fs');
+require('node:path');
+require('node:url');
+var require$$0$1 = require('node:readline');
+var require$$2 = require('node:events');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

package/build/cjs/package-manager.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var path = require('path');
-var fs = require('fs');
-var url = require('url');
+var path = require('node:path');
+var fs = require('node:fs');
+var node_url = require('node:url');
 require('./index.cjs');
 
 function _interopNamespace(e) {
@@ -90,7 +90,7 @@ async function getPackageRoot() {
         packageDirectory
       } = await Promise.resolve().then(function () { return require('./index2.cjs'); });
       return packageDirectory({
-        cwd: path__namespace.dirname(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('package-manager.cjs', document.baseURI).href))))
+        cwd: path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('package-manager.cjs', document.baseURI).href))))
       });
     })();
   }
@@ -152,18 +152,32 @@ async function format(content, {
     format
   }, {
     default: babel
+  }, {
+    default: typescript
   }, {
     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-yaml.cjs'); }).then(function (n) { return n.parserYaml; })]);
+  }] = 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; })]);
   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) {
@@ -311,5 +325,6 @@ exports.emptyDirectory = emptyDirectory;
 exports.format = format;
 exports.isEmpty = isEmpty;
 exports.loadTemplate = loadTemplate;
+exports.mergeDependencies = mergeDependencies;
 exports.relativeDirectoryForDisplay = relativeDirectoryForDisplay;
 exports.toValidPackageName = toValidPackageName;

package/build/cjs/package.cjs

@@ -1,14 +1,14 @@
 'use strict';
 
-var fs = require('fs');
-var path = require('path');
-var child_process = require('child_process');
+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');
-require('tty');
-require('url');
-require('readline');
-require('events');
+require('node:tty');
+require('node:url');
+require('node:readline');
+require('node:events');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -98,14 +98,9 @@ async function createProject() {
   const outputRoot = packageManager.createOutputTarget(rootDirectory);
   const packageTemplate = packageManager.loadTemplate('package');
   const workspaceTemplate = packageManager.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.
@@ -149,9 +144,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 = packageManager.mergeDependencies(workspacePackageJson.devDependencies, projectPackageJson.devDependencies);
       }
 
       adjustPackageJson(newPackageJson, {
@@ -194,7 +187,7 @@ async function createProject() {
   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(directory, packageDirectory);
+    projectPackageJson.repository.directory = path__namespace.relative(rootDirectory, packageDirectory);
     adjustPackageJson(projectPackageJson, {
       name: packageManager.toValidPackageName(name),
       react: useReact,
@@ -211,7 +204,7 @@ async function createProject() {
   if (shouldInstall) {
     process.stdout.write('\nInstalling dependencies...\n'); // TODO: better loading, handle errors
 
-    child_process.execSync(`${packageManager$1} install`, {
+    node_child_process.execSync(`${packageManager$1} install`, {
       cwd: rootDirectory
     });
     process.stdout.moveCursor(0, -1);
@@ -418,15 +411,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;
-}
-
 exports.createProject = createProject;