Skip to content

Commit

Permalink
fix(babel-plugin): Use require.resolve instead of relative path resol…
Browse files Browse the repository at this point in the history
…ution (#303)
  • Loading branch information
fatemab authored and gregberge committed Apr 10, 2019
1 parent 42f55f9 commit bad7f1f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
34 changes: 17 additions & 17 deletions packages/babel-plugin/src/__snapshots__/index.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports[`plugin Magic comment should remove only needed comments 1`] = `
return require.resolveWeak(\\"moment\\");
}
return require('path').resolve(__dirname, \\"moment\\");
return eval('require.resolve')(\\"moment\\");
}
};"
Expand Down Expand Up @@ -74,7 +74,7 @@ exports[`plugin Magic comment should transpile arrow functions 1`] = `
return require.resolveWeak(\\"moment\\");
}
return require('path').resolve(__dirname, \\"moment\\");
return eval('require.resolve')(\\"moment\\");
}
};"
Expand Down Expand Up @@ -115,7 +115,7 @@ exports[`plugin Magic comment should transpile function expression 1`] = `
return require.resolveWeak(\\"moment\\");
}
return require('path').resolve(__dirname, \\"moment\\");
return eval('require.resolve')(\\"moment\\");
}
};"
Expand Down Expand Up @@ -157,7 +157,7 @@ exports[`plugin Magic comment should transpile shortand properties 1`] = `
return require.resolveWeak(\\"moment\\");
}
return require('path').resolve(__dirname, \\"moment\\");
return eval('require.resolve')(\\"moment\\");
}
}
Expand Down Expand Up @@ -203,7 +203,7 @@ exports[`plugin aggressive import should work with destructuration 1`] = `
return require.resolveWeak(\`./\${foo}\`);
}
return require('path').resolve(__dirname, \`./\${foo}\`);
return eval('require.resolve')(\`./\${foo}\`);
}
});"
Expand Down Expand Up @@ -242,7 +242,7 @@ exports[`plugin aggressive import with "webpackChunkName" should replace it 1`]
return require.resolveWeak(\`./\${props.foo}\`);
}
return require('path').resolve(__dirname, \`./\${props.foo}\`);
return eval('require.resolve')(\`./\${props.foo}\`);
}
});"
Expand Down Expand Up @@ -281,7 +281,7 @@ exports[`plugin aggressive import without "webpackChunkName" should support comp
return require.resolveWeak(\`./dir/\${props.foo}/test\`);
}
return require('path').resolve(__dirname, \`./dir/\${props.foo}/test\`);
return eval('require.resolve')(\`./dir/\${props.foo}/test\`);
}
});"
Expand Down Expand Up @@ -326,7 +326,7 @@ exports[`plugin aggressive import without "webpackChunkName" should support dest
return require.resolveWeak(\`./dir/\${foo}/test\`);
}
return require('path').resolve(__dirname, \`./dir/\${foo}/test\`);
return eval('require.resolve')(\`./dir/\${foo}/test\`);
}
});"
Expand Down Expand Up @@ -365,7 +365,7 @@ exports[`plugin aggressive import without "webpackChunkName" should support simp
return require.resolveWeak(\`./\${props.foo}\`);
}
return require('path').resolve(__dirname, \`./\${props.foo}\`);
return eval('require.resolve')(\`./\${props.foo}\`);
}
});"
Expand Down Expand Up @@ -404,7 +404,7 @@ exports[`plugin loadable.lib should be transpiled too 1`] = `
return require.resolveWeak(\\"moment\\");
}
return require('path').resolve(__dirname, \\"moment\\");
return eval('require.resolve')(\\"moment\\");
}
});"
Expand Down Expand Up @@ -443,7 +443,7 @@ exports[`plugin simple import in a complex promise should work 1`] = `
return require.resolveWeak(\\"./ModA\\");
}
return require('path').resolve(__dirname, \\"./ModA\\");
return eval('require.resolve')(\\"./ModA\\");
}
});"
Expand Down Expand Up @@ -482,7 +482,7 @@ exports[`plugin simple import should transform path into "chunk-friendly" name 1
return require.resolveWeak(\\"../foo/bar\\");
}
return require('path').resolve(__dirname, \\"../foo/bar\\");
return eval('require.resolve')(\\"../foo/bar\\");
}
});"
Expand Down Expand Up @@ -521,7 +521,7 @@ exports[`plugin simple import should work with * in name 1`] = `
return require.resolveWeak(\`./foo*\`);
}
return require('path').resolve(__dirname, \`./foo*\`);
return eval('require.resolve')(\`./foo*\`);
}
});"
Expand Down Expand Up @@ -560,7 +560,7 @@ exports[`plugin simple import should work with template literal 1`] = `
return require.resolveWeak(\`./ModA\`);
}
return require('path').resolve(__dirname, \`./ModA\`);
return eval('require.resolve')(\`./ModA\`);
}
});"
Expand Down Expand Up @@ -599,7 +599,7 @@ exports[`plugin simple import with "webpackChunkName" comment should use it 1`]
return require.resolveWeak(\\"./ModA\\");
}
return require('path').resolve(__dirname, \\"./ModA\\");
return eval('require.resolve')(\\"./ModA\\");
}
});"
Expand Down Expand Up @@ -638,7 +638,7 @@ exports[`plugin simple import with "webpackChunkName" comment should use it even
return require.resolveWeak(\\"./ModA\\");
}
return require('path').resolve(__dirname, \\"./ModA\\");
return eval('require.resolve')(\\"./ModA\\");
}
});"
Expand Down Expand Up @@ -677,7 +677,7 @@ exports[`plugin simple import without "webpackChunkName" comment should add it 1
return require.resolveWeak(\\"./ModA\\");
}
return require('path').resolve(__dirname, \\"./ModA\\");
return eval('require.resolve')(\\"./ModA\\");
}
});"
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin/src/properties/resolve.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default function resolveProperty({ types: t, template }) {
return require.resolveWeak(ID)
}
return require('path').resolve(__dirname, ID)
return eval('require.resolve')(ID)
`

function getCallValue(callPath) {
Expand Down

0 comments on commit bad7f1f

Please sign in to comment.