Merge remote-tracking branch 'upstream/master' into merge-upstream-2

BobRazowsky · May 27, 2019 · d86ef61 · d86ef61
2 parents e36c1b1 + 8481ac3
commit d86ef61
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 1 deletion.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -44,5 +44,12 @@
         "jest": true
       }
     }
-  ]
+  ],
+  "settings": {
+    "import/resolver": {
+      "webpack": {
+        "config": "config/webpack.common.js"
+      }
+    }
+  }
 }
diff --git a/config/webpack.common.js b/config/webpack.common.js
@@ -63,4 +63,10 @@ module.exports = {
             chunksSortMode: "dependency",
         }),
     ],
+    resolve: {
+        alias: {
+            modules: path.resolve("src/modules"),
+            vendors: path.resolve("src/vendors"),
+        },
+    },
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,6 +39,7 @@
     "css-loader": "^2.0.1",
     "eslint": "^5.4.0",
     "eslint-config-airbnb-base": "^13.1.0",
+    "eslint-import-resolver-webpack": "^0.10.1",
     "eslint-plugin-import": "^2.12.0",
     "favicons-webpack-plugin": "0.0.9",
     "friendly-errors-webpack-plugin": "^1.7.0",