Resolve programmatic/CLI arguments from cwd, not file being compiled. (#5466)

This commit is contained in:
Logan Smyth
2017-03-14 16:56:00 -07:00
committed by GitHub
parent 2642c2c2df
commit dd1bc3b183
3 changed files with 29 additions and 18 deletions

View File

@@ -33,7 +33,7 @@ export default function buildConfigChain(opts: Object = {}) {
builder.mergeConfig({
options: opts,
alias: "base",
dirname: filename && path.dirname(filename),
dirname: process.cwd(),
});
return builder.configs;
@@ -173,7 +173,6 @@ class ConfigChainBuilder {
options = Object.assign({}, options);
dirname = dirname || process.cwd();
loc = loc || alias;
// add extends clause

View File

@@ -10,6 +10,10 @@ function fixture() {
return path.join.apply(path, args);
}
function base() {
return process.cwd();
}
describe("buildConfigChain", function () {
let oldBabelEnv;
let oldNodeEnv;
@@ -69,7 +73,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("dir1"),
dirname: base(),
},
];
@@ -108,7 +112,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("dir2"),
dirname: base(),
},
];
@@ -147,7 +151,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("env"),
dirname: base(),
},
];
@@ -198,7 +202,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("env"),
dirname: base(),
},
];
@@ -250,7 +254,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("env"),
dirname: base(),
},
];
@@ -288,7 +292,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("pkg"),
dirname: base(),
},
];
@@ -328,7 +332,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("js-config"),
dirname: base(),
},
];
@@ -368,7 +372,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("js-config-default"),
dirname: base(),
},
];
@@ -417,7 +421,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("js-config-extended"),
dirname: base(),
},
];
@@ -457,7 +461,7 @@ describe("buildConfigChain", function () {
},
alias: "base",
loc: "base",
dirname: fixture("json-pkg-config-no-babel"),
dirname: base(),
},
];

View File

@@ -33,13 +33,21 @@ describe("addon resolution", function () {
function fixturesReady (err) {
if (err) return done(err);
const actual = babel.transform(fixtures.actual, {
filename: paths.actual,
plugins: ["addons/plugin"],
presets: ["addons/preset"],
}).code;
const orignalCwd = process.cwd();
try {
process.chdir(paths.fixtures);
const actual = babel.transform(fixtures.actual, {
filename: paths.actual,
plugins: ["addons/plugin"],
presets: ["addons/preset"],
}).code;
assert.equal(actual, fixtures.expected);
} finally {
process.chdir(orignalCwd);
}
assert.equal(actual, fixtures.expected);
done();
}
// fixturesReady