@haxtheweb/create 10.0.5 → 10.0.7

package/README.md

@@ -184,7 +184,6 @@ rollup.config.js
 
 # File extension
 # (Must start with *, as seen below)
-*.html
 *.md
 *.yml
 *.json

package/dist/create.js

@@ -29,14 +29,23 @@ exec('git --version', error => {
   }
 });
 async function main() {
+  let wcReg = {};
+  let regPath = path.join(__dirname, './lib/wc-registry.json');
+  if (fs.existsSync(regPath)) {
+    try {
+      wcReg = JSON.parse(fs.readFileSync(regPath));
+    } catch (e) {
+      // no registry for testing, probably busted package
+    }
+  }
   var commandRun = {};
-  _commander.program.option('--').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')
+  _commander.program.option('--').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('--name <char>', 'name of the project/web component').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')
 
   // options for webcomponent
   .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('--name <char>', 'name of the project').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(await HAXCMS.getHAXCMSVersion()).helpCommand(true);
 
   // default command which runs interactively
   _commander.program.command('start').description('Select which hax sub-program to run').action(() => {
@@ -68,19 +77,24 @@ async function main() {
     _commander.program.option(`--${(0, _utils.camelToDash)(siteNodeOps[i].value)} <char>`, `${siteNodeOps[i].label}`);
     siteProg.option(`--${(0, _utils.camelToDash)(siteNodeOps[i].value)} <char>`, `${siteNodeOps[i].label}`);
   }
+
   // webcomponent program
-  _commander.program.command('webcomponent').description('Create Lit based web components, with HAX recommendations').argument('[name]', 'name of the project').action(name => {
+  let strWebcomponentActions = '';
+  (0, _webcomponent.webcomponentActions)().forEach(action => {
+    strWebcomponentActions += `${action.value} - ${action.label}` + "\n\r";
+  });
+  _commander.program.command('wc').alias('webcomponent').description('Create Lit based web components, with HAX recommendations').argument('[action]', 'Actions to perform on web component include:' + "\n\r" + strWebcomponentActions).action(action => {
     commandRun = {
       command: 'webcomponent',
       arguments: {},
       options: {}
     };
     // if name set, populate
-    if (name) {
-      commandRun.arguments.name = name;
+    if (action) {
+      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('--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(await HAXCMS.getHAXCMSVersion());
 
   // audit program
   _commander.program.command('audit').description('Audits web components for compliance with DDD (HAX design system)').action(() => {
@@ -283,14 +297,8 @@ async function main() {
       activeProject = project.type;
       // silly but this way we don't have to take options for quitting
       if (project.type !== 'quit') {
-        // also silly temp spot
-        let themes = await (0, _site.siteThemeList)();
-        const custom = {
-          value: 'custom-theme',
-          label: 'Create Custom Theme'
-        };
-        // Append custom option to list of core themes
-        themes.push(custom);
+        // global spot for core themes list
+        let coreThemes = await (0, _site.siteThemeList)(true);
         project = await p.group({
           type: ({
             results
@@ -322,7 +330,7 @@ async function main() {
           name: ({
             results
           }) => {
-            if (!commandRun.arguments.action && !commandRun.arguments.name) {
+            if (!commandRun.arguments.action) {
               let placeholder = "mysite";
               let message = "Site name:";
               if (commandRun.command === "webcomponent" || results.type === "webcomponent") {
@@ -337,15 +345,22 @@ async function main() {
                   if (!value) {
                     return "Name is required (tab writes default)";
                   }
+                  if (value.toLocaleLowerCase() !== value) {
+                    return "Name must be lowercase";
+                  }
                   if (/^\d/.test(value)) {
                     return "Name cannot start with a number";
                   }
                   if (value.indexOf(' ') !== -1) {
-                    return "No spaces allowed in project name";
+                    return "No spaces allowed in name";
                   }
-                  if (results.type === "webcomponent" && value.indexOf('-') === -1 && value.indexOf('-') !== 0 && value.indexOf('-') !== value.length - 1) {
+                  if (results.type === "webcomponent" && (value.indexOf('-') === -1 || value.replace('--', '') !== value || value[0] === '-' || value[value.length - 1] === '-')) {
                     return "Name must include at least one `-` and must not start or end name.";
                   }
+                  // test that this is not an existing element we use in the registry
+                  if (results.type === "webcomponent" && wcReg[value]) {
+                    return "Name is already a web component in the wc-registry published for HAX.";
+                  }
                   // assumes auto was selected in CLI
                   let joint = process.cwd();
                   if (commandRun.options.path) {
@@ -359,6 +374,44 @@ async function main() {
                 }
               });
             }
+            if (commandRun.arguments.action) {
+              let value = commandRun.arguments.action;
+              if (!value) {
+                _commander.program.error(_picocolors.default.red("Name is required (tab writes default)"));
+                process.exit(1);
+              }
+              if (value.toLocaleLowerCase() !== value) {
+                _commander.program.error(_picocolors.default.red("Name must be lowercase"));
+                process.exit(1);
+              }
+              if (/^\d/.test(value)) {
+                _commander.program.error(_picocolors.default.red("Name cannot start with a number"));
+              }
+              if (value.indexOf(' ') !== -1) {
+                _commander.program.error(_picocolors.default.red("No spaces allowed in name"));
+                process.exit(1);
+              }
+              if (results.type === "webcomponent" && (value.indexOf('-') === -1 || value.replace('--', '') !== value || value[0] === '-' || value[value.length - 1] === '-')) {
+                _commander.program.error(_picocolors.default.red("Name must include at least one `-` and must not start or end name."));
+                process.exit(1);
+              }
+              // test that this is not an existing element we use in the registry
+              if (results.type === "webcomponent" && wcReg[value]) {
+                _commander.program.error(_picocolors.default.red("Name is already a web component in the wc-registry published for HAX."));
+                process.exit(1);
+              }
+              // assumes auto was selected in CLI
+              let joint = process.cwd();
+              if (commandRun.options.path) {
+                joint = commandRun.options.path;
+              } else if (results.path) {
+                joint = results.path;
+              }
+              if (fs.existsSync(path.join(joint, value))) {
+                _commander.program.error(_picocolors.default.red(`${path.join(joint, value)} exists, rename this project`));
+                process.exit(1);
+              }
+            }
           },
           org: ({
             results
@@ -394,15 +447,20 @@ async function main() {
             if (results.type === "site" && !commandRun.options.theme) {
               // support having no theme but autoselecting
               if (commandRun.options.auto && commandRun.options.skip) {
-                commandRun.options.theme = themes[0].value;
+                commandRun.options.theme = coreThemes[0].value;
               } else {
                 return p.select({
                   message: "Theme:",
                   required: false,
-                  options: themes,
-                  initialValue: themes[0]
+                  options: coreThemes,
+                  initialValue: coreThemes[0]
                 });
               }
+            } else if (results.type === "site" && commandRun.options.theme) {
+              if (coreThemes.filter(item => item.value === commandRun.options.theme).length === 0) {
+                _commander.program.error(_picocolors.default.red('Theme is not in the list of valid themes'));
+                process.exit(1);
+              }
             }
           },
           customThemeName: async ({
@@ -411,13 +469,13 @@ async function main() {
             if (results.theme === "custom-theme") {
               let tmpCustomName = await p.text({
                 message: 'Theme Name:',
-                placeholder: `${results.name}`,
+                placeholder: `custom-${commandRun.arguments.action ? commandRun.arguments.action : results.name}-theme`,
                 required: false,
                 validate: value => {
                   if (!value) {
                     return "Theme name is required (tab writes default)";
                   }
-                  if (themes.some(theme => theme.value === value)) {
+                  if (coreThemes.some(theme => theme.value === value)) {
                     return "Theme name is already in use";
                   }
                   if (/^\d/.test(value)) {
@@ -432,6 +490,24 @@ async function main() {
                 }
               });
               return tmpCustomName;
+            } else if (results.type === "site") {
+              // need to validate theme from CLI arguments
+              let value = `${commandRun.options.customThemeName ? commandRun.options.customThemeName : results.name ? results.name : commandRun.arguments.action}`;
+              if (!value) {
+                _commander.program.error(_picocolors.default.red("Theme name is required (tab writes default)"));
+              }
+              if (coreThemes.some(theme => theme.value === value)) {
+                _commander.program.error(_picocolors.default.red("Theme name is already in use"));
+              }
+              if (/^\d/.test(value)) {
+                _commander.program.error(_picocolors.default.red("Theme name cannot start with a number"));
+              }
+              if (/[A-Z]/.test(value)) {
+                _commander.program.error(_picocolors.default.red("No uppercase letters allowed in theme name"));
+              }
+              if (value.indexOf(' ') !== -1) {
+                _commander.program.error(_picocolors.default.red("No spaces allowed in theme name"));
+              }
             }
           },
           customThemeTemplate: ({
@@ -508,7 +584,7 @@ async function main() {
         });
         // merge cli options with project options assume this is NOT a monorepo
         // but spread will overwrite if needed
-        if (commandRun.command === 'webcomponent' && !commandRun.arguments.name) {
+        if (commandRun.command === 'webcomponent' && !commandRun.arguments.action) {
           project = {
             isMonorepo: false,
             ...project,
@@ -524,16 +600,22 @@ async function main() {
         }
         project.year = new Date().getFullYear();
         project.version = await HAXCMS.getHAXCMSVersion();
+        if (!project.name && commandRun.arguments.action) {
+          project.name = commandRun.arguments.action;
+        }
+
         // resolve site vs multi-site
         switch (project.type) {
           case 'site':
-            if (!project.name && commandRun.arguments.action) {
-              project.name = commandRun.arguments.action;
+            // only set path if not already set, normalize across clack and commander
+            if (commandRun.options.path && !project.path) {
+              project.path = commandRun.options.path;
+            }
+            if (!project.path) {
+              project.path = process.cwd();
             }
-            // only set path if not already set
             if (!commandRun.options.path) {
-              commandRun.options.path = process.cwd();
-              project.path = commandRun.options.path;
+              commandRun.options.path = project.path;
             }
             await (0, _site.siteProcess)(commandRun, project);
             break;

package/dist/lib/programs/audit.js

@@ -8,9 +8,12 @@ var _nodeFs = require("node:fs");
 var _nodePath = _interopRequireDefault(require("node:path"));
 var _picocolors = _interopRequireDefault(require("picocolors"));
 var p = _interopRequireWildcard(require("@clack/prompts"));
+var _commander = require("commander");
 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; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+let checksPassed = true;
+
 /**
  * @description Runs the audit command, to be called when `hax audit` command is run
  */
@@ -28,6 +31,7 @@ function auditCommandDetected(commandRun) {
     
     📘 For more information about DDD variables and capabilities: ${_picocolors.default.underline(_picocolors.default.cyan(`https://haxtheweb.org/documentation/ddd`))}
   `);
+  returnCode();
 }
 
 /**
@@ -258,11 +262,24 @@ function auditFile(fileLocation, fileName) {
   });
   if (data.length !== 0) {
     console.table(data);
+    checksPassed = false;
   } else {
     p.note("No changes needed!");
   }
 }
 
+/**
+ * @description returns code for automation purposes. 0 = compliant, 1 = not compliant
+ */
+function returnCode() {
+  if (!checksPassed) {
+    // Not-compliant
+    _commander.program.error(_picocolors.default.red("Component not compliant with DDD"));
+    process.exit(1);
+  }
+  process.exit(0); // Compliant
+}
+
 // ! Audit Helpers
 
 /**

package/dist/lib/programs/site.js

@@ -588,7 +588,7 @@ async function siteCommandDetected(commandRun) {
                 // these have fixed possible values
                 else if (['parent', 'theme'].includes(nodeProp)) {
                   let l = nodeProp === 'parent' ? "-- no parent --" : "-- no theme --";
-                  let list = nodeProp === 'parent' ? await siteItemsOptionsList(activeHaxsite, page.id) : await siteThemeList();
+                  let list = nodeProp === 'parent' ? await siteItemsOptionsList(activeHaxsite, page.id) : await siteThemeList(true);
                   propValue = await p.select({
                     message: `${nodeProp}:`,
                     defaultValue: val,
@@ -744,8 +744,8 @@ async function siteCommandDetected(commandRun) {
       case "site:theme":
         try {
           //theme
-          let list = await siteThemeList();
           activeHaxsite = await hax.systemStructureContext();
+          let list = await siteThemeList(true, activeHaxsite.directory);
           let val = activeHaxsite.manifest.metadata.theme.element;
           if (!commandRun.options.theme) {
             commandRun.options.theme = await p.select({
@@ -755,11 +755,71 @@ async function siteCommandDetected(commandRun) {
               options: list
             });
           }
+          if (commandRun.options.theme === "custom-theme") {
+            if (!commandRun.options.customThemeName) {
+              commandRun.options.customThemeName = await p.text({
+                message: 'Theme Name:',
+                placeholder: `custom-${activeHaxsite.name}-theme`,
+                required: false,
+                validate: value => {
+                  if (!value) {
+                    return "Theme name is required (tab writes default)";
+                  }
+                  if (list.some(theme => theme.value === value)) {
+                    return "Theme name is already in use";
+                  }
+                  if (/^\d/.test(value)) {
+                    return "Theme name cannot start with a number";
+                  }
+                  if (/[A-Z]/.test(value)) {
+                    return "No uppercase letters allowed in theme name";
+                  }
+                  if (value.indexOf(' ') !== -1) {
+                    return "No spaces allowed in theme name";
+                  }
+                }
+              });
+            }
+            if (!commandRun.options.customThemeTemplate) {
+              const options = [{
+                value: 'base',
+                label: 'Vanilla Theme with Hearty Documentation'
+              }, {
+                value: 'polaris-flex',
+                label: 'Minimalist Theme with Horizontal Nav'
+              }, {
+                value: 'polaris-sidebar',
+                label: 'Content-Focused Theme with Flexible Sidebar'
+              }];
+              commandRun.options.customThemeTemplate = await p.select({
+                message: 'Template:',
+                required: false,
+                options: options,
+                initialValue: options[0]
+              });
+            }
+          }
           let themes = await HAXCMS.getThemes();
-          if (themes && commandRun.options.theme && themes[commandRun.options.theme]) {
-            activeHaxsite.manifest.metadata.theme = themes[commandRun.options.theme];
-            activeHaxsite.manifest.save(false);
-            recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
+          if (themes && commandRun.options.theme) {
+            if (themes[commandRun.options.theme]) {
+              activeHaxsite.manifest.metadata.theme = themes[commandRun.options.theme];
+              activeHaxsite.manifest.save(false);
+              recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
+            } else if (commandRun.options.theme === "custom-theme") {
+              commandRun.options.name = activeHaxsite.name;
+              commandRun.options.directory = activeHaxsite.directory;
+              // temporary for proof of concept
+              commandRun.options.npmClient = 'npm';
+              await customSiteTheme(commandRun, {});
+            } else if (!themes[commandRun.options.theme]) {
+              let themeObj = {
+                element: commandRun.options.theme,
+                path: "./custom/build/custom.es6.js",
+                name: (0, _utils.dashToCamel)(commandRun.options.theme)
+              };
+              activeHaxsite.manifest.metadata.theme = themeObj;
+              activeHaxsite.manifest.save(false);
+            }
           }
         } catch (e) {
           (0, _logging.log)(e.stderr);
@@ -1197,6 +1257,9 @@ async function siteProcess(commandRun, project, port = '3000') {
   });
   // matching the common object elsewhere tho different reference in this command since it creates from nothing
   // capture this if use input on the fly
+  if (!commandRun.arguments.action) {
+    commandRun.arguments.action = project.name;
+  }
   commandRun.options.theme = project.theme;
   recipe.log(siteLoggingName, (0, _logging.commandString)(commandRun));
   if (commandRun.options.v) {
@@ -1222,6 +1285,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')) {
@@ -1269,14 +1342,53 @@ async function siteItemsOptionsList(activeHaxsite, skipId = null) {
   }
   return optionItems;
 }
-async function siteThemeList() {
-  let themes = await HAXCMS.getThemes();
+async function siteThemeList(coreOnly = true, directory = null) {
   let items = [];
-  for (var i in themes) {
-    items.push({
-      value: i,
-      label: themes[i].name
-    });
+  if (coreOnly) {
+    items = [{
+      value: 'clean-one',
+      label: 'Clean One'
+    }, {
+      value: 'clean-two',
+      label: 'Clean Two'
+    }, {
+      value: 'clean-portfolio-theme',
+      label: 'Clean Portfolio'
+    }, {
+      value: 'haxor-slevin',
+      label: 'Haxor Blog'
+    }, {
+      value: 'polaris-flex-theme',
+      label: 'Polaris - Flex'
+    }, {
+      value: 'polaris-flex-sidebar',
+      label: 'Polaris - Flex Sidebar'
+    }, {
+      value: 'polaris-invent-theme',
+      label: 'Polaris - Invent'
+    }, {
+      value: 'custom-theme',
+      label: 'Create Custom Theme'
+    }];
+    if (fs.existsSync(`${directory}/custom/custom-elements.json`)) {
+      let customThemeArray = JSON.parse(fs.readFileSync(`${directory}/custom/custom-elements.json`, 'utf8')).modules;
+      for (var i in customThemeArray) {
+        if (customThemeArray[i].declarations[0].superclass.name === "PolarisFlexTheme" || customThemeArray[i].declarations[0].superclass.name === "HAXCMSLitElementTheme") {
+          items.push({
+            value: customThemeArray[i].declarations[0].tagName,
+            label: customThemeArray[i].declarations[0].name
+          });
+        }
+      }
+    }
+  } else {
+    let themes = await HAXCMS.getThemes();
+    for (var i in themes) {
+      items.push({
+        value: i,
+        label: themes[i].name
+      });
+    }
   }
   return items;
 }
@@ -1287,7 +1399,7 @@ async function customSiteTheme(commandRun, project) {
   // validate start and end tags for theme name
   if (/^custom/.test(project.customThemeName) && !/^custom-/.test(project.customThemeName)) {
     project.customThemeName = project.customThemeName.replace(/^custom/, "custom-");
-  } else if (!/^custom-/.test(project.className)) {
+  } else if (!/^custom-/.test(project.customThemeName)) {
     project.customThemeName = `custom-${project.customThemeName}`;
   }
   if (/theme$/.test(project.customThemeName) && !/-theme$/.test(project.customThemeName)) {
@@ -1300,10 +1412,30 @@ async function customSiteTheme(commandRun, project) {
   project.className = (0, _utils.dashToCamel)(project.customThemeName);
 
   // path to hax site
-  var sitePath = `${project.path}/${commandRun.options.name ? commandRun.options.name : project.name}`;
+  var sitePath;
+  if (!commandRun.options.directory) {
+    sitePath = `${commandRun.options.path ? commandRun.options.path : project.path}/${commandRun.options.name ? commandRun.options.name : project.name}`;
+  } else {
+    // existing sites
+    sitePath = commandRun.options.directory;
+  }
 
   // path to new theme file
   const filePath = `${sitePath}/custom/src/${project.customThemeName}.js`;
+  if (!project.year) {
+    project.year = new Date().getFullYear();
+  }
+  if (!project.author) {
+    try {
+      let value = await exec(`git config user.name`);
+      project.author = value.stdout.trim();
+    } catch (e) {
+      (0, _logging.log)(`
+          git user name not configured. Run the following to do this:\n
+          git config --global user.name "namehere"\n
+          git config --global user.email "email@here`, 'debug');
+    }
+  }
 
   // theme template to use
   const themeTemplate = commandRun.options.customThemeTemplate ? commandRun.options.customThemeTemplate : project.customThemeTemplate;
@@ -1338,14 +1470,14 @@ async function customSiteTheme(commandRun, project) {
   // add theme to site.json
   let themeObj = {
     element: project.customThemeName,
-    path: filePath,
+    path: "./custom/build/custom.es6.js",
     name: project.className
   };
   activeHaxsite.manifest.metadata.theme = themeObj;
   activeHaxsite.manifest.save(false);
 
   // install and build theme dependencies
-  await exec(`cd ${sitePath}/custom/ && ${commandRun.options.npmClient} install && ${commandRun.options.npmClient} run build && cd ${sitePath}`);
+  await exec(`cd ${sitePath}/custom/ && ${commandRun.options.npmClient} install && ${commandRun.options.npmClient} run build && ${commandRun.options.npmClient} run analyze && cd ${sitePath}`);
 }
 
 // @fork of the hax core util for this so that we avoid api difference between real dom and parse nodejs dom