Skip to content
This repository has been archived by the owner on Feb 18, 2024. It is now read-only.

Update dependency eslint-config-airbnb-base to v14 #192

Merged
merged 3 commits into from
Aug 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"ava": "^1.4.1",
"babel-eslint": "^10.0.2",
"eslint": "^5.16.0",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-config-airbnb-base": "^14.0.0",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-ava": "^7.1.0",
"eslint-plugin-babel": "^5.3.0",
Expand Down
12 changes: 4 additions & 8 deletions src/DevServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,10 @@ module.exports = class extends ChainedMap {
}

toConfig() {
return this.clean(
Object.assign(
{
allowedHosts: this.allowedHosts.values(),
},
this.entries() || {},
),
);
return this.clean({
allowedHosts: this.allowedHosts.values(),
...(this.entries() || {}),
});
}

merge(obj, omit = []) {
Expand Down
14 changes: 5 additions & 9 deletions src/ResolveLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@ module.exports = class extends Resolve {
}

toConfig() {
return this.clean(
Object.assign(
{
moduleExtensions: this.moduleExtensions.values(),
packageMains: this.packageMains.values(),
},
super.toConfig(),
),
);
return this.clean({
moduleExtensions: this.moduleExtensions.values(),
packageMains: this.packageMains.values(),
...super.toConfig(),
});
}

merge(obj, omit = []) {
Expand Down
1 change: 1 addition & 0 deletions test/Config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable max-classes-per-file */
import test from 'ava';
import { validate } from 'webpack';
import EnvironmentPlugin from 'webpack/lib/EnvironmentPlugin';
Expand Down
1 change: 1 addition & 0 deletions test/Plugin.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable max-classes-per-file */
import test from 'ava';
import EnvironmentPlugin from 'webpack/lib/EnvironmentPlugin';
import Plugin from '../src/Plugin';
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ configstore@^3.0.0:
write-file-atomic "^2.0.0"
xdg-basedir "^3.0.0"

confusing-browser-globals@^1.0.5:
confusing-browser-globals@^1.0.7:
version "1.0.8"
resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.8.tgz#93ffec1f82a6e2bf2bc36769cc3a92fa20e502f3"
integrity sha512-lI7asCibVJ6Qd3FGU7mu4sfG4try4LX3+GVS+Gv8UlrEf2AeW57piecapnog2UHZSbcX/P/1UDWVaTsblowlZg==
Expand Down Expand Up @@ -1835,12 +1835,12 @@ escape-string-regexp@^1.0.4, escape-string-regexp@^1.0.5:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=

eslint-config-airbnb-base@^13.1.0:
version "13.2.0"
resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz#f6ea81459ff4dec2dda200c35f1d8f7419d57943"
integrity sha512-1mg/7eoB4AUeB0X1c/ho4vb2gYkNH8Trr/EgCT/aGmKhhG+F6vF5s8+iRBlWAzFIAphxIdp3YfEKgEl0f9Xg+w==
eslint-config-airbnb-base@^14.0.0:
version "14.0.0"
resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.0.0.tgz#8a7bcb9643d13c55df4dd7444f138bf4efa61e17"
integrity sha512-2IDHobw97upExLmsebhtfoD3NAKhV4H0CJWP3Uprd/uk+cHuWYOczPVxQ8PxLFUAw7o3Th1RAU8u1DoUpr+cMA==
dependencies:
confusing-browser-globals "^1.0.5"
confusing-browser-globals "^1.0.7"
object.assign "^4.1.0"
object.entries "^1.1.0"

Expand Down