From 4940644ae33b0ec21942c83c42c7265f8e7c631b Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 21 Jan 2018 16:11:46 -0500 Subject: [PATCH] more tidying up --- src/core/build.js | 8 ++++---- src/core/create_app.js | 4 +--- src/core/{generate_asset_cache.js => create_assets.js} | 4 ++-- src/core/{get_compilers.js => create_compilers.js} | 2 +- src/core/export.js | 4 ++-- src/core/index.js | 6 +++--- src/core/templates.js | 2 ++ src/middleware/create_watcher.js | 4 ++-- src/middleware/index.js | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) rename src/core/{generate_asset_cache.js => create_assets.js} (94%) rename src/core/{get_compilers.js => create_compilers.js} (86%) diff --git a/src/core/build.js b/src/core/build.js index 3f0df53..48c0844 100644 --- a/src/core/build.js +++ b/src/core/build.js @@ -2,9 +2,9 @@ import * as fs from 'fs'; import * as path from 'path'; import mkdirp from 'mkdirp'; import rimraf from 'rimraf'; -import get_compilers from './get_compilers.js'; +import create_compilers from './create_compilers.js'; import create_app from './create_app.js'; -import generate_asset_cache from './generate_asset_cache.js'; +import create_assets from './create_assets.js'; export default function build({ dest, dev, entry, src }) { mkdirp.sync(dest); @@ -26,7 +26,7 @@ export default function build({ dest, dev, entry, src }) { } } - const { client, server } = get_compilers(); + const { client, server } = create_compilers(); client.run((err, client_stats) => { handleErrors(err, client_stats); @@ -38,7 +38,7 @@ export default function build({ dest, dev, entry, src }) { const server_info = server_stats.toJson(); fs.writeFileSync(path.join(dest, 'stats.server.json'), JSON.stringify(server_info, null, ' ')); - generate_asset_cache({ src, dest, dev, client_info, server_info }); + create_assets({ src, dest, dev, client_info, server_info }); fulfil(); }); }); diff --git a/src/core/create_app.js b/src/core/create_app.js index ea9ea96..a65f4dd 100644 --- a/src/core/create_app.js +++ b/src/core/create_app.js @@ -16,8 +16,6 @@ function create_app({ src, dev, entry }) { const routes = create_routes({ src }); function create_client_main() { - const template = fs.readFileSync('templates/main.js', 'utf-8'); - const code = `[${ routes .filter(route => route.type === 'page') @@ -32,7 +30,7 @@ function create_app({ src, dev, entry }) { .join(', ') }]`; - let main = template + let main = fs.readFileSync('templates/main.js', 'utf-8') .replace(/__app__/g, posixify(path.resolve(__dirname, '../../runtime/app.js'))) .replace(/__routes__/g, code) .replace(/__dev__/g, String(dev)); diff --git a/src/core/generate_asset_cache.js b/src/core/create_assets.js similarity index 94% rename from src/core/generate_asset_cache.js rename to src/core/create_assets.js index 1f65a6a..438e5f2 100644 --- a/src/core/generate_asset_cache.js +++ b/src/core/create_assets.js @@ -8,7 +8,7 @@ function ensure_array(thing) { return Array.isArray(thing) ? thing : [thing]; // omg webpack what the HELL are you doing } -export default function generate_asset_cache({ src, dest, dev, client_info, server_info }) { +export default function create_assets({ src, dest, dev, client_info, server_info }) { create_templates(); // TODO refactor this... const main_file = `/client/${ensure_array(client_info.assetsByChunkName.main)[0]}`; @@ -20,7 +20,7 @@ export default function generate_asset_cache({ src, dest, dev, client_info, serv const routes = create_routes({ src }); - if (dev) { + if (dev) { // TODO move this into calling code fs.writeFileSync(path.join(dest, 'service-worker.js'), service_worker); fs.writeFileSync(path.join(dest, 'index.html'), index); } diff --git a/src/core/get_compilers.js b/src/core/create_compilers.js similarity index 86% rename from src/core/get_compilers.js rename to src/core/create_compilers.js index c835229..b410890 100644 --- a/src/core/get_compilers.js +++ b/src/core/create_compilers.js @@ -1,7 +1,7 @@ import * as path from 'path'; import relative from 'require-relative'; -export default function get_compilers() { +export default function create_compilers() { const webpack = relative('webpack', process.cwd()); return { diff --git a/src/core/export.js b/src/core/export.js index 7416c36..069c232 100644 --- a/src/core/export.js +++ b/src/core/export.js @@ -4,7 +4,7 @@ import express from 'express'; import cheerio from 'cheerio'; import fetch from 'node-fetch'; import URL from 'url-parse'; -import generate_asset_cache from './generate_asset_cache.js'; +import create_assets from './create_assets.js'; // import middleware from '../middleware/index.js'; const { PORT = 3000, OUTPUT_DIR = 'dist' } = process.env; @@ -21,7 +21,7 @@ export default function exporter({ src, dest }) { // TODO dest is a terrible nam // Prep output directory sander.rimrafSync(OUTPUT_DIR); - const { service_worker } = generate_asset_cache({ + const { service_worker } = create_assets({ src, dest, dev: false, client_info: read_json(path.join(dest, 'stats.client.json')), diff --git a/src/core/index.js b/src/core/index.js index 5b26df4..a085272 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -1,9 +1,9 @@ -import * as templates from './templates.js'; +import * as templates from './templates.js'; // TODO templates is an anomaly... fix post-#91 export { default as build } from './build.js'; export { default as export } from './export.js'; -export { default as generate_asset_cache } from './generate_asset_cache.js'; -export { default as get_compilers } from './get_compilers.js'; +export { default as create_assets } from './create_assets.js'; +export { default as create_compilers } from './create_compilers.js'; export { default as create_routes } from './create_routes.js'; export { default as create_app } from './create_app.js'; diff --git a/src/core/templates.js b/src/core/templates.js index c95a07e..d0862a0 100644 --- a/src/core/templates.js +++ b/src/core/templates.js @@ -96,6 +96,8 @@ export function create_templates() { }; }) .sort((a, b) => b.specificity - a.specificity); + + return templates; } export function render(status, data) { diff --git a/src/middleware/create_watcher.js b/src/middleware/create_watcher.js index dd71321..0b65998 100644 --- a/src/middleware/create_watcher.js +++ b/src/middleware/create_watcher.js @@ -1,7 +1,7 @@ import * as fs from 'fs'; import * as path from 'path'; import chalk from 'chalk'; -import { generate_asset_cache, create_routes, create_app } from 'sapper/core.js'; +import { create_assets, create_routes, create_app } from 'sapper/core.js'; import { dest } from '../config.js'; function deferred() { @@ -31,7 +31,7 @@ export default function create_watcher({ compilers, dev, entry, 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({ + return create_assets({ src, dest, dev, client_info: client_stats.toJson(), server_info: server_stats.toJson() diff --git a/src/middleware/index.js b/src/middleware/index.js index 3bb39c6..d349b8f 100644 --- a/src/middleware/index.js +++ b/src/middleware/index.js @@ -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, get_compilers, generate_asset_cache } from 'sapper/core.js'; +import { create_routes, templates, create_compilers, create_assets } from 'sapper/core.js'; import create_watcher from './create_watcher.js'; import { dest, dev, entry, src } from '../config.js'; @@ -12,7 +12,7 @@ function connect_dev() { mkdirp.sync(dest); rimraf.sync(path.join(dest, '**/*')); - const compilers = get_compilers(); + const compilers = create_compilers(); let routes; @@ -77,7 +77,7 @@ function connect_dev() { } function connect_prod() { - const asset_cache = generate_asset_cache({ + const asset_cache = create_assets({ src, dest, dev: false, client_info: read_json(path.join(dest, 'stats.client.json')),