@haxtheweb/create 10.0.6 → 10.0.8

package/dist/create.js

@@ -16,6 +16,7 @@ var hax = _interopRequireWildcard(require("@haxtheweb/haxcms-nodejs"));
 var child_process = _interopRequireWildcard(require("child_process"));
 var util = _interopRequireWildcard(require("node:util"));
 var _commander = require("commander");
+var _package = _interopRequireDefault(require("../package.json"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -45,7 +46,7 @@ async function main() {
   .option('--org <char>', 'organization for package.json').option('--author <char>', 'author for site / package.json').option('--writeHaxProperties', 'Write haxProperties for the element')
 
   // options for site
-  .option('--import-site <char>', 'URL of site to import').option('--import-structure <char>', `import method to use:\n\rpressbooksToSite\n\relmslnToSite\n\rhaxcmsToSite\n\rnotionToSite\n\rgitbookToSite\n\revolutionToSite\n\rhtmlToSite\n\rdocxToSite`).option('--node-op <char>', 'node operation to perform').option('--item-id <char>', 'node ID to operate on').option('--domain <char>', 'published domain name').option('--title-scrape <char>', 'CSS Selector for `title` in resource').option('--content-scrape <char>', 'CSS Selector for `body` in resource').option('--items-import <char>', 'import items from a file / site').option('--recipe <char>', 'path to recipe file').option('--custom-theme-name <char>', 'custom theme name').option('--custom-theme-template <char>', 'custom theme template; (options: base, polaris-flex, polaris-sidebar)').version(await HAXCMS.getHAXCMSVersion()).helpCommand(true);
+  .option('--import-site <char>', 'URL of site to import').option('--import-structure <char>', `import method to use:\n\rpressbooksToSite\n\relmslnToSite\n\rhaxcmsToSite\n\rnotionToSite\n\rgitbookToSite\n\revolutionToSite\n\rhtmlToSite\n\rdocxToSite`).option('--node-op <char>', 'node operation to perform').option('--item-id <char>', 'node ID to operate on').option('--domain <char>', 'published domain name').option('--title-scrape <char>', 'CSS Selector for `title` in resource').option('--content-scrape <char>', 'CSS Selector for `body` in resource').option('--items-import <char>', 'import items from a file / site').option('--recipe <char>', 'path to recipe file').option('--custom-theme-name <char>', 'custom theme name').option('--custom-theme-template <char>', 'custom theme template; (options: base, polaris-flex, polaris-sidebar)').version(_package.default.version).helpCommand(true);
 
   // default command which runs interactively
   _commander.program.command('start').description('Select which hax sub-program to run').action(() => {
@@ -71,7 +72,7 @@ async function main() {
       commandRun.arguments.action = action;
       commandRun.options.skip = true;
     }
-  }).option('--v', 'Verbose output').option('--debug', 'Output for developers').option('--format <char>', 'Output format; json (default), yaml').option('--path <char>', 'where to perform operation').option('--npm-client <char>', 'npm client to use (must be installed) npm, yarn, pnpm', 'npm').option('--y', 'yes to all questions').option('--skip', 'skip frills like animations').option('--quiet', 'remove console logging').option('--auto', 'yes to all questions, alias of y').option('--no-i', 'prevent interactions / sub-process, good for scripting').option('--to-file <char>', 'redirect command output to a file').option('--no-extras', 'skip all extra / automatic command processing').option('--root <char>', 'root location to execute the command from').option('--import-site <char>', 'URL of site to import').option('--import-structure <char>', `import method to use:\n\rpressbooksToSite\n\relmslnToSite\n\rhaxcmsToSite\n\rnotionToSite\n\rgitbookToSite\n\revolutionToSite\n\rhtmlToSite\n\rdocxToSite`).option('--name <char>', 'name of the site (when creating a new one)').option('--domain <char>', 'published domain name').option('--node-op <char>', 'node operation to perform').option('--title-scrape <char>', 'CSS Selector for `title` in resource').option('--content-scrape <char>', 'CSS Selector for `body` in resource').option('--items-import <char>', 'import items from a file / site').option('--recipe <char>', 'path to recipe file').option('--custom-theme-name <char>', 'custom theme name').option('--custom-theme-template <char>', 'custom theme template (options: base, polaris-flex, polaris-sidebar)').version(await HAXCMS.getHAXCMSVersion());
+  }).option('--v', 'Verbose output').option('--debug', 'Output for developers').option('--format <char>', 'Output format; json (default), yaml').option('--path <char>', 'where to perform operation').option('--npm-client <char>', 'npm client to use (must be installed) npm, yarn, pnpm', 'npm').option('--y', 'yes to all questions').option('--skip', 'skip frills like animations').option('--quiet', 'remove console logging').option('--auto', 'yes to all questions, alias of y').option('--no-i', 'prevent interactions / sub-process, good for scripting').option('--to-file <char>', 'redirect command output to a file').option('--no-extras', 'skip all extra / automatic command processing').option('--root <char>', 'root location to execute the command from').option('--import-site <char>', 'URL of site to import').option('--import-structure <char>', `import method to use:\n\rpressbooksToSite\n\relmslnToSite\n\rhaxcmsToSite\n\rnotionToSite\n\rgitbookToSite\n\revolutionToSite\n\rhtmlToSite\n\rdocxToSite`).option('--name <char>', 'name of the site (when creating a new one)').option('--domain <char>', 'published domain name').option('--node-op <char>', 'node operation to perform').option('--title-scrape <char>', 'CSS Selector for `title` in resource').option('--content-scrape <char>', 'CSS Selector for `body` in resource').option('--items-import <char>', 'import items from a file / site').option('--recipe <char>', 'path to recipe file').option('--custom-theme-name <char>', 'custom theme name').option('--custom-theme-template <char>', 'custom theme template (options: base, polaris-flex, polaris-sidebar)').version(_package.default.version);
   let siteNodeOps = (0, _site.siteNodeOperations)();
   for (var i in siteNodeOps) {
     _commander.program.option(`--${(0, _utils.camelToDash)(siteNodeOps[i].value)} <char>`, `${siteNodeOps[i].label}`);
@@ -94,7 +95,7 @@ async function main() {
       commandRun.arguments.action = action;
       commandRun.options.skip = true;
     }
-  }).option('--path <char>', 'path the project should be created in').option('--org <char>', 'organization for package.json').option('--author <char>', 'author for site / package.json').option('--name <char>', 'name of the web component').option('--writeHaxProperties', 'Write haxProperties for the element').option('--to-file <char>', 'redirect command output to a file').option('--no-extras', 'skip all extra / automatic command processing').option('--no-i', 'prevent interactions / sub-process, good for scripting').option('--root <char>', 'root location to execute the command from').version(await HAXCMS.getHAXCMSVersion());
+  }).option('--path <char>', 'path the project should be created in').option('--org <char>', 'organization for package.json').option('--author <char>', 'author for site / package.json').option('--name <char>', 'name of the web component').option('--writeHaxProperties', 'Write haxProperties for the element').option('--to-file <char>', 'redirect command output to a file').option('--no-extras', 'skip all extra / automatic command processing').option('--no-i', 'prevent interactions / sub-process, good for scripting').option('--root <char>', 'root location to execute the command from').version(_package.default.version);
 
   // audit program
   _commander.program.command('audit').description('Audits web components for compliance with DDD (HAX design system)').action(() => {
@@ -103,7 +104,7 @@ async function main() {
       arguments: {},
       options: {}
     };
-  }).option('--debug', 'Output for developers').version(await HAXCMS.getHAXCMSVersion());
+  }).option('--debug', 'Output for developers').version(_package.default.version);
 
   // process program arguments
   _commander.program.parse();
@@ -599,7 +600,7 @@ async function main() {
           };
         }
         project.year = new Date().getFullYear();
-        project.version = await HAXCMS.getHAXCMSVersion();
+        project.version = _package.default.version;
         if (!project.name && commandRun.arguments.action) {
           project.name = commandRun.arguments.action;
         }

package/dist/lib/programs/site.js

@@ -41,6 +41,26 @@ _microFrontendRegistry.MicroFrontendRegistry.enableServices(['core', 'haxcms', '
 const JSONOutlineSchema = josfile.default;
 const HAXCMS = hax.HAXCMS;
 const exec = util.promisify(child_process.exec);
+const spawn = child_process.spawn;
+async function interactiveExec(command, args = [], options = {}) {
+  return new Promise((resolve, reject) => {
+    process.env.NODE_NO_WARNINGS = 1;
+    const child = spawn(command, args, {
+      stdio: 'inherit',
+      ...options
+    });
+    child.on('exit', code => {
+      if (code === 0) {
+        resolve();
+      } else {
+        reject(new Error(`Command failed with code ${code}`));
+      }
+    });
+    child.on('error', err => {
+      reject(err);
+    });
+  });
+}
 var sysSurge = true;
 exec('surge --version', error => {
   if (error) {
@@ -837,23 +857,26 @@ async function siteCommandDetected(commandRun) {
             (0, _logging.log)(execOutput.stdout.trim());
             sysSurge = true;
           }
-          if (!commandRun.options.domain) {
-            commandRun.options.domain = await p.text({
-              message: `Domain for surge`,
-              initialValue: `haxcli-${activeHaxsite.name}.surge.sh`,
-              defaultValue: `haxcli-${activeHaxsite.name}.surge.sh`,
-              required: true,
-              validate: value => {
-                if (!value) {
-                  return "Domain must have a value";
-                }
-              }
+          let execOutput;
+          if (commandRun.options.domain && commandRun.options.y) {
+            let s = p.spinner();
+            s.start((0, _statements.merlinSays)('Sending site to Surge.sh ..'));
+            execOutput = await exec(`cd ${activeHaxsite.directory} && surge . ${commandRun.options.domain}`);
+            (0, _logging.log)(execOutput.stdout.trim());
+            s.stop((0, _statements.merlinSays)(`Site published: https://${commandRun.options.domain}`));
+          } else {
+            let surgeArgs = ['.'];
+            // could get here bc of being interactive, yet passed in a domain...
+            if (commandRun.options.domain) {
+              surgeArgs.push(commandRun.options.domain);
+            }
+            execOutput = await interactiveExec('surge', surgeArgs, {
+              cwd: activeHaxsite.directory
             });
+            (0, _logging.log)((0, _statements.merlinSays)(`Site published: https://${commandRun.options.domain}`));
           }
-          let execOutput = await exec(`cd ${activeHaxsite.directory} && surge . ${commandRun.options.domain}`);
-          (0, _logging.log)(execOutput.stdout.trim());
-          (0, _logging.log)(`Site published: https://${commandRun.options.domain}`);
         } catch (e) {
+          console.log("?");
           (0, _logging.log)(e.stderr);
         }
         break;
@@ -1123,9 +1146,6 @@ async function siteProcess(commandRun, project, port = '3000') {
       project.extras = ['launch'];
     }
   }
-  if (!commandRun.options.quiet) {
-    s.start((0, _statements.merlinSays)(`Creating new site: ${project.name}`));
-  }
   let siteRequest = {
     "site": {
       "name": project.name,
@@ -1241,9 +1261,18 @@ async function siteProcess(commandRun, project, port = '3000') {
   }
   HAXCMS.cliWritePath = `${project.path}`;
   let res = new Res();
+  // unfortunately the twig exception is not blockable from output at this layer
   await hax.RoutesMap.post.createSite({
     body: siteRequest
   }, res);
+  // so we run it and then clear the screen
+  // this is a bit of a hack but it works to give the user the feedback that the site was
+  // created successfully, but only if not in quiet mode (default)
+  if (!commandRun.options.quiet) {
+    process.stdout.write('\x1Bc');
+    s.start((0, _statements.merlinSays)(`Creating new site: ${project.name}`));
+    await (0, _promises.setTimeout)(1000);
+  }
   // path different for this one as it's on the fly produced
   const recipeFileName = path.join(project.path, '/', project.name, `${siteRecipeFile}`);
   const recipeLogTransport = new winston.transports.File({
@@ -1270,7 +1299,7 @@ async function siteProcess(commandRun, project, port = '3000') {
     }
   }
   if (!commandRun.options.quiet) {
-    s.stop((0, _statements.merlinSays)(`${project.name} created!`));
+    s.stop((0, _statements.merlinSays)(`${project.name} created successfully!`));
     await (0, _promises.setTimeout)(500);
   }
 
@@ -1285,6 +1314,16 @@ async function siteProcess(commandRun, project, port = '3000') {
       await exec(`cd ${project.path}/${project.name} && git init && git add -A && git commit -m "first commit" && git branch -M main${project.gitRepo ? ` && git remote add origin ${project.gitRepo}` : ''}`);
     } catch (e) {}
   }
+  // ensure dot files is there because it doesn't copy for some reason for sites :\
+  if (!fs.existsSync(`${project.path}/${project.name}/.gitignore`)) {
+    await fs.copyFileSync(`${process.mainModule.path}/templates/sitedotfiles/_gitignore`, `${project.path}/${project.name}/.gitignore`);
+  }
+  if (!fs.existsSync(`${project.path}/${project.name}/._npmignore`)) {
+    await fs.copyFileSync(`${process.mainModule.path}/templates/sitedotfiles/_npmignore`, `${project.path}/${project.name}/.npmignore`);
+  }
+  if (!fs.existsSync(`${project.path}/${project.name}/._surgeignore`)) {
+    await fs.copyFileSync(`${process.mainModule.path}/templates/sitedotfiles/_surgeignore`, `${project.path}/${project.name}/.surgeignore`);
+  }
   // options for install, git and other extras
   // can't launch if we didn't install first so launch implies installation
   if (project.extras && project.extras.includes && project.extras.includes('launch')) {

package/dist/templates/sitedotfiles/_gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+node_modules
+dist
+yarn.lock
+!custom/build
+!build/es6/node_modules
+!build/es6/node_modules/**

package/dist/templates/sitedotfiles/_npmignore

@@ -0,0 +1 @@
+node_modules

package/dist/templates/sitedotfiles/_surgeignore

@@ -0,0 +1 @@
+!node_modules/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haxtheweb/create",
-  "version": "10.0.6",
+  "version": "10.0.8",
   "publishConfig": {
     "access": "public"
   },
@@ -45,7 +45,7 @@
   "dependencies": {
     "@clack/core": "0.3.4",
     "@clack/prompts": "0.7.0",
-    "@haxtheweb/haxcms-nodejs": "^10.0.5",
+    "@haxtheweb/haxcms-nodejs": "^10.0.6",
     "@haxtheweb/open-apis": "^10.0.1",
     "commander": "12.1.0",
     "ejs": "3.1.10",
@@ -55,10 +55,11 @@
     "winston": "3.17.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.24.6",
-    "@babel/core": "^7.24.6",
-    "@babel/preset-env": "7.24.6",
-    "@babel/register": "^7.24.6",
+    "@babel/cli": "^7.27.0",
+    "@babel/core": "^7.26.10",
+    "@babel/preset-env": "^7.26.9",
+    "@babel/register": "^7.25.9",
+    "@babel/plugin-syntax-import-attributes": "^7.26.0",
     "@custom-elements-manifest/analyzer": "^0.10.3",
     "babel-plugin-transform-dynamic-import": "^2.1.0",
     "commit-and-tag-version": "12.4.1",