Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ Options:
reduce output size (where supported)
--serve [HOST:]PORT
serve generated files via HTTP
--liveserve [HOST:]PORT
serve generated files via HTTP with live reloading
`.trim();

exports.parseCLI = async function parseCLI() {
Expand Down Expand Up @@ -78,6 +76,10 @@ exports.parseCLI = async function parseCLI() {
liveserve: values.liveserve
};

if(values.liveserve) {
abort("The `--liveserve` option was removed. Please use `--serve` instead", 0);
}

if(options.watch && options.fingerprint) { // for convenience
console.error("you might consider disabling fingerprinting in watch " +
"mode to avoid littering your file system with obsolete bundles");
Expand Down
7 changes: 1 addition & 6 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let { SerializedRunner } = require("./util/runner");
let browserslist = require("browserslist");

exports.faucetDispatch = async function faucetDispatch(referenceDir, config,
{ watch, fingerprint, sourcemaps, compact, serve, liveserve }) {
{ watch, fingerprint, sourcemaps, compact, serve }) {
config = await config;

let assetManager = new AssetManager(referenceDir, {
Expand Down Expand Up @@ -47,13 +47,8 @@ exports.faucetDispatch = async function faucetDispatch(referenceDir, config,
});
}

if(serve && liveserve) {
abort("ERROR: serve and liveserve must not be used together");
}
if(serve) {
server.static(serve, assetManager.manifest.webRoot);
} else if(liveserve) {
server.live(liveserve, assetManager.manifest.webRoot);
}

return res; // notifies consumers once the initial build has completed
Expand Down
7 changes: 0 additions & 7 deletions lib/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ exports.static = async (config, webroot) => {
console.error(`serving ${repr(webroot)} at http://${host}:${port}`);
};

exports.live = async (config, root) => {
let liveServer = await loadExtension("live-server", "failed to activate live-server");
let [host, port] = parseHost(config);

liveServer.start({ port, host, root, open: false });
};

exports._parseHost = parseHost;

function parseHost(config) {
Expand Down
Loading