totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-12 19:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

more tidying up

Browse Source
This commit is contained in:
Rich Harris
2018-01-21 16:02:42 -05:00
parent fc631c4866
commit fb8d952eeb
6 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/middleware/create_watcher.js
View File

@@ -1,7 +1,7 @@
import * as fs from 'fs';
import * as path from 'path';
import chalk from 'chalk';
import { generate_asset_cache, create_routes } from 'sapper/core.js';
import { generate_asset_cache, create_routes, create_app } from 'sapper/core.js';
import { dest } from '../config.js';
function deferred() {
@@ -15,7 +15,7 @@ function deferred() {
return d;
}
export default function create_watcher({ compilers, src, onroutes }) {
export default function create_watcher({ compilers, dev, entry, src, onroutes }) {
const deferreds = {
client: deferred(),
server: deferred()
@@ -31,10 +31,11 @@ export default function create_watcher({ compilers, src, onroutes }) {
const server_info = server_stats.toJson();
fs.writeFileSync(path.join(dest, 'stats.server.json'), JSON.stringify(server_info, null, ' '));
return generate_asset_cache(
client_stats.toJson(),
server_stats.toJson()
);
return generate_asset_cache({
src, dest, dev,
client_info: client_stats.toJson(),
server_info: server_stats.toJson()
});
});
function watch_compiler(type) {
@@ -63,7 +64,6 @@ export default function create_watcher({ compilers, src, onroutes }) {
function watch_files(pattern, callback) {
const watcher = chokidar.watch(pattern, {
ignoreInitial: true,
persistent: false
});
@@ -71,13 +71,6 @@ export default function create_watcher({ compilers, src, onroutes }) {
watcher.on('change', callback);
watcher.on('unlink', callback);
// watch('templates/main.js', create_app);
// watch('routes/**/*.+(html|js|mjs)', () => {
// route_manager.update({ src });
// create_app();
// });
// watch('templates/**.html', () => {
// create_templates();
// // TODO reload current page?
@@ -87,6 +80,12 @@ export default function create_watcher({ compilers, src, onroutes }) {
watch_files('routes/**/*.+(html|js|mjs)', () => {
const routes = create_routes({ src });
onroutes(routes);
create_app({ dev, entry, src }); // TODO this calls `create_routes` again, we should pass `routes` to `create_app` instead
});
watch_files('templates/main.js', () => {
create_app({ dev, entry, src });
});
const watcher = {

7
src/middleware/index.js
View File

@@ -4,7 +4,7 @@ import mkdirp from 'mkdirp';
import rimraf from 'rimraf';
import serialize from 'serialize-javascript';
import escape_html from 'escape-html';
import { create_routes, templates, create_app, get_compilers, generate_asset_cache } from 'sapper/core.js';
import { create_routes, templates, get_compilers, generate_asset_cache } from 'sapper/core.js';
import create_watcher from './create_watcher.js';
import { dest, dev, entry, src } from '../config.js';
@@ -12,15 +12,14 @@ function connect_dev() {
mkdirp.sync(dest);
rimraf.sync(path.join(dest, '**/*'));
create_app({ dev, entry, src });
const compilers = get_compilers();
let routes;
const watcher = create_watcher({
dev, entry, src,
compilers,
on_routes_update: _ => {
onroutes: _ => {
routes = _;
}
});