diff --git a/src/cli/index.ts b/src/cli/index.ts index cb15dc7..b9d046b 100755 --- a/src/cli/index.ts +++ b/src/cli/index.ts @@ -1,6 +1,8 @@ import { build, export as exporter } from 'sapper/core.js'; import { dest, dev, entry, src } from '../config'; +process.env.NODE_ENV = 'production'; + const cmd = process.argv[2]; const start = Date.now(); @@ -14,9 +16,7 @@ if (cmd === 'build') { console.error(err ? err.details || err.stack || err.message || err : 'Unknown error'); }); } else if (cmd === 'export') { - const start = Date.now(); - - build({ dest, dev, entry, src }) + build({ dest, dev: false, entry, src }) .then(() => exporter({ src, dest })) .then(() => { const elapsed = Date.now() - start; diff --git a/src/core/export.ts b/src/core/export.ts index 0a28e06..a285bdd 100644 --- a/src/core/export.ts +++ b/src/core/export.ts @@ -63,7 +63,7 @@ export default function exporter({ src, dest }) { // TODO dest is a terrible nam return fetch(url, opts); }; - const middleware = require('./middleware')(); // TODO this is filthy + const middleware = require('./middleware')({ dev: false }); // TODO this is filthy app.use(middleware); const server = app.listen(PORT); @@ -100,8 +100,5 @@ export default function exporter({ src, dest }) { // TODO dest is a terrible nam } return handle(new URL(origin)) // TODO all static routes - .then(() => { - server.close(); - middleware.close(); - }); + .then(() => server.close()); } \ No newline at end of file diff --git a/src/middleware/index.ts b/src/middleware/index.ts index 506bdbb..2bb5c34 100644 --- a/src/middleware/index.ts +++ b/src/middleware/index.ts @@ -122,7 +122,10 @@ function connect_prod() { return middleware; } -export default dev ? connect_dev : connect_prod; +export default function connect({ dev: _dev = dev } = {}) { + console.log({ dev, _dev }); + return _dev ? connect_dev() : connect_prod(); +} function set_req_pathname(req, res, next) { req.pathname = req.url.replace(/\?.*/, '');