Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/webpack-cli/lib/webpack-cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ class WebpackCLI {
}

// For babel/typescript
if (result.default) {
result = result.default;
if (result && typeof result === "object" && "default" in result) {
result = result.default || {};
}

return result;
return result || {};
}

loadJSONFile(pathToFile, handleError = true) {
Expand Down
16 changes: 16 additions & 0 deletions test/build/config/no-code/no-code.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"use strict";
const { resolve } = require("path");
const { run } = require("../../../utils/test-utils");

describe("config flag with no code", () => {
it("should not throw error with no configuration or index file", async () => {
const { exitCode, stderr, stdout } = await run(__dirname, [
"-c",
resolve(__dirname, "webpack.config.js"),
]);

expect(exitCode).toBe(0);
expect(stderr).toBeFalsy();
expect(stdout).toBeTruthy();
});
});
1 change: 1 addition & 0 deletions test/build/config/no-code/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log("Peeves");
Empty file.
1 change: 1 addition & 0 deletions test/build/config/undefined-default/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log("Tom Riddle");
16 changes: 16 additions & 0 deletions test/build/config/undefined-default/undefined-default.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"use strict";
const { resolve } = require("path");
const { run } = require("../../../utils/test-utils");

describe("config flag with undefined default export config file", () => {
it("should not throw error with no configuration or index file", async () => {
const { exitCode, stderr, stdout } = await run(__dirname, [
"-c",
resolve(__dirname, "webpack.config.js"),
]);

expect(exitCode).toBe(0);
expect(stderr).toBeFalsy();
expect(stdout).toBeTruthy();
});
});
1 change: 1 addition & 0 deletions test/build/config/undefined-default/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports.default = undefined;
1 change: 1 addition & 0 deletions test/build/config/undefined/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
console.log("Percy Weasley");
16 changes: 16 additions & 0 deletions test/build/config/undefined/undefined.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"use strict";
const { resolve } = require("path");
const { run } = require("../../../utils/test-utils");

describe("config flag with undefined export config file", () => {
it("should not throw error with no configuration or index file", async () => {
const { exitCode, stderr, stdout } = await run(__dirname, [
"-c",
resolve(__dirname, "webpack.config.js"),
]);

expect(exitCode).toBe(0);
expect(stderr).toBeFalsy();
expect(stdout).toBeTruthy();
});
});
1 change: 1 addition & 0 deletions test/build/config/undefined/webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = undefined;