@haxtheweb/create 9.0.24 → 10.0.0

package/dist/lib/programs/site.js

@@ -909,6 +909,7 @@ async function siteCommandDetected(commandRun) {
           let recContents = await fs.readFileSync(commandRun.options.recipe, 'utf8');
           // split into commands
           let commandList = recContents.replaceAll('cli: ', '').split("\n");
+          let rootDir = '';
           // confirm each command or allow --y so that it auto applies
           for (var i in commandList) {
             // verify every command starts this way for safety
@@ -924,7 +925,23 @@ async function siteCommandDetected(commandRun) {
               }
               // confirmed; let's run!
               if (confirmation) {
-                await exec(`${commandList[i]} --y --no-i --auto --quiet`);
+                let commandMatch = siteActions().filter(action => action.value === commandList[i].split(' ')[2]);
+                // if we found a command that means it is a valid command to run against the site
+                if (commandMatch.length > 0) {
+                  await exec(`${commandList[i]} --y --no-i --auto --quiet${rootDir}`);
+                }
+                // 1st command won't match as the argument creates a new site
+                // but ensure we don't have a site context prior to running this
+                // or we'll get a site in a site with the same name which is not
+                // the desired result
+                else if (!(await hax.systemStructureContext())) {
+                  await exec(`${commandList[i]} --y --no-i --auto --quiet --no-extras`);
+                  // site will have been created, obtain the site name and set root so
+                  // the other commands get piped into it correctly
+                  rootDir = ` --root ${commandList[i].split(' ')[2]}`;
+                } else {
+                  (0, _logging.log)('Did not run because we already have a site', 'warn');
+                }
               }
             }
           }

package/dist/lib/programs/webcomponent.js

@@ -138,7 +138,8 @@ class HAXWiring {
 async function webcomponentProcess(commandRun, project, port = "8000") {
   // auto select operations to perform if requested
   if (!project.extras) {
-    if (!commandRun.options.extras) {
+    console.log(commandRun.options.extras);
+    if (commandRun.options.extras === false) {
       project.extras = [];
     } else {
       let extras = ['launch', 'install', 'git'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haxtheweb/create",
-  "version": "9.0.24",
+  "version": "10.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -45,8 +45,8 @@
   "dependencies": {
     "@clack/core": "0.3.4",
     "@clack/prompts": "0.7.0",
-    "@haxtheweb/haxcms-nodejs": "^9.0.20",
-    "@haxtheweb/open-apis": "^9.0.12",
+    "@haxtheweb/haxcms-nodejs": "^10.0.0",
+    "@haxtheweb/open-apis": "^10.0.1",
     "commander": "12.1.0",
     "node-html-parser": "6.1.13",
     "ejs": "3.1.10",