Skip to content

Commit

Permalink
chore: apply prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
shakyShane committed Jan 24, 2021
1 parent 148c151 commit cdbcabd
Show file tree
Hide file tree
Showing 30 changed files with 371 additions and 290 deletions.
31 changes: 18 additions & 13 deletions packages/browser-sync/lib/async.js
Expand Up @@ -62,19 +62,24 @@ 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);
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
}
]
});
}
done(null, {
optionsIn: [
{
path: ["socket", "port"],
value: port
}
]
});
});
);
},
/**
* Some features require an internet connection.
Expand Down Expand Up @@ -290,7 +295,7 @@ module.exports = {
* Append the 'listen' option
*/
const opts = uiOpts.update(uiOpts => {
const listen = bs.options.get('listen');
const listen = bs.options.get("listen");
if (listen) {
return uiOpts.set("listen", listen);
}
Expand Down
22 changes: 11 additions & 11 deletions packages/browser-sync/lib/bin.ts
Expand Up @@ -8,26 +8,26 @@ import { resolve } from "path";
import { existsSync } from "fs";
import { logger } from "./logger";
import { compile } from "eazy-logger";
import {printErrors} from "./cli/cli-options";
import { printErrors } from "./cli/cli-options";

export enum BsErrorLevels {
Fatal = "Fatal"
}

export enum BsErrorTypes {
PathNotFound = "PathNotFound",
HostAndListenIncompatible = "HostAndListenIncompatible",
HostAndListenIncompatible = "HostAndListenIncompatible"
}

export type BsErrors = BsError[];
export interface BsError {
type: BsErrorTypes,
level: BsErrorLevels,
errors: BsErrorItem[]
type: BsErrorTypes;
level: BsErrorLevels;
errors: BsErrorItem[];
}
export interface BsErrorItem {
error: Error,
meta?(...args): string[]
error: Error;
meta?(...args): string[];
}

/**
Expand Down Expand Up @@ -178,7 +178,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())
.default("cwd", () => process.cwd())
.help().argv;
}

Expand All @@ -196,7 +196,7 @@ function handleIncoming(command, yargs) {
out = yargs
.usage("Usage: $0 init")
.example("$0 init")
.default('cwd', () => process.cwd())
.default("cwd", () => process.cwd())
.help().argv;
}
if (command === "reload") {
Expand All @@ -205,7 +205,7 @@ function handleIncoming(command, yargs) {
.options(reloadOpts)
.example("$0 reload")
.example("$0 reload --port 4000")
.default('cwd', () => process.cwd())
.default("cwd", () => process.cwd())
.help().argv;
}
if (command === "recipe") {
Expand All @@ -214,7 +214,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())
.default("cwd", () => process.cwd())
.help().argv;
}

Expand Down
@@ -1,8 +1,8 @@
import {BsTempOptions, TransformResult} from "../cli-options";
import { BsTempOptions, TransformResult } from "../cli-options";

export function addCwdToWatchOptions(incoming: BsTempOptions): TransformResult {
const output = incoming.updateIn(['watchOptions', 'cwd'], (watchCwd) => {
return watchCwd || incoming.get('cwd');
const output = incoming.updateIn(["watchOptions", "cwd"], watchCwd => {
return watchCwd || incoming.get("cwd");
});

return [output, []];
Expand Down
@@ -1,16 +1,18 @@
import {List} from "immutable";
import {BsTempOptions, TransformResult} from "../cli-options";
import { List } from "immutable";
import { BsTempOptions, TransformResult } from "../cli-options";

const defaultIgnorePatterns = [
/node_modules/,
/bower_components/,
'.sass-cache',
'.vscode',
'.git',
'.idea',
".sass-cache",
".vscode",
".git",
".idea"
];

export function addDefaultIgnorePatterns(incoming: BsTempOptions): TransformResult {
export function addDefaultIgnorePatterns(
incoming: BsTempOptions
): TransformResult {
if (!incoming.get("watch")) {
return [incoming, []];
}
Expand All @@ -24,7 +26,7 @@ export function addDefaultIgnorePatterns(incoming: BsTempOptions): TransformResu
const merged = userIgnored.merge(defaultIgnorePatterns);

return watchOptions.merge({
ignored: merged.toList(),
ignored: merged.toList()
});
});

Expand Down
36 changes: 16 additions & 20 deletions packages/browser-sync/lib/cli/transforms/addToFilesOption.ts
@@ -1,5 +1,5 @@
import {List, Map} from "immutable";
import {BsTempOptions, TransformResult} from "../cli-options";
import { List, Map } from "immutable";
import { BsTempOptions, TransformResult } from "../cli-options";

export function addToFilesOption(incoming: BsTempOptions): TransformResult {
if (!incoming.get("watch")) {
Expand All @@ -8,19 +8,16 @@ export function addToFilesOption(incoming: BsTempOptions): TransformResult {

let serverPaths = [];

const fromServeStatic = incoming
.get("serveStatic", List([]))
.toArray();
const ssPaths = fromServeStatic
.reduce((acc, ss) => {
if (typeof ss === "string") {
return acc.concat(ss);
}
if (ss.dir && typeof ss.dir === "string") {
return acc.concat(ss);
}
return acc;
}, []);
const fromServeStatic = incoming.get("serveStatic", List([])).toArray();
const ssPaths = fromServeStatic.reduce((acc, ss) => {
if (typeof ss === "string") {
return acc.concat(ss);
}
if (ss.dir && typeof ss.dir === "string") {
return acc.concat(ss);
}
return acc;
}, []);

ssPaths.forEach(p => serverPaths.push(p));

Expand All @@ -32,15 +29,14 @@ export function addToFilesOption(incoming: BsTempOptions): TransformResult {
if (typeof server === "string") {
serverPaths.push(server);
}
if (
List.isList(server) &&
server.every(x => typeof x === "string")
) {
if (List.isList(server) && server.every(x => typeof x === "string")) {
server.forEach(s => serverPaths.push(s));
}
if (Map.isMap(server)) {
const baseDirProp = server.get("baseDir");
const baseDirs = List([]).concat(baseDirProp).filter(Boolean);
const baseDirs = List([])
.concat(baseDirProp)
.filter(Boolean);
baseDirs.forEach(s => serverPaths.push(s));
}
}
Expand Down
@@ -1,9 +1,14 @@
import {BsTempOptions, TransformResult} from "../cli-options";
import { BsTempOptions, TransformResult } from "../cli-options";

export function appendServerDirectoryOption(incoming: BsTempOptions): TransformResult {
if (!incoming.get('server')) return [incoming, []];
if (incoming.get('directory')) {
return [incoming.setIn(['server', 'directory'], incoming.has('directory')), []];
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, []];
}
@@ -1,11 +1,13 @@
import {BsTempOptions, TransformResult} from "../cli-options";
import { BsTempOptions, TransformResult } from "../cli-options";

export function appendServerIndexOption(incoming: BsTempOptions): TransformResult {
if (!incoming.get('server')) return [incoming, []];
const value = incoming.get('index');
export function appendServerIndexOption(
incoming: BsTempOptions
): TransformResult {
if (!incoming.get("server")) return [incoming, []];
const value = incoming.get("index");

if (value) {
return [incoming.setIn(['server', 'index'], value), []];
return [incoming.setIn(["server", "index"], value), []];
}

return [incoming, []];
Expand Down
@@ -1,13 +1,19 @@
import {List} from "immutable";
import {BsTempOptions, TransformResult} from "../cli-options";
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, []];
}
18 changes: 12 additions & 6 deletions packages/browser-sync/lib/cli/transforms/handleExtensionsOption.ts
@@ -1,18 +1,24 @@
import {List} from "immutable";
import {BsTempOptions, explodeFilesArg, TransformResult} from "../cli-options";
import { List } from "immutable";
import {
BsTempOptions,
explodeFilesArg,
TransformResult
} from "../cli-options";

const _ = require("../../lodash.custom");

export function handleExtensionsOption(incoming: BsTempOptions): TransformResult {
const value = incoming.get('extensions');
export function handleExtensionsOption(
incoming: BsTempOptions
): TransformResult {
const value = incoming.get("extensions");
if (_.isString(value)) {
const split = explodeFilesArg(value);
if (split.length) {
return [incoming.set('extensions', List(split)), []];
return [incoming.set("extensions", List(split)), []];
}
}
if (List.isList(value)) {
return [incoming.set('extensions', value), []];
return [incoming.set("extensions", value), []];
}
return [incoming, []];
}
10 changes: 5 additions & 5 deletions packages/browser-sync/lib/cli/transforms/handleFilesOption.ts
@@ -1,9 +1,9 @@
import {fromJS} from "immutable";
import {BsTempOptions, makeFilesArg, TransformResult} from "../cli-options";
import {FilesNamespaces} from "../../types";
import { fromJS } from "immutable";
import { BsTempOptions, makeFilesArg, TransformResult } from "../cli-options";
import { FilesNamespaces } from "../../types";

export function handleFilesOption(incoming: BsTempOptions): TransformResult {
const value = incoming.get('files');
const value = incoming.get("files");
const namespaces: FilesNamespaces = {
core: {
globs: [],
Expand All @@ -21,5 +21,5 @@ export function handleFilesOption(incoming: BsTempOptions): TransformResult {
namespaces.core.objs = processed.objs;
}

return [incoming.set('files', fromJS(namespaces)), []];
return [incoming.set("files", fromJS(namespaces)), []];
}

0 comments on commit cdbcabd

Please sign in to comment.