-> v0.10.7

Merge pull request #245 from johnmuhl/patch-1
Include process.env in exporter server options
2026-01-13 11:35:28 +00:00 · 2018-05-03 21:42:50 -04:00 · 2018-05-03 21:40:50 -04:00 · 2018-05-03 21:39:46 -04:00 · 2018-05-03 21:37:59 -04:00 · 2018-04-22 22:50:05 -05:00
5 changed files with 31 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # sapper changelog

+## 0.10.7
+
+* Allow routes to have a leading `.` ([#243](https://github.com/sveltejs/sapper/pull/243))
+* Only encode necessary characters in routes ([#234](https://github.com/sveltejs/sapper/pull/234))
+* Preserve existing `process.env` when exporting ([#245](https://github.com/sveltejs/sapper/pull/245))
+
 ## 0.10.6

 * Fix error reporting in `sapper start`
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "sapper",
-  "version": "0.10.6",
+  "version": "0.10.7",
  "description": "Military-grade apps, engineered by Svelte",
  "main": "dist/middleware.ts.js",
  "bin": {
--- a/src/cli/export.ts
+++ b/src/cli/export.ts
@@ -35,12 +35,12 @@ export async function exporter(export_dir: string, { basepath = '' }) {

 	const proc = child_process.fork(path.resolve(`${build_dir}/server.js`), [], {
 		cwd: process.cwd(),
-		env: {
+		env: Object.assign({
 			PORT: port,
 			NODE_ENV: 'production',
 			SAPPER_DEST: build_dir,
 			SAPPER_EXPORT: 'true'
-		}
+		}, process.env)
 	});

 	const seen = new Set();
@@ -103,4 +103,4 @@ export async function exporter(export_dir: string, { basepath = '' }) {
 	return ports.wait(port)
 		.then(() => handle(new URL(`/${basepath}`, origin))) // TODO all static routes
 		.then(() => proc.kill());
-}
+}
--- a/src/core/create_routes.ts
+++ b/src/core/create_routes.ts
@@ -3,7 +3,7 @@ import glob from 'glob';
 import { locations } from '../config';
 import { Route } from '../interfaces';

-export default function create_routes({ files } = { files: glob.sync('**/*.*', { cwd: locations.routes(), nodir: true }) }) {
+export default function create_routes({ files } = { files: glob.sync('**/*.*', { cwd: locations.routes(), dot: true, nodir: true }) }) {
 	const routes: Route[] = files
 		.map((file: string) => {
 			if (/(^|\/|\\)_/.test(file)) return;
@@ -33,7 +33,7 @@ export default function create_routes({ files } = { files: glob.sync('**/*.*', {
 			let i = parts.length;
 			let nested = true;
 			while (i--) {
-				const part = encodeURIComponent(parts[i].normalize()).replace(/%5B/g, '[').replace(/%5D/g, ']');
+				const part = encodeURI(parts[i].normalize()).replace(/\?/g, '%3F').replace(/#/g, '%23').replace(/%5B/g, '[').replace(/%5D/g, ']');
 				const dynamic = ~part.indexOf('[');

 				if (dynamic) {
--- a/test/unit/create_routes.test.js
+++ b/test/unit/create_routes.test.js
@@ -2,6 +2,25 @@ const assert = require('assert');
 const { create_routes } = require('../../dist/core.ts.js');

 describe('create_routes', () => {
+	it('encodes caharcters not allowed in path', () => {
+		const routes = create_routes({
+			files: [
+				'"',
+				'#',
+				'?'
+			]
+		});
+
+		assert.deepEqual(
+			routes.map(r => r.pattern),
+			[
+				/^\/%22\/?$/,
+				/^\/%23\/?$/,
+				/^\/%3F\/?$/
+			]
+		);
+	});
+
 	it('sorts routes correctly', () => {
 		const routes = create_routes({
 			files: ['index.html', 'about.html', 'post/f[xx].html', '[wildcard].html', 'post/foo.html', 'post/[id].html', 'post/bar.html', 'post/[id].json.js']
Author	SHA1	Message	Date
Rich Harris	3531cc587d	-> v0.10.7	2018-05-03 21:42:50 -04:00
Rich Harris	562a91fa57	Merge pull request #245 from johnmuhl/patch-1 Include process.env in exporter server options	2018-05-03 21:40:50 -04:00
Rich Harris	93128a0156	Merge pull request #243 from akihikodaki/dot Accept directory entries which starts with dot as routes	2018-05-03 21:39:46 -04:00
Rich Harris	d7a2132966	Merge pull request #234 from akihikodaki/master Do not encode characters allowed in path when generating routes	2018-05-03 21:37:59 -04:00
John Muhl	56ac1aea9d	match sapper start	2018-04-22 22:50:05 -05:00
John Muhl	37a9fb62e2	Include process.env in exporter server options	2018-04-22 20:29:47 -05:00
Akihiko Odaki	6f9ce9ce85	Accept directory entries which starts with dot as routes It allows to implement .well-known URIs.	2018-04-19 22:04:03 +09:00
Akihiko Odaki	b13cc6f39a	Do not encode characters allowed in path when generating routes In RFC 3986, some characters not allowed in query, which encodeURIComponent is designed for, is allowed in path. A notable example is "@", which is commonly included in paths of social profile pages. Such characters should not be encoded. The new encoding function is conforming to the RFC.	2018-04-14 01:08:27 +09:00