Remove duplicate code in inferno-server

demo/inferno-router-demo/src/server.ts

@@ -4,16 +4,16 @@ import koaRouter from 'koa-router'; // koa-router@next
 import koaStatic from 'koa-static';
 import koaMount from 'koa-mount';
 import koaJSONBody from 'koa-json-body';
-import { renderToString, resolveLoaders } from 'inferno-server';
-import { StaticRouter } from 'inferno-router'
+import { renderToString } from 'inferno-server';
+import { StaticRouter, resolveLoaders, traverseLoaders } from 'inferno-router'
 import {Parcel} from '@parcel/core';
 import { createElement } from 'inferno-create-element';
 import path from 'path';
 
 const PORT = process.env.PORT || 3000
 
 // Parcel watch subscription and bundle output
-let subscription;
+// let subscription;
 let bundles;
 
 let bundler = new Parcel({
@@ -111,7 +111,8 @@ frontend.get('(/page)?/:slug?', async (ctx) => {
   const { appFactory } = require(pathToAppJs)
   const app = appFactory();
 
-  const initialData = await resolveLoaders(location, app);
+  const loaderEntries = traverseLoaders(location, app);
+  const initialData = await resolveLoaders(loaderEntries);
 
   const htmlApp = renderToString(createElement(StaticRouter, {
     context: {},

packages/inferno-router/__tests__/loaderOnRoute.spec.jsx

@@ -1,7 +1,6 @@
 import { render } from 'inferno';
-import { BrowserRouter, MemoryRouter, StaticRouter, Route, NavLink, useLoaderData, useLoaderError } from 'inferno-router';
+import { BrowserRouter, MemoryRouter, StaticRouter, Route, NavLink, useLoaderData, useLoaderError, resolveLoaders, traverseLoaders } from 'inferno-router';
 // Cherry picked relative import so we don't get node-stuff from inferno-server in browser test
-import { resolveLoaders } from '../../inferno-server/src/ssrLoaderResolver';
 import { createEventGuard } from './testUtils';
 
 describe('A <Route> with loader in a MemoryRouter', () => {
@@ -182,7 +181,13 @@ describe('A <Route> with loader in a MemoryRouter', () => {
   });
 
   it('Can abort fetch', async () => {
-    const abortSpy = jest.spyOn(AbortController.prototype, 'abort');
+    const abortCalls = {
+      nrofCalls: 0
+    };
+    const _abortFn = AbortController.prototype.abort;
+    AbortController.prototype.abort = () => {
+      abortCalls.nrofCalls++;
+    }
     const [setDone, waitForRerender] = createEventGuard();
 
     const TEST = "ok";
@@ -251,8 +256,9 @@ describe('A <Route> with loader in a MemoryRouter', () => {
 
     await waitForRerender();
 
-    expect(abortSpy).toBeCalledTimes(1);
+    expect(abortCalls.nrofCalls).toEqual(1);
     expect(container.querySelector('#create')).toBeNull();
+    AbortController.prototype.abort = _abortFn;
   });
 });
 
@@ -520,7 +526,8 @@ describe('Resolve loaders during server side rendering', () => {
         <Route path="/flowers" render={Component} loader={loaderFunc} />
       </StaticRouter>;
 
-    const result = await resolveLoaders('/flowers', app);
+    const loaderEntries = traverseLoaders('/flowers', app);
+    const result = await resolveLoaders(loaderEntries);
     expect(result).toEqual(initialData);
   });
 
@@ -544,7 +551,8 @@ describe('Resolve loaders during server side rendering', () => {
         <Route path="/bees" render={Component} loader={loaderFuncNoHit} />
       </StaticRouter>;
 
-    const result = await resolveLoaders('/birds', app);
+    const loaderEntries = traverseLoaders('/birds', app);
+    const result = await resolveLoaders(loaderEntries);
     expect(result).toEqual(initialData);
   });
 
@@ -571,7 +579,8 @@ describe('Resolve loaders during server side rendering', () => {
         </Route>
       </StaticRouter>;
 
-    const result = await resolveLoaders('/flowers/birds', app);
+    const loaderEntries = traverseLoaders('/flowers/birds', app);
+    const result = await resolveLoaders(loaderEntries);
     expect(result).toEqual(initialData);
   });
 })

packages/inferno-router/__tests__/loaderWithSwitch.spec.jsx

@@ -1,7 +1,6 @@
 import { render } from 'inferno';
 import { MemoryRouter, Route, Switch, NavLink, useLoaderData, useLoaderError } from 'inferno-router';
 // Cherry picked relative import so we don't get node-stuff from inferno-server in browser test
-import { resolveLoaders } from '../../inferno-server/src/ssrLoaderResolver';
 import { createEventGuard } from './testUtils';
 
 describe('A <Route> with loader in a MemoryRouter', () => {

packages/inferno-router/src/index.ts

@@ -11,6 +11,7 @@ import { Prompt } from './Prompt';
 import { Redirect } from './Redirect';
 import { matchPath } from './matchPath';
 import { withRouter } from './withRouter';
+export * from './resolveLoaders';
 export * from './helpers';
 
 export { BrowserRouter, HashRouter, Link, MemoryRouter, NavLink, Prompt, Redirect, Route, Router, StaticRouter, Switch, matchPath, withRouter };

packages/inferno-server/__tests__/loaderOnRoute.spec.server.jsx

@@ -1,6 +1,6 @@
 import { render } from 'inferno';
-import { renderToString, resolveLoaders } from 'inferno-server';
-import { BrowserRouter, StaticRouter, Route, useLoaderData } from 'inferno-router';
+import { renderToString } from 'inferno-server';
+import { BrowserRouter, StaticRouter, Route, useLoaderData, resolveLoaders, traverseLoaders } from 'inferno-router';
 
 describe('Resolve loaders during server side rendering', () => {
   let container;
@@ -34,7 +34,8 @@ describe('Resolve loaders during server side rendering', () => {
         <Route path="/bees" render={Component} loader={loaderFuncNoHit} />,
     ]
 
-    const initialData = await resolveLoaders('/birds', routes);
+    const loaderEntries = traverseLoaders('/birds', routes);
+    const initialData = await resolveLoaders(loaderEntries);
 
     // Render on server
     const html = renderToString(<StaticRouter location="/birds" initialData={initialData}>{routes}</StaticRouter>);

packages/inferno-server/src/index.ts

@@ -1,7 +1,6 @@
 import { renderToString } from './renderToString';
 import { RenderQueueStream, streamQueueAsString } from './renderToString.queuestream';
 import { RenderStream, streamAsString } from './renderToString.stream';
-export * from './ssrLoaderResolver';
 
 // Inferno does not generate "data-root" attributes so staticMarkup is literally same as renderToString
 export {