Skip to content

Commit

Permalink
#604: Fixed code that relied on removed dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
jfmengels committed Oct 4, 2016
1 parent 5a6c38d commit 6a83c80
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 11 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
This change log adheres to standards from [Keep a CHANGELOG](http://keepachangelog.com).

## [Unreleased]

### Fixed
- Fixed code that relied on removed dependencies. ([#604])

## [2.0.0]! - 2016-09-30
### Added
Expand All @@ -25,7 +26,7 @@ This change log adheres to standards from [Keep a CHANGELOG](http://keepachangel
### Changed
- `imports-first` is renamed to [`first`]. `imports-first` alias will continue to
exist, but may be removed in a future major release.
- Case-sensitivity: now specifically (and optionally) reported by [`no-unresolved`].
- Case-sensitivity: now specifically (and optionally) reported by [`no-unresolved`].
Other rules will ignore case-mismatches on paths on case-insensitive filesystems. ([#311])

### Fixed
Expand Down Expand Up @@ -395,6 +396,7 @@ for info on changes for earlier releases.
[#157]: https://github.com/benmosher/eslint-plugin-import/pull/157
[#314]: https://github.com/benmosher/eslint-plugin-import/pull/314

[#604]: https://github.com/benmosher/eslint-plugin-import/issues/604
[#577]: https://github.com/benmosher/eslint-plugin-import/issues/577
[#570]: https://github.com/benmosher/eslint-plugin-import/issues/570
[#567]: https://github.com/benmosher/eslint-plugin-import/issues/567
Expand Down
3 changes: 1 addition & 2 deletions resolvers/node/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
var resolve = require('resolve')
, path = require('path')
, assign = require('object-assign')

var log = require('debug')('eslint-plugin-import:resolver:node')

Expand All @@ -26,7 +25,7 @@ exports.resolve = function (source, file, config) {
}

function opts(file, config) {
return assign({
return Object.assign({
// more closely matches Node (#333)
extensions: ['.js', '.json'],
},
Expand Down
1 change: 0 additions & 1 deletion resolvers/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"homepage": "https://github.com/benmosher/eslint-plugin-import",
"dependencies": {
"debug": "^2.2.0",
"object-assign": "^4.0.1",
"resolve": "^1.1.6"
},
"devDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions resolvers/webpack/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ var findRoot = require('find-root')
, isAbsolute = path.isAbsolute || require('is-absolute')
, fs = require('fs')
, coreLibs = require('node-libs-browser')
, assign = require('object-assign')
, resolve = require('resolve')
, semver = require('semver')
, has = require('has')
Expand Down Expand Up @@ -139,7 +138,7 @@ function createResolveSync(configPath, webpackConfig) {
function createWebpack2ResolveSync(webpackRequire, resolveConfig) {
var EnhancedResolve = webpackRequire('enhanced-resolve')

return EnhancedResolve.create.sync(assign({}, webpack2DefaultResolveConfig, resolveConfig))
return EnhancedResolve.create.sync(Object.assign({}, webpack2DefaultResolveConfig, resolveConfig))
}

/**
Expand Down
1 change: 0 additions & 1 deletion resolvers/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"is-absolute": "^0.2.3",
"lodash.get": "^3.7.0",
"node-libs-browser": "^1.0.0",
"object-assign": "^4.1.0",
"resolve": "^1.1.7",
"semver": "^5.3.0"
},
Expand Down
3 changes: 1 addition & 2 deletions src/rules/extensions.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import path from 'path'
import has from 'has'
import assign from 'object-assign'

import resolve from 'eslint-module-utils/resolve'
import { isBuiltIn } from '../core/importType'
Expand Down Expand Up @@ -42,7 +41,7 @@ module.exports = {
create: function (context) {
const configuration = context.options[0] || 'never'
const defaultConfig = typeof configuration === 'string' ? configuration : null
const modifiers = assign(
const modifiers = Object.assign(
{},
typeof configuration === 'object' ? configuration : context.options[1]
)
Expand Down
1 change: 0 additions & 1 deletion src/rules/max-dependencies.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Set from 'es6-set'
import isStaticRequire from '../core/staticRequire'

const DEFAULT_MAX = 10
Expand Down

0 comments on commit 6a83c80

Please sign in to comment.