totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-03-11 11:54:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

sapper build defaults to build dir, sapper export defaults to export dir (#133)

Browse Source
This commit is contained in:
Rich Harris
2018-03-03 12:09:06 -05:00
parent d9cb572271
commit b73e5eaa8e
11 changed files with 71 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/middleware/index.ts
View File

@@ -7,14 +7,12 @@ import rimraf from 'rimraf';
import serialize from 'serialize-javascript';
import escape_html from 'escape-html';
import { create_routes, templates, create_compilers, create_template } from 'sapper/core.js';
import { dest, entry, isDev, src } from '../config';
import { dest } from '../config';
import { Route, Template } from '../interfaces';
import sourceMapSupport from 'source-map-support';
sourceMapSupport.install();
const dev = isDev();
type RouteObject = {
id: string;
type: 'page' | 'route';
@@ -43,12 +41,14 @@ interface Req extends ClientRequest {
export default function middleware({ routes }: {
routes: RouteObject[]
}) {
const client_info = JSON.parse(fs.readFileSync(path.join(dest, 'client_info.json'), 'utf-8'));
const output = dest();
const client_info = JSON.parse(fs.readFileSync(path.join(output, 'client_info.json'), 'utf-8'));
const template = create_template();
const shell = try_read(path.join(dest, 'index.html'));
const serviceworker = try_read(path.join(dest, 'service-worker.js'));
const shell = try_read(path.join(output, 'index.html'));
const serviceworker = try_read(path.join(output, 'service-worker.js'));
const middleware = compose_handlers([
(req: Req, res: ServerResponse, next: () => void) => {
@@ -76,7 +76,7 @@ export default function middleware({ routes }: {
const type = 'application/javascript'; // TODO might not be, if using e.g. CSS plugin
// TODO cache?
const rs = fs.createReadStream(path.join(dest, req.pathname.slice(1)));
const rs = fs.createReadStream(path.join(output, req.pathname.slice(1)));
rs.on('error', error => {
res.statusCode = 404;