diff --git a/src/middleware.ts b/src/middleware.ts index 44c2b50..4f23e17 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -45,15 +45,10 @@ interface Component { preload: (data: any) => any | Promise } -export default function middleware({ App, routes, store }: { - App: Component, +export default function middleware({ routes, store }: { routes: RouteObject[], store: (req: Req) => Store }) { - if (!App) { - throw new Error(`As of 0.12, you must supply an App component to Sapper — see https://sapper.svelte.technology/guide#0-11-to-0-12 for more information`); - } - const output = locations.dest(); let emitted_basepath = false; @@ -109,7 +104,7 @@ export default function middleware({ App, routes, store }: { }), get_server_route_handler(routes.server_routes), - get_page_handler(App, routes, store) + get_page_handler(routes, store) ].filter(Boolean)); return middleware; @@ -227,7 +222,7 @@ function get_server_route_handler(routes: RouteObject[]) { }; } -function get_page_handler(App: Component, routes: RouteObject[], store_getter: (req: Req) => Store) { +function get_page_handler(routes: RouteObject[], store_getter: (req: Req) => Store) { const output = locations.dest(); const get_chunks = dev() diff --git a/src/runtime/index.ts b/src/runtime/index.ts index e149c47..75cf02e 100644 --- a/src/runtime/index.ts +++ b/src/runtime/index.ts @@ -3,7 +3,6 @@ import { Component, ComponentConstructor, Params, Query, Route, RouteData, Scrol const manifest = typeof window !== 'undefined' && window.__SAPPER__; -export let App: ComponentConstructor; export let component: Component; let target: Node; let store: Store; diff --git a/test/app/app/App.html b/test/app/app/App.html deleted file mode 100644 index a7bf15f..0000000 --- a/test/app/app/App.html +++ /dev/null @@ -1,6 +0,0 @@ -{#if preloading} - -{/if} - - - diff --git a/test/app/app/client.js b/test/app/app/client.js index da89de9..95bbf73 100644 --- a/test/app/app/client.js +++ b/test/app/app/client.js @@ -1,12 +1,10 @@ import { init, prefetchRoutes } from '../../../runtime.js'; import { Store } from 'svelte/store.js'; import { routes } from './manifest/client.js'; -import App from './App.html'; window.init = () => { return init({ target: document.querySelector('#sapper'), - App, routes, store: data => new Store(data) }); diff --git a/test/app/app/server.js b/test/app/app/server.js index 3cef2a2..01b2153 100644 --- a/test/app/app/server.js +++ b/test/app/app/server.js @@ -5,7 +5,6 @@ import serve from 'serve-static'; import sapper from '../../../dist/middleware.ts.js'; import { Store } from 'svelte/store.js'; import { routes } from './manifest/server.js'; -import App from './App.html' let pending; let ended; @@ -87,7 +86,6 @@ const middlewares = [ }, sapper({ - App, routes, store: () => { return new Store({ diff --git a/test/app/routes/_default.html b/test/app/routes/_default.html new file mode 100644 index 0000000..cb37b8c --- /dev/null +++ b/test/app/routes/_default.html @@ -0,0 +1,26 @@ + + Sapper project template + + +

Great success!

+ +home +about +slow preload +redirect +broken link +error link +credentials +blog + +
+ + \ No newline at end of file diff --git a/test/app/routes/blog/_default.html b/test/app/routes/blog/_default.html new file mode 100644 index 0000000..2e9f428 --- /dev/null +++ b/test/app/routes/blog/_default.html @@ -0,0 +1,25 @@ + + Blog + + +

Recent posts

+ + + + \ No newline at end of file diff --git a/test/app/routes/blog/index.html b/test/app/routes/blog/index.html index 2e9f428..8c0dcbb 100644 --- a/test/app/routes/blog/index.html +++ b/test/app/routes/blog/index.html @@ -1,25 +1 @@ - - Blog - - -

Recent posts

- - - - \ No newline at end of file + \ No newline at end of file diff --git a/test/app/routes/index.html b/test/app/routes/index.html index cb37b8c..51debd8 100644 --- a/test/app/routes/index.html +++ b/test/app/routes/index.html @@ -1,26 +1,6 @@ - - Sapper project template - +{#if preloading} + +{/if} -

Great success!

+ -home -about -slow preload -redirect -broken link -error link -credentials -blog - -
- - \ No newline at end of file diff --git a/test/app/routes/preload-values/index.html b/test/app/routes/preload-values/index.html new file mode 100644 index 0000000..8c0dcbb --- /dev/null +++ b/test/app/routes/preload-values/index.html @@ -0,0 +1 @@ + \ No newline at end of file