totole/sapper
1
0
Fork 0
mirror of https://github.com/kevin-DL/sapper.git synced 2026-01-18 05:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167 from sveltejs/gh-166

Browse Source 
rename preloadRoutes to prefetchRoutes
This commit is contained in:
Rich Harris
2018-03-04 22:54:11 -05:00
committed by GitHub
parent 2ad10b380f 329c113723
commit 01ff84f241
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/index.ts
View File

@@ -266,7 +266,7 @@ export function goto(href: string, opts = { replaceState: false }) {
} }
} }
export function preloadRoutes(pathnames: string[]) { export function prefetchRoutes(pathnames: string[]) {
if (!routes) throw new Error(`You must call init() first`); if (!routes) throw new Error(`You must call init() first`);
return routes return routes
@@ -281,4 +281,7 @@ export function preloadRoutes(pathnames: string[]) {
.reduce((promise: Promise<any>, route) => { .reduce((promise: Promise<any>, route) => {
return promise.then(route.load); return promise.then(route.load);
}, Promise.resolve()); }, Promise.resolve());
} }
// remove this in 0.9
export { prefetchRoutes as preloadRoutes };

4
test/app/app/client.js
View File

@@ -1,8 +1,8 @@
import { init, preloadRoutes } from '../../../runtime.js'; import { init, prefetchRoutes } from '../../../runtime.js';
import { routes } from './manifest/client.js'; import { routes } from './manifest/client.js';
window.init = () => { window.init = () => {
return init(document.querySelector('#sapper'), routes); return init(document.querySelector('#sapper'), routes);
}; };
window.preloadRoutes = preloadRoutes; window.prefetchRoutes = prefetchRoutes;

6
test/common/test.js
View File

@@ -23,8 +23,8 @@ Nightmare.action('init', function(done) {
this.evaluate_now(() => window.init(), done); this.evaluate_now(() => window.init(), done);
}); });
Nightmare.action('preloadRoutes', function(done) { Nightmare.action('prefetchRoutes', function(done) {
this.evaluate_now(() => window.preloadRoutes(), done); this.evaluate_now(() => window.prefetchRoutes(), done);
}); });
function run(env) { function run(env) {
@@ -159,7 +159,7 @@ function run(env) {
}); });
it('navigates to a new page without reloading', () => { it('navigates to a new page without reloading', () => {
return capture(() => nightmare.goto(base).init().preloadRoutes()) return capture(() => nightmare.goto(base).init().prefetchRoutes())
.then(() => { .then(() => {
return capture(() => nightmare.click('a[href="/about"]')); return capture(() => nightmare.click('a[href="/about"]'));
}) })