feat: add html head options to CLI (#33)

* feat: add html head options to CLI * chore: update cleanup cli options * chore: cleanup cli options before using it * chore: remove breaking change
vite-pwa · Jan 13, 2024 · e9b15d3 · e9b15d3
1 parent 1c889f5
commit e9b15d3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/src/api/instructions-resolver.ts b/src/api/instructions-resolver.ts
@@ -93,14 +93,15 @@ async function resolvePreset(
   preset: BuiltInPreset | Preset,
   faviconPreset?: HtmlLinkPreset,
 ): Promise<[preset: Preset, htmlLinkPreset: HtmlLinkPreset]> {
+  const htmlLinkPreset = faviconPreset ?? 'default'
   if (typeof preset === 'object')
-    return [preset, faviconPreset ?? 'default']
+    return [preset, htmlLinkPreset]
 
   switch (preset) {
     case 'minimal':
-      return [await import('../presets/minimal.ts').then(m => m.minimalPreset), 'default']
+      return [await import('../presets/minimal.ts').then(m => m.minimalPreset), htmlLinkPreset]
     case 'minimal-2023':
-      return [await import('../presets/minimal-2023.ts').then(m => m.minimal2023Preset), '2023']
+      return [await import('../presets/minimal-2023.ts').then(m => m.minimal2023Preset), faviconPreset ?? '2023']
     default:
       throw new Error(`Preset ${preset} not yet implemented`)
   }

diff --git a/src/cli-start.ts b/src/cli-start.ts
@@ -14,7 +14,7 @@ import { generateManifestIconsEntry } from './api/generate-manifest-icons-entry.
 
 interface CliOptions extends Omit<UserConfig, 'preset' | 'images'> {
   preset?: BuiltInPreset
-  headLinkOptions?: HeadLinkOptions
+  headLinkOptions?: Omit<HeadLinkOptions, 'resolveSvgName'>
   override?: boolean
   manifest?: boolean
 }
@@ -29,6 +29,7 @@ export async function startCli(args: string[] = process.argv) {
     .option('-p, --preset <preset-name>', 'Built-in preset name: minimal, android, windows, ios or all')
     .option('-o, --override', 'Override assets? Defaults to true')
     .option('-m, --manifest', 'Generate generate PWA web manifest icons entry? Defaults to true')
+    .option('--html [options]', 'Available options: --html.basePath <path>, --html.preset <preset>, --html.xhtml <false|true>, --html.includeId <false|true>')
     .help()
     .command(
       '[...images]',
@@ -38,11 +39,33 @@ export async function startCli(args: string[] = process.argv) {
   cli.parse(args)
 }
 
+function cleanupCliOptions(cliOptions: any) {
+  delete cliOptions['--']
+  delete cliOptions['r']
+  delete cliOptions['c']
+  delete cliOptions['p']
+  delete cliOptions['o']
+  delete cliOptions['m']
+  if (typeof cliOptions['html'] === 'object') {
+    cliOptions.headLinkOptions = { ...cliOptions['html'] }
+    if (typeof cliOptions.headLinkOptions.preset === 'number')
+      cliOptions.headLinkOptions.preset = `${cliOptions.headLinkOptions.preset}`
+    if (typeof cliOptions.headLinkOptions.xhtml === 'string')
+      cliOptions.headLinkOptions.xhtml = cliOptions.headLinkOptions.xhtml === 'true'
+    if (typeof cliOptions.headLinkOptions.includeId === 'string')
+      cliOptions.headLinkOptions.includeId = cliOptions.headLinkOptions.includeId === 'true'
+
+    delete cliOptions['html']
+  }
+}
+
 async function run(images: string[] = [], cliOptions: CliOptions = {}) {
   consola.log(green(`Zero Config PWA Assets Generator v${version}`))
   consola.start('Preparing to generate PWA assets...')
 
-  const root = cliOptions?.root ?? process.cwd()
+  cleanupCliOptions(cliOptions)
+
+  const root = cliOptions.root ?? process.cwd()
 
   const { config } = await loadConfig<UserConfig>(root, cliOptions)