@quilted/create 0.1.87 → 0.1.89

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @quilted/create
 
+## 0.1.89
+
+### Patch Changes
+
+- [`48beeccb`](https://github.com/lemonmade/quilt/commit/48beeccb4366c73ee1040221414af690ccba0958) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix module template and rollup build
+
+## 0.1.88
+
+### Patch Changes
+
+- [`78f914d3`](https://github.com/lemonmade/quilt/commit/78f914d36e5a70b76ea9364529e9a00269065fb6) Thanks [@lemonmade](https://github.com/lemonmade)! - Add better module template
+
 ## 0.1.87
 
 ### Patch Changes

package/build/cjs/module.cjs

@@ -49,9 +49,18 @@ var path__namespace = /*#__PURE__*/_interopNamespaceDefault(path);
 async function createModule() {
   const argv = getArgv();
   if (argv['--help']) {
+    const additionalOptions = stripIndent["default"]`
+      ${index.cyan(`--entry [entry]`)}
+      The entry file for your module. This should be a relative path from the root
+      of the project, and should include the file extension.
+
+      ${index.cyan(`--react`)}
+      Whether this package will use React. Defaults to false.
+    `;
     help.printHelp({
       kind: 'module',
-      packageManager: argv['--package-manager']?.toLowerCase()
+      packageManager: argv['--package-manager']?.toLowerCase(),
+      options: additionalOptions
     });
     return;
   }
@@ -92,99 +101,67 @@ async function createModule() {
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = shared.createOutputTarget(rootDirectory);
   const moduleTemplate = shared.loadTemplate('module');
-  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 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 moduleRelativeToRoot = shared.relativeDirectoryForDisplay(path__namespace.relative(directory, moduleDirectory));
-      const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
-      workspacePackageJson.name = shared.toValidPackageName(name);
-      workspacePackageJson.workspaces = [moduleRelativeToRoot, './packages/*'];
-      if (packageManager$1.type === 'pnpm') {
-        await outputRoot.write('pnpm-workspace.yaml', await shared.format(`
-              packages:
-              - '${moduleRelativeToRoot}'
-              - './packages/*'
-            `, {
-          as: 'yaml'
-        }));
-      }
-      await outputRoot.write('package.json', await shared.format(JSON.stringify(workspacePackageJson), {
-        as: 'json-stringify'
-      }));
-    } else {
-      const [projectPackageJson, projectTSConfig, workspacePackageJson] = await Promise.all([moduleTemplate.read('package.json').then(content => JSON.parse(content)), moduleTemplate.read('tsconfig.json').then(content => JSON.parse(content)), workspaceTemplate.read('package.json').then(content => JSON.parse(content))]);
-      const combinedPackageJson = shared.mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
-      adjustPackageJson(combinedPackageJson, {
-        name,
-        entry,
-        react: useReact
-      });
-      delete combinedPackageJson.workspaces;
-      await outputRoot.write('package.json', await shared.format(JSON.stringify(combinedPackageJson), {
-        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);
+    const moduleRelativeToRoot = shared.relativeDirectoryForDisplay(path__namespace.relative(directory, moduleDirectory));
+    if (packageManager$1.type === 'pnpm') {
+      await outputRoot.write('pnpm-workspace.yaml', await shared.format(`
+            packages:
+            - './packages/*'
+            - '${moduleRelativeToRoot}'
+          `, {
+        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 moduleTemplate.copy(moduleDirectory, file => {
-    // If we are in a monorepo, we can use all the template files as they are
-    if (file === 'quilt.project.ts' || file === 'tsconfig.json') {
-      return partOfMonorepo;
-    }
-
-    // We will adjust the entry file
-    if (file === 'module.ts') return false;
-
-    // We need to make some adjustments the project’s package.json and quilt
-    // config
-    if (file === 'package.json' || file === 'quilt.project.ts') return false;
-    return true;
+    // We will adjust the package.json before writing them
+    return file !== 'package.json';
   });
-  let quiltProject = await moduleTemplate.read('quilt.project.ts');
-  if (!partOfMonorepo) {
-    quiltProject = quiltProject.replace('quiltModule', 'quiltWorkspace, quiltModule').replace('quiltModule(', 'quiltWorkspace(), quiltModule(');
-  }
-  if (!useReact) {
-    quiltProject = quiltProject.replace('quiltPackage()', 'quiltPackage({react: false})');
-  }
-  await outputRoot.write(path__namespace.join(moduleDirectory, 'quilt.project.ts'), await shared.format(quiltProject, {
-    as: 'typescript'
-  }));
-  await outputRoot.write(path__namespace.join(moduleDirectory, entry), await moduleTemplate.read('module.ts'));
   if (partOfMonorepo) {
-    // Write the app’s package.json (the root one was already created)
+    // Add the package to the workspace configuration files
+    await Promise.all([tsconfig.addToTsConfig(moduleDirectory, outputRoot), packageManager.addToPackageManagerWorkspaces(moduleDirectory, outputRoot, packageManager$1.type)]);
+
+    // Write the package’s package.json (the root one was already created)
     const projectPackageJson = JSON.parse(await moduleTemplate.read('package.json'));
     adjustPackageJson(projectPackageJson, {
-      name,
-      entry,
-      react: useReact
+      name: shared.toValidPackageName(name),
+      react: useReact,
+      entry
     });
     await outputRoot.write(path__namespace.join(moduleDirectory, 'package.json'), await shared.format(JSON.stringify(projectPackageJson), {
       as: 'json-stringify'
     }));
-    await Promise.all([tsconfig.addToTsConfig(moduleDirectory, outputRoot), packageManager.addToPackageManagerWorkspaces(moduleDirectory, 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([moduleTemplate.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),
+      react: useReact,
+      entry
+    });
+    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();
@@ -239,7 +216,6 @@ function getArgv() {
     '--extras': [String],
     '--no-extras': Boolean,
     '--react': Boolean,
-    '--no-react': Boolean,
     '--help': Boolean,
     '-h': '--help'
   }, {
@@ -247,10 +223,12 @@ function getArgv() {
   });
   return argv;
 }
-async function getName(argv) {
-  let {
-    '--name': name
-  } = argv;
+async function getName(args) {
+  const {
+    _,
+    '--name': nameArgument
+  } = args;
+  let name = nameArgument ?? _[1];
   if (name == null) {
     name = await prompt.prompt({
       type: 'text',
@@ -302,19 +280,7 @@ async function getDirectory(argv, {
   return directory;
 }
 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 module depend on React?',
-      initial: false
-    });
-  }
-  return useReact;
+  return Boolean(args['--react']);
 }
 function adjustPackageJson(packageJson, {
   name,
@@ -322,14 +288,13 @@ function adjustPackageJson(packageJson, {
   react
 }) {
   packageJson.name = name;
-  packageJson.main = `./${entry}`;
+  packageJson.exports['.'] = `./${entry}`;
   if (!react) {
     delete packageJson.devDependencies['@types/react'];
     delete packageJson.devDependencies['@types/react-dom'];
     delete packageJson.devDependencies['preact'];
     delete packageJson.devDependencies['react'];
     delete packageJson.devDependencies['react-dom'];
-    packageJson.eslintConfig.extends = packageJson.eslintConfig.extends.filter(extend => !extend.includes('react'));
   }
   return packageJson;
 }

package/build/cjs/node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/dist/prompts.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var prompts = require('../../../../../../_virtual/prompts.cjs');
+var prompts = require('../../../../../../_virtual/prompts2.cjs');
 var index = require('./elements/index.cjs');
 
 var hasRequiredPrompts;

package/build/cjs/node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/index.cjs

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _commonjsHelpers = require('../../../../../_virtual/_commonjsHelpers.cjs');
-var index = require('./dist/index.cjs');
 var index$1 = require('./lib/index.cjs');
+var index = require('./dist/index.cjs');
 
 function isNodeLT(tar) {
   tar = (Array.isArray(tar) ? tar : tar.split('.')).map(Number);

package/build/cjs/node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/lib/prompts.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var prompts = require('../../../../../../_virtual/prompts2.cjs');
+var prompts = require('../../../../../../_virtual/prompts.cjs');
 var index = require('./elements/index.cjs');
 
 var hasRequiredPrompts;

package/build/cjs/package.cjs

@@ -116,7 +116,7 @@ async function createProject() {
   }
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = shared.createOutputTarget(rootDirectory);
-  const packageTemplate = shared.loadTemplate('package-simple');
+  const packageTemplate = shared.loadTemplate('package');
   const workspaceTemplate = shared.loadTemplate('workspace-simple');
   if (createAsMonorepo) {
     await workspaceTemplate.copy(directory, file => {

package/build/cjs/shared.cjs

@@ -4,6 +4,7 @@ var fs = require('node:fs');
 var path = require('node:path');
 var node_url = require('node:url');
 
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
 function _interopNamespaceDefault(e) {
   var n = Object.create(null);
   if (e) {
@@ -80,7 +81,7 @@ async function getPackageRoot() {
         packageDirectory
       } = await Promise.resolve().then(function () { return require('./node_modules/.pnpm/pkg-dir@6.0.1/node_modules/pkg-dir/index.cjs'); });
       return packageDirectory({
-        cwd: path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('shared.cjs', document.baseURI).href))))
+        cwd: path__namespace.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('shared.cjs', document.baseURI).href))))
       });
     })();
   }

package/build/esm/module.mjs

@@ -27,9 +27,18 @@ import { prompt } from './packages/cli-kit/source/prompt.mjs';
 async function createModule() {
   const argv = getArgv();
   if (argv['--help']) {
+    const additionalOptions = stripIndent`
+      ${cyan_1(`--entry [entry]`)}
+      The entry file for your module. This should be a relative path from the root
+      of the project, and should include the file extension.
+
+      ${cyan_1(`--react`)}
+      Whether this package will use React. Defaults to false.
+    `;
     printHelp({
       kind: 'module',
-      packageManager: argv['--package-manager']?.toLowerCase()
+      packageManager: argv['--package-manager']?.toLowerCase(),
+      options: additionalOptions
     });
     return;
   }
@@ -70,99 +79,67 @@ async function createModule() {
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = createOutputTarget(rootDirectory);
   const moduleTemplate = loadTemplate('module');
-  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 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 moduleRelativeToRoot = relativeDirectoryForDisplay(path.relative(directory, moduleDirectory));
-      const workspacePackageJson = JSON.parse(await workspaceTemplate.read('package.json'));
-      workspacePackageJson.name = toValidPackageName(name);
-      workspacePackageJson.workspaces = [moduleRelativeToRoot, './packages/*'];
-      if (packageManager.type === 'pnpm') {
-        await outputRoot.write('pnpm-workspace.yaml', await format(`
-              packages:
-              - '${moduleRelativeToRoot}'
-              - './packages/*'
-            `, {
-          as: 'yaml'
-        }));
-      }
-      await outputRoot.write('package.json', await format(JSON.stringify(workspacePackageJson), {
-        as: 'json-stringify'
-      }));
-    } else {
-      const [projectPackageJson, projectTSConfig, workspacePackageJson] = await Promise.all([moduleTemplate.read('package.json').then(content => JSON.parse(content)), moduleTemplate.read('tsconfig.json').then(content => JSON.parse(content)), workspaceTemplate.read('package.json').then(content => JSON.parse(content))]);
-      const combinedPackageJson = mergeWorkspaceAndProjectPackageJsons(projectPackageJson, workspacePackageJson);
-      adjustPackageJson(combinedPackageJson, {
-        name,
-        entry,
-        react: useReact
-      });
-      delete combinedPackageJson.workspaces;
-      await outputRoot.write('package.json', await format(JSON.stringify(combinedPackageJson), {
-        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);
+    const moduleRelativeToRoot = relativeDirectoryForDisplay(path.relative(directory, moduleDirectory));
+    if (packageManager.type === 'pnpm') {
+      await outputRoot.write('pnpm-workspace.yaml', await format(`
+            packages:
+            - './packages/*'
+            - '${moduleRelativeToRoot}'
+          `, {
+        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 moduleTemplate.copy(moduleDirectory, file => {
-    // If we are in a monorepo, we can use all the template files as they are
-    if (file === 'quilt.project.ts' || file === 'tsconfig.json') {
-      return partOfMonorepo;
-    }
-
-    // We will adjust the entry file
-    if (file === 'module.ts') return false;
-
-    // We need to make some adjustments the project’s package.json and quilt
-    // config
-    if (file === 'package.json' || file === 'quilt.project.ts') return false;
-    return true;
+    // We will adjust the package.json before writing them
+    return file !== 'package.json';
   });
-  let quiltProject = await moduleTemplate.read('quilt.project.ts');
-  if (!partOfMonorepo) {
-    quiltProject = quiltProject.replace('quiltModule', 'quiltWorkspace, quiltModule').replace('quiltModule(', 'quiltWorkspace(), quiltModule(');
-  }
-  if (!useReact) {
-    quiltProject = quiltProject.replace('quiltPackage()', 'quiltPackage({react: false})');
-  }
-  await outputRoot.write(path.join(moduleDirectory, 'quilt.project.ts'), await format(quiltProject, {
-    as: 'typescript'
-  }));
-  await outputRoot.write(path.join(moduleDirectory, entry), await moduleTemplate.read('module.ts'));
   if (partOfMonorepo) {
-    // Write the app’s package.json (the root one was already created)
+    // Add the package to the workspace configuration files
+    await Promise.all([addToTsConfig(moduleDirectory, outputRoot), addToPackageManagerWorkspaces(moduleDirectory, outputRoot, packageManager.type)]);
+
+    // Write the package’s package.json (the root one was already created)
     const projectPackageJson = JSON.parse(await moduleTemplate.read('package.json'));
     adjustPackageJson(projectPackageJson, {
-      name,
-      entry,
-      react: useReact
+      name: toValidPackageName(name),
+      react: useReact,
+      entry
     });
     await outputRoot.write(path.join(moduleDirectory, 'package.json'), await format(JSON.stringify(projectPackageJson), {
       as: 'json-stringify'
     }));
-    await Promise.all([addToTsConfig(moduleDirectory, outputRoot), addToPackageManagerWorkspaces(moduleDirectory, 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([moduleTemplate.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),
+      react: useReact,
+      entry
+    });
+    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();
@@ -217,7 +194,6 @@ function getArgv() {
     '--extras': [String],
     '--no-extras': Boolean,
     '--react': Boolean,
-    '--no-react': Boolean,
     '--help': Boolean,
     '-h': '--help'
   }, {
@@ -225,10 +201,12 @@ function getArgv() {
   });
   return argv;
 }
-async function getName(argv) {
-  let {
-    '--name': name
-  } = argv;
+async function getName(args) {
+  const {
+    _,
+    '--name': nameArgument
+  } = args;
+  let name = nameArgument ?? _[1];
   if (name == null) {
     name = await prompt({
       type: 'text',
@@ -280,19 +258,7 @@ async function getDirectory(argv, {
   return directory;
 }
 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 module depend on React?',
-      initial: false
-    });
-  }
-  return useReact;
+  return Boolean(args['--react']);
 }
 function adjustPackageJson(packageJson, {
   name,
@@ -300,14 +266,13 @@ function adjustPackageJson(packageJson, {
   react
 }) {
   packageJson.name = name;
-  packageJson.main = `./${entry}`;
+  packageJson.exports['.'] = `./${entry}`;
   if (!react) {
     delete packageJson.devDependencies['@types/react'];
     delete packageJson.devDependencies['@types/react-dom'];
     delete packageJson.devDependencies['preact'];
     delete packageJson.devDependencies['react'];
     delete packageJson.devDependencies['react-dom'];
-    packageJson.eslintConfig.extends = packageJson.eslintConfig.extends.filter(extend => !extend.includes('react'));
   }
   return packageJson;
 }

package/build/esm/node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/dist/prompts.mjs

@@ -1,4 +1,4 @@
-import { __exports as prompts } from '../../../../../../_virtual/prompts.mjs';
+import { __exports as prompts } from '../../../../../../_virtual/prompts2.mjs';
 import { __require as requireElements } from './elements/index.mjs';
 
 var hasRequiredPrompts;

package/build/esm/node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/index.mjs

@@ -1,6 +1,6 @@
 import { getDefaultExportFromCjs } from '../../../../../_virtual/_commonjsHelpers.mjs';
-import { __require as requireDist } from './dist/index.mjs';
 import { __require as requireLib } from './lib/index.mjs';
+import { __require as requireDist } from './dist/index.mjs';
 
 function isNodeLT(tar) {
   tar = (Array.isArray(tar) ? tar : tar.split('.')).map(Number);

package/build/esm/node_modules/.pnpm/prompts@2.4.2/node_modules/prompts/lib/prompts.mjs

@@ -1,4 +1,4 @@
-import { __exports as prompts } from '../../../../../../_virtual/prompts2.mjs';
+import { __exports as prompts } from '../../../../../../_virtual/prompts.mjs';
 import { __require as requireElements } from './elements/index.mjs';
 
 var hasRequiredPrompts;

package/build/esm/package.mjs

@@ -94,7 +94,7 @@ async function createProject() {
   }
   const rootDirectory = inWorkspace ? process.cwd() : directory;
   const outputRoot = createOutputTarget(rootDirectory);
-  const packageTemplate = loadTemplate('package-simple');
+  const packageTemplate = loadTemplate('package');
   const workspaceTemplate = loadTemplate('workspace-simple');
   if (createAsMonorepo) {
     await workspaceTemplate.copy(directory, file => {