feat: expose an option for both cli and configFile to determine whether to enable minifyHtml (#109)

* feat: expose an option for both cli and config

* fix: cli flag

* improve vite-pages ssr options

* make minifyHtml default to true

* fix: make `--minifyHtml=false` to be treated as boolean false instead of string "false"

Co-authored-by: csr632 <[email protected]>

Author: cijiugechu

packages/react-pages/src/node/cli.ts

@@ -3,8 +3,10 @@ import fs from 'fs-extra'
 import minimist from 'minimist'
 import path from 'node:path'
 import { resolveConfig } from 'vite'
+import type { InlineConfig } from 'vite'
 import { PKG_ROOT } from './constants'
 import { ssrBuild } from './static-site-generation'
+import type { staticSiteGenerationConfig } from './types'
 
 const argv: any = minimist(process.argv.slice(2))
 
@@ -17,34 +19,46 @@ console.log(
 )
 // console.log(chalk.cyan(`vite v${require('vite/package.json').version}`))
 
-// cli usage: vite-pages ssr [root] [vite config like --outDir or --configFile]
+// cli usage: vite-pages ssr [root] [--minifyHtml] [vite options like: --configFile, --base, --logLevel, --mode, --build.outDir, etc.]
 const [command, root] = argv._
 if (root) {
   argv.root = root
 }
 
+// make `--minifyHtml=false` to be treated as boolean false instead of string "false"
+Object.entries(argv).forEach(([key, value]) => {
+  if (value === 'false') argv[key] = false
+})
+
+// console.log('@@argv', argv)
 ;(async () => {
   if (!command || command === 'ssr') {
+    const toBeResovledConfig: InlineConfig = {
+      ...argv,
+    }
+
     // user can pass in vite config like --outDir or --configFile
     const viteConfig = await resolveConfig(
-      argv,
+      toBeResovledConfig,
       'build',
       'production',
       'production'
     )
     const thisPlugin = viteConfig.plugins.find((plugin) => {
       return plugin.name === 'vite-plugin-react-pages'
     })
-    // @ts-expect-error
-    const ssrConfig = thisPlugin?.vitePagesStaticSiteGeneration
+    //@ts-expect-error
+    const ssrConfig = thisPlugin?.vitePagesStaticSiteGeneration as
+      | staticSiteGenerationConfig
+      | undefined
 
-    await ssrBuild(viteConfig, ssrConfig, argv).catch((err: any) => {
+    await ssrBuild(viteConfig, argv, ssrConfig).catch((err: any) => {
       console.error(chalk.red(`ssr error:\n`), err)
       process.exit(1)
     })
   } else {
     console.error(
-      `[vite-pages] Invalid command. CLI usage: vite-pages ssr [root] [vite config like --outDir or --configFile]`
+      `[vite-pages] Invalid command. CLI usage: vite-pages ssr [root] [--minifyHtml] [vite options like: --configFile, --base, --logLevel, --mode, --build.outDir, etc.]`
     )
   }
 })()

packages/react-pages/src/node/index.ts

@@ -2,6 +2,7 @@ import * as path from 'path'
 import type { PluggableList } from 'unified'
 import type { Plugin, IndexHtmlTransformContext } from 'vite'
 import type { OutputPlugin } from 'rollup'
+import type { staticSiteGenerationConfig } from './types'
 
 import {
   DefaultPageStrategy,
@@ -52,7 +53,7 @@ export interface PluginConfig {
   pagesDir?: string
   pageStrategy?: PageStrategy
   useHashRouter?: boolean
-  staticSiteGeneration?: {}
+  staticSiteGeneration?: staticSiteGenerationConfig
 }
 
 function pluginFactory(opts: PluginConfig = {}): Plugin {

packages/react-pages/src/node/static-site-generation/index.ts

@@ -8,6 +8,7 @@ import { pathToFileURL } from 'node:url'
 
 import { CLIENT_PATH } from '../constants'
 import type { SSRPlugin } from '../../../clientTypes'
+import type { staticSiteGenerationConfig } from '../types'
 
 const minifyOptions = {
   keepClosingSlash: true,
@@ -19,8 +20,8 @@ const minifyOptions = {
 
 export async function ssrBuild(
   viteConfig: ResolvedConfig,
-  ssrConfig: any,
-  argv: any
+  argv: any,
+  ssrConfig?: staticSiteGenerationConfig
 ) {
   // ssr build should not use hash router
   // if (viteOptions?.define?.['__HASH_ROUTER__'])
@@ -222,9 +223,13 @@ ${CSSInjectPoint}`
       `<script type="module" src="${basePath}${entryChunk.fileName}"></script>`
     )
 
-    const minifiedHtml = await minify(html, minifyOptions)
+    const minifyHtml = argv?.minifyHtml ?? ssrConfig?.minifyHtml ?? true
+    if (minifyHtml) {
+      const minifiedHtml = await minify(html, minifyOptions)
+      return minifiedHtml
+    }
 
-    return minifiedHtml
+    return html
   }
 }
 

packages/react-pages/src/node/types.ts

@@ -0,0 +1,6 @@
+export interface staticSiteGenerationConfig {
+  /**
+   * @default true
+   */
+  readonly minifyHtml?: boolean
+}