Skip to content

Commit

Permalink
Update deps (#3799)
Browse files Browse the repository at this point in the history
* update deps

* linting: disable generator-star-spacing

Since it doesn't allow these to coexist:
function*<space>namedFunction() {}
function*() {}

Relevant ESLint issue in the patch.
  • Loading branch information
erikdesjardins authored Dec 22, 2016
1 parent b6e9e61 commit 190489b
Show file tree
Hide file tree
Showing 6 changed files with 342 additions and 359 deletions.
21 changes: 4 additions & 17 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"parser": "babel-eslint",
"plugins": [
"babel",
"flowtype",
"ava",
"dollar-sign",
Expand All @@ -24,16 +23,6 @@
},
"extends": ["eslint:all", "plugin:ava/recommended"],
"rules": {
"babel/generator-star-spacing": [2, { "before": false, "after": true }],
"babel/new-cap": 0,
"babel/array-bracket-spacing": 2,
"babel/object-curly-spacing": [2, "always"],
"babel/object-shorthand": 2,
"babel/arrow-parens": [2, "as-needed"],
"babel/no-await-in-loop": 2,
"babel/flow-object-type": 0,
"babel/func-params-comma-dangle": 2,

"flowtype/boolean-style": 2,
"flowtype/define-flow-type": 2,
"flowtype/delimiter-dangle": [2, "always-multiline"],
Expand Down Expand Up @@ -144,9 +133,8 @@
"no-use-before-define": [0, "nofunc"],
"no-useless-escape": 0,
"no-warning-comments": 0,
"array-bracket-spacing": 0, // see babel/array-bracket-spacing
"array-callback-return": 0,
"arrow-parens": 0, // see babel/arrow-parens
"arrow-parens": [2, "as-needed"],
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
"callback-return": 0,
"camelcase": [2, { "properties": "never" }],
Expand All @@ -160,7 +148,7 @@
"dot-location": [2, "property"],
"func-names": 0, // all anonymous functions should be arrows (when this is turned on)
"func-style": [2, "declaration", { "allowArrowFunctions": true }],
"generator-star-spacing": 0, // see babel/generator-star-spacing
"generator-star-spacing": [0, { "before": false, "after": true }], // disabled pending https://github.com/eslint/eslint/issues/6195
"guard-for-in": 0,
"id-blacklist": 0,
"id-length": 0,
Expand All @@ -178,14 +166,13 @@
"max-statements": 0,
"max-statements-per-line": 0,
"multiline-ternary": 0,
"new-cap": 0, // see babel/new-cap
"new-cap": 0,
"newline-after-var": [0, "never"],
"newline-before-return": 0,
"newline-per-chained-call": 0,
"object-curly-newline": 0,
"object-curly-spacing": 0, // see babel/object-curly-spacing
"object-curly-spacing": [2, "always"],
"object-property-newline": [2, { "allowMultiplePropertiesPerLine": true }],
"object-shorthand": 0, // see babel/object-shorthand
"one-var": [2, { "initialized": "never" }],
"one-var-declaration-per-line": [2, "initializations"],
"operator-assignment": [2, "always"],
Expand Down
2 changes: 1 addition & 1 deletion lib/modules/showImages.js
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ async function getMediaInfo(element, mediaUrl) {
for (const siteModule of matchingHosts) {
const detectResult = siteModule.detect(mediaUrl);
if (detectResult) {
const requiresPermission = siteModule.permissions ? !(await Permissions.has(siteModule.permissions)) : false; // eslint-disable-line babel/no-await-in-loop
const requiresPermission = siteModule.permissions ? !(await Permissions.has(siteModule.permissions)) : false; // eslint-disable-line no-await-in-loop
return { detectResult, siteModule, requiresPermission, element, href: mediaUrl.href };
}
}
Expand Down
8 changes: 5 additions & 3 deletions lib/modules/subredditManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ module.go = async () => {
}
};

async function manageSubreddits() {
function manageSubreddits() {
// This is the init function for Manage Subreddits - it'll get your preferences and redraw the top bar.
redrawSubredditBar();
// Listen for subscriptions / unsubscriptions from reddits so we know to reload the JSON string...
Expand All @@ -217,7 +217,9 @@ async function manageSubreddits() {
if ($(`#subButtons-${thisSubredditFragment}`).length === 0) {
const $subButtonsWrapper = $(`<div id="subButtons-${thisSubredditFragment}" class="subButtons"></div>`);
$(subButton).wrap($subButtonsWrapper);
$(subButton).append(await getMultiCounts(thisSubredditFragment));
getMultiCounts(thisSubredditFragment).then(multiCount => {
$(subButton).append(multiCount);
});
// move this wrapper to the end (after any icons that may exist...)
if (isMulti) {
const theWrap = $(subButton).parent();
Expand Down Expand Up @@ -1127,7 +1129,7 @@ async function getSubreddits(user) {
let page = 0;

do {
const { data } = (await ajax({ // eslint-disable-line babel/no-await-in-loop
const { data } = (await ajax({ // eslint-disable-line no-await-in-loop
url: '/subreddits/mine.json',
data: {
after,
Expand Down
4 changes: 2 additions & 2 deletions lib/utils/array.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export type Iteratee<T, R> = (e: T, i: number, a: T[]) => R;
*/
export async function forEachSeq<T>(iterable: Iterable<T>, callback: (x: T) => ?Promise<void>): Promise<void> {
for (const val of iterable) {
await callback(val); // eslint-disable-line babel/no-await-in-loop
await callback(val); // eslint-disable-line no-await-in-loop
}
}

Expand All @@ -22,7 +22,7 @@ export async function asyncReduce<T, V>(iterable: Iterable<T>, callback: (acc: V
let accumulator = initialValue;

for (const val of iterable) {
accumulator = await callback(accumulator, val); // eslint-disable-line babel/no-await-in-loop
accumulator = await callback(accumulator, val); // eslint-disable-line no-await-in-loop
}

return accumulator;
Expand Down
49 changes: 24 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,48 +56,47 @@
]
},
"dependencies": {
"babel-runtime": "6.18.0",
"element-resize-detector": "1.1.9",
"babel-runtime": "6.20.0",
"element-resize-detector": "1.1.10",
"escape-string-regexp": "1.0.5",
"favico.js": "0.3.10",
"intersection-observer": "0.1.1",
"jquery": "3.1.1",
"jquery-sortable": "0.9.13",
"lodash": "4.16.6",
"moment": "2.16.0",
"lodash": "4.17.2",
"moment": "2.17.1",
"snudown-js": "2.0.0",
"tinycolor2": "1.4.1"
},
"devDependencies": {
"autoprefixer": "6.5.3",
"autoprefixer": "6.5.4",
"ava": "0.15.2",
"babel-core": "6.18.2",
"babel-core": "6.21.0",
"babel-eslint": "7.1.1",
"babel-loader": "6.2.7",
"babel-plugin-lodash": "3.2.9",
"babel-loader": "6.2.10",
"babel-plugin-lodash": "3.2.11",
"babel-plugin-transform-async-to-generator": "6.16.0",
"babel-plugin-transform-class-properties": "6.18.0",
"babel-plugin-transform-dead-code-elimination": "2.2.1",
"babel-plugin-transform-es2015-block-scoping": "6.18.0",
"babel-plugin-transform-es2015-destructuring": "6.18.0",
"babel-plugin-transform-class-properties": "6.19.0",
"babel-plugin-transform-dead-code-elimination": "2.2.2",
"babel-plugin-transform-es2015-block-scoping": "6.21.0",
"babel-plugin-transform-es2015-destructuring": "6.19.0",
"babel-plugin-transform-es2015-modules-commonjs": "6.18.0",
"babel-plugin-transform-es2015-parameters": "6.18.0",
"babel-plugin-transform-es2015-parameters": "6.21.0",
"babel-plugin-transform-exponentiation-operator": "6.8.0",
"babel-plugin-transform-export-extensions": "6.8.0",
"babel-plugin-transform-flow-strip-types": "6.8.0",
"babel-plugin-transform-flow-strip-types": "6.21.0",
"babel-plugin-transform-node-env-inline": "6.8.0",
"babel-plugin-transform-object-rest-spread": "6.16.0",
"babel-plugin-transform-object-rest-spread": "6.20.2",
"babel-plugin-transform-runtime": "6.15.0",
"babel-preset-es2015": "6.18.0",
"chrome-extension-deploy": "2.0.3",
"coveralls": "2.11.15",
"cross-env": "3.1.3",
"css-loader": "0.25.0",
"css-loader": "0.26.1",
"deep-equal": "1.0.1",
"eslint": "3.11.1",
"eslint-import-resolver-webpack": "0.7.0",
"eslint": "3.12.2",
"eslint-import-resolver-webpack": "0.8.0",
"eslint-plugin-ava": "4.0.0",
"eslint-plugin-babel": "3.3.0",
"eslint-plugin-dollar-sign": "1.0.0",
"eslint-plugin-filenames": "1.1.0",
"eslint-plugin-flowtype": "2.29.1",
Expand All @@ -116,20 +115,20 @@
"jsdom": "9.8.3",
"json-loader": "0.5.4",
"jszip": "2.6.1",
"mustache-loader": "0.4.0",
"nightwatch": "0.9.9",
"node-sass": "3.11.3",
"mustache-loader": "0.4.1",
"nightwatch": "0.9.11",
"node-sass": "4.0.0",
"nyc": "10.0.0",
"postcss-loader": "1.1.1",
"postcss-loader": "1.2.1",
"progress-bar-webpack-plugin": "1.9.0",
"prop-loader": "0.0.5",
"rimraf": "2.5.4",
"sass-lint": "1.10.2",
"sass-loader": "4.0.2",
"sass-loader": "4.1.0",
"semver": "5.3.0",
"spawn-loader": "0.1.0",
"url-loader": "0.5.7",
"webpack": "1.13.3",
"webpack": "1.14.0",
"yargs": "6.5.0",
"zip-webpack-plugin": "0.2.0"
}
Expand Down
Loading

0 comments on commit 190489b

Please sign in to comment.