default yarn to instructions (#10)

* default to yarn for now * build the distrobution files, this by the way includes the change to allow dash in project names
observablehq · Jan 5, 2024 · dae1fc0 · dae1fc0
1 parent a5da0d7
commit dae1fc0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/dist/main.cjs b/dist/main.cjs
@@ -51,7 +51,7 @@ async function init() {
   ]);
   const root = path__default.join(projectDir, results.projectName);
   const pkgInfo = pkgFromUserAgent(process.env["npm_config_user_agent"]);
-  const pkgManager = pkgInfo ? pkgInfo.name : "npm";
+  const pkgManager = pkgInfo ? pkgInfo.name : "yarn";
   const templateDir = path__default.resolve(
     node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('main.cjs', document.baseURI).href))),
     "../../template"
@@ -83,8 +83,8 @@ function validateProjectName(projectDir, projectName) {
   if (projectName.length === 0) {
     return "Project name must be at least 1 character long.";
   }
-  if (!/^([^0-9\W]\w*)$/.test(projectName)) {
-    return "Project name must contain only alphanumerics or underscore with no leading digits.";
+  if (!/^([^0-9\W][\w-]*)$/.test(projectName)) {
+    return "Project name must contain only alphanumerics, dash or underscore with no leading digits.";
   }
   return true;
 }

diff --git a/dist/main.mjs b/dist/main.mjs
@@ -42,7 +42,7 @@ async function init() {
   ]);
   const root = path.join(projectDir, results.projectName);
   const pkgInfo = pkgFromUserAgent(process.env["npm_config_user_agent"]);
-  const pkgManager = pkgInfo ? pkgInfo.name : "npm";
+  const pkgManager = pkgInfo ? pkgInfo.name : "yarn";
   const templateDir = path.resolve(
     fileURLToPath(import.meta.url),
     "../../template"
@@ -74,8 +74,8 @@ function validateProjectName(projectDir, projectName) {
   if (projectName.length === 0) {
     return "Project name must be at least 1 character long.";
   }
-  if (!/^([^0-9\W]\w*)$/.test(projectName)) {
-    return "Project name must contain only alphanumerics or underscore with no leading digits.";
+  if (!/^([^0-9\W][\w-]*)$/.test(projectName)) {
+    return "Project name must contain only alphanumerics, dash or underscore with no leading digits.";
   }
   return true;
 }

diff --git a/src/main.ts b/src/main.ts
@@ -47,7 +47,7 @@ async function init() {
 
   const root = path.join(projectDir, results.projectName);
   const pkgInfo = pkgFromUserAgent(process.env["npm_config_user_agent"]);
-  const pkgManager = pkgInfo ? pkgInfo.name : "npm";
+  const pkgManager = pkgInfo ? pkgInfo.name : "yarn";
 
   const templateDir = path.resolve(
     fileURLToPath(import.meta.url),