Improve internal API

test/apps/export/__test__.ts

@@ -1,70 +0,0 @@
-import * as path from 'path';
-import * as assert from 'assert';
-import { walk } from '../../utils';
-import * as api from '../../../api';
-
-describe('export', function() {
-	this.timeout(10000);
-
-	// hooks
-	before(() => {
-		return new Promise((fulfil, reject) => {
-			// TODO this is brittle. Make it unnecessary
-			process.chdir(__dirname);
-			process.env.NODE_ENV = 'production';
-
-			// TODO this API isn't great. Rethink it
-			const builder = api.build({
-				bundler: 'rollup'
-			}, {
-				src: path.join(__dirname, 'src'),
-				routes: path.join(__dirname, 'src/routes'),
-				dest: path.join(__dirname, '__sapper__/build')
-			});
-
-			builder.on('error', reject);
-			builder.on('done', () => {
-				// TODO it'd be nice if build and export returned promises.
-				// not sure how best to combine promise and event emitter
-				const exporter = api.exporter({
-					build: '__sapper__/build',
-					dest: '__sapper__/export',
-					static: 'static',
-					basepath: '',
-					timeout: 5000
-				});
-
-				exporter.on('error', (err: Error) => {
-					console.error(err);
-					reject(err);
-				});
-				exporter.on('done', () => fulfil());
-			});
-		});
-	});
-
-	it('crawls a site', () => {
-		const files = walk('__sapper__/export');
-
-		const client_assets = files.filter(file => file.startsWith('client/'));
-		const non_client_assets = files.filter(file => !file.startsWith('client/')).sort();
-
-		assert.ok(client_assets.length > 0);
-
-		assert.deepEqual(non_client_assets, [
-			'blog.json',
-			'blog/bar.json',
-			'blog/bar/index.html',
-			'blog/baz.json',
-			'blog/baz/index.html',
-			'blog/foo.json',
-			'blog/foo/index.html',
-			'blog/index.html',
-			'global.css',
-			'index.html',
-			'service-worker.js'
-		]);
-	});
-
-	// TODO test timeout, basepath
-});

test/apps/export/test.ts

@@ -0,0 +1,38 @@
+import * as assert from 'assert';
+import { walk } from '../../utils';
+import * as api from '../../../api';
+
+describe('export', function() {
+	this.timeout(10000);
+
+	// hooks
+	before(async () => {
+		await api.build({ cwd: __dirname });
+		await api.export({ cwd: __dirname });
+	});
+
+	it('crawls a site', () => {
+		const files = walk(`${__dirname}/__sapper__/export`);
+
+		const client_assets = files.filter(file => file.startsWith('client/'));
+		const non_client_assets = files.filter(file => !file.startsWith('client/')).sort();
+
+		assert.ok(client_assets.length > 0);
+
+		assert.deepEqual(non_client_assets, [
+			'blog.json',
+			'blog/bar.json',
+			'blog/bar/index.html',
+			'blog/baz.json',
+			'blog/baz/index.html',
+			'blog/foo.json',
+			'blog/foo/index.html',
+			'blog/index.html',
+			'global.css',
+			'index.html',
+			'service-worker.js'
+		]);
+	});
+
+	// TODO test timeout, basepath
+});