From 5867c97a691771e2291a012ef54152df3b73875b Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 20 May 2018 19:35:41 -0500 Subject: [PATCH 1/2] Move browser env configuration browser directory --- base/index.js | 1 - browser/index.js | 3 +++ server/index.js | 5 +---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/base/index.js b/base/index.js index a1d27c3..0189f81 100644 --- a/base/index.js +++ b/base/index.js @@ -1,7 +1,6 @@ module.exports = { extends: ['airbnb/base', 'prettier'], env: { - browser: true, node: true, }, plugins: [ diff --git a/browser/index.js b/browser/index.js index 9a961b4..4b82c39 100644 --- a/browser/index.js +++ b/browser/index.js @@ -5,6 +5,9 @@ module.exports = { 'eslint-config-wizeline', 'prettier/react', ], + env: { + browser: true, + }, plugins: [ 'react', ], diff --git a/server/index.js b/server/index.js index a2dac23..e1159a0 100644 --- a/server/index.js +++ b/server/index.js @@ -1,8 +1,5 @@ module.exports = { "extends": [ 'eslint-config-wizeline', - ], - "env": { - "node": true, - }, + ] }; From 617614a2aeab75daf3a318ba1dffd75402d85189 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 20 May 2018 19:36:48 -0500 Subject: [PATCH 2/2] Fix plugins for base config. Some extensions were wrongly put on plugins. --- base/index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/base/index.js b/base/index.js index 0189f81..6301e6c 100644 --- a/base/index.js +++ b/base/index.js @@ -1,14 +1,12 @@ module.exports = { - extends: ['airbnb/base', 'prettier'], + extends: ['airbnb/base', 'prettier', 'prettier/flowtype', 'plugin:flowtype/recommended'], env: { node: true, }, plugins: [ 'prettier', - 'prettier/flowtype', 'flowtype', 'flowtype-errors', - 'plugin:flowtype/recommended', ], rules: { semi: 0,