Skip to content

Fix preact serve --server config --dest XX #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rkostrzewski merged 1 commit into from
Jul 1, 2017
Merged

Fix preact serve --server config --dest XX #157

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/commands/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ async function serve(options) {
await fs.writeFile(configFile, JSON.stringify(config));

await serveHttp2({
options,
config: configFile,
configObj: config,
server: options.server,
Expand Down Expand Up @@ -196,13 +197,13 @@ const SERVERS = {
];
},
/** Writes the firebase/superstatic/simplehttp2server configuration to stdout or a file. */
async config(options) {
async config({ configObj, options }) {
let dir = process.cwd(),
outfile;
if (options.dest && options.dest!=='-') {
let isDir = false;
try {
isDir = (await fs.stat()).isDirectory();
isDir = (await fs.stat(options.dest)).isDirectory();
} catch (e) {}
if (isDir) {
dir = options.dest;
Expand All @@ -215,12 +216,13 @@ const SERVERS = {
}

let config = JSON.stringify({
...options.configObj,
public: path.relative(dir, options.configObj.public)
...configObj,
public: path.relative(dir, configObj.public)
}, null, 2);

if (outfile) {
await fs.writeFile(path.resolve(dir, outfile), config);
return `Configuration written to ${outfile}.`;
}
else {
return config;
Expand Down