cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow relative paths in babelrc options in options.json (#4797)

Browse Source
This commit is contained in:
Henry Zhu 2016-11-01 16:58:28 -04:00 committed by GitHub
parent a21100f6b3
commit 9681b530e9
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/babel-helper-fixtures/src/index.js
View File

@ -102,6 +102,7 @@ export default function get(entryLoc): Array<Suite> {
if (taskOptsLoc) _.merge(taskOpts, require(taskOptsLoc));
let test = {
optionsDir: taskOptsLoc ? path.dirname(taskOptsLoc) : null,
title: humanize(taskName, true),
disabled: taskName[0] === ".",
options: taskOpts,

23
packages/babel-helper-transform-fixture-test-runner/src/index.js
View File

@ -13,10 +13,24 @@ import path from "path";
let babelHelpers = eval(buildExternalHelpers(null, "var"));
function wrapPackagesArray(type, names) {
function wrapPackagesArray(type, names, optionsDir) {
return (names || []).map(function (val) {
if (typeof val === "string") val = [val];
val[0] = __dirname + "/../../babel-" + type + "-" + val[0];
// relative path (outside of monorepo)
if (val[0][0] === ".") {
if (!optionsDir) {
throw new Error("Please provide an options.json in test dir when using a relative plugin path.");
}
val[0] = path.resolve(optionsDir, val[0]);
}
// check node_modules/babel-x-y
else {
val[0] = __dirname + "/../../babel-" + type + "-" + val[0];
}
return val;
});
}
@ -26,14 +40,15 @@ function run(task) {
let expect = task.expect;
let exec = task.exec;
let opts = task.options;
let optionsDir = task.optionsDir;
function getOpts(self) {
let newOpts = _.merge({
filename: self.loc,
}, opts);
newOpts.plugins = wrapPackagesArray("plugin", newOpts.plugins);
newOpts.presets = wrapPackagesArray("preset", newOpts.presets).map(function (val) {
newOpts.plugins = wrapPackagesArray("plugin", newOpts.plugins, optionsDir);
newOpts.presets = wrapPackagesArray("preset", newOpts.presets, optionsDir).map(function (val) {
if (val.length > 2) {
throw new Error(`Unexpected extra options ${JSON.stringify(val.slice(2))} passed to preset.`);
}