Merge branch 'master' into master

tleunen · Mar 30, 2017 · 0cf0379 · 0cf0379
2 parents c319ec5 + ed54855
commit 0cf0379
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="2.6.1"></a>
+## [2.6.1](https://github.com/tleunen/babel-plugin-module-resolver/compare/v2.6.0...v2.6.1) (2017-03-29)
+
+
+### Bug Fixes
+
+* Fix `regExps.find` undefined error ([2171200](https://github.com/tleunen/babel-plugin-module-resolver/commit/2171200))
+
+
+
 <a name="2.6.0"></a>
 # [2.6.0](https://github.com/tleunen/babel-plugin-module-resolver/compare/v2.5.0...v2.6.0) (2017-03-29)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-module-resolver",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "main": "lib/index.js",
   "description": "Module resolver plugin for Babel",
   "repository": {

diff --git a/src/getRealPath.js b/src/getRealPath.js
@@ -98,7 +98,7 @@ export default function getRealPath(sourcePath, currentFile, opts) {
 
   const { cwd, extensions, pluginOpts } = opts;
   const rootDirs = pluginOpts.root || [];
-  const regExps = pluginOpts.regExps;
+  const regExps = pluginOpts.regExps || [];
   const alias = pluginOpts.alias || {};
 
   const sourceFileFromRoot = getRealPathFromRootConfig(