chore(eslint): upgrade to eslint@4

import-js · Jun 17, 2017 · eec46df · eec46df
1 parent 3f9e4bf
commit eec46df
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,20 @@
 language: node_js
 node_js:
   - 6
-  - 7
+  - 8
 
 os:
   - linux
   - osx
 
+env:
+  - ESLINT_VERSION=2
+  - ESLINT_VERSION=3
+  - ESLINT_VERSION=4
+
 install:
-  - npm -g install npm@3
   - npm install
+  - npm install eslint@$ESLINT_VERSION --ignore-scripts || true
   # install all resolver deps
   - "for resolver in ./resolvers/*; do cd $resolver && npm install && cd ../..; done"
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,8 +1,24 @@
 # Test against this version of Node.js
 environment:
+  environment:
   matrix:
-  - nodejs_version: "7"
-  - nodejs_version: "6"
+    - nodejs_version: "8"
+      ESLINT_VERSION: "4"
+
+    - nodejs_version: "8"
+      ESLINT_VERSION: "3"
+
+    - nodejs_version: "8"
+      ESLINT_VERSION: "2"
+
+    - nodejs_version: "6"
+      ESLINT_VERSION: "4"
+
+    - nodejs_version: "6"
+      ESLINT_VERSION: "3"
+
+    - nodejs_version: "6"
+      ESLINT_VERSION: "2"
 
 # platform:
 #   - x86
@@ -13,12 +29,9 @@ install:
   # Get the latest stable version of Node.js or io.js
   - ps: Install-Product node $env:nodejs_version
 
-  # update npm (only needed for Node 0.10)
-  - npm -g install npm@3
-  # - set PATH=%APPDATA%\npm;%PATH%
-
   # install modules
   - npm install
+  - npm install eslint@$ESLINT_VERSION --ignore-scripts || true
 
   # todo: learn how to do this for all .\resolvers\* on Windows
   - cd .\resolvers\webpack && npm install && cd ..\..

diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "typescript-eslint-parser": "^2.1.0"
   },
   "peerDependencies": {
-    "eslint": "2.x - 3.x"
+    "eslint": "2.x - 4.x"
   },
   "dependencies": {
     "builtin-modules": "^1.1.1",

diff --git a/src/rules/no-amd.js b/src/rules/no-amd.js
@@ -17,7 +17,7 @@ module.exports = {
         return {
 
             'CallExpression': function (node) {
-          if (context.getScope().type !== 'module') return
+          if (context.getScope().type !== 'module' && context.getScope().type !== 'global') return
 
           if (node.callee.type !== 'Identifier') return
           if (node.callee.name !== 'require' &&

diff --git a/src/rules/no-commonjs.js b/src/rules/no-commonjs.js
@@ -41,7 +41,7 @@ module.exports = {
 
       },
       'CallExpression': function (call) {
-        if (context.getScope().type !== 'module') return
+        if (context.getScope().type !== 'module' && context.getScope().type !== 'global') return
 
         if (call.callee.type !== 'Identifier') return
         if (call.callee.name !== 'require') return

diff --git a/src/rules/no-named-default.js b/src/rules/no-named-default.js
@@ -10,7 +10,7 @@ module.exports = {
           if (im.type === 'ImportSpecifier' && im.imported.name === 'default') {
             context.report({
               node: im.local,
-              message: `Use default import syntax to import \'${im.local.name}\'.` })
+              message: `Use default import syntax to import '${im.local.name}'.` })
           }
         })
       },

diff --git a/tests/src/rules/default.js b/tests/src/rules/default.js
@@ -58,8 +58,7 @@ ruleTester.run('default', rule, {
 
     // #94: redux export of execution result,
     test({ code: 'import connectedApp from "./redux"' }),
-    test({ code: 'import App from "./jsx/App"'
-         , ecmaFeatures: { jsx: true, modules: true } }),
+    test({ code: 'import App from "./jsx/App"'}),
 
     // from no-errors
     test({

diff --git a/tests/src/rules/named.js b/tests/src/rules/named.js
@@ -135,7 +135,6 @@ ruleTester.run('named', rule, {
 
     test({
       code: 'import { a } from "./re-export-names"',
-      args: [2, 'es6-only'],
       errors: [error('a', './re-export-names')],
     }),