extract render-html-plugin

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, "/");
+};

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"
+  }
+}

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);

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';

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';
 

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;

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;

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';
 

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 = {}) {

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);

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;

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'];

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(
 				[

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"
   }
 }