From 2663c1d4a5a324175af3e4f917ca65b145a8252f Mon Sep 17 00:00:00 2001
From: "Juan J. Jimenez Anca" <cortopy@users.noreply.github.com>
Date: Mon, 29 Jul 2019 20:59:13 +0100
Subject: [PATCH] extract render-html-plugin

---
 packages/cli-util/index.js                    |  36 +++++
 packages/cli-util/package.json                |  19 +++
 packages/{cli/lib => cli-util}/symbols.js     |   0
 .../webpack/create-load-manifest.js           |   0
 packages/cli/lib/commands/build.js            |   2 +-
 packages/cli/lib/commands/create.js           |   2 +-
 packages/cli/lib/commands/list.js             |   2 +-
 packages/cli/lib/commands/watch.js            |   2 +-
 packages/cli/lib/index.js                     |   2 +-
 packages/cli/lib/lib/setup.js                 |   2 +-
 packages/cli/lib/lib/webpack/push-manifest.js |   2 +-
 .../cli/lib/lib/webpack/render-html-plugin.js | 106 ---------------
 packages/cli/lib/lib/webpack/run-webpack.js   |   2 +-
 packages/cli/lib/lib/webpack/sw-plugin.js     |   2 +-
 .../cli/lib/lib/webpack/transform-config.js   |   2 +-
 .../lib/lib/webpack/webpack-client-config.js  |   6 +-
 packages/cli/lib/util.js                      |  36 -----
 packages/cli/package.json                     |   7 +-
 packages/render-html/index.js                 | 128 ++++++++++++++++++
 packages/render-html/package.json             |  20 +++
 .../lib/webpack => render-html}/prerender.js  |   0
 packages/render-html/resources/favicon.ico    | Bin 0 -> 15086 bytes
 packages/render-html/resources/template.ejs   |  42 ++++++
 23 files changed, 261 insertions(+), 159 deletions(-)
 create mode 100644 packages/cli-util/index.js
 create mode 100644 packages/cli-util/package.json
 rename packages/{cli/lib => cli-util}/symbols.js (100%)
 rename packages/{cli/lib/lib => cli-util}/webpack/create-load-manifest.js (100%)
 delete mode 100644 packages/cli/lib/lib/webpack/render-html-plugin.js
 delete mode 100644 packages/cli/lib/util.js
 create mode 100644 packages/render-html/index.js
 create mode 100644 packages/render-html/package.json
 rename packages/{cli/lib/lib/webpack => render-html}/prerender.js (100%)
 create mode 100644 packages/render-html/resources/favicon.ico
 create mode 100644 packages/render-html/resources/template.ejs

diff --git a/packages/cli-util/index.js b/packages/cli-util/index.js
new file mode 100644
index 000000000..16693715c
--- /dev/null
+++ b/packages/cli-util/index.js
@@ -0,0 +1,36 @@
+const { blue, yellow, red } = require("kleur");
+const { normalize } = require("path");
+const { statSync, existsSync } = require("fs");
+const symbols = require("./symbols");
+const which = require("which");
+
+exports.isDir = function(str) {
+  return existsSync(str) && statSync(str).isDirectory();
+};
+
+exports.hasCommand = function(str) {
+  return !!which.sync(str, { nothrow: true });
+};
+
+exports.trim = function(str) {
+  return str.trim().replace(/^\t+/gm, "");
+};
+
+exports.info = function(text, code) {
+  process.stderr.write(symbols.info + blue(" INFO ") + text + "\n");
+  code && process.exit(code);
+};
+
+exports.warn = function(text, code) {
+  process.stdout.write(symbols.warning + yellow(" WARN ") + text + "\n");
+  code && process.exit(code);
+};
+
+exports.error = function(text, code) {
+  process.stderr.write(symbols.error + red(" ERROR ") + text + "\n");
+  code && process.exit(code);
+};
+
+exports.normalizePath = function(str) {
+  return normalize(str).replace(/\\/g, "/");
+};
diff --git a/packages/cli-util/package.json b/packages/cli-util/package.json
new file mode 100644
index 000000000..e60667954
--- /dev/null
+++ b/packages/cli-util/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@preact/cli-util",
+  "version": "3.0.0-rc.5",
+  "description": "Preact-cli's util library",
+  "main": "index.js",
+  "files": [
+    "*.js"
+  ],
+  "engines": {
+    "node": ">=6"
+  },
+  "dependencies": {
+    "kleur": "^3.0.3",
+    "which": "^1.2.14"
+  },
+  "peerDependencies": {
+    "preact": "^8.1.0"
+  }
+}
diff --git a/packages/cli/lib/symbols.js b/packages/cli-util/symbols.js
similarity index 100%
rename from packages/cli/lib/symbols.js
rename to packages/cli-util/symbols.js
diff --git a/packages/cli/lib/lib/webpack/create-load-manifest.js b/packages/cli-util/webpack/create-load-manifest.js
similarity index 100%
rename from packages/cli/lib/lib/webpack/create-load-manifest.js
rename to packages/cli-util/webpack/create-load-manifest.js
diff --git a/packages/cli/lib/commands/build.js b/packages/cli/lib/commands/build.js
index ac4e5c8f0..93633694c 100644
--- a/packages/cli/lib/commands/build.js
+++ b/packages/cli/lib/commands/build.js
@@ -1,7 +1,7 @@
 const rimraf = require('rimraf');
 const { resolve } = require('path');
 const { promisify } = require('util');
-const { isDir, error, warn } = require('../util');
+const { isDir, error, warn } = require('@preact/cli-util');
 const runWebpack = require('../lib/webpack/run-webpack');
 
 const toBool = val => val === void 0 || (val === 'false' ? false : val);
diff --git a/packages/cli/lib/commands/create.js b/packages/cli/lib/commands/create.js
index 25ac8eb37..15400e511 100644
--- a/packages/cli/lib/commands/create.js
+++ b/packages/cli/lib/commands/create.js
@@ -7,7 +7,7 @@ const { green } = require('kleur');
 const { resolve, join } = require('path');
 const { prompt } = require('prompts');
 const isValidName = require('validate-npm-package-name');
-const { info, isDir, hasCommand, error, trim, warn } = require('../util');
+const { info, isDir, hasCommand, error, trim, warn } = require('@preact/cli-util');
 const { addScripts, install, initGit, isMissing } = require('../lib/setup');
 
 const ORG = 'preactjs-templates';
diff --git a/packages/cli/lib/commands/list.js b/packages/cli/lib/commands/list.js
index 2346c5f23..e311df72e 100644
--- a/packages/cli/lib/commands/list.js
+++ b/packages/cli/lib/commands/list.js
@@ -1,6 +1,6 @@
 const fetch = require('isomorphic-unfetch');
 const { bold, magenta } = require('kleur');
-const { error, info } = require('../util');
+const { error, info } = require('@preact/cli-util');
 
 const REPOS_URL = 'https://api.github.com/users/preactjs-templates/repos';
 
diff --git a/packages/cli/lib/commands/watch.js b/packages/cli/lib/commands/watch.js
index 226cde090..6ef4f200f 100644
--- a/packages/cli/lib/commands/watch.js
+++ b/packages/cli/lib/commands/watch.js
@@ -1,5 +1,5 @@
 const runWebpack = require('../lib/webpack/run-webpack');
-const { warn } = require('../util');
+const { warn } = require('@preact/cli-util');
 
 module.exports = async function(src, argv) {
 	argv.src = src || argv.src;
diff --git a/packages/cli/lib/index.js b/packages/cli/lib/index.js
index d651be2bb..d33dea4c4 100755
--- a/packages/cli/lib/index.js
+++ b/packages/cli/lib/index.js
@@ -2,7 +2,7 @@
 const envinfo = require('envinfo');
 const sade = require('sade');
 const notifier = require('update-notifier');
-const { error } = require('./util');
+const { error } = require('@preact/cli-util');
 const pkg = require('../package');
 
 const ver = process.version;
diff --git a/packages/cli/lib/lib/setup.js b/packages/cli/lib/lib/setup.js
index 475e9c555..64a3a6bd3 100644
--- a/packages/cli/lib/lib/setup.js
+++ b/packages/cli/lib/lib/setup.js
@@ -1,5 +1,5 @@
 const spawn = require('cross-spawn-promise');
-const { hasCommand, warn } = require('../util');
+const { hasCommand, warn } = require('@preact/cli-util');
 
 const stdio = 'ignore';
 
diff --git a/packages/cli/lib/lib/webpack/push-manifest.js b/packages/cli/lib/lib/webpack/push-manifest.js
index 968864432..a14504752 100644
--- a/packages/cli/lib/lib/webpack/push-manifest.js
+++ b/packages/cli/lib/lib/webpack/push-manifest.js
@@ -1,4 +1,4 @@
-const createLoadManifest = require('./create-load-manifest');
+const createLoadManifest = require('@preact/cli-util/webpack/create-load-manifest');
 
 module.exports = class PushManifestPlugin {
 	constructor(env = {}) {
diff --git a/packages/cli/lib/lib/webpack/render-html-plugin.js b/packages/cli/lib/lib/webpack/render-html-plugin.js
deleted file mode 100644
index 7a54bb093..000000000
--- a/packages/cli/lib/lib/webpack/render-html-plugin.js
+++ /dev/null
@@ -1,106 +0,0 @@
-const { resolve } = require('path');
-const { existsSync } = require('fs');
-const HtmlWebpackExcludeAssetsPlugin = require('html-webpack-exclude-assets-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const prerender = require('./prerender');
-const createLoadManifest = require('./create-load-manifest');
-const { warn } = require('../../util');
-const { info } = require('../../util');
-let template = resolve(__dirname, '../../resources/template.html');
-
-module.exports = async function(config) {
-	const { cwd, dest, isProd, src } = config;
-	const inProjectTemplatePath = resolve(src, 'template.html');
-	if (existsSync(inProjectTemplatePath)) {
-		template = inProjectTemplatePath;
-	}
-	const htmlWebpackConfig = values => {
-		const { url, title, ...routeData } = values;
-		return Object.assign(values, {
-			filename: resolve(dest, url.substring(1), 'index.html'),
-			template: `!!ejs-loader!${config.template || template}`,
-			minify: isProd && {
-				collapseWhitespace: true,
-				removeScriptTypeAttributes: true,
-				removeRedundantAttributes: true,
-				removeStyleLinkTypeAttributes: true,
-				removeComments: true,
-			},
-			favicon: existsSync(resolve(src, 'assets/favicon.ico'))
-				? 'assets/favicon.ico'
-				: '',
-			inject: true,
-			compile: true,
-			inlineCss: config['inline-css'],
-			preload: config.preload,
-			manifest: config.manifest,
-			title:
-				title ||
-				config.title ||
-				config.manifest.name ||
-				config.manifest.short_name ||
-				(config.pkg.name || '').replace(/^@[a-z]\//, '') ||
-				'Preact App',
-			excludeAssets: [/(bundle|polyfills)(\..*)?\.js$/],
-			createLoadManifest: (assets, namedChunkGroups) => {
-				if (assets['push-manifest.json']) {
-					return JSON.parse(assets['push-manifest.json'].source());
-				}
-				return createLoadManifest(assets, config.esm, namedChunkGroups);
-			},
-			config,
-			url,
-			ssr() {
-				return config.prerender ? prerender({ cwd, dest, src }, values) : '';
-			},
-			scriptLoading: 'defer',
-			CLI_DATA: { preRenderData: { url, ...routeData } },
-		});
-	};
-
-	let pages = [{ url: '/' }];
-
-	if (config.prerenderUrls) {
-		if (existsSync(resolve(cwd, config.prerenderUrls))) {
-			try {
-				let result = require(resolve(cwd, config.prerenderUrls));
-				if (typeof result.default !== 'undefined') {
-					result = result.default();
-				}
-				if (typeof result === 'function') {
-					info(`Fetching URLs from ${config.prerenderUrls}`);
-					result = await result();
-					info(`Fetched URLs from ${config.prerenderUrls}`);
-				}
-				if (typeof result === 'string') {
-					result = JSON.parse(result);
-				}
-				if (result instanceof Array) {
-					pages = result;
-				}
-			} catch (error) {
-				warn(
-					`Failed to load prerenderUrls file, using default!\n${
-						config.verbose ? error.stack : error.message
-					}`
-				);
-			}
-			// don't warn if the default file doesn't exist
-		} else if (
-			config.prerenderUrls !== 'prerender-urls.json' ||
-			config.verbose
-		) {
-			warn(
-				`prerenderUrls file (${resolve(
-					cwd,
-					config.prerenderUrls
-				)}) doesn't exist, using default!`
-			);
-		}
-	}
-
-	return pages
-		.map(htmlWebpackConfig)
-		.map(conf => new HtmlWebpackPlugin(conf))
-		.concat([new HtmlWebpackExcludeAssetsPlugin()]);
-};
diff --git a/packages/cli/lib/lib/webpack/run-webpack.js b/packages/cli/lib/lib/webpack/run-webpack.js
index 525a0e5a4..5310da282 100644
--- a/packages/cli/lib/lib/webpack/run-webpack.js
+++ b/packages/cli/lib/lib/webpack/run-webpack.js
@@ -9,7 +9,7 @@ const DevServer = require('webpack-dev-server');
 const clientConfig = require('./webpack-client-config');
 const serverConfig = require('./webpack-server-config');
 const transformConfig = require('./transform-config');
-const { error, isDir, warn } = require('../../util');
+const { error, isDir, warn } = require('@preact/cli-util');
 
 async function devBuild(env) {
 	let config = await clientConfig(env);
diff --git a/packages/cli/lib/lib/webpack/sw-plugin.js b/packages/cli/lib/lib/webpack/sw-plugin.js
index 0e43e5752..b78158f6d 100644
--- a/packages/cli/lib/lib/webpack/sw-plugin.js
+++ b/packages/cli/lib/lib/webpack/sw-plugin.js
@@ -3,7 +3,7 @@ const BabelEsmPlugin = require('babel-esm-plugin');
 const { DefinePlugin } = require('webpack');
 const fs = require('fs');
 const { resolve } = require('path');
-const { info } = require('../../util');
+const { info } = require('@preact/cli-util');
 class SWBuilderPlugin {
 	constructor(config) {
 		const { src, brotli, esm } = config;
diff --git a/packages/cli/lib/lib/webpack/transform-config.js b/packages/cli/lib/lib/webpack/transform-config.js
index ac5a7ae54..1c26acc94 100644
--- a/packages/cli/lib/lib/webpack/transform-config.js
+++ b/packages/cli/lib/lib/webpack/transform-config.js
@@ -1,7 +1,7 @@
 const { resolve } = require('path');
 const webpack = require('webpack');
 const fs = require('../../fs');
-const { error } = require('../../util');
+const { error } = require('@preact/cli-util');
 
 const FILE = 'preact.config';
 const EXTENSIONS = ['js', 'json'];
diff --git a/packages/cli/lib/lib/webpack/webpack-client-config.js b/packages/cli/lib/lib/webpack/webpack-client-config.js
index fdceaa8d9..ad018d370 100644
--- a/packages/cli/lib/lib/webpack/webpack-client-config.js
+++ b/packages/cli/lib/lib/webpack/webpack-client-config.js
@@ -8,13 +8,13 @@ const TerserPlugin = require('terser-webpack-plugin');
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const CrittersPlugin = require('critters-webpack-plugin');
-const renderHTMLPlugin = require('./render-html-plugin');
+const renderHTMLPlugin = require('@preact/render-html-plugin');
 const PushManifestPlugin = require('./push-manifest');
 const baseConfig = require('./webpack-base-config');
 const BabelEsmPlugin = require('babel-esm-plugin');
 const { InjectManifest } = require('workbox-webpack-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
-const { normalizePath } = require('../../util');
+const { normalizePath } = require('@preact/cli-util');
 const SWBuilderPlugin = require('./sw-plugin');
 
 const cleanFilename = name =>
@@ -86,7 +86,7 @@ async function clientConfig(env) {
 
 		plugins: [
 			new PushManifestPlugin(env),
-			...(await renderHTMLPlugin(env)),
+			...(await renderHTMLPlugin({})(env)),
 			...getBabelEsmPlugin(env),
 			new CopyWebpackPlugin(
 				[
diff --git a/packages/cli/lib/util.js b/packages/cli/lib/util.js
deleted file mode 100644
index 555db47d6..000000000
--- a/packages/cli/lib/util.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const { blue, yellow, red } = require('kleur');
-const { normalize } = require('path');
-const { statSync, existsSync } = require('fs');
-const symbols = require('./symbols');
-const which = require('which');
-
-exports.isDir = function(str) {
-	return existsSync(str) && statSync(str).isDirectory();
-};
-
-exports.hasCommand = function(str) {
-	return !!which.sync(str, { nothrow: true });
-};
-
-exports.trim = function(str) {
-	return str.trim().replace(/^\t+/gm, '');
-};
-
-exports.info = function(text, code) {
-	process.stderr.write(symbols.info + blue(' INFO ') + text + '\n');
-	code && process.exit(code);
-};
-
-exports.warn = function(text, code) {
-	process.stdout.write(symbols.warning + yellow(' WARN ') + text + '\n');
-	code && process.exit(code);
-};
-
-exports.error = function(text, code) {
-	process.stderr.write(symbols.error + red(' ERROR ') + text + '\n');
-	code && process.exit(code);
-};
-
-exports.normalizePath = function(str) {
-	return normalize(str).replace(/\\/g, '/');
-};
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 932e9ec13..87aac9148 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -77,6 +77,8 @@
     "@babel/preset-env": "^7.5.5",
     "@babel/preset-typescript": "^7.3.3",
     "@preact/async-loader": "^3.0.0-rc.0",
+    "@preact/cli-util": "^3.0.0-rc.5",
+    "@preact/render-html-plugin": "^3.0.0-rc.5",
     "autoprefixer": "^9.6.0",
     "babel-esm-plugin": "^0.5.0",
     "babel-loader": "^8.0.6",
@@ -98,8 +100,6 @@
     "get-port": "^5.0.0",
     "gittar": "^0.1.0",
     "glob": "^7.1.4",
-    "html-webpack-exclude-assets-plugin": "0.0.7",
-    "html-webpack-plugin": "^3.2.0",
     "ip": "^1.1.5",
     "isomorphic-unfetch": "^3.0.0",
     "kleur": "^3.0.3",
@@ -133,8 +133,7 @@
     "webpack-dev-server": "^3.4.1",
     "webpack-fix-style-only-entries": "^0.3.0",
     "webpack-merge": "^4.1.0",
-    "webpack-plugin-replace": "^1.2.0",
-    "which": "^1.2.14",
+    "webpack-plugin-replace": "^1.2.0",    
     "workbox-webpack-plugin": "^4.3.1"
   }
 }
diff --git a/packages/render-html/index.js b/packages/render-html/index.js
new file mode 100644
index 000000000..59abcc03e
--- /dev/null
+++ b/packages/render-html/index.js
@@ -0,0 +1,128 @@
+const { resolve } = require('path');
+const { existsSync } = require('fs');
+const HtmlWebpackExcludeAssetsPlugin = require('html-webpack-exclude-assets-plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const createLoadManifest = require('@preact/cli-util/webpack/create-load-manifest');
+const { warn, info } = require('@preact/cli-util');
+
+const defaultConfig = {
+	template: 'template.html', // Template path from src
+	favicon: 'assets/favicon.ico', // Favicon path from src
+	prerender: './prerender', // path to the prerender function
+};
+
+module.exports = (config = {}) =>
+	async function(env) {
+		const { template, favicon, prerender } = {
+			...defaultConfig,
+			...config,
+		};
+		const { cwd, dest, isProd, src } = env;
+		let templatePath = [
+			...(env.template ? [[env.template], [src, env.template]] : []),
+			...(template ? [[template], [src, template]] : []),
+			[src, 'template.html'],
+		].find(xs => existsSync(resolve(...xs)));
+
+		if (templatePath) {
+			info(`Using custom template from ${resolve(...templatePath)}`);
+		} else if (env.template || config.template) {
+			warn(
+				`Unable to find supplied template path ${env.template ||
+					config.template}. Reverting to default template.`
+			);
+		}
+
+		templatePath = resolve(
+			...(templatePath ? templatePath : [__dirname, './resources/template.ejs'])
+		);
+
+		const htmlWebpackConfig = values => {
+			const { url, title, ...routeData } = values;
+			return Object.assign(values, {
+				filename: resolve(dest, url.substring(1), 'index.html'),
+				template: `!!ejs-loader!${templatePath}`,
+				minify: isProd && {
+					collapseWhitespace: true,
+					removeScriptTypeAttributes: true,
+					removeRedundantAttributes: true,
+					removeStyleLinkTypeAttributes: true,
+					removeComments: true,
+				},
+				favicon: existsSync(resolve(src, favicon))
+					? resolve(src, favicon)
+					: resolve(__dirname, './resources/favicon.ico'),
+				inject: true,
+				compile: true,
+				inlineCss: env['inline-css'],
+				preload: env.preload,
+				manifest: env.manifest,
+				title:
+					title ||
+					env.title ||
+					env.manifest.name ||
+					env.manifest.short_name ||
+					(env.pkg.name || '').replace(/^@[a-z]\//, '') ||
+					'Preact App',
+				excludeAssets: [/(bundle|polyfills)(\..*)?\.js$/],
+				createLoadManifest: (assets, namedChunkGroups) => {
+					if (assets['push-manifest.json']) {
+						return JSON.parse(assets['push-manifest.json'].source());
+					}
+					return createLoadManifest(assets, env.esm, namedChunkGroups);
+				},
+				config: env,
+				url,
+				ssr() {
+					return env.prerender
+						? require(prerender)({ cwd, dest, src }, values)
+						: '';
+				},
+				scriptLoading: 'defer',
+				CLI_DATA: { preRenderData: { url, ...routeData } },
+			});
+		};
+
+		let pages = [{ url: '/' }];
+
+		if (env.prerenderUrls) {
+			if (existsSync(resolve(cwd, env.prerenderUrls))) {
+				try {
+					let result = require(resolve(cwd, env.prerenderUrls));
+					if (typeof result.default !== 'undefined') {
+						result = result.default();
+					}
+					if (typeof result === 'function') {
+						info(`Fetching URLs from ${env.prerenderUrls}`);
+						result = await result();
+						info(`Fetched URLs from ${env.prerenderUrls}`);
+					}
+					if (typeof result === 'string') {
+						result = JSON.parse(result);
+					}
+					if (result instanceof Array) {
+						pages = result;
+					}
+				} catch (error) {
+					warn(
+						`Failed to load prerenderUrls file, using default!\n${
+							env.verbose ? error.stack : error.message
+						}`
+					);
+				}
+				// don't warn if the default file doesn't exist
+			} else if (env.prerenderUrls !== 'prerender-urls.json' || env.verbose) {
+				warn(
+					`prerenderUrls file (${resolve(
+						cwd,
+						env.prerenderUrls
+					)}) doesn't exist, using default!`
+				);
+			}
+		}
+
+		return pages
+			.map(htmlWebpackConfig)
+			.map(conf => new HtmlWebpackPlugin(conf))
+			.concat([new HtmlWebpackExcludeAssetsPlugin()]);
+	};
diff --git a/packages/render-html/package.json b/packages/render-html/package.json
new file mode 100644
index 000000000..46ab76237
--- /dev/null
+++ b/packages/render-html/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@preact/render-html-plugin",
+  "version": "3.0.0-rc.5",
+  "description": "Preact's html renderer plugin for Webpack",
+  "main": "index.js",
+  "files": [
+    "*.js"
+  ],
+  "engines": {
+    "node": ">=6"
+  },
+  "dependencies": {
+    "@preact/cli-util": "^3.0.0-rc.5",
+    "html-webpack-exclude-assets-plugin": "0.0.7",
+    "html-webpack-plugin": "^3.2.0"
+  },
+  "peerDependencies": {
+    "preact": "^8.1.0"
+  }
+}
diff --git a/packages/cli/lib/lib/webpack/prerender.js b/packages/render-html/prerender.js
similarity index 100%
rename from packages/cli/lib/lib/webpack/prerender.js
rename to packages/render-html/prerender.js
diff --git a/packages/render-html/resources/favicon.ico b/packages/render-html/resources/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f6da4336801ba3fba9cae9f222cfd4ad73785ebd
GIT binary patch
literal 15086
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
BbC>`C

literal 0
HcmV?d00001

diff --git a/packages/render-html/resources/template.ejs b/packages/render-html/resources/template.ejs
new file mode 100644
index 000000000..28781915a
--- /dev/null
+++ b/packages/render-html/resources/template.ejs
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8">
+		<title><%= htmlWebpackPlugin.options.title %></title>
+		<meta name="viewport" content="width=device-width,initial-scale=1">
+		<meta name="mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<link rel="manifest" href="<%= htmlWebpackPlugin.files.publicPath %>manifest.json">
+		<% if (htmlWebpackPlugin.options.manifest.theme_color) { %>
+			<meta name="theme-color" content="<%= htmlWebpackPlugin.options.manifest.theme_color %>">
+		<% } %>
+		<% const loadManifest = htmlWebpackPlugin.options.createLoadManifest(compilation.assets, webpack.namedChunkGroups);%>
+		<% const filesRegexp = htmlWebpackPlugin.options.inlineCss ? /\.(chunk\.\w{5}\.css|js)$/ : /\.(css|js)$/;%>
+		<% for (const file in loadManifest[htmlWebpackPlugin.options.url]) { %>
+			<% if (htmlWebpackPlugin.options.preload && file && file.match(filesRegexp)) { %>
+				<% /* crossorigin for main bundle as that is loaded from `<script type=module` tag, other lazy loaded bundles are from webpack so its not needed */ %>
+				<link rel="preload" href="<%= htmlWebpackPlugin.files.publicPath + file %>" as="<%= file.match(/\.css$/)?'style':'script' %>" <%= file.match(/bundle\.\w{5}\.esm\.js$/)?'crossorigin="anonymous"':'' %>>
+			<% } %>
+		<% } %>
+	</head>
+	<body>
+		<%= htmlWebpackPlugin.options.ssr() %>
+		<% if (webpack.assets.filter(entry => entry.name.match(/bundle(\.\w{5})?.esm.js$/)).length > 0) { %>
+			<% /* Fix for safari < 11 nomodule bug. TODO: Do the following only for safari. */ %>
+			<script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()},!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+			<script crossorigin="anonymous" src="<%= htmlWebpackPlugin.files.publicPath %><%= webpack.assets.filter(entry => entry.name.match(/bundle(\.\w{5})?.esm.js$/))[0].name %>" type="module"></script>
+			<%
+				/*Fetch and Promise polyfills are not needed for browsers that support type=module
+				Please re-evaluate below line if adding more polyfills.*/
+			%>
+			<script nomodule src="<%= htmlWebpackPlugin.files.chunks["polyfills"].entry %>"></script>
+			<script nomodule defer src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
+		<% } else { %>
+			<script <%= htmlWebpackPlugin.options.scriptLoading %>  src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
+			<script nomodule src="<%= htmlWebpackPlugin.files.chunks["polyfills"].entry %>"></script>
+		<% } %>
+		<script type="__PREACT_CLI_DATA__">
+			<%= JSON.stringify(htmlWebpackPlugin.options.CLI_DATA) %>
+		</script>
+	</body>
+</html>