Skip to content

Commit

Permalink
Add babelrc.json support (#10783)
Browse files Browse the repository at this point in the history
* Add babelrc.json support

* Add tests

Co-authored-by: Nicol貌 Ribaudo <nicolo.ribaudo@gmail.com>
  • Loading branch information
yordis and nicolo-ribaudo committed Jan 10, 2020
1 parent ae06baf commit 4c28f54
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 23 deletions.
1 change: 1 addition & 0 deletions packages/babel-core/src/config/files/configuration.js
Expand Up @@ -32,6 +32,7 @@ const RELATIVE_CONFIG_FILENAMES = [
".babelrc.js",
".babelrc.cjs",
".babelrc.mjs",
".babelrc.json",
];

const BABELIGNORE_FILENAME = ".babelignore";
Expand Down
51 changes: 28 additions & 23 deletions packages/babel-core/test/config-chain.js
Expand Up @@ -1076,25 +1076,28 @@ describe("buildConfigChain", function() {
});

describe("relative", () => {
test.each(["package.json", ".babelrc", ".babelrc.js", ".babelrc.cjs"])(
"should load %s synchronously",
async name => {
const { cwd, tmp, config } = await getTemp(
`babel-test-load-config-${name}`,
);
const filename = tmp("src.js");
test.each([
"package.json",
".babelrc",
".babelrc.js",
".babelrc.cjs",
".babelrc.json",
])("should load %s synchronously", async name => {
const { cwd, tmp, config } = await getTemp(
`babel-test-load-config-${name}`,
);
const filename = tmp("src.js");

await config(name);
await config(name);

expect(loadOptions({ filename, cwd })).toEqual({
...getDefaults(),
filename,
cwd,
root: cwd,
comments: true,
});
},
);
expect(loadOptions({ filename, cwd })).toEqual({
...getDefaults(),
filename,
cwd,
root: cwd,
comments: true,
});
});

test("should not load .babelrc.mjs synchronously", async () => {
const { cwd, tmp, config } = await getTemp(
Expand Down Expand Up @@ -1147,6 +1150,7 @@ describe("buildConfigChain", function() {
".babelrc.js",
".babelrc.cjs",
".babelrc.mjs",
".babelrc.json",
]),
)("should throw if both %s and %s are used", async (name1, name2) => {
const { cwd, tmp, config } = await getTemp(
Expand All @@ -1173,12 +1177,13 @@ describe("buildConfigChain", function() {
});

test.each`
config | dir | error
${".babelrc"} | ${"babelrc-error"} | ${/Error while parsing config - /}
${".babelrc.js"} | ${"babelrc-js-error"} | ${/Babelrc threw an error/}
${".babelrc.cjs"} | ${"babelrc-cjs-error"} | ${/Babelrc threw an error/}
${".babelrc.mjs"} | ${"babelrc-mjs-error"} | ${/Babelrc threw an error/}
${"package.json"} | ${"pkg-error"} | ${/Error while parsing JSON - /}
config | dir | error
${".babelrc"} | ${"babelrc-error"} | ${/Error while parsing config - /}
${".babelrc.json"} | ${"babelrc-json-error"} | ${/Error while parsing config - /}
${".babelrc.js"} | ${"babelrc-js-error"} | ${/Babelrc threw an error/}
${".babelrc.cjs"} | ${"babelrc-cjs-error"} | ${/Babelrc threw an error/}
${".babelrc.mjs"} | ${"babelrc-mjs-error"} | ${/Babelrc threw an error/}
${"package.json"} | ${"pkg-error"} | ${/Error while parsing JSON - /}
`("should show helpful errors for $config", async ({ dir, error }) => {
const filename = fixture("config-files", dir, "src.js");

Expand Down
@@ -0,0 +1,3 @@
{
"comments": true
}
@@ -0,0 +1 @@
{45

0 comments on commit 4c28f54

Please sign in to comment.