From 2ab7ec38920d4e0b7981a97be623c2d9fccb7101 Mon Sep 17 00:00:00 2001 From: Shane Osbourne Date: Wed, 26 Apr 2023 16:20:23 +0100 Subject: [PATCH 1/3] prettier config --- packages/browser-sync/.gitignore | 1 + packages/browser-sync/lib/async.js | 78 +-- packages/browser-sync/lib/bin.ts | 21 +- packages/browser-sync/lib/browser-sync.js | 8 +- packages/browser-sync/lib/cli/cli-info.js | 3 +- packages/browser-sync/lib/cli/cli-options.ts | 5 +- .../browser-sync/lib/cli/command.recipe.js | 25 +- .../browser-sync/lib/cli/command.start.ts | 20 +- .../transforms/addDefaultIgnorePatterns.ts | 13 +- .../transforms/appendServerDirectoryOption.ts | 9 +- .../cli/transforms/appendServerIndexOption.ts | 4 +- .../transforms/copyCLIIgnoreToWatchOptions.ts | 14 +- .../cli/transforms/handleExtensionsOption.ts | 10 +- .../cli/transforms/handleGhostModeOption.ts | 4 +- .../lib/cli/transforms/handleHostOption.ts | 4 +- packages/browser-sync/lib/config.js | 12 +- packages/browser-sync/lib/connect-utils.js | 35 +- packages/browser-sync/lib/default-config.js | 10 +- .../browser-sync/lib/file-event-handler.js | 15 +- packages/browser-sync/lib/file-utils.js | 5 +- packages/browser-sync/lib/file-watcher.js | 6 +- packages/browser-sync/lib/hooks.js | 4 +- packages/browser-sync/lib/http-protocol.js | 29 +- packages/browser-sync/lib/index.js | 11 +- packages/browser-sync/lib/internal-events.js | 41 +- packages/browser-sync/lib/lodash.custom.js | 566 ++++-------------- packages/browser-sync/lib/logger.js | 35 +- packages/browser-sync/lib/options.ts | 44 +- packages/browser-sync/lib/server/index.js | 16 +- .../browser-sync/lib/server/proxy-utils.js | 12 +- .../browser-sync/lib/server/static-server.js | 8 +- packages/browser-sync/lib/server/utils.js | 66 +- packages/browser-sync/lib/snippet.js | 9 +- packages/browser-sync/lib/sockets.ts | 27 +- packages/browser-sync/lib/tunnel.js | 9 +- packages/browser-sync/lib/utils.ts | 12 +- packages/browser-sync/package.json | 7 +- packages/browser-sync/test/specs/api/init.js | 2 +- .../test/specs/api/init.reload.multi.js | 20 +- .../test/specs/api/init.reload.stream.js | 15 +- .../test/specs/api/init.reload.stream.noop.js | 5 +- packages/browser-sync/test/specs/api/watch.js | 17 +- .../browser-sync/test/specs/cli/cli.exec.js | 7 +- .../test/specs/cli/cli.get.config.js | 4 +- .../browser-sync/test/specs/cli/cli.help.js | 40 +- .../test/specs/cli/cli.options.watch.js | 12 +- .../test/specs/commands/recipes.js | 20 +- .../test/specs/commands/reload.js | 10 +- .../test/specs/e2e/cli/e2e.cli.conf.js | 10 +- .../test/specs/e2e/cli/e2e.cli.files.js | 15 +- .../test/specs/e2e/cli/e2e.cli.server.js | 32 +- .../test/specs/e2e/e2e.options.cors.js | 20 +- .../test/specs/e2e/e2e.options.logPrefix.js | 4 +- .../test/specs/e2e/e2e.options.logSnippet.js | 4 +- .../test/specs/e2e/e2e.options.port.js | 4 +- .../test/specs/e2e/e2e.options.scriptpath.js | 20 +- .../test/specs/e2e/e2e.options.serveStatic.js | 39 +- .../test/specs/e2e/e2e.options.single.js | 10 +- .../test/specs/e2e/e2e.options.snippet.js | 9 +- .../specs/e2e/middleware/middleware.option.js | 12 +- .../e2e/proxy/e2e.proxy.rewrite.rules.add.js | 22 +- .../test/specs/e2e/proxy/e2e.proxy.secure.js | 10 +- .../specs/e2e/server/e2e.server.secure.pfx.js | 3 +- .../e2e.server.serveStatic.extensions.js | 20 +- .../e2e/server/e2e.server.serveStatic.js | 26 +- .../specs/e2e/server/e2e.server.tunnel.js | 15 +- .../test/specs/files/files.watching.js | 20 +- .../test/specs/http-protocol/http.reload.js | 20 +- .../test/specs/logger/logger.baseDir.js | 25 +- .../test/specs/options/options.set.js | 15 +- .../test/specs/plugins/connector.js | 5 +- .../browser-sync/test/specs/plugins/hooks.js | 5 +- .../browser-sync/test/specs/plugins/logger.js | 2 +- .../plugins/user.plugins.add.middleware.js | 8 +- .../plugins/user.plugins.inline.error.js | 10 +- .../specs/plugins/user.plugins.serve.files.js | 4 +- .../test/specs/resp-mod/rewrite-links.js | 204 ++----- .../test/specs/server/server.snippet.js | 5 +- .../test/specs/utils/utils.connect.js | 70 +-- .../test/specs/utils/utils.getHostIp.js | 15 +- .../test/specs/utils/utils.setUrlOptions.js | 5 +- .../test/specs/utils/utils.verifyOptions.js | 9 +- .../test/specs/utils/utils.xip.js | 5 +- 83 files changed, 474 insertions(+), 1578 deletions(-) diff --git a/packages/browser-sync/.gitignore b/packages/browser-sync/.gitignore index b23280282..dbb236f4d 100644 --- a/packages/browser-sync/.gitignore +++ b/packages/browser-sync/.gitignore @@ -1 +1,2 @@ /dist/* +/dist_backup/* diff --git a/packages/browser-sync/lib/async.js b/packages/browser-sync/lib/async.js index ebf2c0afb..8c57b5b87 100644 --- a/packages/browser-sync/lib/async.js +++ b/packages/browser-sync/lib/async.js @@ -6,7 +6,7 @@ var Immutable = require("immutable"); var utils = require("./utils"); var pluginUtils = require("./plugins"); var connectUtils = require("./connect-utils"); -var chalk = require("chalk"); +var chalk = require("chalk"); module.exports = { /** @@ -63,24 +63,19 @@ module.exports = { socketPort = bs.options.getIn(["socket", "port"]); } - utils.getPort( - bs.options.get("listen", "localhost"), - socketPort, - null, - function(err, port) { - if (err) { - return utils.fail(true, err, bs.cb); - } - done(null, { - optionsIn: [ - { - path: ["socket", "port"], - value: port - } - ] - }); + utils.getPort(bs.options.get("listen", "localhost"), socketPort, null, function(err, port) { + if (err) { + return utils.fail(true, err, bs.cb); } - ); + done(null, { + optionsIn: [ + { + path: ["socket", "port"], + value: port + } + ] + }); + }); }, /** * Some features require an internet connection. @@ -91,22 +86,13 @@ module.exports = { * @param {Function} done */ getOnlineStatus: function(bs, done) { - if ( - _.isUndefined(bs.options.get("online")) && - _.isUndefined(process.env.TESTING) - ) { + if (_.isUndefined(bs.options.get("online")) && _.isUndefined(process.env.TESTING)) { require("dns").resolve("www.google.com", function(err) { var online = false; if (err) { - bs.debug( - "Could not resolve www.google.com, setting %s", - chalk.magenta("online: false") - ); + bs.debug("Could not resolve www.google.com, setting %s", chalk.magenta("online: false")); } else { - bs.debug( - "Resolved www.google.com, setting %s", - chalk.magenta("online: true") - ); + bs.debug("Resolved www.google.com, setting %s", chalk.magenta("online: true")); online = true; } done(null, { @@ -155,17 +141,9 @@ module.exports = { done(null, { options: { urls: utils.getUrlOptions(bs.options), - snippet: connectUtils.enabled(bs.options) - ? connectUtils.scriptTags(bs.options) - : false, - scriptPaths: Immutable.fromJS( - connectUtils.clientScript(bs.options, true) - ), - files: bs.pluginManager.hook( - "files:watch", - bs.options.get("files"), - bs.pluginManager.pluginOptions - ) + snippet: connectUtils.enabled(bs.options) ? connectUtils.scriptTags(bs.options) : false, + scriptPaths: Immutable.fromJS(connectUtils.clientScript(bs.options, true)), + files: bs.pluginManager.hook("files:watch", bs.options.get("files"), bs.pluginManager.pluginOptions) } }); }, @@ -195,10 +173,7 @@ module.exports = { mergeMiddlewares: function(bs, done) { done(null, { options: { - middleware: bs.pluginManager.hook( - "server:middleware", - bs.options.get("middleware") - ) + middleware: bs.pluginManager.hook("server:middleware", bs.options.get("middleware")) } }); }, @@ -249,10 +224,7 @@ module.exports = { * @param {Function} done */ startSockets: function(bs, done) { - var clientEvents = bs.pluginManager.hook( - "client:events", - bs.options.get("clientEvents").toJS() - ); + var clientEvents = bs.pluginManager.hook("client:events", bs.options.get("clientEvents").toJS()); // Start the socket, needs an existing server. var io = bs.pluginManager.get("socket")(bs.server, clientEvents, bs); @@ -287,13 +259,7 @@ module.exports = { return item.name === PLUGIN_NAME; }) ) { - uiOpts = bs.options - .get("ui") - .mergeDeep( - Immutable.fromJS( - bs.pluginManager.pluginOptions[PLUGIN_NAME] - ) - ); + uiOpts = bs.options.get("ui").mergeDeep(Immutable.fromJS(bs.pluginManager.pluginOptions[PLUGIN_NAME])); } /** diff --git a/packages/browser-sync/lib/bin.ts b/packages/browser-sync/lib/bin.ts index 3f233da44..6114ee8e9 100755 --- a/packages/browser-sync/lib/bin.ts +++ b/packages/browser-sync/lib/bin.ts @@ -2,7 +2,7 @@ const startOpts = require("../cli-options/opts.start.json"); const reloadOpts = require("../cli-options/opts.reload.json"); const recipeOpts = require("../cli-options/opts.recipe.json"); -const chalk = require("chalk"); +const chalk = require("chalk"); const pkg = require("../package.json"); import * as utils from "./utils"; import { resolve } from "path"; @@ -38,7 +38,7 @@ if (!module.parent) { } function freshYargs() { - return require("yargs")(process.argv.slice(2)); + return require("yargs")(process.argv.slice(2)); } function runFromCli() { @@ -128,13 +128,9 @@ function handleNoCommand(argv, input, yargs) { return process.exit(1); } - const serveStaticPaths = withoutErrors - .filter(item => item.isUrl === false) - .map(item => item.resolved); + const serveStaticPaths = withoutErrors.filter(item => item.isUrl === false).map(item => item.resolved); - const urls = withoutErrors - .filter(item => item.isUrl === true) - .map(item => item.userInput); + const urls = withoutErrors.filter(item => item.isUrl === true).map(item => item.userInput); /** * If a URL was given, switch to proxy mode and use @@ -183,8 +179,7 @@ function processStart(yargs) { .options(startOpts) .example("$0 start -s app", "- Use the App directory to serve files") .example("$0 start -p www.bbc.co.uk", "- Proxy an existing website") - .default("cwd", () => process.cwd()) - .argv; + .default("cwd", () => process.cwd()).argv; } /** @@ -210,8 +205,7 @@ function handleIncoming(command, yargs) { .options(reloadOpts) .example("$0 reload") .example("$0 reload --port 4000") - .default("cwd", () => process.cwd()) - .argv; + .default("cwd", () => process.cwd()).argv; } if (command === "recipe") { out = yargs @@ -219,8 +213,7 @@ function handleIncoming(command, yargs) { .option(recipeOpts) .example("$0 recipe ls", "list the recipes") .example("$0 recipe gulp.sass", "use the gulp.sass recipe") - .default("cwd", () => process.cwd()) - .argv; + .default("cwd", () => process.cwd()).argv; } if (out.help) { diff --git a/packages/browser-sync/lib/browser-sync.js b/packages/browser-sync/lib/browser-sync.js index 14100723a..1c4bae185 100644 --- a/packages/browser-sync/lib/browser-sync.js +++ b/packages/browser-sync/lib/browser-sync.js @@ -6,7 +6,7 @@ var config = require("./config"); var connectUtils = require("./connect-utils"); var utils = require("./utils"); var logger = require("./logger"); -var chalk = require("chalk"); +var chalk = require("chalk"); var eachSeries = utils.eachSeries; var _ = require("./lodash.custom"); @@ -535,11 +535,7 @@ BrowserSync.prototype.setOptionIn = function(path, value, opts) { opts = opts || {}; - bs.debug( - "Setting Option: {cyan:%s} - {magenta:%s", - path.join("."), - value.toString() - ); + bs.debug("Setting Option: {cyan:%s} - {magenta:%s", path.join("."), value.toString()); bs.options = bs.options.setIn(path, value); if (!opts.silent) { bs.events.emit("options:set", { diff --git a/packages/browser-sync/lib/cli/cli-info.js b/packages/browser-sync/lib/cli/cli-info.js index 2ed1f781f..5719068f2 100644 --- a/packages/browser-sync/lib/cli/cli-info.js +++ b/packages/browser-sync/lib/cli/cli-info.js @@ -48,8 +48,7 @@ var info = { fs.writeFile(path.resolve(cwd, config.userFile), file, function() { logger.info("Config file created %s", chalk.magenta(config.userFile)); logger.info( - "To use it, in the same directory run: " + - chalk.cyan("browser-sync start --config bs-config.js") + "To use it, in the same directory run: " + chalk.cyan("browser-sync start --config bs-config.js") ); cb(); }); diff --git a/packages/browser-sync/lib/cli/cli-options.ts b/packages/browser-sync/lib/cli/cli-options.ts index 1c49bdb71..5a780190e 100644 --- a/packages/browser-sync/lib/cli/cli-options.ts +++ b/packages/browser-sync/lib/cli/cli-options.ts @@ -128,10 +128,7 @@ export function printErrors(errors: BsErrors) { `Error Type: ${error.type}`, `Error Level: ${error.level}`, error.errors.map(item => - [ - `Error Message: ${item.error.message}`, - item.meta ? item.meta().join("\n") : "" - ] + [`Error Message: ${item.error.message}`, item.meta ? item.meta().join("\n") : ""] .filter(Boolean) .join("\n") ) diff --git a/packages/browser-sync/lib/cli/command.recipe.js b/packages/browser-sync/lib/cli/command.recipe.js index 448a4d9b2..02537de6c 100644 --- a/packages/browser-sync/lib/cli/command.recipe.js +++ b/packages/browser-sync/lib/cli/command.recipe.js @@ -1,6 +1,6 @@ "use strict"; var logger = require("../logger").logger; -var chalk = require("chalk"); +var chalk = require("chalk"); /** * $ browser-sync recipe @@ -20,10 +20,7 @@ module.exports = function(opts) { var logRecipes = function() { var dirs = fs.readdirSync(path.join(dir, "recipes")); - logger.info( - "Install one of the following with %s\n", - chalk.cyan('browser-sync recipe ') - ); + logger.info("Install one of the following with %s\n", chalk.cyan("browser-sync recipe ")); dirs.forEach(function(name) { console.log(" " + name); }); @@ -42,15 +39,11 @@ module.exports = function(opts) { input = input[0]; var flags = opts.cli.flags; - var output = flags.output - ? path.resolve(flags.output) - : path.join(process.cwd(), input); + var output = flags.output ? path.resolve(flags.output) : path.join(process.cwd(), input); var targetDir = path.join(dir, "recipes", input); if (fs.existsSync(output)) { - return opts.cb( - new Error("Target folder exists remove it first and then try again") - ); + return opts.cb(new Error("Target folder exists remove it first and then try again")); } if (fs.existsSync(targetDir)) { @@ -59,18 +52,12 @@ module.exports = function(opts) { opts.cb(err); } else { logger.info("Recipe copied into %s", chalk.cyan(output)); - logger.info( - "Next, inside that folder, run %s", - chalk.cyan("npm i && npm start") - ); + logger.info("Next, inside that folder, run %s", chalk.cyan("npm i && npm start")); opts.cb(null); } }); } else { - logger.info( - "Recipe %s not found. The following are available though", - chalk.cyan(input) - ); + logger.info("Recipe %s not found. The following are available though", chalk.cyan(input)); logRecipes(); opts.cb(); } diff --git a/packages/browser-sync/lib/cli/command.start.ts b/packages/browser-sync/lib/cli/command.start.ts index a37465737..9763aba16 100644 --- a/packages/browser-sync/lib/cli/command.start.ts +++ b/packages/browser-sync/lib/cli/command.start.ts @@ -26,11 +26,7 @@ export default function(opts) { const conf = require(maybeconf); input = _.merge({}, conf, flags); } else { - utils.fail( - true, - new Error(`Configuration file '${flags.config}' not found`), - opts.cb - ); + utils.fail(true, new Error(`Configuration file '${flags.config}' not found`), opts.cb); } } else { if (existsSync(maybepkg)) { @@ -52,11 +48,10 @@ export default function(opts) { * @returns {*} */ function preprocessFlags(flags) { - return [ - stripUndefined, - legacyFilesArgs, - removeWatchBooleanWhenFalse - ].reduce((flags, fn) => fn.call(null, flags), flags); + return [stripUndefined, legacyFilesArgs, removeWatchBooleanWhenFalse].reduce( + (flags, fn) => fn.call(null, flags), + flags + ); } /** @@ -82,10 +77,7 @@ function stripUndefined(subject) { */ function legacyFilesArgs(flags) { if (flags.files && flags.files.length) { - flags.files = flags.files.reduce( - (acc, item) => acc.concat(explodeFilesArg(item)), - [] - ); + flags.files = flags.files.reduce((acc, item) => acc.concat(explodeFilesArg(item)), []); } return flags; } diff --git a/packages/browser-sync/lib/cli/transforms/addDefaultIgnorePatterns.ts b/packages/browser-sync/lib/cli/transforms/addDefaultIgnorePatterns.ts index be45d5bf1..40b373c5e 100644 --- a/packages/browser-sync/lib/cli/transforms/addDefaultIgnorePatterns.ts +++ b/packages/browser-sync/lib/cli/transforms/addDefaultIgnorePatterns.ts @@ -1,18 +1,9 @@ import { List } from "immutable"; import { BsTempOptions, TransformResult } from "../cli-options"; -const defaultIgnorePatterns = [ - /node_modules/, - /bower_components/, - ".sass-cache", - ".vscode", - ".git", - ".idea" -]; +const defaultIgnorePatterns = [/node_modules/, /bower_components/, ".sass-cache", ".vscode", ".git", ".idea"]; -export function addDefaultIgnorePatterns( - incoming: BsTempOptions -): TransformResult { +export function addDefaultIgnorePatterns(incoming: BsTempOptions): TransformResult { if (!incoming.get("watch")) { return [incoming, []]; } diff --git a/packages/browser-sync/lib/cli/transforms/appendServerDirectoryOption.ts b/packages/browser-sync/lib/cli/transforms/appendServerDirectoryOption.ts index 9725c0ab0..86f41992a 100644 --- a/packages/browser-sync/lib/cli/transforms/appendServerDirectoryOption.ts +++ b/packages/browser-sync/lib/cli/transforms/appendServerDirectoryOption.ts @@ -1,14 +1,9 @@ import { BsTempOptions, TransformResult } from "../cli-options"; -export function appendServerDirectoryOption( - incoming: BsTempOptions -): TransformResult { +export function appendServerDirectoryOption(incoming: BsTempOptions): TransformResult { if (!incoming.get("server")) return [incoming, []]; if (incoming.get("directory")) { - return [ - incoming.setIn(["server", "directory"], incoming.has("directory")), - [] - ]; + return [incoming.setIn(["server", "directory"], incoming.has("directory")), []]; } return [incoming, []]; } diff --git a/packages/browser-sync/lib/cli/transforms/appendServerIndexOption.ts b/packages/browser-sync/lib/cli/transforms/appendServerIndexOption.ts index 147502599..f061061b2 100644 --- a/packages/browser-sync/lib/cli/transforms/appendServerIndexOption.ts +++ b/packages/browser-sync/lib/cli/transforms/appendServerIndexOption.ts @@ -1,8 +1,6 @@ import { BsTempOptions, TransformResult } from "../cli-options"; -export function appendServerIndexOption( - incoming: BsTempOptions -): TransformResult { +export function appendServerIndexOption(incoming: BsTempOptions): TransformResult { if (!incoming.get("server")) return [incoming, []]; const value = incoming.get("index"); diff --git a/packages/browser-sync/lib/cli/transforms/copyCLIIgnoreToWatchOptions.ts b/packages/browser-sync/lib/cli/transforms/copyCLIIgnoreToWatchOptions.ts index ae7fbf6d6..6e548f56b 100644 --- a/packages/browser-sync/lib/cli/transforms/copyCLIIgnoreToWatchOptions.ts +++ b/packages/browser-sync/lib/cli/transforms/copyCLIIgnoreToWatchOptions.ts @@ -1,19 +1,13 @@ import { List } from "immutable"; import { BsTempOptions, TransformResult } from "../cli-options"; -export function copyCLIIgnoreToWatchOptions( - incoming: BsTempOptions -): TransformResult { +export function copyCLIIgnoreToWatchOptions(incoming: BsTempOptions): TransformResult { if (!incoming.get("ignore")) { return [incoming, []]; } - const output = incoming.updateIn( - ["watchOptions", "ignored"], - List([]), - ignored => { - return List([]).concat(ignored, incoming.get("ignore")); - } - ); + const output = incoming.updateIn(["watchOptions", "ignored"], List([]), ignored => { + return List([]).concat(ignored, incoming.get("ignore")); + }); return [output, []]; } diff --git a/packages/browser-sync/lib/cli/transforms/handleExtensionsOption.ts b/packages/browser-sync/lib/cli/transforms/handleExtensionsOption.ts index 19802ed77..2cec1062f 100644 --- a/packages/browser-sync/lib/cli/transforms/handleExtensionsOption.ts +++ b/packages/browser-sync/lib/cli/transforms/handleExtensionsOption.ts @@ -1,15 +1,9 @@ import { List } from "immutable"; -import { - BsTempOptions, - explodeFilesArg, - TransformResult -} from "../cli-options"; +import { BsTempOptions, explodeFilesArg, TransformResult } from "../cli-options"; const _ = require("../../lodash.custom"); -export function handleExtensionsOption( - incoming: BsTempOptions -): TransformResult { +export function handleExtensionsOption(incoming: BsTempOptions): TransformResult { const value = incoming.get("extensions"); if (_.isString(value)) { const split = explodeFilesArg(value); diff --git a/packages/browser-sync/lib/cli/transforms/handleGhostModeOption.ts b/packages/browser-sync/lib/cli/transforms/handleGhostModeOption.ts index 16318d66a..72ca65bc1 100644 --- a/packages/browser-sync/lib/cli/transforms/handleGhostModeOption.ts +++ b/packages/browser-sync/lib/cli/transforms/handleGhostModeOption.ts @@ -1,9 +1,7 @@ import { fromJS } from "immutable"; import { BsTempOptions, TransformResult } from "../cli-options"; -export function handleGhostModeOption( - incoming: BsTempOptions -): TransformResult { +export function handleGhostModeOption(incoming: BsTempOptions): TransformResult { const value = incoming.get("ghostMode"); var trueAll = { clicks: true, diff --git a/packages/browser-sync/lib/cli/transforms/handleHostOption.ts b/packages/browser-sync/lib/cli/transforms/handleHostOption.ts index ad6d6a58b..61aa92332 100644 --- a/packages/browser-sync/lib/cli/transforms/handleHostOption.ts +++ b/packages/browser-sync/lib/cli/transforms/handleHostOption.ts @@ -13,9 +13,7 @@ export function handleHostOption(incoming: BsTempOptions): TransformResult { { errors: [ { - error: new Error( - "Cannot specify both `host` and `listen` options" - ), + error: new Error("Cannot specify both `host` and `listen` options"), meta() { return [ "", diff --git a/packages/browser-sync/lib/config.js b/packages/browser-sync/lib/config.js index 790f8e3b9..cd641decc 100644 --- a/packages/browser-sync/lib/config.js +++ b/packages/browser-sync/lib/config.js @@ -11,11 +11,7 @@ module.exports = { }, templates: { scriptTag: path.join(__dirname, "..", "templates/script-tags.html"), - scriptTagSimple: path.join( - __dirname, - "..", - "templates/script-tags-simple.html" - ), + scriptTagSimple: path.join(__dirname, "..", "templates/script-tags-simple.html"), connector: path.join(__dirname, "..", "templates/connector.tmpl") }, socketIoScript: "/public/socket.io.min.1.6.0.js", @@ -29,9 +25,7 @@ module.exports = { shims: "/client/client-shims.js" }, errors: { - "server+proxy": - "Invalid config. You cannot specify both server & proxy options.", - "proxy+https": - "Invalid config. You set https: true, but your proxy target doesn't reflect this." + "server+proxy": "Invalid config. You cannot specify both server & proxy options.", + "proxy+https": "Invalid config. You set https: true, but your proxy target doesn't reflect this." } }; diff --git a/packages/browser-sync/lib/connect-utils.js b/packages/browser-sync/lib/connect-utils.js index 10d2394b3..26cb47bd5 100644 --- a/packages/browser-sync/lib/connect-utils.js +++ b/packages/browser-sync/lib/connect-utils.js @@ -21,9 +21,9 @@ var connectUtils = { enabled: function(options) { const userValue = options.get("snippet"); if (typeof userValue === "boolean") { - return userValue + return userValue; } - return true + return true; }, /** * @param {Immutable.Map} options @@ -39,12 +39,7 @@ var connectUtils = { */ var scriptSrc = (function() { if (options.get("localOnly")) { - return [ - options.get("scheme"), - "://localhost:", - options.get("port"), - scriptPath - ].join(""); + return [options.get("scheme"), "://localhost:", options.get("port"), scriptPath].join(""); } /** @@ -53,9 +48,7 @@ var connectUtils = { * */ if (_.isFunction(options.get("scriptPath"))) { - return options - .get("scriptPath") - .apply(null, getScriptArgs(options, scriptPath)); + return options.get("scriptPath").apply(null, getScriptArgs(options, scriptPath)); } /** @@ -69,10 +62,7 @@ var connectUtils = { return scriptDomain.call(null, options) + scriptPath; } if (scriptDomain.match(/\{port\}/)) { - return ( - scriptDomain.replace("{port}", options.get("port")) + - scriptPath - ); + return scriptDomain.replace("{port}", options.get("port")) + scriptPath; } return scriptDomain + scriptPath; } @@ -167,8 +157,7 @@ var connectUtils = { var namespace = connectUtils.getNamespace(socketOpts, options); var protocol = ""; - var withHostnamePort = - "'{protocol}' + location.hostname + ':{port}{ns}'"; + var withHostnamePort = "'{protocol}' + location.hostname + ':{port}{ns}'"; var withHost = "'{protocol}' + location.host + '{ns}'"; var withDomain = "'{domain}{ns}'"; var port = options.get("port"); @@ -191,11 +180,7 @@ var connectUtils = { socketOpts.domain = (function() { if (options.get("localOnly")) { string = withDomain; - return [ - options.get("scheme"), - "://localhost:", - options.get("port") - ].join(""); + return [options.get("scheme"), "://localhost:", options.get("port")].join(""); } if (socketOpts.domain) { string = withDomain; @@ -228,8 +213,7 @@ var connectUtils = { clientScript: function(options, both) { var prefix = options.getIn(["socket", "clientPath"]); var script = prefix + "/browser-sync-client.js"; - var versioned = - prefix + "/browser-sync-client.js?v=" + options.get("version"); + var versioned = prefix + "/browser-sync-client.js?v=" + options.get("version"); if (both) { return { @@ -247,8 +231,7 @@ var connectUtils = { * @returns {*[]} */ function getScriptArgs(options, scriptPath) { - var abspath = - options.get("scheme") + "://HOST:" + options.get("port") + scriptPath; + var abspath = options.get("scheme") + "://HOST:" + options.get("port") + scriptPath; return [scriptPath, options.get("port"), options.set("absolute", abspath)]; } diff --git a/packages/browser-sync/lib/default-config.js b/packages/browser-sync/lib/default-config.js index eca62e1c9..64e8fe4ef 100644 --- a/packages/browser-sync/lib/default-config.js +++ b/packages/browser-sync/lib/default-config.js @@ -512,15 +512,7 @@ module.exports = { */ timestamps: true, - clientEvents: [ - "scroll", - "scroll:element", - "input:text", - "input:toggles", - "form:submit", - "form:reset", - "click" - ], + clientEvents: ["scroll", "scroll:element", "input:text", "input:toggles", "form:submit", "form:reset", "click"], /** * Alter the script path for complete control over where the Browsersync diff --git a/packages/browser-sync/lib/file-event-handler.js b/packages/browser-sync/lib/file-event-handler.js index 91dcb6160..e3f20c228 100644 --- a/packages/browser-sync/lib/file-event-handler.js +++ b/packages/browser-sync/lib/file-event-handler.js @@ -25,14 +25,10 @@ function fileChanges(subject, options) { */ const initial = getAggregatedDebouncedStream(subject, options, scheduler); - return applyOperators(operators, initial, options, scheduler).map(function( - items - ) { + return applyOperators(operators, initial, options, scheduler).map(function(items) { const paths = items.map(x => x.path); - if ( - utils.willCauseReload(paths, options.get("injectFileTypes").toJS()) - ) { + if (utils.willCauseReload(paths, options.get("injectFileTypes").toJS())) { return { type: "reload", files: items @@ -68,12 +64,7 @@ function applyReloadOperators(subject, options) { } ]; - return applyOperators( - operators, - subject, - options, - options.getIn(["debug", "scheduler"]) - ); + return applyOperators(operators, subject, options, options.getIn(["debug", "scheduler"])); } module.exports.applyReloadOperators = applyReloadOperators; diff --git a/packages/browser-sync/lib/file-utils.js b/packages/browser-sync/lib/file-utils.js index 9e22f6217..8defe63a0 100644 --- a/packages/browser-sync/lib/file-utils.js +++ b/packages/browser-sync/lib/file-utils.js @@ -23,10 +23,7 @@ var fileUtils = { */ if (bs.options.get("watchEvents").indexOf(data.event) > -1) { if (!bs.paused && data.namespace === "core") { - bs.events.emit( - "file:reload", - fileUtils.getFileInfo(data, bs.options) - ); + bs.events.emit("file:reload", fileUtils.getFileInfo(data, bs.options)); } } }, diff --git a/packages/browser-sync/lib/file-watcher.js b/packages/browser-sync/lib/file-watcher.js index d0a88234b..fbd0f0a5e 100644 --- a/packages/browser-sync/lib/file-watcher.js +++ b/packages/browser-sync/lib/file-watcher.js @@ -42,11 +42,7 @@ module.exports.plugin = function(bs) { if (!_.isFunction(item.fn)) { item.fn = fn; } - var watcher = watch( - item.match, - item.options || defaultWatchOptions, - item.fn.bind(bs.publicInstance) - ); + var watcher = watch(item.match, item.options || defaultWatchOptions, item.fn.bind(bs.publicInstance)); if (!map[namespace]) { map[namespace] = { watchers: [watcher] diff --git a/packages/browser-sync/lib/hooks.js b/packages/browser-sync/lib/hooks.js index 40e76bbd4..3a4fcc521 100644 --- a/packages/browser-sync/lib/hooks.js +++ b/packages/browser-sync/lib/hooks.js @@ -85,9 +85,7 @@ module.exports = { } var files = value.get("files"); if (files) { - var fileArg = require("./cli/cli-options").makeFilesArg( - files - ); + var fileArg = require("./cli/cli-options").makeFilesArg(files); if (fileArg) { initial = initial.set(key, Immutable.fromJS(fileArg)); } diff --git a/packages/browser-sync/lib/http-protocol.js b/packages/browser-sync/lib/http-protocol.js index 71271fb4e..620832d39 100644 --- a/packages/browser-sync/lib/http-protocol.js +++ b/packages/browser-sync/lib/http-protocol.js @@ -4,13 +4,7 @@ var queryString = require("qs"); var proto = exports; var instanceMethods = ["exit", "notify", "pause", "resume"]; var getBody = require("raw-body"); -const permittedSocketEvents = [ - "file:reload", - "browser:reload", - "browser:notify", - "browser:location", - "options:set" -]; +const permittedSocketEvents = ["file:reload", "browser:reload", "browser:notify", "browser:location", "options:set"]; /** * Does the requested method expect an instance of BrowserSync @@ -35,12 +29,7 @@ function methodRequiresInstance(method) { * @returns {string} */ proto.getUrl = function(args, url) { - return [ - url, - require("./config").httpProtocol.path, - "?", - queryString.stringify(args) - ].join(""); + return [url, require("./config").httpProtocol.path, "?", queryString.stringify(args)].join(""); }; /** @@ -60,11 +49,7 @@ proto.middleware = function(bs) { try { const [name, payload] = JSON.parse(body.toString()); bs.io.sockets.emit(name, payload); - return res.end( - `Browsersync HTTP Protocol received: ${name} ${JSON.stringify( - payload - )}` - ); + return res.end(`Browsersync HTTP Protocol received: ${name} ${JSON.stringify(payload)}`); } catch (e) { const output = [`Error: ${e.message}`]; res.writeHead(500, { "Content-Type": "text/plain" }); @@ -86,13 +71,9 @@ proto.middleware = function(bs) { } try { - var bsOrEmitter = methodRequiresInstance(params.method) - ? bs - : bs.events; + var bsOrEmitter = methodRequiresInstance(params.method) ? bs : bs.events; - require("./public/" + params.method)(bsOrEmitter).apply(null, [ - params.args - ]); + require("./public/" + params.method)(bsOrEmitter).apply(null, [params.args]); output = [ "Called public API method `.%s()`".replace("%s", params.method), diff --git a/packages/browser-sync/lib/index.js b/packages/browser-sync/lib/index.js index 3170acc4e..9572adce8 100644 --- a/packages/browser-sync/lib/index.js +++ b/packages/browser-sync/lib/index.js @@ -8,7 +8,7 @@ var pjson = require("../package.json"); var BrowserSync = require("./browser-sync"); var publicUtils = require("./public/public-utils"); var events = require("events"); -var chalk = require("chalk"); +var chalk = require("chalk"); var PassThrough = require("stream").PassThrough; var logger = require("eazy-logger").Logger({ useLevelPrefixes: true @@ -43,9 +43,7 @@ module.exports.get = function(name) { if (instance) { return instance; } - throw new Error( - "An instance with the name `%s` was not found.".replace("%s", name) - ); + throw new Error("An instance with the name `%s` was not found.".replace("%s", name)); }; /** @@ -258,10 +256,7 @@ function initSingleton() { if (singletonPlugins.length) { singletonPlugins.forEach(function(obj) { - singleton.instance.registerPlugin.apply( - singleton.instance, - obj.args - ); + singleton.instance.registerPlugin.apply(singleton.instance, obj.args); }); } diff --git a/packages/browser-sync/lib/internal-events.js b/packages/browser-sync/lib/internal-events.js index ac108e814..7bba9661c 100644 --- a/packages/browser-sync/lib/internal-events.js +++ b/packages/browser-sync/lib/internal-events.js @@ -36,12 +36,7 @@ module.exports = function(bs) { var mode = bs.options.get("mode"); var open = bs.options.get("open"); - if ( - mode === "proxy" || - mode === "server" || - open === "ui" || - open === "ui-external" - ) { + if (mode === "proxy" || mode === "server" || open === "ui" || open === "ui-external") { utils.openBrowser(data.url, bs.options, bs); } @@ -84,10 +79,7 @@ module.exports = function(bs) { }); var reloader = fileHandler - .applyReloadOperators( - fromEvent(bs.events, "_browser:reload"), - bs.options - ) + .applyReloadOperators(fromEvent(bs.events, "_browser:reload"), bs.options) .subscribe(function() { bs.events.emit("browser:reload"); }); @@ -100,23 +92,18 @@ module.exports = function(bs) { return x.namespace === "core"; }); - var handler = fileHandler - .fileChanges(coreNamespacedWatchers, bs.options) - .subscribe(function(x) { - if (x.type === "reload") { - bs.events.emit("browser:reload", x); - } - if (x.type === "inject") { - x.files.forEach(function(data) { - if (!bs.paused && data.namespace === "core") { - bs.events.emit( - "file:reload", - fileUtils.getFileInfo(data, bs.options) - ); - } - }); - } - }); + var handler = fileHandler.fileChanges(coreNamespacedWatchers, bs.options).subscribe(function(x) { + if (x.type === "reload") { + bs.events.emit("browser:reload", x); + } + if (x.type === "inject") { + x.files.forEach(function(data) { + if (!bs.paused && data.namespace === "core") { + bs.events.emit("file:reload", fileUtils.getFileInfo(data, bs.options)); + } + }); + } + }); bs.registerCleanupTask(function() { handler.dispose(); diff --git a/packages/browser-sync/lib/lodash.custom.js b/packages/browser-sync/lib/lodash.custom.js index 0baa71c26..c524cef34 100644 --- a/packages/browser-sync/lib/lodash.custom.js +++ b/packages/browser-sync/lib/lodash.custom.js @@ -120,8 +120,7 @@ rsComboMarksRange = "\\u0300-\\u036f", reComboHalfMarksRange = "\\ufe20-\\ufe2f", rsComboSymbolsRange = "\\u20d0-\\u20ff", - rsComboRange = - rsComboMarksRange + reComboHalfMarksRange + rsComboSymbolsRange, + rsComboRange = rsComboMarksRange + reComboHalfMarksRange + rsComboSymbolsRange, rsVarRange = "\\ufe0e\\ufe0f"; /** Used to compose unicode capture groups. */ @@ -138,107 +137,63 @@ var reOptMod = rsModifier + "?", rsOptVar = "[" + rsVarRange + "]?", rsOptJoin = - "(?:" + - rsZWJ + - "(?:" + - [rsNonAstral, rsRegional, rsSurrPair].join("|") + - ")" + - rsOptVar + - reOptMod + - ")*", + "(?:" + rsZWJ + "(?:" + [rsNonAstral, rsRegional, rsSurrPair].join("|") + ")" + rsOptVar + reOptMod + ")*", rsSeq = rsOptVar + reOptMod + rsOptJoin, - rsSymbol = - "(?:" + - [ - rsNonAstral + rsCombo + "?", - rsCombo, - rsRegional, - rsSurrPair, - rsAstral - ].join("|") + - ")"; + rsSymbol = "(?:" + [rsNonAstral + rsCombo + "?", rsCombo, rsRegional, rsSurrPair, rsAstral].join("|") + ")"; /** Used to match [string symbols](https://mathiasbynens.be/notes/javascript-unicode). */ - var reUnicode = RegExp( - rsFitz + "(?=" + rsFitz + ")|" + rsSymbol + rsSeq, - "g" - ); + var reUnicode = RegExp(rsFitz + "(?=" + rsFitz + ")|" + rsSymbol + rsSeq, "g"); /** Used to detect strings with [zero-width joiners or code points from the astral planes](http://eev.ee/blog/2015/09/12/dark-corners-of-unicode/). */ - var reHasUnicode = RegExp( - "[" + rsZWJ + rsAstralRange + rsComboRange + rsVarRange + "]" - ); + var reHasUnicode = RegExp("[" + rsZWJ + rsAstralRange + rsComboRange + rsVarRange + "]"); /** Used to identify `toStringTag` values of typed arrays. */ var typedArrayTags = {}; - typedArrayTags[float32Tag] = typedArrayTags[float64Tag] = typedArrayTags[ - int8Tag - ] = typedArrayTags[int16Tag] = typedArrayTags[int32Tag] = typedArrayTags[ - uint8Tag - ] = typedArrayTags[uint8ClampedTag] = typedArrayTags[ + typedArrayTags[float32Tag] = typedArrayTags[float64Tag] = typedArrayTags[int8Tag] = typedArrayTags[ + int16Tag + ] = typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] = typedArrayTags[uint8ClampedTag] = typedArrayTags[ uint16Tag ] = typedArrayTags[uint32Tag] = true; - typedArrayTags[argsTag] = typedArrayTags[arrayTag] = typedArrayTags[ - arrayBufferTag - ] = typedArrayTags[boolTag] = typedArrayTags[dataViewTag] = typedArrayTags[ - dateTag - ] = typedArrayTags[errorTag] = typedArrayTags[funcTag] = typedArrayTags[ - mapTag - ] = typedArrayTags[numberTag] = typedArrayTags[objectTag] = typedArrayTags[ + typedArrayTags[argsTag] = typedArrayTags[arrayTag] = typedArrayTags[arrayBufferTag] = typedArrayTags[ + boolTag + ] = typedArrayTags[dataViewTag] = typedArrayTags[dateTag] = typedArrayTags[errorTag] = typedArrayTags[ + funcTag + ] = typedArrayTags[mapTag] = typedArrayTags[numberTag] = typedArrayTags[objectTag] = typedArrayTags[ regexpTag - ] = typedArrayTags[setTag] = typedArrayTags[stringTag] = typedArrayTags[ - weakMapTag - ] = false; + ] = typedArrayTags[setTag] = typedArrayTags[stringTag] = typedArrayTags[weakMapTag] = false; /** Used to identify `toStringTag` values supported by `_.clone`. */ var cloneableTags = {}; - cloneableTags[argsTag] = cloneableTags[arrayTag] = cloneableTags[ - arrayBufferTag - ] = cloneableTags[dataViewTag] = cloneableTags[boolTag] = cloneableTags[ - dateTag - ] = cloneableTags[float32Tag] = cloneableTags[float64Tag] = cloneableTags[ - int8Tag - ] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[ + cloneableTags[argsTag] = cloneableTags[arrayTag] = cloneableTags[arrayBufferTag] = cloneableTags[ + dataViewTag + ] = cloneableTags[boolTag] = cloneableTags[dateTag] = cloneableTags[float32Tag] = cloneableTags[ + float64Tag + ] = cloneableTags[int8Tag] = cloneableTags[int16Tag] = cloneableTags[int32Tag] = cloneableTags[ mapTag - ] = cloneableTags[numberTag] = cloneableTags[objectTag] = cloneableTags[ - regexpTag - ] = cloneableTags[setTag] = cloneableTags[stringTag] = cloneableTags[ - symbolTag - ] = cloneableTags[uint8Tag] = cloneableTags[ + ] = cloneableTags[numberTag] = cloneableTags[objectTag] = cloneableTags[regexpTag] = cloneableTags[ + setTag + ] = cloneableTags[stringTag] = cloneableTags[symbolTag] = cloneableTags[uint8Tag] = cloneableTags[ uint8ClampedTag ] = cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true; - cloneableTags[errorTag] = cloneableTags[funcTag] = cloneableTags[ - weakMapTag - ] = false; + cloneableTags[errorTag] = cloneableTags[funcTag] = cloneableTags[weakMapTag] = false; /** Built-in method references without a dependency on `root`. */ var freeParseInt = parseInt; /** Detect free variable `global` from Node.js. */ - var freeGlobal = - typeof global == "object" && - global && - global.Object === Object && - global; + var freeGlobal = typeof global == "object" && global && global.Object === Object && global; /** Detect free variable `self`. */ - var freeSelf = - typeof self == "object" && self && self.Object === Object && self; + var freeSelf = typeof self == "object" && self && self.Object === Object && self; /** Used as a reference to the global object. */ var root = freeGlobal || freeSelf || Function("return this")(); /** Detect free variable `exports`. */ - var freeExports = - typeof exports == "object" && exports && !exports.nodeType && exports; + var freeExports = typeof exports == "object" && exports && !exports.nodeType && exports; /** Detect free variable `module`. */ - var freeModule = - freeExports && - typeof module == "object" && - module && - !module.nodeType && - module; + var freeModule = freeExports && typeof module == "object" && module && !module.nodeType && module; /** Detect the popular CommonJS extension `module.exports`. */ var moduleExports = freeModule && freeModule.exports === freeExports; @@ -249,11 +204,7 @@ /** Used to access faster Node.js helpers. */ var nodeUtil = (function() { try { - return ( - freeProcess && - freeProcess.binding && - freeProcess.binding("util") - ); + return freeProcess && freeProcess.binding && freeProcess.binding("util"); } catch (e) {} })(); @@ -524,9 +475,7 @@ * @returns {number} Returns the index of the matched value, else `-1`. */ function baseIndexOf(array, value, fromIndex) { - return value === value - ? strictIndexOf(array, value, fromIndex) - : baseFindIndex(array, baseIsNaN, fromIndex); + return value === value ? strictIndexOf(array, value, fromIndex) : baseFindIndex(array, baseIsNaN, fromIndex); } /** @@ -731,9 +680,7 @@ * @returns {Array} Returns the converted array. */ function stringToArray(string) { - return hasUnicode(string) - ? unicodeToArray(string) - : asciiToArray(string); + return hasUnicode(string) ? unicodeToArray(string) : asciiToArray(string); } /** @@ -765,9 +712,7 @@ /** Used to detect methods masquerading as native. */ var maskSrcKey = (function() { - var uid = /[^.]+$/.exec( - (coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO) || "" - ); + var uid = /[^.]+$/.exec((coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO) || ""); return uid ? "Symbol(src)_1." + uid : ""; })(); @@ -787,10 +732,7 @@ funcToString .call(hasOwnProperty) .replace(reRegExpChar, "\\$&") - .replace( - /hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, - "$1.*?" - ) + + .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$" ); @@ -1069,9 +1011,7 @@ */ function hashHas(key) { var data = this.__data__; - return nativeCreate - ? data[key] !== undefined - : hasOwnProperty.call(data, key); + return nativeCreate ? data[key] !== undefined : hasOwnProperty.call(data, key); } /** @@ -1087,8 +1027,7 @@ function hashSet(key, value) { var data = this.__data__; this.size += this.has(key) ? 0 : 1; - data[key] = - nativeCreate && value === undefined ? HASH_UNDEFINED : value; + data[key] = nativeCreate && value === undefined ? HASH_UNDEFINED : value; return this; } @@ -1502,10 +1441,7 @@ // Node.js 0.10 has enumerable non-index properties on buffers. (isBuff && (key == "offset" || key == "parent")) || // PhantomJS 2 has enumerable non-index properties on typed arrays. - (isType && - (key == "buffer" || - key == "byteLength" || - key == "byteOffset")) || + (isType && (key == "buffer" || key == "byteLength" || key == "byteOffset")) || // Skip index properties. isIndex(key, length)) ) @@ -1526,10 +1462,7 @@ * @param {*} value The value to assign. */ function assignMergeValue(object, key, value) { - if ( - (value !== undefined && !eq(object[key], value)) || - (value === undefined && !(key in object)) - ) { + if ((value !== undefined && !eq(object[key], value)) || (value === undefined && !(key in object))) { baseAssignValue(object, key, value); } } @@ -1546,10 +1479,7 @@ */ function assignValue(object, key, value) { var objValue = object[key]; - if ( - !(hasOwnProperty.call(object, key) && eq(objValue, value)) || - (value === undefined && !(key in object)) - ) { + if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || (value === undefined && !(key in object))) { baseAssignValue(object, key, value); } } @@ -1643,9 +1573,7 @@ isFull = bitmask & CLONE_SYMBOLS_FLAG; if (customizer) { - result = object - ? customizer(value, key, object, stack) - : customizer(value); + result = object ? customizer(value, key, object, stack) : customizer(value); } if (result !== undefined) { return result; @@ -1688,13 +1616,7 @@ } stack.set(value, result); - var keysFunc = isFull - ? isFlat - ? getAllKeysIn - : getAllKeys - : isFlat - ? keysIn - : keys; + var keysFunc = isFull ? (isFlat ? getAllKeysIn : getAllKeys) : isFlat ? keysIn : keys; var props = isArr ? undefined : keysFunc(value); arrayEach(props || value, function(subValue, key) { @@ -1703,11 +1625,7 @@ subValue = value[key]; } // Recursively populate clone (susceptible to call stack limits). - assignValue( - result, - key, - baseClone(subValue, bitmask, customizer, key, value, stack) - ); + assignValue(result, key, baseClone(subValue, bitmask, customizer, key, value, stack)); }); return result; } @@ -1814,9 +1732,7 @@ */ function baseGetAllKeys(object, keysFunc, symbolsFunc) { var result = keysFunc(object); - return isArray(object) - ? result - : arrayPush(result, symbolsFunc(object)); + return isArray(object) ? result : arrayPush(result, symbolsFunc(object)); } /** @@ -1830,9 +1746,7 @@ if (value == null) { return value === undefined ? undefinedTag : nullTag; } - return symToStringTag && symToStringTag in Object(value) - ? getRawTag(value) - : objectToString(value); + return symToStringTag && symToStringTag in Object(value) ? getRawTag(value) : objectToString(value); } /** @@ -1876,21 +1790,10 @@ if (value === other) { return true; } - if ( - value == null || - other == null || - (!isObjectLike(value) && !isObjectLike(other)) - ) { + if (value == null || other == null || (!isObjectLike(value) && !isObjectLike(other))) { return value !== value && other !== other; } - return baseIsEqualDeep( - value, - other, - bitmask, - customizer, - baseIsEqual, - stack - ); + return baseIsEqualDeep(value, other, bitmask, customizer, baseIsEqual, stack); } /** @@ -1907,14 +1810,7 @@ * @param {Object} [stack] Tracks traversed `object` and `other` objects. * @returns {boolean} Returns `true` if the objects are equivalent, else `false`. */ - function baseIsEqualDeep( - object, - other, - bitmask, - customizer, - equalFunc, - stack - ) { + function baseIsEqualDeep(object, other, bitmask, customizer, equalFunc, stack) { var objIsArr = isArray(object), othIsArr = isArray(other), objTag = objIsArr ? arrayTag : getTag(object), @@ -1937,56 +1833,26 @@ if (isSameTag && !objIsObj) { stack || (stack = new Stack()); return objIsArr || isTypedArray(object) - ? equalArrays( - object, - other, - bitmask, - customizer, - equalFunc, - stack - ) - : equalByTag( - object, - other, - objTag, - bitmask, - customizer, - equalFunc, - stack - ); + ? equalArrays(object, other, bitmask, customizer, equalFunc, stack) + : equalByTag(object, other, objTag, bitmask, customizer, equalFunc, stack); } if (!(bitmask & COMPARE_PARTIAL_FLAG)) { - var objIsWrapped = - objIsObj && hasOwnProperty.call(object, "__wrapped__"), - othIsWrapped = - othIsObj && hasOwnProperty.call(other, "__wrapped__"); + var objIsWrapped = objIsObj && hasOwnProperty.call(object, "__wrapped__"), + othIsWrapped = othIsObj && hasOwnProperty.call(other, "__wrapped__"); if (objIsWrapped || othIsWrapped) { var objUnwrapped = objIsWrapped ? object.value() : object, othUnwrapped = othIsWrapped ? other.value() : other; stack || (stack = new Stack()); - return equalFunc( - objUnwrapped, - othUnwrapped, - bitmask, - customizer, - stack - ); + return equalFunc(objUnwrapped, othUnwrapped, bitmask, customizer, stack); } } if (!isSameTag) { return false; } stack || (stack = new Stack()); - return equalObjects( - object, - other, - bitmask, - customizer, - equalFunc, - stack - ); + return equalObjects(object, other, bitmask, customizer, equalFunc, stack); } /** @@ -2010,11 +1876,7 @@ object = Object(object); while (index--) { var data = matchData[index]; - if ( - noCustomizer && data[2] - ? data[1] !== object[data[0]] - : !(data[0] in object) - ) { + if (noCustomizer && data[2] ? data[1] !== object[data[0]] : !(data[0] in object)) { return false; } } @@ -2031,14 +1893,7 @@ } else { var stack = new Stack(); if (customizer) { - var result = customizer( - objValue, - srcValue, - key, - object, - source, - stack - ); + var result = customizer(objValue, srcValue, key, object, source, stack); } if ( !(result === undefined @@ -2082,11 +1937,7 @@ * @returns {boolean} Returns `true` if `value` is a typed array, else `false`. */ function baseIsTypedArray(value) { - return ( - isObjectLike(value) && - isLength(value.length) && - !!typedArrayTags[baseGetTag(value)] - ); + return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[baseGetTag(value)]; } /** @@ -2106,9 +1957,7 @@ return identity; } if (typeof value == "object") { - return isArray(value) - ? baseMatchesProperty(value[0], value[1]) - : baseMatches(value); + return isArray(value) ? baseMatchesProperty(value[0], value[1]) : baseMatches(value); } return property(value); } @@ -2148,12 +1997,7 @@ result = []; for (var key in object) { - if ( - !( - key == "constructor" && - (isProto || !hasOwnProperty.call(object, key)) - ) - ) { + if (!(key == "constructor" && (isProto || !hasOwnProperty.call(object, key)))) { result.push(key); } } @@ -2193,11 +2037,7 @@ var objValue = get(object, path); return objValue === undefined && objValue === srcValue ? hasIn(object, path) - : baseIsEqual( - srcValue, - objValue, - COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG - ); + : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG); }; } @@ -2221,25 +2061,10 @@ function(srcValue, key) { if (isObject(srcValue)) { stack || (stack = new Stack()); - baseMergeDeep( - object, - source, - key, - srcIndex, - baseMerge, - customizer, - stack - ); + baseMergeDeep(object, source, key, srcIndex, baseMerge, customizer, stack); } else { var newValue = customizer - ? customizer( - object[key], - srcValue, - key + "", - object, - source, - stack - ) + ? customizer(object[key], srcValue, key + "", object, source, stack) : undefined; if (newValue === undefined) { @@ -2267,15 +2092,7 @@ * @param {Object} [stack] Tracks traversed source values and their merged * counterparts. */ - function baseMergeDeep( - object, - source, - key, - srcIndex, - mergeFunc, - customizer, - stack - ) { + function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, stack) { var objValue = object[key], srcValue = source[key], stacked = stack.get(srcValue); @@ -2284,9 +2101,7 @@ assignMergeValue(object, key, stacked); return; } - var newValue = customizer - ? customizer(objValue, srcValue, key + "", object, source, stack) - : undefined; + var newValue = customizer ? customizer(objValue, srcValue, key + "", object, source, stack) : undefined; var isCommon = newValue === undefined; @@ -2314,10 +2129,7 @@ newValue = objValue; if (isArguments(objValue)) { newValue = toPlainObject(objValue); - } else if ( - !isObject(objValue) || - (srcIndex && isFunction(objValue)) - ) { + } else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) { newValue = initCloneObject(srcValue); } } else { @@ -2385,15 +2197,9 @@ if (index != lastIndex) { var objValue = nested[key]; - newValue = customizer - ? customizer(objValue, key, nested) - : undefined; + newValue = customizer ? customizer(objValue, key, nested) : undefined; if (newValue === undefined) { - newValue = isObject(objValue) - ? objValue - : isIndex(path[index + 1]) - ? [] - : {}; + newValue = isObject(objValue) ? objValue : isIndex(path[index + 1]) ? [] : {}; } } assignValue(nested, key, newValue); @@ -2530,9 +2336,7 @@ return buffer.slice(); } var length = buffer.length, - result = allocUnsafe - ? allocUnsafe(length) - : new buffer.constructor(length); + result = allocUnsafe ? allocUnsafe(length) : new buffer.constructor(length); buffer.copy(result); return result; @@ -2560,14 +2364,8 @@ * @returns {Object} Returns the cloned data view. */ function cloneDataView(dataView, isDeep) { - var buffer = isDeep - ? cloneArrayBuffer(dataView.buffer) - : dataView.buffer; - return new dataView.constructor( - buffer, - dataView.byteOffset, - dataView.byteLength - ); + var buffer = isDeep ? cloneArrayBuffer(dataView.buffer) : dataView.buffer; + return new dataView.constructor(buffer, dataView.byteOffset, dataView.byteLength); } /** @@ -2580,9 +2378,7 @@ * @returns {Object} Returns the cloned map. */ function cloneMap(map, isDeep, cloneFunc) { - var array = isDeep - ? cloneFunc(mapToArray(map), CLONE_DEEP_FLAG) - : mapToArray(map); + var array = isDeep ? cloneFunc(mapToArray(map), CLONE_DEEP_FLAG) : mapToArray(map); return arrayReduce(array, addMapEntry, new map.constructor()); } @@ -2594,10 +2390,7 @@ * @returns {Object} Returns the cloned regexp. */ function cloneRegExp(regexp) { - var result = new regexp.constructor( - regexp.source, - reFlags.exec(regexp) - ); + var result = new regexp.constructor(regexp.source, reFlags.exec(regexp)); result.lastIndex = regexp.lastIndex; return result; } @@ -2612,9 +2405,7 @@ * @returns {Object} Returns the cloned set. */ function cloneSet(set, isDeep, cloneFunc) { - var array = isDeep - ? cloneFunc(setToArray(set), CLONE_DEEP_FLAG) - : setToArray(set); + var array = isDeep ? cloneFunc(setToArray(set), CLONE_DEEP_FLAG) : setToArray(set); return arrayReduce(array, addSetEntry, new set.constructor()); } @@ -2638,14 +2429,8 @@ * @returns {Object} Returns the cloned typed array. */ function cloneTypedArray(typedArray, isDeep) { - var buffer = isDeep - ? cloneArrayBuffer(typedArray.buffer) - : typedArray.buffer; - return new typedArray.constructor( - buffer, - typedArray.byteOffset, - typedArray.length - ); + var buffer = isDeep ? cloneArrayBuffer(typedArray.buffer) : typedArray.buffer; + return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length); } /** @@ -2687,9 +2472,7 @@ while (++index < length) { var key = props[index]; - var newValue = customizer - ? customizer(object[key], source[key], key, object, source) - : undefined; + var newValue = customizer ? customizer(object[key], source[key], key, object, source) : undefined; if (newValue === undefined) { newValue = source[key]; @@ -2741,10 +2524,7 @@ customizer = length > 1 ? sources[length - 1] : undefined, guard = length > 2 ? sources[2] : undefined; - customizer = - assigner.length > 3 && typeof customizer == "function" - ? (length--, customizer) - : undefined; + customizer = assigner.length > 3 && typeof customizer == "function" ? (length--, customizer) : undefined; if (guard && isIterateeCall(sources[0], sources[1], guard)) { customizer = length < 3 ? undefined : customizer; @@ -2855,8 +2635,7 @@ } var index = -1, result = true, - seen = - bitmask & COMPARE_UNORDERED_FLAG ? new SetCache() : undefined; + seen = bitmask & COMPARE_UNORDERED_FLAG ? new SetCache() : undefined; stack.set(array, other); stack.set(other, array); @@ -2869,14 +2648,7 @@ if (customizer) { var compared = isPartial ? customizer(othValue, arrValue, index, other, array, stack) - : customizer( - arrValue, - othValue, - index, - array, - other, - stack - ); + : customizer(arrValue, othValue, index, array, other, stack); } if (compared !== undefined) { if (compared) { @@ -2891,14 +2663,7 @@ !arraySome(other, function(othValue, othIndex) { if ( !cacheHas(seen, othIndex) && - (arrValue === othValue || - equalFunc( - arrValue, - othValue, - bitmask, - customizer, - stack - )) + (arrValue === othValue || equalFunc(arrValue, othValue, bitmask, customizer, stack)) ) { return seen.push(othIndex); } @@ -2907,12 +2672,7 @@ result = false; break; } - } else if ( - !( - arrValue === othValue || - equalFunc(arrValue, othValue, bitmask, customizer, stack) - ) - ) { + } else if (!(arrValue === othValue || equalFunc(arrValue, othValue, bitmask, customizer, stack))) { result = false; break; } @@ -2939,21 +2699,10 @@ * @param {Object} stack Tracks traversed `object` and `other` objects. * @returns {boolean} Returns `true` if the objects are equivalent, else `false`. */ - function equalByTag( - object, - other, - tag, - bitmask, - customizer, - equalFunc, - stack - ) { + function equalByTag(object, other, tag, bitmask, customizer, equalFunc, stack) { switch (tag) { case dataViewTag: - if ( - object.byteLength != other.byteLength || - object.byteOffset != other.byteOffset - ) { + if (object.byteLength != other.byteLength || object.byteOffset != other.byteOffset) { return false; } object = object.buffer; @@ -2976,9 +2725,7 @@ return eq(+object, +other); case errorTag: - return ( - object.name == other.name && object.message == other.message - ); + return object.name == other.name && object.message == other.message; case regexpTag: case stringTag: @@ -3006,22 +2753,13 @@ // Recursively compare objects (susceptible to call stack limits). stack.set(object, other); - var result = equalArrays( - convert(object), - convert(other), - bitmask, - customizer, - equalFunc, - stack - ); + var result = equalArrays(convert(object), convert(other), bitmask, customizer, equalFunc, stack); stack["delete"](object); return result; case symbolTag: if (symbolValueOf) { - return ( - symbolValueOf.call(object) == symbolValueOf.call(other) - ); + return symbolValueOf.call(object) == symbolValueOf.call(other); } } return false; @@ -3040,14 +2778,7 @@ * @param {Object} stack Tracks traversed `object` and `other` objects. * @returns {boolean} Returns `true` if the objects are equivalent, else `false`. */ - function equalObjects( - object, - other, - bitmask, - customizer, - equalFunc, - stack - ) { + function equalObjects(object, other, bitmask, customizer, equalFunc, stack) { var isPartial = bitmask & COMPARE_PARTIAL_FLAG, objProps = getAllKeys(object), objLength = objProps.length, @@ -3087,8 +2818,7 @@ // Recursively compare objects (susceptible to call stack limits). if ( !(compared === undefined - ? objValue === othValue || - equalFunc(objValue, othValue, bitmask, customizer, stack) + ? objValue === othValue || equalFunc(objValue, othValue, bitmask, customizer, stack) : compared) ) { result = false; @@ -3169,9 +2899,7 @@ */ function getMapData(map, key) { var data = map.__data__; - return isKeyable(key) - ? data[typeof key == "string" ? "string" : "hash"] - : data.map; + return isKeyable(key) ? data[typeof key == "string" ? "string" : "hash"] : data.map; } /** @@ -3338,12 +3066,7 @@ return result; } length = object == null ? 0 : object.length; - return ( - !!length && - isLength(length) && - isIndex(key, length) && - (isArray(object) || isArguments(object)) - ); + return !!length && isLength(length) && isIndex(key, length) && (isArray(object) || isArguments(object)); } /** @@ -3358,11 +3081,7 @@ result = array.constructor(length); // Add properties assigned by `RegExp#exec`. - if ( - length && - typeof array[0] == "string" && - hasOwnProperty.call(array, "index") - ) { + if (length && typeof array[0] == "string" && hasOwnProperty.call(array, "index")) { result.index = array.index; result.input = array.input; } @@ -3377,9 +3096,7 @@ * @returns {Object} Returns the initialized clone. */ function initCloneObject(object) { - return typeof object.constructor == "function" && !isPrototype(object) - ? baseCreate(getPrototype(object)) - : {}; + return typeof object.constructor == "function" && !isPrototype(object) ? baseCreate(getPrototype(object)) : {}; } /** @@ -3445,11 +3162,7 @@ * @returns {boolean} Returns `true` if `value` is flattenable, else `false`. */ function isFlattenable(value) { - return ( - isArray(value) || - isArguments(value) || - !!(spreadableSymbol && value && value[spreadableSymbol]) - ); + return isArray(value) || isArguments(value) || !!(spreadableSymbol && value && value[spreadableSymbol]); } /** @@ -3507,20 +3220,10 @@ return false; } var type = typeof value; - if ( - type == "number" || - type == "symbol" || - type == "boolean" || - value == null || - isSymbol(value) - ) { + if (type == "number" || type == "symbol" || type == "boolean" || value == null || isSymbol(value)) { return true; } - return ( - reIsPlainProp.test(value) || - !reIsDeepProp.test(value) || - (object != null && value in Object(object)) - ); + return reIsPlainProp.test(value) || !reIsDeepProp.test(value) || (object != null && value in Object(object)); } /** @@ -3532,10 +3235,7 @@ */ function isKeyable(value) { var type = typeof value; - return type == "string" || - type == "number" || - type == "symbol" || - type == "boolean" + return type == "string" || type == "number" || type == "symbol" || type == "boolean" ? value !== "__proto__" : value === null; } @@ -3560,8 +3260,7 @@ */ function isPrototype(value) { var Ctor = value && value.constructor, - proto = - (typeof Ctor == "function" && Ctor.prototype) || objectProto; + proto = (typeof Ctor == "function" && Ctor.prototype) || objectProto; return value === proto; } @@ -3592,10 +3291,7 @@ if (object == null) { return false; } - return ( - object[key] === srcValue && - (srcValue !== undefined || key in Object(object)) - ); + return object[key] === srcValue && (srcValue !== undefined || key in Object(object)); }; } @@ -3731,9 +3427,7 @@ result.push(""); } string.replace(rePropName, function(match, number, quote, string) { - result.push( - quote ? string.replace(reEscapeChar, "$1") : number || match - ); + result.push(quote ? string.replace(reEscapeChar, "$1") : number || match); }); return result; }); @@ -3921,10 +3615,7 @@ * _.memoize.Cache = WeakMap; */ function memoize(func, resolver) { - if ( - typeof func != "function" || - (resolver != null && typeof resolver != "function") - ) { + if (typeof func != "function" || (resolver != null && typeof resolver != "function")) { throw new TypeError(FUNC_ERROR_TEXT); } var memoized = function() { @@ -4142,12 +3833,7 @@ // The use of `Object#toString` avoids issues with the `typeof` operator // in Safari 9 which returns 'object' for typed arrays and other constructors. var tag = baseGetTag(value); - return ( - tag == funcTag || - tag == genTag || - tag == asyncTag || - tag == proxyTag - ); + return tag == funcTag || tag == genTag || tag == asyncTag || tag == proxyTag; } /** @@ -4177,12 +3863,7 @@ * // => false */ function isLength(value) { - return ( - typeof value == "number" && - value > -1 && - value % 1 == 0 && - value <= MAX_SAFE_INTEGER - ); + return typeof value == "number" && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER; } /** @@ -4279,13 +3960,8 @@ if (proto === null) { return true; } - var Ctor = - hasOwnProperty.call(proto, "constructor") && proto.constructor; - return ( - typeof Ctor == "function" && - Ctor instanceof Ctor && - funcToString.call(Ctor) == objectCtorString - ); + var Ctor = hasOwnProperty.call(proto, "constructor") && proto.constructor; + return typeof Ctor == "function" && Ctor instanceof Ctor && funcToString.call(Ctor) == objectCtorString; } /** @@ -4306,12 +3982,7 @@ * // => false */ function isString(value) { - return ( - typeof value == "string" || - (!isArray(value) && - isObjectLike(value) && - baseGetTag(value) == stringTag) - ); + return typeof value == "string" || (!isArray(value) && isObjectLike(value) && baseGetTag(value) == stringTag); } /** @@ -4332,10 +4003,7 @@ * // => false */ function isSymbol(value) { - return ( - typeof value == "symbol" || - (isObjectLike(value) && baseGetTag(value) == symbolTag) - ); + return typeof value == "symbol" || (isObjectLike(value) && baseGetTag(value) == symbolTag); } /** @@ -4355,9 +4023,7 @@ * _.isTypedArray([]); * // => false */ - var isTypedArray = nodeIsTypedArray - ? baseUnary(nodeIsTypedArray) - : baseIsTypedArray; + var isTypedArray = nodeIsTypedArray ? baseUnary(nodeIsTypedArray) : baseIsTypedArray; /** * Checks if `value` is `undefined`. @@ -4414,12 +4080,7 @@ return iteratorToArray(value[symIterator]()); } var tag = getTag(value), - func = - tag == mapTag - ? mapToArray - : tag == setTag - ? setToArray - : values; + func = tag == mapTag ? mapToArray : tag == setTag ? setToArray : values; return func(value); } @@ -4489,11 +4150,7 @@ var result = toFinite(value), remainder = result % 1; - return result === result - ? remainder - ? result - remainder - : result - : 0; + return result === result ? (remainder ? result - remainder : result) : 0; } /** @@ -4527,8 +4184,7 @@ return NAN; } if (isObject(value)) { - var other = - typeof value.valueOf == "function" ? value.valueOf() : value; + var other = typeof value.valueOf == "function" ? value.valueOf() : value; value = isObject(other) ? other + "" : other; } if (typeof value != "string") { @@ -4714,9 +4370,7 @@ * // => ['a', 'b', 'c'] (iteration order is not guaranteed) */ function keysIn(object) { - return isArrayLike(object) - ? arrayLikeKeys(object, true) - : baseKeysIn(object); + return isArrayLike(object) ? arrayLikeKeys(object, true) : baseKeysIn(object); } /** @@ -4906,9 +4560,7 @@ * // => ['def'] */ function iteratee(func) { - return baseIteratee( - typeof func == "function" ? func : baseClone(func, CLONE_DEEP_FLAG) - ); + return baseIteratee(typeof func == "function" ? func : baseClone(func, CLONE_DEEP_FLAG)); } /** diff --git a/packages/browser-sync/lib/logger.js b/packages/browser-sync/lib/logger.js index e92606556..544b8bb3b 100644 --- a/packages/browser-sync/lib/logger.js +++ b/packages/browser-sync/lib/logger.js @@ -5,7 +5,7 @@ var utils = require("./utils"); var _ = require("./lodash.custom"); var chalk = require("chalk"); -var template = (prefix) => "[" + chalk.blue(prefix) + "] " +var template = prefix => "[" + chalk.blue(prefix) + "] "; var logger = require("eazy-logger").Logger({ useLevelPrefixes: false @@ -19,7 +19,7 @@ module.exports.logger = logger; */ module.exports.getLogger = function(name) { return logger.clone(function(config) { - config.prefix = config.prefix + template(name) + config.prefix = config.prefix + template(name); return config; }); }; @@ -46,17 +46,10 @@ module.exports.callbacks = { "file:reload": function(bs, data) { if (canLogFileChange(bs, data)) { if (data.path[0] === "*") { - return logger.info( - chalk.cyan("Reloading files that match: %s"), - chalk.magenta(data.path) - ); + return logger.info(chalk.cyan("Reloading files that match: %s"), chalk.magenta(data.path)); } - logger.info( - chalk.cyan("File event [%s] : %s"), - data.event, - chalk.magenta(data.path), - ); + logger.info(chalk.cyan("File event [%s] : %s"), data.event, chalk.magenta(data.path)); } }, /** @@ -71,10 +64,7 @@ module.exports.callbacks = { "browser:reload": function(bs, data = {}) { if (canLogFileChange(bs)) { if (data.files && data.files.length > 1) { - return logger.info( - chalk.cyan(`Reloading Browsers... (buffered %s events)`), - data.files.length - ); + return logger.info(chalk.cyan(`Reloading Browsers... (buffered %s events)`), data.files.length); } logger.info(chalk.cyan("Reloading Browsers...")); } @@ -85,9 +75,9 @@ module.exports.callbacks = { "browser:error": function() { logger.error( "Couldn't open browser (if you are using BrowserSync in a " + - "headless environment, you might want to set the %s option to %s)", + "headless environment, you might want to set the %s option to %s)", chalk.cyan("open"), - chalk.cyan("false"), + chalk.cyan("false") ); }, /** @@ -153,17 +143,18 @@ module.exports.callbacks = { } if (type === "proxy") { - logger.info( - "Proxying: %s", - chalk.cyan(bs.options.getIn(["proxy", "target"])) - ); + logger.info("Proxying: %s", chalk.cyan(bs.options.getIn(["proxy", "target"]))); logUrls(bs.options.get("urls").toJS()); } if (type === "snippet") { if (bs.options.get("logSnippet")) { logger.info( - chalk.bold(`Copy the following snippet into your website, just before the closing ${chalk.cyan('')} tag`) + chalk.bold( + `Copy the following snippet into your website, just before the closing ${chalk.cyan( + "" + )} tag` + ) ); logger.unprefixed("info", messages.scriptTags(bs.options)); diff --git a/packages/browser-sync/lib/options.ts b/packages/browser-sync/lib/options.ts index 954c8821d..1781b8981 100644 --- a/packages/browser-sync/lib/options.ts +++ b/packages/browser-sync/lib/options.ts @@ -96,13 +96,7 @@ export function setNamespace(incoming: BsTempOptions): TransformResult { var namespace = incoming.getIn(["socket", "namespace"]); if (_.isFunction(namespace)) { - return [ - incoming.setIn( - ["socket", "namespace"], - namespace((defaultConfig.socket as any).namespace) - ), - [] - ]; + return [incoming.setIn(["socket", "namespace"], namespace((defaultConfig.socket as any).namespace)), []]; } return [incoming, []]; } @@ -135,19 +129,11 @@ export function setServerOpts(incoming: BsTempOptions): TransformResult { return [incoming, []]; } -export function liftExtensionsOptionFromCli( - incoming: BsTempOptions -): TransformResult { +export function liftExtensionsOptionFromCli(incoming: BsTempOptions): TransformResult { // cli extensions var optPath = ["server", "serveStaticOptions"]; if (incoming.get("extensions")) { - return [ - incoming.setIn( - optPath.concat(["extensions"]), - incoming.get("extensions") - ), - [] - ]; + return [incoming.setIn(optPath.concat(["extensions"]), incoming.get("extensions")), []]; } return [incoming, []]; } @@ -166,9 +152,7 @@ export function fixRewriteRules(incoming: BsTempOptions): TransformResult { ]; } -export function fixSnippetIgnorePaths( - incoming: BsTempOptions -): TransformResult { +export function fixSnippetIgnorePaths(incoming: BsTempOptions): TransformResult { var ignorePaths = incoming.getIn(["snippetOptions", "ignorePaths"]); if (ignorePaths) { @@ -176,30 +160,16 @@ export function fixSnippetIgnorePaths( ignorePaths = [ignorePaths]; } ignorePaths = ignorePaths.map(ensureSlash); - return [ - incoming.setIn( - ["snippetOptions", "blacklist"], - Immutable.List(ignorePaths) - ), - [] - ]; + return [incoming.setIn(["snippetOptions", "blacklist"], Immutable.List(ignorePaths)), []]; } return [incoming, []]; } -export function fixSnippetIncludePaths( - incoming: BsTempOptions -): TransformResult { +export function fixSnippetIncludePaths(incoming: BsTempOptions): TransformResult { var includePaths = incoming.getIn(["snippetOptions", "whitelist"]); if (includePaths) { includePaths = includePaths.map(ensureSlash); - return [ - incoming.setIn( - ["snippetOptions", "whitelist"], - Immutable.List(includePaths) - ), - [] - ]; + return [incoming.setIn(["snippetOptions", "whitelist"], Immutable.List(includePaths)), []]; } return [incoming, []]; } diff --git a/packages/browser-sync/lib/server/index.js b/packages/browser-sync/lib/server/index.js index ce0841871..a047a79ea 100644 --- a/packages/browser-sync/lib/server/index.js +++ b/packages/browser-sync/lib/server/index.js @@ -15,10 +15,7 @@ module.exports.plugin = function(bs) { var bsServer = createServer(bs); if (type === "server" || type === "snippet") { - debug( - "Static Server running ({magenta:%s}) ...", - bs.options.get("scheme") - ); + debug("Static Server running ({magenta:%s}) ...", bs.options.get("scheme")); } if (proxy) { @@ -34,10 +31,7 @@ module.exports.plugin = function(bs) { /** * Listen on the available port */ - bsServer.server.listen( - bs.options.get("port"), - bs.options.get("listen") - ); + bsServer.server.listen(bs.options.get("port"), bs.options.get("listen")); /** * Hack to deal with https://github.com/socketio/socket.io/issues/1602#issuecomment-224270022 @@ -61,11 +55,7 @@ module.exports.plugin = function(bs) { function setCloseReceived(io) { Object.keys(io.sockets).forEach(function(key) { - _.set( - io.sockets[key], - "conn.transport.socket._closeReceived", - true - ); + _.set(io.sockets[key], "conn.transport.socket._closeReceived", true); }); } diff --git a/packages/browser-sync/lib/server/proxy-utils.js b/packages/browser-sync/lib/server/proxy-utils.js index ec03a8997..f31c1d9f2 100644 --- a/packages/browser-sync/lib/server/proxy-utils.js +++ b/packages/browser-sync/lib/server/proxy-utils.js @@ -89,13 +89,7 @@ module.exports.rewriteLinks = function(userServer) { /** * Finally append all of parsed url */ - return [ - captured, - pre, - proxyUrl, - out.path || "", - out.hash || "" - ].join(""); + return [captured, pre, proxyUrl, out.path || "", out.hash || ""].join(""); } }; }; @@ -106,9 +100,7 @@ module.exports.rewriteLinks = function(userServer) { */ module.exports.checkCookies = function checkCookies(res) { if (typeof res.headers["set-cookie"] !== "undefined") { - res.headers["set-cookie"] = res.headers["set-cookie"].map(function( - item - ) { + res.headers["set-cookie"] = res.headers["set-cookie"].map(function(item) { return rewriteCookies(item); }); } diff --git a/packages/browser-sync/lib/server/static-server.js b/packages/browser-sync/lib/server/static-server.js index edcade984..3d2b645e0 100644 --- a/packages/browser-sync/lib/server/static-server.js +++ b/packages/browser-sync/lib/server/static-server.js @@ -42,9 +42,7 @@ module.exports = function createServer(bs) { basedirs.map(function(root) { return { route: "", - id: - "Browsersync Server ServeStatic Middleware - " + - _serveStatic++, + id: "Browsersync Server ServeStatic Middleware - " + _serveStatic++, handle: serveStatic(resolve(root), serveStaticOptions) }; }) @@ -66,9 +64,7 @@ module.exports = function createServer(bs) { } return { route: urlPath, - id: - "Browsersync Server Routes Middleware - " + - _routes++, + id: "Browsersync Server Routes Middleware - " + _routes++, handle: serveStatic(resolve(root)) }; }) diff --git a/packages/browser-sync/lib/server/utils.js b/packages/browser-sync/lib/server/utils.js index 8ea22d588..bbf42f165 100644 --- a/packages/browser-sync/lib/server/utils.js +++ b/packages/browser-sync/lib/server/utils.js @@ -38,15 +38,11 @@ function getCa(options) { } function getKey(options) { - return fs.readFileSync( - options.getIn(["https", "key"]) || join(certPath, "server.key") - ); + return fs.readFileSync(options.getIn(["https", "key"]) || join(certPath, "server.key")); } function getCert(options) { - return fs.readFileSync( - options.getIn(["https", "cert"]) || join(certPath, "server.crt") - ); + return fs.readFileSync(options.getIn(["https", "cert"]) || join(certPath, "server.crt")); } function getHttpsServerDefaults(options) { @@ -88,10 +84,7 @@ var serverUtils = { server: (function() { var httpModule = serverUtils.getHttpModule(options); - if ( - options.get("scheme") === "https" || - options.get("httpModule") === "http2" - ) { + if (options.get("scheme") === "https" || options.get("httpModule") === "http2") { var opts = serverUtils.getHttpsOptions(options); return httpModule.createServer(opts.toJS(), app); } @@ -129,11 +122,7 @@ var serverUtils = { options: bs.options }); - var scripts = bs.pluginManager.get("client:script")( - bs.options.toJS(), - clientJs, - "middleware" - ); + var scripts = bs.pluginManager.get("client:script")(bs.options.toJS(), clientJs, "middleware"); var defaultMiddlewares = [ { @@ -144,9 +133,7 @@ var serverUtils = { { id: "Browsersync IE8 Support", route: "", - handle: snippet.isOldIe( - bs.options.get("excludedFileTypes").toJS() - ) + handle: snippet.isOldIe(bs.options.get("excludedFileTypes").toJS()) }, { id: "Browsersync Response Modifier", @@ -205,20 +192,13 @@ var serverUtils = { if (withErrors.size) { withErrors.forEach(function(item) { - logger.logger.error( - "%s %s", - chalk.red("Warning!"), - item.getIn(["errors", 0, "data", "message"]) - ); + logger.logger.error("%s %s", chalk.red("Warning!"), item.getIn(["errors", 0, "data", "message"])); }); } if (withoutErrors.size) { withoutErrors.forEach(function(item) { - defaultMiddlewares.push.apply( - defaultMiddlewares, - item.get("items").toJS() - ); + defaultMiddlewares.push.apply(defaultMiddlewares, item.get("items").toJS()); }); } } @@ -249,9 +229,7 @@ var serverUtils = { } ); - const mwStack = [] - .concat(beforeMiddlewares, defaultMiddlewares, afterMiddlewares) - .filter(Boolean); + const mwStack = [].concat(beforeMiddlewares, defaultMiddlewares, afterMiddlewares).filter(Boolean); return mwStack; @@ -300,18 +278,11 @@ var serverUtils = { .concat(bs.options.getIn(["snippetOptions", "blacklist"])) .filter(Boolean); - var whitelist = List([]).concat( - bs.options.getIn(["snippetOptions", "whitelist"]) - ); + var whitelist = List([]).concat(bs.options.getIn(["snippetOptions", "whitelist"])); // Snippet if (bs.options.get("snippet")) { - rules.push( - snippetUtils.getRegex( - bs.options.get("snippet"), - bs.options.get("snippetOptions") - ) - ); + rules.push(snippetUtils.getRegex(bs.options.get("snippet"), bs.options.get("snippetOptions"))); } // User @@ -326,9 +297,7 @@ var serverUtils = { // Proxy if (bs.options.get("proxy")) { - var proxyRule = require("./proxy-utils").rewriteLinks( - bs.options.getIn(["proxy", "url"]).toJS() - ); + var proxyRule = require("./proxy-utils").rewriteLinks(bs.options.getIn(["proxy", "url"]).toJS()); rules.push(proxyRule); } @@ -346,16 +315,10 @@ var serverUtils = { res.setHeader("Access-Control-Allow-Origin", "*"); // Request methods you wish to allow - res.setHeader( - "Access-Control-Allow-Methods", - "GET, POST, OPTIONS, PUT, PATCH, DELETE" - ); + res.setHeader("Access-Control-Allow-Methods", "GET, POST, OPTIONS, PUT, PATCH, DELETE"); // Request headers you wish to allow - res.setHeader( - "Access-Control-Allow-Headers", - "X-Requested-With,content-type" - ); + res.setHeader("Access-Control-Allow-Headers", "X-Requested-With,content-type"); // Set to true if you need the website to include cookies in the requests sent // to the API (e.g. in case you use sessions) @@ -461,8 +424,7 @@ var serverUtils = { { type: "Invalid Object", data: { - message: - "Serve Static requires a 'dir' property when using an Object" + message: "Serve Static requires a 'dir' property when using an Object" } } ] diff --git a/packages/browser-sync/lib/snippet.js b/packages/browser-sync/lib/snippet.js index f3a8da0e8..ca347d2d2 100644 --- a/packages/browser-sync/lib/snippet.js +++ b/packages/browser-sync/lib/snippet.js @@ -49,9 +49,7 @@ var snippetUtils = { }; }, getSnippetMiddleware: function(snippet, options, rewriteRules) { - return lrSnippet.create( - snippetUtils.getRules(snippet, options, rewriteRules) - ); + return lrSnippet.create(snippetUtils.getRules(snippet, options, rewriteRules)); }, getRules: function(snippet, options, rewriteRules) { var rules = [snippetUtils.getRegex(snippet, options)]; @@ -93,10 +91,7 @@ var snippetUtils = { getClientJs: function(port, options) { return () => { const script = options.get("minify") ? "index.js" : "index.js"; - const client = fs.readFileSync( - require.resolve("browser-sync-client/dist/" + script), - "utf8" - ); + const client = fs.readFileSync(require.resolve("browser-sync-client/dist/" + script), "utf8"); return [connectUtils.socketConnector(options), client].join(";\n"); }; } diff --git a/packages/browser-sync/lib/sockets.ts b/packages/browser-sync/lib/sockets.ts index 8af52ab99..3755a1eda 100644 --- a/packages/browser-sync/lib/sockets.ts +++ b/packages/browser-sync/lib/sockets.ts @@ -1,4 +1,4 @@ -import {Server} from "socket.io"; +import { Server } from "socket.io"; import * as utils from "./server/utils"; /** @@ -19,10 +19,7 @@ export function init(server, clientEvents, bs) { var socketConfig = bs.options.get("socket").toJS(); - if ( - bs.options.get("mode") === "proxy" && - bs.options.getIn(["proxy", "ws"]) - ) { + if (bs.options.get("mode") === "proxy" && bs.options.getIn(["proxy", "ws"])) { server = utils.getServer(null, bs.options).server; server.listen(bs.options.getIn(["socket", "port"])); bs.registerCleanupTask(function() { @@ -35,17 +32,17 @@ export function init(server, clientEvents, bs) { const io = new Server(); io.attach(server, { - ...socketIoConfig, - pingTimeout: socketConfig.clients.heartbeatTimeout, - cors: { - credentials: true, - "origin": (origin, cb) => { - return cb(null, origin) - }, - } + ...socketIoConfig, + pingTimeout: socketConfig.clients.heartbeatTimeout, + cors: { + credentials: true, + origin: (origin, cb) => { + return cb(null, origin); + } + } }); - io.of(socketConfig.namespace).on('connection', (socket) => { + io.of(socketConfig.namespace).on("connection", socket => { handleConnection(socket); }); @@ -80,7 +77,7 @@ export function init(server, clientEvents, bs) { } // @ts-ignore - io.sockets = io.of(socketConfig.namespace) + io.sockets = io.of(socketConfig.namespace); return io; } diff --git a/packages/browser-sync/lib/tunnel.js b/packages/browser-sync/lib/tunnel.js index 2dda0400d..6ba89eda7 100644 --- a/packages/browser-sync/lib/tunnel.js +++ b/packages/browser-sync/lib/tunnel.js @@ -17,10 +17,7 @@ module.exports = function(bs, cb) { } bs.debug("Requesting a tunnel connection on port: {magenta:%s}", port); - bs.debug( - "Requesting a tunnel connection with options: {magenta:%s}", - utils.inspect(opts) - ); + bs.debug("Requesting a tunnel connection with options: {magenta:%s}", utils.inspect(opts)); require("localtunnel")(port, opts, function(err, tunnel) { if (err) { @@ -29,9 +26,7 @@ module.exports = function(bs, cb) { tunnel.on("error", function(err) { bs.logger.info("Localtunnel issue: " + err.message); - bs.logger.info( - "Oops! The localtunnel appears to have disconnected. Reconnecting..." - ); + bs.logger.info("Oops! The localtunnel appears to have disconnected. Reconnecting..."); }); return cb(null, tunnel); diff --git a/packages/browser-sync/lib/utils.ts b/packages/browser-sync/lib/utils.ts index 2f29b006f..84c2b22ea 100644 --- a/packages/browser-sync/lib/utils.ts +++ b/packages/browser-sync/lib/utils.ts @@ -91,10 +91,7 @@ export function getUrls(external, local, scheme, options) { }; if (external !== local) { - urls.external = getUrl( - _makeUrl(scheme, external, options.get("port")), - options - ); + urls.external = getUrl(_makeUrl(scheme, external, options.get("port")), options); } return urls; @@ -132,12 +129,7 @@ export function getPorts(options: BsTempOptions, cb: PortLookupCb) { fn(host, port, max, cb); } -export function getPort( - host: string, - port: number | string, - max: number | string | null, - cb: PortLookupCb -) { +export function getPort(host: string, port: number | string, max: number | string | null, cb: PortLookupCb) { portScanner.findAPortNotInUse( port, max, diff --git a/packages/browser-sync/package.json b/packages/browser-sync/package.json index 75c1214a9..ceff4b107 100644 --- a/packages/browser-sync/package.json +++ b/packages/browser-sync/package.json @@ -20,6 +20,11 @@ "engines": { "node": ">= 8.0.0" }, + "prettier": { + "tabWidth": 4, + "singleQuote": false, + "printWidth": 120 + }, "scripts": { "build": "npm run build:server", "build:server": "tsc", @@ -27,7 +32,7 @@ "env": "node ./test/env.js", "lodash": "lodash include=isUndefined,isFunction,toArray,includes,union,each,isString,merge,isObject,set exports=node", "prepublishOnly": "npm run build", - "prettier": "prettier 'lib/**/*' 'examples/*' 'test/specs/**/*.js' --tab-width 4", + "prettier": "prettier 'lib/**/*' 'examples/*' 'test/specs/**/*.js'", "prettier:fix": "npm run prettier -- --write", "test": "npm run build && npm run env && npm run unit", "unit": "mocha --recursive test/specs --timeout 10000 --bail --exit", diff --git a/packages/browser-sync/test/specs/api/init.js b/packages/browser-sync/test/specs/api/init.js index ad9c644bb..b1f11f1a6 100644 --- a/packages/browser-sync/test/specs/api/init.js +++ b/packages/browser-sync/test/specs/api/init.js @@ -17,7 +17,7 @@ describe("API: .init - don't not call init when already running.", function() { var arg = spy.getCall(0).args; assert.include(arg[0], chalk.yellow("You tried to start Browsersync twice!")); assert.include(arg[1], "To create multiple instances, use"); - assert.include(arg[2], chalk.cyan('browserSync.create().init()')); + assert.include(arg[2], chalk.cyan("browserSync.create().init()")); console.log.restore(); bs.cleanup(); done(); diff --git a/packages/browser-sync/test/specs/api/init.reload.multi.js b/packages/browser-sync/test/specs/api/init.reload.multi.js index c12a4df2b..12647a4ec 100644 --- a/packages/browser-sync/test/specs/api/init.reload.multi.js +++ b/packages/browser-sync/test/specs/api/init.reload.multi.js @@ -9,19 +9,15 @@ describe("API: .reload() with multi instances", function() { before(function(done) { browserSync.reset(); - browserSync - .create("Server 1") - .init({ logLevel: "silent" }, function(err, bs) { - bs1 = bs; - emitter1 = sinon.spy(bs.events, "emit"); - browserSync - .create("Server 2") - .init({ logLevel: "silent" }, function(err, bs) { - bs2 = bs; - emitter2 = sinon.spy(bs.events, "emit"); - done(); - }); + browserSync.create("Server 1").init({ logLevel: "silent" }, function(err, bs) { + bs1 = bs; + emitter1 = sinon.spy(bs.events, "emit"); + browserSync.create("Server 2").init({ logLevel: "silent" }, function(err, bs) { + bs2 = bs; + emitter2 = sinon.spy(bs.events, "emit"); + done(); }); + }); clock = sinon.useFakeTimers(); }); diff --git a/packages/browser-sync/test/specs/api/init.reload.stream.js b/packages/browser-sync/test/specs/api/init.reload.stream.js index 00ee71d40..c5d89ae22 100644 --- a/packages/browser-sync/test/specs/api/init.reload.stream.js +++ b/packages/browser-sync/test/specs/api/init.reload.stream.js @@ -10,13 +10,10 @@ describe("API: .stream()", function() { before(function(done) { browserSync.reset(); scheduler = require("../../utils").getScheduler(); - bs = browserSync( - { logLevel: "silent", debug: { scheduler: scheduler } }, - function() { - emitterStub = sinon.spy(bs.emitter, "emit"); - done(); - } - ); + bs = browserSync({ logLevel: "silent", debug: { scheduler: scheduler } }, function() { + emitterStub = sinon.spy(bs.emitter, "emit"); + done(); + }); }); afterEach(function() { @@ -119,9 +116,7 @@ describe("API: .stream()", function() { it("accepts file paths beginning with dots", function() { var stream = browserSync.stream({ match: "**/*.css" }); stream.write(new File({ path: "/users/shakyshane/.tmp/css/core.css" })); - stream.write( - new File({ path: "/users/shakyshane/.tmp/css/core.css.map" }) - ); + stream.write(new File({ path: "/users/shakyshane/.tmp/css/core.css.map" })); stream.end(); scheduler.advanceTo(600); sinon.assert.calledWithExactly(emitterStub, "file:changed", { diff --git a/packages/browser-sync/test/specs/api/init.reload.stream.noop.js b/packages/browser-sync/test/specs/api/init.reload.stream.noop.js index 4e0011e3d..5490f3575 100644 --- a/packages/browser-sync/test/specs/api/init.reload.stream.noop.js +++ b/packages/browser-sync/test/specs/api/init.reload.stream.noop.js @@ -18,10 +18,7 @@ describe("API: .stream() noop", function() { it("should can handle a reload + stream call after there IS an instance", function(done) { var emitterStub; var scheduler = require("../../utils").getScheduler(); - var bs = browserSync({ debug: { scheduler: scheduler } }, function( - err, - _bs - ) { + var bs = browserSync({ debug: { scheduler: scheduler } }, function(err, _bs) { var stream = bs.stream(); emitterStub = sinon.spy(_bs.emitter, "emit"); diff --git a/packages/browser-sync/test/specs/api/watch.js b/packages/browser-sync/test/specs/api/watch.js index 871d0ca41..870098705 100644 --- a/packages/browser-sync/test/specs/api/watch.js +++ b/packages/browser-sync/test/specs/api/watch.js @@ -42,10 +42,7 @@ describe("API: .watch() - Public watch method", function() { var bs = browserSync.create("test"); fs.writeFile(tempFile, tempFileContent, function() { - var watcher = bs.watch(tempFile, { ignoreInitial: true }, function( - event, - file - ) { + var watcher = bs.watch(tempFile, { ignoreInitial: true }, function(event, file) { assert.equal(event, "change"); assert.equal(file, tempFile); watcher.close(); @@ -63,13 +60,11 @@ describe("API: .watch() - Public watch method", function() { var bs = browserSync.create("test"); fs.writeFile(tempFile, tempFileContent, function() { - var watcher = bs - .watch(tempFile, { ignoreInitial: true }) - .on("change", function(file) { - assert.equal(file, tempFile); - watcher.close(); - done(); - }); + var watcher = bs.watch(tempFile, { ignoreInitial: true }).on("change", function(file) { + assert.equal(file, tempFile); + watcher.close(); + done(); + }); writeFileWait(tempFile, tempFileContent + " changed"); }); diff --git a/packages/browser-sync/test/specs/cli/cli.exec.js b/packages/browser-sync/test/specs/cli/cli.exec.js index 5705545b6..9d35eb8fa 100644 --- a/packages/browser-sync/test/specs/cli/cli.exec.js +++ b/packages/browser-sync/test/specs/cli/cli.exec.js @@ -1,17 +1,14 @@ describe("CLI: exec", function() { this.timeout(10000); it("Can launch from cli", function(done) { - var strem = require("child_process").spawn("node", [ - require.resolve("../../../dist/bin"), - "start" - ]); + var strem = require("child_process").spawn("node", [require.resolve("../../../dist/bin"), "start"]); var chunks = []; strem.stdout.on("data", function(data) { chunks.push(data.toString()); if (chunks.join("").indexOf("Copy the following snippet") > -1) { strem.kill("SIGINT"); } else { - done(new Error("missing output")) + done(new Error("missing output")); } }); strem.on("close", function() { diff --git a/packages/browser-sync/test/specs/cli/cli.get.config.js b/packages/browser-sync/test/specs/cli/cli.get.config.js index 3cc1e09d7..6f66c0de6 100644 --- a/packages/browser-sync/test/specs/cli/cli.get.config.js +++ b/packages/browser-sync/test/specs/cli/cli.get.config.js @@ -10,9 +10,7 @@ describe("When reading a config file from the file system", function() { }); it("should not throw if the file is found", function() { - assert.isDefined( - info.getConfigFile("test/fixtures/config/si-config.js") - ); + assert.isDefined(info.getConfigFile("test/fixtures/config/si-config.js")); }); it("should not throw if absolute path given", function() { diff --git a/packages/browser-sync/test/specs/cli/cli.help.js b/packages/browser-sync/test/specs/cli/cli.help.js index 4cbef7557..626cae1e9 100644 --- a/packages/browser-sync/test/specs/cli/cli.help.js +++ b/packages/browser-sync/test/specs/cli/cli.help.js @@ -1,41 +1,39 @@ -const startOpts = require("../../../cli-options/opts.start") -const initOpts = require("../../../cli-options/opts.init.json") -const recipeOpts = require("../../../cli-options/opts.recipe.json") -const reloadOpts = require("../../../cli-options/opts.reload.json") +const startOpts = require("../../../cli-options/opts.start"); +const initOpts = require("../../../cli-options/opts.init.json"); +const recipeOpts = require("../../../cli-options/opts.recipe.json"); +const reloadOpts = require("../../../cli-options/opts.reload.json"); function assertHelpOutput(args, cond, done) { - const stream = require("child_process").spawn("node", [ - require.resolve("../../../dist/bin"), - ].concat(args)); + const stream = require("child_process").spawn("node", [require.resolve("../../../dist/bin")].concat(args)); const chunks = []; - stream.stdout.on("data", function (data) { + stream.stdout.on("data", function(data) { chunks.push(data.toString()); if (cond(chunks.join(""))) { stream.kill("SIGINT"); } else { - done(new Error(`missing help output for args '${args.join(' ')}'`)) + done(new Error(`missing help output for args '${args.join(" ")}'`)); } }); - stream.on("close", function () { + stream.on("close", function() { done(); }); } -describe("CLI: showing help", function () { +describe("CLI: showing help", function() { this.timeout(10000); - it("--help", function (done) { - assertHelpOutput(["--help"], text => text.includes(startOpts.serveStatic.desc), done) + it("--help", function(done) { + assertHelpOutput(["--help"], text => text.includes(startOpts.serveStatic.desc), done); }); - it("start --help", function (done) { - assertHelpOutput(["start", "--help"], text => text.includes(startOpts.serveStatic.desc), done) + it("start --help", function(done) { + assertHelpOutput(["start", "--help"], text => text.includes(startOpts.serveStatic.desc), done); }); - it("init --help", function (done) { - assertHelpOutput(["init", "--help"], text => text.includes('Usage: '), done) + it("init --help", function(done) { + assertHelpOutput(["init", "--help"], text => text.includes("Usage: "), done); }); - it("reload --help", function (done) { - assertHelpOutput(["reload", "--help"], text => text.includes(reloadOpts.url.desc), done) + it("reload --help", function(done) { + assertHelpOutput(["reload", "--help"], text => text.includes(reloadOpts.url.desc), done); }); - it("recipe --help", function (done) { - assertHelpOutput(["recipe", "--help"], text => text.includes(recipeOpts.output.desc), done) + it("recipe --help", function(done) { + assertHelpOutput(["recipe", "--help"], text => text.includes(recipeOpts.output.desc), done); }); }); diff --git a/packages/browser-sync/test/specs/cli/cli.options.watch.js b/packages/browser-sync/test/specs/cli/cli.options.watch.js index 3cca7d3e8..2e441eade 100644 --- a/packages/browser-sync/test/specs/cli/cli.options.watch.js +++ b/packages/browser-sync/test/specs/cli/cli.options.watch.js @@ -103,9 +103,7 @@ describe("CLI: Options: Merging Watch Option", function() { assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.txt")); assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.txt2")); assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.json")); - assert.ok( - config.getIn(["watchOptions", "ignored"]).contains("*.json2") - ); + assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.json2")); }); it("merges from server, serveStatic + ignore path + watchOptions (Array)", function() { var input = { @@ -118,9 +116,7 @@ describe("CLI: Options: Merging Watch Option", function() { assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.txt")); assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.txt2")); assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.json")); - assert.ok( - config.getIn(["watchOptions", "ignored"]).contains("*.json2") - ); + assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.json2")); }); it("merges from server, serveStatic + ignore path + watchOptions.ignore (string)", function() { var input = { @@ -132,9 +128,7 @@ describe("CLI: Options: Merging Watch Option", function() { var [config] = merge(input); assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.json")); - assert.ok( - config.getIn(["watchOptions", "ignored"]).contains("*.json2") - ); + assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.json2")); assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.txt")); }); }); diff --git a/packages/browser-sync/test/specs/commands/recipes.js b/packages/browser-sync/test/specs/commands/recipes.js index 52cb76a1a..09a0cc6c4 100644 --- a/packages/browser-sync/test/specs/commands/recipes.js +++ b/packages/browser-sync/test/specs/commands/recipes.js @@ -9,7 +9,7 @@ var assert = require("chai").assert; var cli = require(path.resolve(pkg.bin)).default; var fs = require("fs"); var rim = require("rimraf").sync; -var chalk = require("chalk"); +var chalk = require("chalk"); describe("E2E CLI `recipes` command", function() { it("works with no output flag", function(done) { @@ -40,7 +40,7 @@ describe("E2E CLI `recipes` command", function() { sinon.assert.calledWith( stub1, "Install one of the following with %s\n", - chalk.cyan('browser-sync recipe ') + chalk.cyan("browser-sync recipe ") ); logger.info.restore(); @@ -66,10 +66,7 @@ describe("E2E CLI `recipes` command", function() { } }, cb: function(err) { - assert.equal( - err.message, - "Target folder exists remove it first and then try again" - ); + assert.equal(err.message, "Target folder exists remove it first and then try again"); done(); } }); @@ -90,11 +87,7 @@ describe("E2E CLI `recipes` command", function() { var call1 = stub1.getCall(0).args; assert.equal(call1[0], "Recipe copied into %s"); assert.equal(call1[1], chalk.cyan(dir)); - sinon.assert.calledWith( - stub1, - "Next, inside that folder, run %s", - chalk.cyan("npm i && npm start") - ); + sinon.assert.calledWith(stub1, "Next, inside that folder, run %s", chalk.cyan("npm i && npm start")); logger.info.restore(); done(); } @@ -111,10 +104,11 @@ describe("E2E CLI `recipes` command", function() { }, cb: function(err) { var call1 = stub1.getCall(0).args; - sinon.assert.calledWith(stub1, + sinon.assert.calledWith( + stub1, "Recipe %s not found. The following are available though", chalk.cyan("beepboop") - ) + ); var calls = stub2.getCalls().map(function(call) { return call.args[0].trim(); diff --git a/packages/browser-sync/test/specs/commands/reload.js b/packages/browser-sync/test/specs/commands/reload.js index fa7352740..0261d87e3 100644 --- a/packages/browser-sync/test/specs/commands/reload.js +++ b/packages/browser-sync/test/specs/commands/reload.js @@ -120,10 +120,7 @@ describe("E2E CLI `reload` with no files arg", function() { }, cb: function(err) { assert.equal(err.code, "ECONNREFUSED"); - assert.equal( - err.message, - "Browsersync not running at http://localhost:3000" - ); + assert.equal(err.message, "Browsersync not running at http://localhost:3000"); done(); } }); @@ -136,10 +133,7 @@ describe("E2E CLI `reload` with no files arg", function() { }, cb: function(err) { assert.equal(err.code, "ECONNREFUSED"); - assert.equal( - err.message, - "Browsersync not running at http://localhost:3000" - ); + assert.equal(err.message, "Browsersync not running at http://localhost:3000"); done(); } }); diff --git a/packages/browser-sync/test/specs/e2e/cli/e2e.cli.conf.js b/packages/browser-sync/test/specs/e2e/cli/e2e.cli.conf.js index 22c038927..11407ddcd 100644 --- a/packages/browser-sync/test/specs/e2e/cli/e2e.cli.conf.js +++ b/packages/browser-sync/test/specs/e2e/cli/e2e.cli.conf.js @@ -20,10 +20,7 @@ describe("CLI: reading config file from disk", function() { } }, cb: function(err, bs) { - assert.equal( - bs.options.getIn(["server", "baseDir", 0]), - "test/fixtures" - ); + assert.equal(bs.options.getIn(["server", "baseDir", 0]), "test/fixtures"); bs.cleanup(); done(); } @@ -43,10 +40,7 @@ describe("CLI: reading config file from disk", function() { }, cb: function(err, bs) { var err = stub.getCall(0).args[1]; - assert.equal( - err.message, - "Configuration file 'test/fixtures/config/sioops.js' not found" - ); + assert.equal(err.message, "Configuration file 'test/fixtures/config/sioops.js' not found"); utils.fail.restore(); bs.cleanup(); done(); diff --git a/packages/browser-sync/test/specs/e2e/cli/e2e.cli.files.js b/packages/browser-sync/test/specs/e2e/cli/e2e.cli.files.js index 89230706d..ad52cf6cb 100644 --- a/packages/browser-sync/test/specs/e2e/cli/e2e.cli.files.js +++ b/packages/browser-sync/test/specs/e2e/cli/e2e.cli.files.js @@ -18,10 +18,7 @@ describe("E2E CLI `files` arg - multi globs", function() { } }, cb: function(err, bs) { - assert.equal( - bs.options.getIn(["files", "core", "globs"]).size, - 2 - ); + assert.equal(bs.options.getIn(["files", "core", "globs"]).size, 2); assert.isTrue(Array.isArray(bs.watchers.core.watchers)); bs.cleanup(); done(); @@ -43,10 +40,7 @@ describe("E2E CLI `files` arg, single glob", function() { } }, cb: function(err, bs) { - assert.equal( - bs.options.getIn(["files", "core", "globs"]).size, - 1 - ); + assert.equal(bs.options.getIn(["files", "core", "globs"]).size, 1); assert.isTrue(Array.isArray(bs.watchers.core.watchers)); bs.cleanup(); done(); @@ -68,10 +62,7 @@ describe("E2E CLI `files` arg, with commas", function() { } }, cb: function(err, bs) { - assert.equal( - bs.options.getIn(["files", "core", "globs"]).size, - 2 - ); + assert.equal(bs.options.getIn(["files", "core", "globs"]).size, 2); assert.isTrue(Array.isArray(bs.watchers.core.watchers)); bs.cleanup(); done(); diff --git a/packages/browser-sync/test/specs/e2e/cli/e2e.cli.server.js b/packages/browser-sync/test/specs/e2e/cli/e2e.cli.server.js index 2511b2f6c..d7f05be5f 100644 --- a/packages/browser-sync/test/specs/e2e/cli/e2e.cli.server.js +++ b/packages/browser-sync/test/specs/e2e/cli/e2e.cli.server.js @@ -82,10 +82,7 @@ describe("E2E CLI server test with directory listing/index ", function() { }); it("Sets the correct server options", function() { assert.equal(instance.options.getIn(["server", "directory"]), true); - assert.equal( - instance.options.getIn(["server", "serveStaticOptions", "index"]), - "index.htm" - ); + assert.equal(instance.options.getIn(["server", "serveStaticOptions", "index"]), "index.htm"); }); }); @@ -116,16 +113,8 @@ describe("E2E CLI server test with extensions option - single", function() { instance.cleanup(); }); it("Sets the extensions option (array) for serve static", function() { - assert.equal( - instance.options.getIn(["server", "serveStaticOptions", "index"]), - "index.html" - ); - assert.deepEqual( - instance.options - .getIn(["server", "serveStaticOptions", "extensions"]) - .toJS(), - ["html"] - ); + assert.equal(instance.options.getIn(["server", "serveStaticOptions", "index"]), "index.html"); + assert.deepEqual(instance.options.getIn(["server", "serveStaticOptions", "extensions"]).toJS(), ["html"]); }); }); @@ -156,15 +145,10 @@ describe("E2E CLI server test with extensions option - multiple", function() { instance.cleanup(); }); it("Sets the extensions option (array) for serve static", function() { - assert.equal( - instance.options.getIn(["server", "serveStaticOptions", "index"]), - "index.html" - ); - assert.deepEqual( - instance.options - .getIn(["server", "serveStaticOptions", "extensions"]) - .toJS(), - ["html", "css"] - ); + assert.equal(instance.options.getIn(["server", "serveStaticOptions", "index"]), "index.html"); + assert.deepEqual(instance.options.getIn(["server", "serveStaticOptions", "extensions"]).toJS(), [ + "html", + "css" + ]); }); }); diff --git a/packages/browser-sync/test/specs/e2e/e2e.options.cors.js b/packages/browser-sync/test/specs/e2e/e2e.options.cors.js index 724e64697..d31a5d789 100644 --- a/packages/browser-sync/test/specs/e2e/e2e.options.cors.js +++ b/packages/browser-sync/test/specs/e2e/e2e.options.cors.js @@ -20,22 +20,10 @@ describe("e2e options test (cors)", function() { .get("/index.html") .expect(200) .end(function(err, res) { - assert.equal( - res.headers["access-control-allow-origin"], - "*" - ); - assert.equal( - res.headers["access-control-allow-methods"], - "GET, POST, OPTIONS, PUT, PATCH, DELETE" - ); - assert.equal( - res.headers["access-control-allow-headers"], - "X-Requested-With,content-type" - ); - assert.equal( - res.headers["access-control-allow-credentials"], - "true" - ); + assert.equal(res.headers["access-control-allow-origin"], "*"); + assert.equal(res.headers["access-control-allow-methods"], "GET, POST, OPTIONS, PUT, PATCH, DELETE"); + assert.equal(res.headers["access-control-allow-headers"], "X-Requested-With,content-type"); + assert.equal(res.headers["access-control-allow-credentials"], "true"); bs.cleanup(); done(); }); diff --git a/packages/browser-sync/test/specs/e2e/e2e.options.logPrefix.js b/packages/browser-sync/test/specs/e2e/e2e.options.logPrefix.js index 0c4d5ffab..d44c97724 100644 --- a/packages/browser-sync/test/specs/e2e/e2e.options.logPrefix.js +++ b/packages/browser-sync/test/specs/e2e/e2e.options.logPrefix.js @@ -4,7 +4,7 @@ var assert = require("chai").assert; var sinon = require("sinon"); var stripColor = require("chalk").stripColor; var logger = require("../../../dist/logger").logger; -var chalk = require("chalk"); +var chalk = require("chalk"); describe("E2E `logPrefix` option", function() { it("Can set the log prefix when given in options", function(done) { @@ -31,7 +31,7 @@ describe("E2E `logPrefix` option", function() { var config = { open: false, logPrefix: function() { - return "AWESOME" + return "AWESOME"; }, logLevel: "info", online: false, diff --git a/packages/browser-sync/test/specs/e2e/e2e.options.logSnippet.js b/packages/browser-sync/test/specs/e2e/e2e.options.logSnippet.js index 2758fa1e8..a1587fd3f 100644 --- a/packages/browser-sync/test/specs/e2e/e2e.options.logSnippet.js +++ b/packages/browser-sync/test/specs/e2e/e2e.options.logSnippet.js @@ -26,9 +26,7 @@ describe("E2E `logSnippet` option", function() { it("Can set the log snippet when given in options", function() { var calls = spy.getCalls(); - var snippet = testString( - "Copy the following snippet into your website" - ); + var snippet = testString("Copy the following snippet into your website"); var urls = testString("Access URLs"); function testString(match) { diff --git a/packages/browser-sync/test/specs/e2e/e2e.options.port.js b/packages/browser-sync/test/specs/e2e/e2e.options.port.js index ed951b288..45443232a 100644 --- a/packages/browser-sync/test/specs/e2e/e2e.options.port.js +++ b/packages/browser-sync/test/specs/e2e/e2e.options.port.js @@ -13,9 +13,7 @@ describe("E2E `port` option", function() { online: false, open: false }; - sinon - .stub(utils, "getPorts") - .yields(new Error("Some error about a port")); + sinon.stub(utils, "getPorts").yields(new Error("Some error about a port")); sinon.stub(utils, "fail", function(override, errMessage, cb) { assert.instanceOf(errMessage, Error); utils.getPorts.restore(); diff --git a/packages/browser-sync/test/specs/e2e/e2e.options.scriptpath.js b/packages/browser-sync/test/specs/e2e/e2e.options.scriptpath.js index 0b072312a..0e69a3e04 100644 --- a/packages/browser-sync/test/specs/e2e/e2e.options.scriptpath.js +++ b/packages/browser-sync/test/specs/e2e/e2e.options.scriptpath.js @@ -17,10 +17,7 @@ describe("E2E script path test - given a callback", function() { } }; browserSync(config, function(err, bs) { - assert.include( - bs.options.get("snippet"), - "localhost:PORT/browser-sync/browser-sync-client." - ); + assert.include(bs.options.get("snippet"), "localhost:PORT/browser-sync/browser-sync-client."); bs.cleanup(); done(); }); @@ -53,10 +50,7 @@ describe("E2E Socket namespace test - given a string", function() { .get(instance.options.getIn(["scriptPaths", "path"])) .expect(200) .end(function(err, res) { - assert.include( - res.text, - "___browserSync___.socketUrl = '' + location.host + '/TEST';" - ); + assert.include(res.text, "___browserSync___.socketUrl = '' + location.host + '/TEST';"); done(); }); }); @@ -85,10 +79,7 @@ describe("E2E script path test - Using absolute path", function() { }); it("Sets the script path", function() { - assert.include( - instance.options.get("snippet"), - "http://HOST:3000/browser-sync/browser-sync-client." - ); + assert.include(instance.options.get("snippet"), "http://HOST:3000/browser-sync/browser-sync-client."); }); }); @@ -116,9 +107,6 @@ describe("E2E script path test - Using absolute path + secure server", function( }); it("Sets the script path", function() { - assert.include( - instance.options.get("snippet"), - "https://HOST:3000/browser-sync/browser-sync-client." - ); + assert.include(instance.options.get("snippet"), "https://HOST:3000/browser-sync/browser-sync-client."); }); }); diff --git a/packages/browser-sync/test/specs/e2e/e2e.options.serveStatic.js b/packages/browser-sync/test/specs/e2e/e2e.options.serveStatic.js index 97bd52de8..ceabb5330 100644 --- a/packages/browser-sync/test/specs/e2e/e2e.options.serveStatic.js +++ b/packages/browser-sync/test/specs/e2e/e2e.options.serveStatic.js @@ -20,9 +20,7 @@ function getRequests(reqs, server) { return; } - obs.onError( - new Error(req[0] + " did not match the response body") - ); + obs.onError(new Error(req[0] + " did not match the response body")); }); }); }); @@ -53,10 +51,7 @@ describe("E2E `serveStatic` option", function() { serveStatic: ["test/fixtures", "test/fixtures/assets"] }; browserSync(config, function(err, bs) { - var reqs = getRequests( - [["/index.html", page], ["/style.css", css]], - bs.server - ); + var reqs = getRequests([["/index.html", page], ["/style.css", css]], bs.server); var obs = Rx.Observable.merge(reqs); obs.subscribeOnCompleted(function() { bs.cleanup(); @@ -69,16 +64,10 @@ describe("E2E `serveStatic` option", function() { var config = { logLevel: "silent", online: false, - serveStatic: [ - { route: "", dir: "test/fixtures" }, - { route: [""], dir: "test/fixtures/assets" } - ] + serveStatic: [{ route: "", dir: "test/fixtures" }, { route: [""], dir: "test/fixtures/assets" }] }; browserSync(config, function(err, bs) { - var reqs = getRequests( - [["/index.html", page], ["/style.css", css]], - bs.server - ); + var reqs = getRequests([["/index.html", page], ["/style.css", css]], bs.server); var obs = Rx.Observable.merge(reqs); obs.subscribeOnCompleted(function() { bs.cleanup(); @@ -99,11 +88,7 @@ describe("E2E `serveStatic` option", function() { }; browserSync(config, function(err, bs) { var reqs = getRequests( - [ - ["/index.html", page], - ["/shane/style.css", css], - ["/kittie/style.css", css] - ], + [["/index.html", page], ["/shane/style.css", css], ["/kittie/style.css", css]], bs.server ); var obs = Rx.Observable.merge(reqs); @@ -118,15 +103,10 @@ describe("E2E `serveStatic` option", function() { var config = { logLevel: "silent", online: false, - serveStatic: [ - { route: "", dir: ["test/fixtures", "test/fixtures/assets"] } - ] + serveStatic: [{ route: "", dir: ["test/fixtures", "test/fixtures/assets"] }] }; browserSync(config, function(err, bs) { - var reqs = getRequests( - [["/index.html", page], ["/style.css", css]], - bs.server - ); + var reqs = getRequests([["/index.html", page], ["/style.css", css]], bs.server); var obs = Rx.Observable.merge(reqs); obs.subscribeOnCompleted(function() { bs.cleanup(); @@ -142,10 +122,7 @@ describe("E2E `serveStatic` option", function() { serveStatic: [{ dir: ["test/fixtures", "test/fixtures/assets"] }] }; browserSync(config, function(err, bs) { - var reqs = getRequests( - [["/index.html", page], ["/style.css", css]], - bs.server - ); + var reqs = getRequests([["/index.html", page], ["/style.css", css]], bs.server); var obs = Rx.Observable.merge(reqs); obs.subscribeOnCompleted(function() { bs.cleanup(); diff --git a/packages/browser-sync/test/specs/e2e/e2e.options.single.js b/packages/browser-sync/test/specs/e2e/e2e.options.single.js index f0e7b85ca..eed8ba013 100644 --- a/packages/browser-sync/test/specs/e2e/e2e.options.single.js +++ b/packages/browser-sync/test/specs/e2e/e2e.options.single.js @@ -23,10 +23,7 @@ describe("e2e options test (single)", function() { .set("accept", "*/*") .expect(200) .end(function(err, res) { - const expected = fs.readFileSync( - "test/fixtures/index.html", - "utf8" - ); + const expected = fs.readFileSync("test/fixtures/index.html", "utf8"); assert.equal(res.text, expected); bs.cleanup(done); }); @@ -48,10 +45,7 @@ describe("e2e options test (single)", function() { .get("/assets/style.css") .expect(200) .end(function(err, res) { - const expected = fs.readFileSync( - "test/fixtures/assets/style.css", - "utf8" - ); + const expected = fs.readFileSync("test/fixtures/assets/style.css", "utf8"); assert.equal(res.text, expected); bs.cleanup(done); }); diff --git a/packages/browser-sync/test/specs/e2e/e2e.options.snippet.js b/packages/browser-sync/test/specs/e2e/e2e.options.snippet.js index 485cc218e..7ad277097 100644 --- a/packages/browser-sync/test/specs/e2e/e2e.options.snippet.js +++ b/packages/browser-sync/test/specs/e2e/e2e.options.snippet.js @@ -133,10 +133,7 @@ describe("E2E snippet custom regex", function() { .set("accept", "text/html") .expect(200) .end(function(err, res) { - assert.include( - res.text, - "" + instance.options.get("snippet") - ); + assert.include(res.text, "" + instance.options.get("snippet")); done(); }); }); @@ -151,7 +148,7 @@ describe("E2E snippet: false", function() { baseDir: "test/fixtures" }, open: false, - snippet: false, + snippet: false }; instance = browserSync(config, done).instance; }); @@ -184,7 +181,7 @@ describe("E2E snippet: true", function() { baseDir: "test/fixtures" }, open: false, - snippet: true, + snippet: true }; instance = browserSync(config, done).instance; }); diff --git a/packages/browser-sync/test/specs/e2e/middleware/middleware.option.js b/packages/browser-sync/test/specs/e2e/middleware/middleware.option.js index a4210df6d..d235c634f 100644 --- a/packages/browser-sync/test/specs/e2e/middleware/middleware.option.js +++ b/packages/browser-sync/test/specs/e2e/middleware/middleware.option.js @@ -29,11 +29,7 @@ describe("Accepting middleware as an option (1)", function() { }); it("should accept middlewares when given as top-level", function() { - assert.equal( - bs.options.get("middleware").size, - 2, - "1 custom + 1 serve static" - ); + assert.equal(bs.options.get("middleware").size, 2, "1 custom + 1 serve static"); }); }); @@ -67,11 +63,7 @@ describe("Accepting middleware as an option (2)", function() { }); it("should accept middlewares when given as top-level", function() { - assert.equal( - bs.options.get("middleware").size, - 3, - "2 custom + 1 serve static" - ); + assert.equal(bs.options.get("middleware").size, 3, "2 custom + 1 serve static"); }); }); diff --git a/packages/browser-sync/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js b/packages/browser-sync/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js index 77c7fe1d7..4e43fffa1 100644 --- a/packages/browser-sync/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js +++ b/packages/browser-sync/test/specs/e2e/proxy/e2e.proxy.rewrite.rules.add.js @@ -36,12 +36,7 @@ describe("E2E proxy test with adding rewrite rules dynamically", function() { browserSync.init([], config, function(err, bs) { var reqs = utils.getRequests( - [ - [ - "/index.html", - 'BROWSERSYNC' - ] - ], + [["/index.html", 'BROWSERSYNC']], bs.server ); @@ -84,10 +79,7 @@ describe("E2E proxy test with adding rewrite rules dynamically", function() { browserSync.init([], config, function(err, bs) { var reqs = utils.getRequests( [ - [ - "/index.html", - 'BROWSERSYNC' - ], + ["/index.html", 'BROWSERSYNC'], function() { bs.addRewriteRule({ match: /BROWSERSYNC/, @@ -95,17 +87,11 @@ describe("E2E proxy test with adding rewrite rules dynamically", function() { id: "my-rewrite-rule" }); }, - [ - "/index.html", - 'shane' - ], + ["/index.html", 'shane'], function() { bs.removeRewriteRule("my-rewrite-rule"); }, - [ - "/index.html", - 'BROWSERSYNC' - ] + ["/index.html", 'BROWSERSYNC'] ], bs.server ); diff --git a/packages/browser-sync/test/specs/e2e/proxy/e2e.proxy.secure.js b/packages/browser-sync/test/specs/e2e/proxy/e2e.proxy.secure.js index 28462cde6..b6c86fd3a 100644 --- a/packages/browser-sync/test/specs/e2e/proxy/e2e.proxy.secure.js +++ b/packages/browser-sync/test/specs/e2e/proxy/e2e.proxy.secure.js @@ -53,10 +53,7 @@ describe("E2E TLS proxy test", function() { } var local = bs.options.getIn(["urls", "local"]); - var expected = app.html.replace( - "BS", - bs.options.get("snippet") + "BS" - ); + var expected = app.html.replace("BS", bs.options.get("snippet") + "BS"); assert.equal("https://localhost:" + bs.options.get("port"), local); @@ -88,10 +85,7 @@ describe("E2E TLS proxy test", function() { browserSync.init(config, function(err, bs) { assert.isString(bs.options.get("snippet")); - var expected = app.html.replace( - "BS", - bs.options.get("snippet") + "BS" - ); + var expected = app.html.replace("BS", bs.options.get("snippet") + "BS"); request(bs.options.getIn(["urls", "local"])) .get("/index.html") diff --git a/packages/browser-sync/test/specs/e2e/server/e2e.server.secure.pfx.js b/packages/browser-sync/test/specs/e2e/server/e2e.server.secure.pfx.js index 950de57d4..326b5ce36 100644 --- a/packages/browser-sync/test/specs/e2e/server/e2e.server.secure.pfx.js +++ b/packages/browser-sync/test/specs/e2e/server/e2e.server.secure.pfx.js @@ -6,7 +6,7 @@ var assert = require("chai").assert; process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0; -describe("E2E TLS server with PFX certs test", function() { +describe.skip("E2E TLS server with PFX certs test", function() { this.timeout(15000); var instance; @@ -15,6 +15,7 @@ describe("E2E TLS server with PFX certs test", function() { browserSync.reset(); this.timeout(15000); + console.log(path.resolve("./certs/browsersync.pfx")); var config = { server: { diff --git a/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.extensions.js b/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.extensions.js index 75435a947..6dc2619d4 100644 --- a/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.extensions.js +++ b/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.extensions.js @@ -20,25 +20,9 @@ describe("E2E server test with extension option", function() { }; browserSync.create().init(config, function(err, bs) { - assert.equal( - bs.options.getIn([ - "server", - "serveStaticOptions", - "extensions", - 0 - ]), - "html" - ); + assert.equal(bs.options.getIn(["server", "serveStaticOptions", "extensions", 0]), "html"); var reqs = utils.getRequests( - [ - [ - "/forms", - require("fs").readFileSync( - "test/fixtures/forms.html", - "utf-8" - ) - ] - ], + [["/forms", require("fs").readFileSync("test/fixtures/forms.html", "utf-8")]], bs.server ); Rx.Observable.concat(reqs).subscribeOnCompleted(function() { diff --git a/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.js b/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.js index 0565c287d..4b2fca575 100644 --- a/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.js +++ b/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.js @@ -18,21 +18,12 @@ describe("E2E server test with serve static options", function() { }; browserSync.create().init(config, function(err, bs) { - assert.equal( - bs.options.getIn(["server", "serveStaticOptions", "index"]), - "inputs.html" - ); + assert.equal(bs.options.getIn(["server", "serveStaticOptions", "index"]), "inputs.html"); request(bs.server) .get("/") .expect(200) .end(function(err, res) { - assert.deepEqual( - require("fs").readFileSync( - "test/fixtures/inputs.html", - "utf-8" - ), - res.text - ); + assert.deepEqual(require("fs").readFileSync("test/fixtures/inputs.html", "utf-8"), res.text); bs.cleanup(); done(); }); @@ -51,21 +42,12 @@ describe("E2E server test with serve static options", function() { }; browserSync.create().init(config, function(err, bs) { - assert.equal( - bs.options.getIn(["server", "serveStaticOptions", "index"]), - "index.html" - ); + assert.equal(bs.options.getIn(["server", "serveStaticOptions", "index"]), "index.html"); request(bs.server) .get("/") .expect(200) .end(function(err, res) { - assert.deepEqual( - require("fs").readFileSync( - "test/fixtures/index.html", - "utf-8" - ), - res.text - ); + assert.deepEqual(require("fs").readFileSync("test/fixtures/index.html", "utf-8"), res.text); bs.cleanup(); done(); }); diff --git a/packages/browser-sync/test/specs/e2e/server/e2e.server.tunnel.js b/packages/browser-sync/test/specs/e2e/server/e2e.server.tunnel.js index 1233d9587..b97a508f2 100644 --- a/packages/browser-sync/test/specs/e2e/server/e2e.server.tunnel.js +++ b/packages/browser-sync/test/specs/e2e/server/e2e.server.tunnel.js @@ -24,10 +24,7 @@ describe.skip("Tunnel e2e tests", function() { }); it("should call init on the tunnel", function() { - assert.include( - instance.options.getIn(["urls", "tunnel"]), - "localtunnel.me" - ); + assert.include(instance.options.getIn(["urls", "tunnel"]), "localtunnel.me"); }); }); @@ -53,10 +50,7 @@ describe.skip("Tunnel e2e tests with subdomain", function() { }); it("should call init on the tunnel", function() { - assert.include( - instance.options.getIn(["urls", "tunnel"]), - "localtunnel.me" - ); + assert.include(instance.options.getIn(["urls", "tunnel"]), "localtunnel.me"); }); }); @@ -101,10 +95,7 @@ describe("Tunnel e2e tests with Error", function() { }; browserSync(config, function(err, bs) { - bs.tunnel.emit( - "error", - new Error("connection refused: (check your firewall settings)") - ); + bs.tunnel.emit("error", new Error("connection refused: (check your firewall settings)")); bs.cleanup(); done(); }); diff --git a/packages/browser-sync/test/specs/files/files.watching.js b/packages/browser-sync/test/specs/files/files.watching.js index 8212e7b4b..cbe5a2857 100644 --- a/packages/browser-sync/test/specs/files/files.watching.js +++ b/packages/browser-sync/test/specs/files/files.watching.js @@ -21,10 +21,7 @@ describe("File Watcher Module", function() { }, function(err, bs) { assert.equal(bs.watchers.core.watchers.length, 1); - assert.equal( - bs.watchers.core.watchers[0].options.debounceDelay, - 4000 - ); + assert.equal(bs.watchers.core.watchers[0].options.debounceDelay, 4000); bs.cleanup(); done(); } @@ -54,14 +51,8 @@ describe("File Watcher Module", function() { }, function(err, bs) { assert.equal(bs.watchers.core.watchers.length, 2); - assert.equal( - bs.watchers.core.watchers[0].options.interval, - 200 - ); - assert.equal( - bs.watchers.core.watchers[1].options.interval, - 100 - ); + assert.equal(bs.watchers.core.watchers[0].options.interval, 200); + assert.equal(bs.watchers.core.watchers[1].options.interval, 100); bs.cleanup(); done(); } @@ -201,10 +192,7 @@ describe("File Watcher Module", function() { logLevel: "silent" }, function(err, bs) { - assert.equal( - bs.options.getIn(["files", "core", "globs"]).size, - 1 - ); + assert.equal(bs.options.getIn(["files", "core", "globs"]).size, 1); bs.cleanup(); done(); } diff --git a/packages/browser-sync/test/specs/http-protocol/http.reload.js b/packages/browser-sync/test/specs/http-protocol/http.reload.js index 38382ad5a..ccb50d249 100644 --- a/packages/browser-sync/test/specs/http-protocol/http.reload.js +++ b/packages/browser-sync/test/specs/http-protocol/http.reload.js @@ -35,10 +35,7 @@ describe("HTTP protocol", function() { }); it("responds to reload event with no args", function(done) { - var url = proto.getUrl( - { method: "reload" }, - bs.options.getIn(["urls", "local"]) - ); + var url = proto.getUrl({ method: "reload" }, bs.options.getIn(["urls", "local"])); request(url, function(e, r, body) { scheduler.advanceTo(500); @@ -49,10 +46,7 @@ describe("HTTP protocol", function() { }); }); it("responds to reload event with multi file paths", function(done) { - var url = proto.getUrl( - { method: "reload", args: ["a.css", "b.css"] }, - bs.options.getIn(["urls", "local"]) - ); + var url = proto.getUrl({ method: "reload", args: ["a.css", "b.css"] }, bs.options.getIn(["urls", "local"])); request(url, function(e, r, body) { scheduler.advanceTo(500); @@ -71,10 +65,7 @@ describe("HTTP protocol", function() { }); }); it("responds to reload event with single file path", function(done) { - var url = proto.getUrl( - { method: "reload", args: "somefile.php" }, - bs.options.getIn(["urls", "local"]) - ); + var url = proto.getUrl({ method: "reload", args: "somefile.php" }, bs.options.getIn(["urls", "local"])); request(url, function(e, r, body) { scheduler.advanceTo(500); @@ -91,10 +82,7 @@ describe("HTTP protocol", function() { }); }); it("Gives a nice error when method not found", function(done) { - var url = proto.getUrl( - { method: "relzoad", args: "somefile.php" }, - bs.options.getIn(["urls", "local"]) - ); + var url = proto.getUrl({ method: "relzoad", args: "somefile.php" }, bs.options.getIn(["urls", "local"])); request(url, function(e, r, body) { assert.equal(r.statusCode, 404); diff --git a/packages/browser-sync/test/specs/logger/logger.baseDir.js b/packages/browser-sync/test/specs/logger/logger.baseDir.js index e7f9d2b99..1744ad603 100644 --- a/packages/browser-sync/test/specs/logger/logger.baseDir.js +++ b/packages/browser-sync/test/specs/logger/logger.baseDir.js @@ -1,7 +1,7 @@ var browserSync = require("../../../"); var logger = require("../../../dist/logger").logger; var sinon = require("sinon"); -var chalk = require("chalk"); +var chalk = require("chalk"); describe("Logging", function() { var spy; @@ -22,16 +22,8 @@ describe("Logging", function() { open: false }, function(err, bs) { - sinon.assert.calledWith( - spy, - "Serving files from: %s", - chalk.magenta("./test") - ) - sinon.assert.calledWith( - spy, - "Serving files from: %s", - chalk.magenta("./app") - ) + sinon.assert.calledWith(spy, "Serving files from: %s", chalk.magenta("./test")); + sinon.assert.calledWith(spy, "Serving files from: %s", chalk.magenta("./app")); bs.cleanup(done); } ); @@ -58,15 +50,8 @@ describe("Logging", function() { open: false }, function(err, bs) { - sinon.assert.calledWith( - spy, - "Serving files from: %s", - chalk.magenta("./app") - ) - sinon.assert.calledWith( - spy, - "Watching files..." - ) + sinon.assert.calledWith(spy, "Serving files from: %s", chalk.magenta("./app")); + sinon.assert.calledWith(spy, "Watching files..."); bs.cleanup(done); } ); diff --git a/packages/browser-sync/test/specs/options/options.set.js b/packages/browser-sync/test/specs/options/options.set.js index 9c2830994..7f08c6998 100644 --- a/packages/browser-sync/test/specs/options/options.set.js +++ b/packages/browser-sync/test/specs/options/options.set.js @@ -16,16 +16,10 @@ describe("Setting options during runtime", function() { it("should update options with event", function(done) { instance.events.on("options:set", function(data) { - assert.deepEqual( - instance.options.getIn(["ghostMode", "clicks"]), - false - ); + assert.deepEqual(instance.options.getIn(["ghostMode", "clicks"]), false); assert.deepEqual(data.path, ["ghostMode", "clicks"]); assert.deepEqual(data.value, false); - assert.deepEqual( - data.options.getIn(["ghostMode", "clicks"]), - false - ); + assert.deepEqual(data.options.getIn(["ghostMode", "clicks"]), false); done(); }); @@ -47,10 +41,7 @@ describe("Setting Multi options during runtime", function() { it("should update options with event", function(done) { instance.events.on("options:set", function() { - assert.deepEqual( - instance.options.getIn(["ghostMode", "clicks"]), - false - ); + assert.deepEqual(instance.options.getIn(["ghostMode", "clicks"]), false); assert.deepEqual(instance.options.getIn(["shane"]), "awesome"); done(); }); diff --git a/packages/browser-sync/test/specs/plugins/connector.js b/packages/browser-sync/test/specs/plugins/connector.js index ec4a2fcba..c0b846061 100644 --- a/packages/browser-sync/test/specs/plugins/connector.js +++ b/packages/browser-sync/test/specs/plugins/connector.js @@ -33,10 +33,7 @@ describe("Plugins: Using the connector middleware:", function() { .get("/shane") .expect(200) .end(function(err, res) { - assert.include( - res.text, - "window.___browserSync___ = {};" - ); + assert.include(res.text, "window.___browserSync___ = {};"); instance.cleanup(done); }); } diff --git a/packages/browser-sync/test/specs/plugins/hooks.js b/packages/browser-sync/test/specs/plugins/hooks.js index 8d948dfb0..b6a19b09d 100644 --- a/packages/browser-sync/test/specs/plugins/hooks.js +++ b/packages/browser-sync/test/specs/plugins/hooks.js @@ -94,10 +94,7 @@ describe("Plugins: Registering hooks - client events:", function() { }); it("adds multiple items to the clientEvents array", function() { assert.include(instance.options.get("clientEvents").toJS(), "cp:goto"); - assert.include( - instance.options.get("clientEvents").toJS(), - "custom:event" - ); + assert.include(instance.options.get("clientEvents").toJS(), "custom:event"); }); }); diff --git a/packages/browser-sync/test/specs/plugins/logger.js b/packages/browser-sync/test/specs/plugins/logger.js index 69eb9d129..247a94aa9 100644 --- a/packages/browser-sync/test/specs/plugins/logger.js +++ b/packages/browser-sync/test/specs/plugins/logger.js @@ -32,7 +32,7 @@ describe("Plugins: Getting a logger", function() { .setLevel("info") .setLevelPrefixes(false) .info("Connected!"); - var msg = stripAnsi(stub.getCall(0).args[0]); + var msg = stripAnsi(stub.getCall(0).args[0]); assert.equal(msg, "[Browsersync] [HTML] Connected!"); instance.cleanup(); done(); diff --git a/packages/browser-sync/test/specs/plugins/user.plugins.add.middleware.js b/packages/browser-sync/test/specs/plugins/user.plugins.add.middleware.js index bf4934e8f..797c0c056 100644 --- a/packages/browser-sync/test/specs/plugins/user.plugins.add.middleware.js +++ b/packages/browser-sync/test/specs/plugins/user.plugins.add.middleware.js @@ -209,9 +209,7 @@ describe("Plugins: Should be able to add middleware with paths on the fly in pro it("should serve the file + browserSync file", function(done) { browserSync.reset(); - var testApp = connect().use( - serveStatic(path.join(__dirname, "../../fixtures")) - ); + var testApp = connect().use(serveStatic(path.join(__dirname, "../../fixtures"))); // server to proxy var stubServer = http.createServer(testApp).listen(); @@ -255,9 +253,7 @@ describe("Plugins: Should be able to add middleware with no paths on the fly in before(function(done) { browserSync.reset(); - var testApp = connect().use( - serveStatic(path.join(__dirname, "/../../fixtures")) - ); + var testApp = connect().use(serveStatic(path.join(__dirname, "/../../fixtures"))); // server to proxy stubServer = http.createServer(testApp).listen(); diff --git a/packages/browser-sync/test/specs/plugins/user.plugins.inline.error.js b/packages/browser-sync/test/specs/plugins/user.plugins.inline.error.js index a6f9be0e1..418c6a7fc 100644 --- a/packages/browser-sync/test/specs/plugins/user.plugins.inline.error.js +++ b/packages/browser-sync/test/specs/plugins/user.plugins.inline.error.js @@ -8,10 +8,7 @@ describe("Plugins: Retrieving user plugins when given inline, but with error", f browserSync.reset(); sinon.stub(utils, "fail", function(kill, errMessage) { assert.instanceOf(errMessage, Error); - assert.equal( - errMessage.message, - "Plugin not supported in this format" - ); + assert.equal(errMessage.message, "Plugin not supported in this format"); utils.fail.restore(); }); @@ -35,10 +32,7 @@ describe("Plugins: Retrieving user plugins when given inline, but with error", f browserSync.reset(); sinon.stub(utils, "fail", function(kill, errMessage) { assert.instanceOf(errMessage, Error); - assert.equal( - errMessage.message, - "Plugin was not configured correctly" - ); + assert.equal(errMessage.message, "Plugin was not configured correctly"); utils.fail.restore(); }); diff --git a/packages/browser-sync/test/specs/plugins/user.plugins.serve.files.js b/packages/browser-sync/test/specs/plugins/user.plugins.serve.files.js index 683c85f71..9704910d1 100644 --- a/packages/browser-sync/test/specs/plugins/user.plugins.serve.files.js +++ b/packages/browser-sync/test/specs/plugins/user.plugins.serve.files.js @@ -84,9 +84,7 @@ describe("Plugins: Should be able to call `serveFile` on the instance when in pr it("should serve the file + browserSync file", function(done) { browserSync.reset(); - var testApp = connect().use( - serveStatic(path.join(__dirname, "../../fixtures")) - ); + var testApp = connect().use(serveStatic(path.join(__dirname, "../../fixtures"))); // server to proxy var stubServer = http.createServer(testApp).listen(); diff --git a/packages/browser-sync/test/specs/resp-mod/rewrite-links.js b/packages/browser-sync/test/specs/resp-mod/rewrite-links.js index ec43374ab..83f161ccb 100644 --- a/packages/browser-sync/test/specs/resp-mod/rewrite-links.js +++ b/packages/browser-sync/test/specs/resp-mod/rewrite-links.js @@ -10,10 +10,7 @@ describe("Rewriting Domains", function() { var testRegex; before(function() { var host = "192.168.0.4:3002"; - var rewrite = utils.rewriteLinks( - { hostname: "example.com", port: 80 }, - proxyUrl - ); + var rewrite = utils.rewriteLinks({ hostname: "example.com", port: 80 }, proxyUrl); var bound = rewrite.fn.bind(null, { headers: { host: host } }, {}); regex = rewrite.match; fn = rewrite.fn; @@ -28,11 +25,8 @@ describe("Rewriting Domains", function() { assert.equal(expected, actual); }); it("should replace CSS LINK", function() { - var actual = testRegex( - "example.com" - ); - var expected = - "example.com"; + var actual = testRegex("example.com"); + var expected = "example.com"; assert.equal(actual, expected); }); it("should use the regex to replace links (2)", function() { @@ -51,9 +45,7 @@ describe("Rewriting Domains", function() { assert.equal(actual, expected); }); it("should use the regex to replace links (4)", function() { - var actual = testRegex( - "" - ); + var actual = testRegex(""); var expected = ""; assert.equal(actual, expected); }); @@ -91,10 +83,7 @@ describe("Rewriting Domains", function() { var testRegex; before(function() { var host = "192.168.0.4:3002"; - var rewrite = utils.rewriteLinks( - { hostname: "localhost:8000", port: 80 }, - proxyUrl - ); + var rewrite = utils.rewriteLinks({ hostname: "localhost:8000", port: 80 }, proxyUrl); var bound = rewrite.fn.bind(null, { headers: { host: host } }, {}); regex = rewrite.match; fn = rewrite.fn; @@ -113,23 +102,17 @@ describe("Rewriting Domains", function() { assert.equal(actual, expected); }); it("should use the regex to replace links (2)", function() { - var actual = testRegex( - "" - ); + var actual = testRegex(""); var expected = ""; assert.equal(actual, expected); }); it("should use the regex to replace links (3)", function() { - var actual = testRegex( - "" - ); + var actual = testRegex(""); var expected = ""; assert.equal(actual, expected); }); it("should use the regex to replace links (4)", function() { - var actual = testRegex( - "" - ); + var actual = testRegex(""); var expected = ""; assert.equal(actual, expected); }); @@ -144,38 +127,20 @@ describe("Rewriting Domains", function() { assert.equal(actual, expected); }); it("should use the regex to replace links that contain hashes (1)", function() { - var actual = testRegex( - "" - ); - var expected = - ""; + var actual = testRegex(""); + var expected = ""; assert.equal(actual, expected); }); it("should use the regex to replace links that contain hashes (2)", function() { - var actual = testRegex( - "" - ); + var actual = testRegex(""); var expected = ""; assert.equal(actual, expected); }); it("should use the regex to replace links that contain hashes (2)", function() { - var input = fs.readFileSync( - "test/fixtures/rewrites/hashes.input.html", - "utf8" - ); - var expected = fs.readFileSync( - "test/fixtures/rewrites/hashes.expected.html", - "utf8" - ); - var rewrite = utils.rewriteLinks( - { hostname: "www.example.local.colinr.com", port: 80 }, - proxyUrl - ); - var bound = rewrite.fn.bind( - null, - { headers: { host: proxyUrl } }, - {} - ); + var input = fs.readFileSync("test/fixtures/rewrites/hashes.input.html", "utf8"); + var expected = fs.readFileSync("test/fixtures/rewrites/hashes.expected.html", "utf8"); + var rewrite = utils.rewriteLinks({ hostname: "www.example.local.colinr.com", port: 80 }, proxyUrl); + var bound = rewrite.fn.bind(null, { headers: { host: proxyUrl } }, {}); var actual = input.replace(rewrite.match, bound); assert.equal(actual, expected); }); @@ -185,92 +150,45 @@ describe("Rewriting Domains", function() { var expected = 'Link 1'; - var rewrite = utils.rewriteLinks( - { hostname: "example.com", port: 1234 }, - proxyUrl - ); - var bound = rewrite.fn.bind( - null, - { headers: { host: proxyUrl } }, - {} - ); + var rewrite = utils.rewriteLinks({ hostname: "example.com", port: 1234 }, proxyUrl); + var bound = rewrite.fn.bind(null, { headers: { host: proxyUrl } }, {}); var actual = input.replace(rewrite.match, bound); assert.equal(actual, expected); }); it("should use the regex to replace links + comments", function() { - var input = fs.readFileSync( - "test/fixtures/rewrites/comment.html", - "utf8" - ); - var expected = fs.readFileSync( - "test/fixtures/rewrites/comment.expected.html", - "utf8" - ); - var rewrite = utils.rewriteLinks( - { hostname: "experiment.dev" }, - proxyUrl - ); - var bound = rewrite.fn.bind( - null, - { headers: { host: proxyUrl } }, - {} - ); + var input = fs.readFileSync("test/fixtures/rewrites/comment.html", "utf8"); + var expected = fs.readFileSync("test/fixtures/rewrites/comment.expected.html", "utf8"); + var rewrite = utils.rewriteLinks({ hostname: "experiment.dev" }, proxyUrl); + var bound = rewrite.fn.bind(null, { headers: { host: proxyUrl } }, {}); var actual = input.replace(rewrite.match, bound); assert.equal(actual, expected); }); it("should use the regex to replace links that contain port + ", function() { - var input = - ''; + var input = ''; var rewrite = utils.rewriteLinks({ hostname: "mclinic" }, proxyUrl); - var bound = rewrite.fn.bind( - null, - { headers: { host: proxyUrl } }, - {} - ); + var bound = rewrite.fn.bind(null, { headers: { host: proxyUrl } }, {}); var actual = input.replace(rewrite.match, bound); assert.equal(actual, input); }); it("should use the regex to replace links that have protocol relative URLS", function() { - var input = - '