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

always parse package.json with default json parser, use json5 otherwise

Browse Source
This commit is contained in:
Sebastian McKenzie 2015-07-31 23:36:50 +01:00
parent 855ee71d59
commit b5bd7b1c92
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/babel/src/transformation/file/options/option-manager.js
View File

@ -51,14 +51,14 @@ export default class OptionManager {
* [Please add a description.]
*/
addConfig(loc, key?) {
addConfig(loc, key?, json=json5) {
if (this.resolvedConfigs.indexOf(loc) >= 0) return;
var content = fs.readFileSync(loc, "utf8");
var opts;
try {
opts = jsonCache[content] = jsonCache[content] || json5.parse(content);
opts = jsonCache[content] = jsonCache[content] || json.parse(content);
if (key) opts = opts[key];
} catch (err) {
err.message = `${loc}: Error while parsing JSON - ${err.message}`;
@ -125,7 +125,7 @@ export default class OptionManager {
if (exists(configLoc)) this.addConfig(configLoc);
var pkgLoc = path.join(loc, PACKAGE_FILENAME);
if (exists(pkgLoc)) this.addConfig(pkgLoc, "babel");
if (exists(pkgLoc)) this.addConfig(pkgLoc, "babel", JSON);
var ignoreLoc = path.join(loc, BABELIGNORE_FILENAME);
if (exists(ignoreLoc)) this.addIgnoreConfig(ignoreLoc);