-> v0.0.12

connect.js

@@ -4,21 +4,21 @@ const fs = require('fs');
 const path = require('path');
 const glob = require('glob');
 const rimraf = require('rimraf');
+const mkdirp = require('mkdirp');
 const create_routes = require('./utils/create_routes.js');
 const create_templates = require('./utils/create_templates.js');
 const create_app = require('./utils/create_app.js');
 const create_webpack_compiler = require('./utils/create_webpack_compiler.js');
+const escape_html = require('escape-html');
+const { src, dest, dev } = require('./lib/config.js');
 
 const esmRequire = esm(module, {
 	esm: 'js'
 });
 
 module.exports = function connect(opts) {
-	const src = path.resolve('routes');
-	const dest = path.resolve(opts.tmpDir || '.sapper');
-
-	rimraf.sync(dest);
-	fs.mkdirSync(dest);
+	mkdirp(dest);
+	rimraf.sync(path.join(dest, '**/*'));
 
 	let routes = create_routes(
 		glob.sync('**/*.+(html|js|mjs)', { cwd: src })
@@ -29,7 +29,7 @@ module.exports = function connect(opts) {
 	const webpack_compiler = create_webpack_compiler(
 		dest,
 		routes,
-		opts.dev
+		dev
 	);
 
 	const templates = create_templates();
@@ -100,13 +100,17 @@ module.exports = function connect(opts) {
 			}
 
 			res.status(404).end(templates.render(404, {
+				title: 'Not found',
 				status: 404,
+				method: req.method,
 				url
 			}));
 		} catch(err) {
-			// TODO nice error pages
-			res.status(500);
-			res.end(err.stack);
+			res.status(500).end(templates.render(500, {
+				title: err.name || 'Internal server error',
+				url,
+				error: escape_html(err.details || err.message || err || 'Unknown error')
+			}));
 		}
 	};
 };

lib/config.js

@@ -3,5 +3,10 @@ const path = require('path');
 exports.dev = process.env.NODE_ENV !== 'production';
 
 exports.templates = path.resolve(process.env.SAPPER_TEMPLATES || 'templates');
+
 exports.src = path.resolve(process.env.SAPPER_ROUTES || 'routes');
-exports.dest = path.resolve(process.env.SAPPER_DEST || '.sapper');
+
+exports.dest = path.resolve(
+	process.env.NOW ? '/tmp' :
+	process.env.SAPPER_DEST || '.sapper'
+);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.0.3",
+  "version": "0.0.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -578,6 +578,11 @@
         "es6-symbol": "3.1.1"
       }
     },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -670,18 +675,6 @@
         "is-extglob": "1.0.0"
       }
     },
-    "extract-text-webpack-plugin": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",
-      "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
-      "dev": true,
-      "requires": {
-        "async": "2.6.0",
-        "loader-utils": "1.1.0",
-        "schema-utils": "0.3.0",
-        "webpack-sources": "1.1.0"
-      }
-    },
     "fast-deep-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
@@ -2095,12 +2088,6 @@
         "mem": "1.1.0"
       }
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -2413,15 +2400,6 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
     },
-    "schema-utils": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
-      "dev": true,
-      "requires": {
-        "ajv": "5.5.1"
-      }
-    },
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
@@ -2587,16 +2565,6 @@
       "integrity": "sha512-xRw4pjF19XKfeTxp+TOTE/MQmRS7tRzm0hhh0dr/nc3NuHBfCBXnfve0ZymF8tZ+J/WM0cqfZ83RxZid2zf7qA==",
       "dev": true
     },
-    "svelte-loader": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/svelte-loader/-/svelte-loader-2.2.1.tgz",
-      "integrity": "sha512-SNdEPwLpoWqKMk5wjJUVd7LUFK9rQoMPxQ8uJoszWSgTpbYICSnxFCEDvhDvcHbmAFSOOXnoJAdvoCTnBw3+kg==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "1.1.0",
-        "tmp": "0.0.31"
-      }
-    },
     "tapable": {
       "version": "0.2.8",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
@@ -2610,15 +2578,6 @@
         "setimmediate": "1.0.5"
       }
     },
-    "tmp": {
-      "version": "0.0.31",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
-      "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "1.0.2"
-      }
-    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.0.5",
+  "version": "0.0.12",
   "description": "Combat-ready apps, engineered by Svelte",
   "main": "connect.js",
   "directories": {
@@ -8,6 +8,8 @@
   },
   "dependencies": {
     "@std/esm": "^0.18.0",
+    "escape-html": "^1.0.3",
+    "mkdirp": "^0.5.1",
     "rimraf": "^2.6.2",
     "webpack": "^3.10.0"
   },

templates/main.js

@@ -1,9 +1,12 @@
-import app from 'sapper/runtime/app.js';
-import { detachNode } from 'svelte/shared.js';
+import app from '__app__';
 
 const target = document.querySelector('__selector__');
 let component;
 
+const detach = node => {
+	node.parentNode.removeChild(node);
+};
+
 app.init(url => {
 	if (url.origin !== window.location.origin) return;
 
@@ -25,9 +28,9 @@ app.init(url => {
 				let end = document.querySelector('#sapper-head-end');
 
 				if (start && end) {
-					while (start.nextSibling !== end) detachNode(start.nextSibling);
-					detachNode(start);
-					detachNode(end);
+					while (start.nextSibling !== end) detach(start.nextSibling);
+					detach(start);
+					detach(end);
 				}
 
 				target.innerHTML = '';

utils/create_app.js

@@ -34,6 +34,7 @@ module.exports = function create_app(src, dest, routes, options) {
 		.join(' else ') + ' else return false;';
 
 	const main = template
+		.replace('__app__', path.resolve(__dirname, '../runtime/app.js'))
 		.replace('__selector__', options.selector || 'main')
 		.replace('// ROUTES', code);
 

utils/create_webpack_compiler.js

@@ -1,10 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 const webpack = require('webpack');
-const ExtractTextPlugin = require("extract-text-webpack-plugin");
-const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
-
-// TODO make the webpack config, err, configurable
 
 module.exports = function create_webpack_compiler(out, routes, dev) {
 	const compiler = {};
@@ -34,9 +30,10 @@ module.exports = function create_webpack_compiler(out, routes, dev) {
 	} else {
 		compiler.client_main = new Promise((fulfil, reject) => {
 			client.run((err, stats) => {
+				console.log(stats.toString({ colors: true }));
+
 				if (err || stats.hasErrors()) {
-					console.log(stats.toString({ colors: true }));
-					reject(err);
+					reject(err || stats.toJson().errors[0]);
 				}
 
 				const filename = stats.toJson().assetsByChunkName.main;
@@ -46,10 +43,10 @@ module.exports = function create_webpack_compiler(out, routes, dev) {
 
 		const chunks = new Promise((fulfil, reject) => {
 			server.run((err, stats) => {
+				console.log(stats.toString({ colors: true }));
+
 				if (err || stats.hasErrors()) {
-					// TODO deal with hasErrors
-					console.log(stats.toString({ colors: true }));
-					reject(err);
+					reject(err || stats.toJson().errors[0]);
 				}
 
 				fulfil(stats.toJson().assetsByChunkName);

yarn.lock

@@ -35,7 +35,7 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0, ajv@^5.1.5:
+ajv@^5.1.5:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.1.tgz#b38bb8876d9e86bee994956a04e721e88b248eb2"
   dependencies:
@@ -122,7 +122,7 @@ async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@^2.1.2, async@^2.4.1:
+async@^2.1.2:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -669,15 +669,6 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
-  dependencies:
-    async "^2.4.1"
-    loader-utils "^1.1.0"
-    schema-utils "^0.3.0"
-    webpack-sources "^1.0.1"
-
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -1378,7 +1369,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -1646,7 +1637,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
+rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   dependencies:
@@ -1663,12 +1654,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0,
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-schema-utils@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
-  dependencies:
-    ajv "^5.0.0"
-
 "semver@2 || 3 || 4 || 5", semver@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
@@ -1865,12 +1850,6 @@ timers-browserify@^2.0.4:
   dependencies:
     setimmediate "^1.0.4"
 
-tmp@0.0.33:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"