Tweak html files

egoist · Nov 30, 2018 · 81b9e0b · 81b9e0b
1 parent 7607b5b
commit 81b9e0b
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 17 deletions.
diff --git a/core/poi/lib/index.js b/core/poi/lib/index.js
@@ -234,7 +234,8 @@ module.exports = class PoiCore {
       port,
       open,
       proxy,
-      fileNames
+      fileNames,
+      html
     } = this.cli.options
     return {
       entry: this.cli.args.length > 0 ? this.cli.args : undefined,
@@ -247,7 +248,8 @@ module.exports = class PoiCore {
         publicUrl,
         target,
         clean,
-        fileNames
+        fileNames,
+        html
       },
       parallel,
       cache,

diff --git a/core/poi/lib/plugins/command-options.js b/core/poi/lib/plugins/command-options.js
@@ -28,6 +28,7 @@ exports.apply = api => {
     command.option('--module-name <name>', 'Module name for "umd" format')
     command.option('--file-names <filenames>', 'Customize output filenames')
     command.option('--no-clean', `Don't clean output directory before bundling`)
+    command.option('--html <options>', 'Configure generated HTML file')
 
     if (api.isProd) {
       command.option('--no-minimize', 'Disable minimization')

diff --git a/core/poi/lib/plugins/config-html.js b/core/poi/lib/plugins/config-html.js
@@ -53,13 +53,12 @@ exports.apply = api => {
 
     const defaultHtmlOpts = {
       template: getDefaultTemplate(),
-      templateParameters: {
-        title: api.pkg.data.name || 'Poi App',
+      templateParameters: templateParametersGenerator({
         pkg: api.pkg.data,
         envs: api.webpackUtils.envs,
         constants: api.webpackUtils.constants
-      },
-      pkg: api.pkg.data,
+      }),
+      filename: 'index.html',
       minify: api.isProd
         ? {
             removeComments: true,
@@ -89,14 +88,8 @@ exports.apply = api => {
         page.template = api.resolveCwd(page.template)
         config.plugin(`html-page-${entryName}`).use(HtmlPlugin, [page])
       }
-    } else {
-      const page = merge(
-        defaultHtmlOpts,
-        {
-          filename: 'index.html'
-        },
-        api.config.html
-      )
+    } else if (api.config.html !== false) {
+      const page = merge(defaultHtmlOpts, api.config.html)
       page.template = api.resolveCwd(page.template)
       config.plugin('html').use(HtmlPlugin, [page])
     }
@@ -108,3 +101,34 @@ exports.apply = api => {
       ])
   })
 }
+
+function templateParametersGenerator(data) {
+  const { htmlTagObjectToString } = require('html-webpack-plugin/lib/html-tags')
+
+  return (compilation, assets, assetTags, options) => {
+    const { xhtml } = options
+    assetTags.headTags.toString = function() {
+      return this.map(assetTagObject =>
+        htmlTagObjectToString(assetTagObject, xhtml)
+      ).join('')
+    }
+    assetTags.bodyTags.toString = function() {
+      return this.map(assetTagObject =>
+        htmlTagObjectToString(assetTagObject, xhtml)
+      ).join('')
+    }
+    return Object.assign(
+      {
+        compilation,
+        webpackConfig: compilation.options,
+        htmlWebpackPlugin: {
+          tags: assetTags,
+          files: assets,
+          options
+        },
+        html: options
+      },
+      data
+    )
+  }
+}
diff --git a/core/poi/lib/utils/validateConfig.js b/core/poi/lib/utils/validateConfig.js
@@ -28,7 +28,8 @@ module.exports = (api, config) => {
           font: struct.optional('string'),
           image: struct.optional('string')
         })
-      )
+      ),
+      html: struct.optional('object')
     },
     {
       dir: 'dist',

diff --git a/core/poi/lib/webpack/default-template.html b/core/poi/lib/webpack/default-template.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title><%= title %></title>
+  <title><%= html.title %></title>
 
   <% if (pkg.description) { %>
     <meta name="description" content="<%= pkg.description %>">
@@ -13,7 +13,7 @@
 </head>
 <body>
   <noscript>
-    We're sorry but <%= title %> doesn't work properly without JavaScript enabled. Please enable it to continue.
+    We're sorry but <%= html.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.
   </noscript>
   <div id="app"></div>
 </body>