Merge branch 'master' into relative

Author: amosyuen

CHANGELOG.md

@@ -2,6 +2,24 @@
 
 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="3.1.0"></a>
+# [3.1.0](https://github.com/tleunen/babel-plugin-module-resolver/compare/v3.0.0...v3.1.0) (2018-02-08)
+
+
+### Bug Fixes
+
+* Fix path transformation for dot files that are siblings ([#253](https://github.com/tleunen/babel-plugin-module-resolver/issues/253)) ([7dc2da6](https://github.com/tleunen/babel-plugin-module-resolver/commit/7dc2da6))
+
+
+### Features
+
+* Ability to declare aliases in an array to preserve the order ([#243](https://github.com/tleunen/babel-plugin-module-resolver/issues/243)) ([d03715d](https://github.com/tleunen/babel-plugin-module-resolver/commit/d03715d))
+* Add stripExtensions option to determine which extensions get removed ([#247](https://github.com/tleunen/babel-plugin-module-resolver/issues/247)) ([fdf5da9](https://github.com/tleunen/babel-plugin-module-resolver/commit/fdf5da9))
+* Allow using a function to define the result of an alias ([#245](https://github.com/tleunen/babel-plugin-module-resolver/issues/245)) ([9299d9a](https://github.com/tleunen/babel-plugin-module-resolver/commit/9299d9a))
+* run plugin also on Program exit to handle dynamically added imports from other transforms ([#269](https://github.com/tleunen/babel-plugin-module-resolver/issues/269)) ([12a2d07](https://github.com/tleunen/babel-plugin-module-resolver/commit/12a2d07))
+
+
+
 <a name="3.0.0"></a>
 # [3.0.0](https://github.com/tleunen/babel-plugin-module-resolver/compare/v3.0.0-beta.5...v3.0.0) (2017-11-08)
 

DOCS.md

@@ -47,7 +47,7 @@ A string or an array of root directories. Specify the paths or a glob path (eg.
 
 A map of alias. You can also alias `node_modules` dependencies, not just local files.
 
-### Regular expressions
+### Regular expressions
 
 It is possible to specify an alias using a regular expression. To do that, either start an alias with `'^'` or end it with `'$'`:
 
@@ -69,7 +69,7 @@ You can reference the n-th matched group with `'\\n'` (`'\\0'` refers to the who
 
 To use the backslash character (`\`) just escape it like so: `'\\\\'` (double escape is needed because of JSON already using `\` for escaping).
 
-### Passing a substitute function
+### Passing a substitute function
 
 If you need even more power over the aliased path, you can pass a function in the alias configuration:
 
@@ -206,7 +206,7 @@ If you want to leave some paths as-is, then you can return `undefined` or any ot
 
 create-react-app by default don't use .babelrc, so in webpack.config.dev.js, add plugins property within js loader like below. Note that plugins recieve an array.
 
-```json
+```js
 // Process JS with Babel.
 {
   test: /\.(js|jsx|mjs)$/,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-module-resolver",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "main": "lib/index.js",
   "description": "Module resolver plugin for Babel",
   "repository": {

src/index.js

@@ -18,6 +18,9 @@ const visitor = {
     enter(programPath, state) {
       programPath.traverse(importVisitors, state);
     },
+    exit(programPath, state) {
+      programPath.traverse(importVisitors, state);
+    },
   },
 };
 
@@ -29,7 +32,14 @@ export default ({ types }) => ({
 
     const currentFile = file.opts.filename;
     this.normalizedOpts = normalizeOptions(currentFile, this.opts);
+    // We need to keep track of all handled nodes so we do not try to transform them twice,
+    // because we run before (enter) and after (exit) all nodes are handled
+    this.moduleResolverVisited = new Set();
   },
 
   visitor,
+
+  post() {
+    this.moduleResolverVisited.clear();
+  },
 });

src/transformers/call.js

@@ -6,12 +6,17 @@ import {
 
 
 export default function transformCall(nodePath, state) {
+  if (state.moduleResolverVisited.has(nodePath)) {
+    return;
+  }
+
   const calleePath = nodePath.get('callee');
   const isNormalCall = state.normalizedOpts.transformFunctions.some(
     pattern => matchesPattern(state.types, calleePath, pattern),
   );
 
   if (isNormalCall || isImportCall(state.types, nodePath)) {
+    state.moduleResolverVisited.add(nodePath);
     mapPathString(nodePath.get('arguments.0'), state);
   }
 }

src/transformers/import.js

@@ -2,5 +2,10 @@ import { mapPathString } from '../utils';
 
 
 export default function transformImport(nodePath, state) {
+  if (state.moduleResolverVisited.has(nodePath)) {
+    return;
+  }
+  state.moduleResolverVisited.add(nodePath);
+
   mapPathString(nodePath.get('source'), state);
 }

test/dynamicImport.test.js

@@ -56,4 +56,26 @@ describe('import()', () => {
 
     expect(result.code).toBe('import("").then(() => {}).catch(() => {});');
   });
+
+  it('should handle imports added by other transforms', () => {
+    const options = {
+      ...transformerOpts,
+      plugins: [
+        function fakePlugin({ types }) {
+          return {
+            visitor: {
+              Identifier(path) {
+                path.replaceWith(types.Import());
+              },
+            },
+          };
+        },
+        ...transformerOpts.plugins,
+      ],
+    };
+    const code = 'boo("components/Header/SubHeader");';
+    const result = transform(code, options);
+
+    expect(result.code).toBe('import("./test/testproject/src/components/Header/SubHeader");');
+  });
 });