-> v0.15.3

parallelize exports

CHANGELOG.md

@@ -1,5 +1,10 @@
 # sapper changelog
 
+## 0.15.3
+
+* Crawl pages in parallel when exporting ([#329](https://github.com/sveltejs/sapper/pull/329))
+* Don't minify inline JS when exporting ([#328](https://github.com/sveltejs/sapper/pull/328))
+
 ## 0.15.2
 
 * Collapse component chains where no intermediate layout component is specified ([#312](https://github.com/sveltejs/sapper/issues/312))

README.md

@@ -31,6 +31,44 @@ npm run build
 npm start
 ```
 
+## Development
+
+Pull requests are encouraged and always welcome. [Pick an issue](https://github.com/sveltejs/sapper/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc) and help us out!
+
+To install and work on Sapper locally:
+
+```bash
+git clone git@github.com:sveltejs/sapper.git
+cd sapper
+npm install
+npm run dev
+```
+
+### Linking to a Live Project
+
+You can make changes locally to Sapper and test it against a local Sapper project. For a quick project that takes almost no setup, use the default [sapper-template](https://github.com/sveltejs/sapper-template) project. Instruction on setup are found in that project repository.
+
+To link Sapper to your project, from the root of your local Sapper git checkout:
+
+```bash
+cd sapper
+npm link
+```
+
+Then, to link from `sapper-template` (or any other given project):
+
+```bash
+cd sapper-template
+npm link sapper
+```
+
+You should be good to test changes locally.
+
+### Running Tests
+
+```bash
+npm run test
+```
 
 ## License
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sapper",
-  "version": "0.15.2",
+  "version": "0.15.3",
   "description": "Military-grade apps, engineered by Svelte",
   "main": "dist/middleware.ts.js",
   "bin": {
@@ -23,7 +23,7 @@
     "cheerio": "^1.0.0-rc.2",
     "chokidar": "^2.0.3",
     "cookie": "^0.3.1",
-    "devalue": "^1.0.1",
+    "devalue": "^1.0.4",
     "glob": "^7.1.2",
     "html-minifier": "^3.5.16",
     "mkdirp": "^0.5.1",

src/api/export.ts

@@ -118,9 +118,7 @@ async function execute(emitter: EventEmitter, {
 					}
 				});
 
-				for (const url of urls) {
+				await Promise.all(urls.map(handle));
-					await handle(url);
-				}
 			}
 		}
 	}

src/api/utils/minify_html.ts

@@ -8,7 +8,7 @@ export function minify_html(html: string) {
 		decodeEntities: true,
 		html5: true,
 		minifyCSS: true,
-		minifyJS: true,
+		minifyJS: false,
 		removeAttributeQuotes: true,
 		removeComments: true,
 		removeOptionalTags: true,

src/middleware.ts

@@ -452,9 +452,9 @@ function get_page_handler(manifest: Manifest, store_getter: (req: Req) => Store)
 
 			let inline_script = `__SAPPER__={${[
 				error && `error:1`,
-				`baseUrl: "${req.baseUrl}"`,
+				`baseUrl:"${req.baseUrl}"`,
-				serialized.preloaded && `preloaded: ${serialized.preloaded}`,
+				serialized.preloaded && `preloaded:${serialized.preloaded}`,
-				serialized.store && `store: ${serialized.store}`
+				serialized.store && `store:${serialized.store}`
 			].filter(Boolean).join(',')}};`;
 
 			const has_service_worker = fs.existsSync(path.join(locations.dest(), 'service-worker.js'));

src/runtime/index.ts

@@ -233,7 +233,7 @@ function prepare_page(target: Target): Promise<{
 			path,
 			preloading: false,
 			child: Object.assign({}, root_props.child, {
-				segment: new_segments[0]
+				segment: segments[0]
 			})
 		};
 		if (changed(query, root_props.query)) data.query = query;
@@ -260,12 +260,11 @@ function prepare_page(target: Target): Promise<{
 					params: get_params(target.match),
 				}, results[i].preloaded);
 
-				level.props.child = {
+				level.props.child = {};
-					segment: new_segments[i + 1]
-				};
 			}
 
 			level = level.props.child;
+			level.segment = segments[i + 1];
 		}
 
 		return { data, nullable_depth };

test/app/routes/[x]/[y]/_layout.html

@@ -1,6 +1,8 @@
 <span>y: {segment} {count}</span>
 <svelte:component this={child.component} {...child.props}/>
 
+<span>child segment: {child.segment}</span>
+
 <script>
 	import counts from '../_counts.js';
 

test/common/test.js

@@ -630,7 +630,8 @@ function run({ mode, basepath = '' }) {
 					.then(text => {
 						assert.deepEqual(text.split('\n').filter(Boolean), [
 							'y: bar 1',
-							'z: baz 1'
+							'z: baz 1',
+							'child segment: baz'
 						]);
 
 						return nightmare.click(`a`)
@@ -642,7 +643,8 @@ function run({ mode, basepath = '' }) {
 					.then(text => {
 						assert.deepEqual(text.split('\n').filter(Boolean), [
 							'y: bar 1',
-							'z: qux 2'
+							'z: qux 2',
+							'child segment: qux'
 						]);
 					});
 			});