feat(history-service): make async-ssr-manager dependency optional (#256)

feature-hub · Jan 11, 2019 · 9e8be1e · 9e8be1e
1 parent b349021
commit 9e8be1e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/docs/guides/sharing-the-browser-history.md b/docs/guides/sharing-the-browser-history.md
@@ -106,7 +106,6 @@ registers it at the Feature Service registry.
 In the browser:
 
 ```js
-import {defineAsyncSsrManager} from '@feature-hub/async-ssr-manager';
 import {FeatureServiceRegistry} from '@feature-hub/core';
 import {
   defineHistoryService,
@@ -122,7 +121,6 @@ const rootLocationTransformer = createRootLocationTransformer({
 });
 
 const featureServiceDefinitions = [
-  defineAsyncSsrManager(undefined),
   defineHistoryService(rootLocationTransformer)
 ];
 

diff --git a/packages/demos/src/history-service/integrator.tsx b/packages/demos/src/history-service/integrator.tsx
@@ -1,4 +1,3 @@
-import {defineAsyncSsrManager} from '@feature-hub/async-ssr-manager';
 import {FeatureAppManager, FeatureServiceRegistry} from '@feature-hub/core';
 import {defineHistoryService} from '@feature-hub/history-service';
 import {FeatureAppContainer} from '@feature-hub/react';
@@ -11,10 +10,7 @@ import {rootLocationTransformer} from './root-location-transformer';
 const featureServiceRegistry = new FeatureServiceRegistry();
 
 featureServiceRegistry.registerFeatureServices(
-  [
-    defineAsyncSsrManager(undefined),
-    defineHistoryService(rootLocationTransformer)
-  ],
+  [defineHistoryService(rootLocationTransformer)],
   'demo:integrator'
 );
 

diff --git a/packages/history-service/src/__tests__/define-history-service.test.ts b/packages/history-service/src/__tests__/define-history-service.test.ts
@@ -26,7 +26,8 @@ describe('defineHistoryService', () => {
 
     expect(historyServiceDefinition.id).toBe('s2:history');
 
-    expect(historyServiceDefinition.dependencies).toEqual({
+    expect(historyServiceDefinition.dependencies).toBeUndefined();
+    expect(historyServiceDefinition.optionalDependencies).toEqual({
       's2:async-ssr-manager': '^1.0'
     });
   });

diff --git a/packages/history-service/src/define-history-service.ts b/packages/history-service/src/define-history-service.ts
@@ -19,18 +19,18 @@ export function defineHistoryService(
   rootLocationTransformer: RootLocationTransformer
 ): FeatureServiceProviderDefinition<
   undefined,
-  {'s2:async-ssr-manager': AsyncSsrManagerV1}
+  {'s2:async-ssr-manager': AsyncSsrManagerV1 | undefined}
 > {
   return {
     id: 's2:history',
-    dependencies: {'s2:async-ssr-manager': '^1.0'},
+    optionalDependencies: {'s2:async-ssr-manager': '^1.0'},
 
     create: (env): SharedHistoryService => {
-      const {serverRequest} = env.featureServices['s2:async-ssr-manager'];
+      const asyncSsrManager = env.featureServices['s2:async-ssr-manager'];
 
       const historyMultiplexers = createHistoryMultiplexers(
         rootLocationTransformer,
-        serverRequest
+        asyncSsrManager && asyncSsrManager.serverRequest
       );
 
       return {