Skip to content

Commit a40092d

Browse files
committed
fix(server): default to baseDir: ['./'] when object with routes given for server
1 parent 6ba435c commit a40092d

2 files changed

Lines changed: 19 additions & 1 deletion

File tree

lib/cli/transforms/handleServerOption.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ export function handleServerOption(incoming) {
3131
}
3232

3333
if (Map.isMap(value)) {
34-
const dirs = List([]).concat(value.get("baseDir")).filter(Boolean);
34+
const dirs = List([])
35+
.concat(value.get("baseDir", "./"))
36+
.filter(Boolean);
37+
3538
const merged = value.merge({baseDir: dirs});
39+
3640
return incoming.set('server', merged);
3741
}
3842

test/specs/cli/cli.options.server.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,18 @@ describe("CLI: Options: Merging Server Options", function() {
118118
}
119119
});
120120
});
121+
it("can set baseDir when only routes are provided", function() {
122+
var imm = merge({
123+
server: {
124+
routes: {
125+
"/node_modules": "node_modules"
126+
}
127+
}
128+
});
129+
assert.deepEqual(imm.get("server").toJS(), {
130+
routes: { "/node_modules": "node_modules" },
131+
baseDir: ["./"],
132+
serveStaticOptions: { index: "index.html" }
133+
});
134+
});
121135
});

0 commit comments

Comments
 (0)