diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 0000000..62168f8
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,47 @@
+module.exports = {
+  "root": true,
+  "extends": "eslint:recommended",
+  "globals": {
+    "wp": true
+  },
+  "env": {
+    "node": true,
+    "es6": true,
+    "amd": true,
+    "browser": true,
+    "jquery": true
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "globalReturn": true,
+      "generators": false,
+      "objectLiteralDuplicateProperties": false,
+      "experimentalObjectRestSpread": true
+    },
+    "ecmaVersion": 2017,
+    "sourceType": "module"
+  },
+  "plugins": [
+    "import"
+  ],
+  "settings": {
+    "import/core-modules": [],
+    "import/ignore": [
+      "node_modules",
+      "\\.(coffee|scss|css|less|hbs|svg|json)$"
+    ]
+  },
+  "rules": {
+    "no-console": process.env.NODE_ENV === 'production' ? 2 : 0,
+    "comma-dangle": [
+      "error",
+      {
+        "arrays": "always-multiline",
+        "objects": "always-multiline",
+        "imports": "always-multiline",
+        "exports": "always-multiline",
+        "functions": "ignore"
+      }
+    ]
+  }
+}
diff --git a/.eslintrc.production.json b/.eslintrc.production.json
deleted file mode 100644
index f534afe..0000000
--- a/.eslintrc.production.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": [
-    "./package.json"
-  ],
-  "rules": {
-      "no-console": ["error"]
-  }
-}
diff --git a/package.json b/package.json
index 8eb555b..37eb388 100644
--- a/package.json
+++ b/package.json
@@ -22,53 +22,6 @@
     "android 4",
     "opera 12"
   ],
-  "eslintConfig": {
-    "root": true,
-    "extends": "eslint:recommended",
-    "globals": {
-      "wp": true
-    },
-    "env": {
-      "node": true,
-      "es6": true,
-      "amd": true,
-      "browser": true,
-      "jquery": true
-    },
-    "parserOptions": {
-      "ecmaFeatures": {
-        "globalReturn": true,
-        "generators": false,
-        "objectLiteralDuplicateProperties": false,
-        "experimentalObjectRestSpread": true
-      },
-      "ecmaVersion": 2017,
-      "sourceType": "module"
-    },
-    "plugins": [
-      "import"
-    ],
-    "settings": {
-      "import/core-modules": [],
-      "import/ignore": [
-        "node_modules",
-        "\\.(coffee|scss|css|less|hbs|svg|json)$"
-      ]
-    },
-    "rules": {
-      "no-console": ["off"],
-      "comma-dangle": [
-        "error",
-        {
-          "arrays": "always-multiline",
-          "objects": "always-multiline",
-          "imports": "always-multiline",
-          "exports": "always-multiline",
-          "functions": "ignore"
-        }
-      ]
-    }
-  },
   "stylelint": {
     "extends": "stylelint-config-standard",
     "rules": {
diff --git a/resources/assets/build/webpack.config.js b/resources/assets/build/webpack.config.js
index fc71a38..d6450bb 100644
--- a/resources/assets/build/webpack.config.js
+++ b/resources/assets/build/webpack.config.js
@@ -41,10 +41,7 @@ let webpackConfig = {
         enforce: 'pre',
         test: /\.js$/,
         include: config.paths.assets,
-        loader: 'eslint-loader',
-        options: {
-          configFile: config.env.production ? config.paths.eslintProd : null,
-        },
+        use: 'eslint',
       },
       {
         enforce: 'pre',