totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-21 14:55:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

on second thoughts, default to build/index.js

Browse Source
This commit is contained in:
Rich Harris
2018-05-03 23:16:56 -04:00
parent d7a9074c69
commit 1a5364ae9d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/cli.ts
View File

@@ -45,22 +45,23 @@ prog.command('build [dest]')
let cmd; let cmd;
if (opts.launcher) { if (opts.launcher) {
const launcher = opts.launcher === true ? 'start.js' : opts.launcher; const launcher = opts.launcher === true ? path.join(dest, 'index.js') : opts.launcher;
const resolvedLauncher = path.resolve(launcher); const resolvedLauncher = path.resolve(launcher);
const resolvedDest = path.resolve(dest); const resolvedServer = path.resolve(dest, 'server.js');
const relative = path.relative(path.dirname(resolvedLauncher), resolvedDest); const pathToServer = path.relative(path.dirname(resolvedLauncher), resolvedServer);
const pathToDest = path.relative(path.dirname(resolvedLauncher), dest);
fs.writeFileSync(resolvedLauncher, ` fs.writeFileSync(resolvedLauncher, `
// generated by sapper build at ${new Date().toISOString()} // generated by sapper build at ${new Date().toISOString()}
process.env.NODE_ENV = process.env.NODE_ENV || 'production'; process.env.NODE_ENV = process.env.NODE_ENV || 'production';
process.env.SAPPER_DEST = require('path').resolve(__dirname, '${relative}'); process.env.SAPPER_DEST = ${pathToDest ? `require('path').resolve(__dirname, '${pathToDest}')` : '__dirname'};
process.env.PORT = process.env.PORT || ${opts.port || 3000}; process.env.PORT = process.env.PORT || ${opts.port || 3000};
console.log('Starting server on port ' + process.env.PORT); console.log('Starting server on port ' + process.env.PORT);
require('${relative[0] === '.' ? relative : `./${relative}`}/server.js'); require('${pathToServer[0] === '.' ? pathToServer : `./${pathToServer}`}');
`.replace(/^\t+/gm, '').trim()); `.replace(/^\t+/gm, '').trim());
cmd = `node ${path.relative(process.cwd(), launcher)}`; cmd = `node ${path.relative(process.cwd(), launcher).replace(/[\/\\]index.js$/, '')}`;
} else { } else {
cmd = dest === 'build' ? 'npx sapper start' : `npx sapper start ${dest}`; cmd = dest === 'build' ? 'npx sapper start' : `npx sapper start ${dest}`;
} }