totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-22 07:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #455 from sveltejs/deconflict-server

Browse Source 
put server assets in subfolder
This commit is contained in:
Rich Harris
2018-10-01 15:52:14 -04:00
committed by GitHub
parent 0826a58995 01a519a4d9
commit e8773d3196
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/export.ts
View File

@@ -71,7 +71,7 @@ async function execute(emitter: EventEmitter, opts: Opts) {
message: `Crawling ${root.href}` message: `Crawling ${root.href}`
}); });
const proc = child_process.fork(path.resolve(`${opts.build}/server.js`), [], { const proc = child_process.fork(path.resolve(`${opts.build}/server/server.js`), [], {
cwd: process.cwd(), cwd: process.cwd(),
env: Object.assign({ env: Object.assign({
PORT: port, PORT: port,

2
src/cli.ts
View File

@@ -58,7 +58,7 @@ prog.command('build [dest]')
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('./server.js'); require('./server/server.js');
`.replace(/^\t+/gm, '').trim()); `.replace(/^\t+/gm, '').trim());
console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`node ${dest}`)} to run the app.`); console.error(`\n> Finished in ${elapsed(start)}. Type ${colors.bold.cyan(`node ${dest}`)} to run the app.`);

6
src/rollup.ts
View File

@@ -24,12 +24,14 @@ export default {
server: { server: {
input: () => { input: () => {
return `${locations.src()}/server.js` return {
server: `${locations.src()}/server.js`
};
}, },
output: () => { output: () => {
return { return {
dir: locations.dest(), dir: `${locations.dest()}/server`,
format: 'cjs', format: 'cjs',
sourcemap: dev() sourcemap: dev()
}; };

2
src/webpack.ts
View File

@@ -29,7 +29,7 @@ export default {
output: () => { output: () => {
return { return {
path: locations.dest(), path: `${locations.dest()}/server`,
filename: '[name].js', filename: '[name].js',
chunkFilename: '[hash]/[name].[id].js', chunkFilename: '[hash]/[name].[id].js',
libraryTarget: 'commonjs2' libraryTarget: 'commonjs2'

2
test/common/test.js
View File

@@ -184,7 +184,7 @@ function run({ mode, basepath = '' }) {
assert.ok(fs.existsSync('__sapper__/build/index.js')); assert.ok(fs.existsSync('__sapper__/build/index.js'));
} }
proc = require('child_process').fork(`${dir}/server.js`, { proc = require('child_process').fork(`${dir}/server/server.js`, {
cwd: process.cwd(), cwd: process.cwd(),
env: { env: {
NODE_ENV: mode, NODE_ENV: mode,