Skip to content

Commit

Permalink
remove async from hydrate as it can't be used with CSR
Browse files Browse the repository at this point in the history
  • Loading branch information
mrrajamanickam-coveo committed Jul 27, 2023
1 parent d5953cf commit 256aaab
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions packages/headless/src/app/ssr-engine/ssr-engine.ts
Expand Up @@ -94,7 +94,7 @@ export interface EngineAndControllers<
}

export interface OptionsExtender<TOptions> {
(options: TOptions): TOptions | Promise<TOptions>;
(options: TOptions): TOptions;
}

export interface EngineDefinitionBuildOptionsWithoutProps<TEngineOptions> {
Expand Down Expand Up @@ -130,7 +130,7 @@ export interface BuildWithProps<
TEngineOptions,
TControllersProps
>
): Promise<EngineAndControllers<TEngine, TControllersMap>>;
): EngineAndControllers<TEngine, TControllersMap>;
}

export interface BuildWithoutProps<
Expand All @@ -143,7 +143,7 @@ export interface BuildWithoutProps<
*/
build(
options?: EngineDefinitionBuildOptionsWithoutProps<TEngineOptions>
): Promise<EngineAndControllers<TEngine, TControllersMap>>;
): EngineAndControllers<TEngine, TControllersMap>;
}

export type FetchInitialStateWithoutProps<
Expand Down Expand Up @@ -178,7 +178,7 @@ export type HydrateInitialStateWithoutProps<
*/
hydrateInitialState(
options: EngineDefinitionHydrateOptionsWithoutProps<TSearchFulfilledAction>
): Promise<EngineAndControllers<TEngine, TControllers>>;
): EngineAndControllers<TEngine, TControllers>;
};

export interface EngineDefinitionWithoutProps<
Expand Down Expand Up @@ -242,7 +242,7 @@ export type HydrateInitialStateWithProps<
TSearchFulfilledAction,
TControllersProps
>
): Promise<EngineAndControllers<TEngine, TControllers>>;
): EngineAndControllers<TEngine, TControllers>;
};

export interface EngineDefinitionWithProps<
Expand Down Expand Up @@ -351,15 +351,13 @@ export function defineSearchEngine<
controllers: controllerDefinitions,
...engineOptions
}: SearchEngineDefinitionOptions<TControllerDefinitions>): SearchEngineDefinition<TControllerDefinitions> {
const build: SearchEngineDefinition<TControllerDefinitions>['build'] = async (
const build: SearchEngineDefinition<TControllerDefinitions>['build'] = (
...[buildOptions]: Parameters<
SearchEngineDefinition<TControllerDefinitions>['build']
>
) => {
const engine = buildSearchEngine(
buildOptions?.extend
? await buildOptions.extend(engineOptions)
: engineOptions
buildOptions?.extend ? buildOptions.extend(engineOptions) : engineOptions
);
const controllerOptions =
buildOptions && 'controllers' in buildOptions
Expand Down Expand Up @@ -394,6 +392,7 @@ export function defineSearchEngine<
InferControllerSnapshotsMapFromDefinitions<TControllerDefinitions>
>
// TODO: Fix no-async-promise-executor
// eslint-disable-next-line no-async-promise-executor
>(async (resolve, reject) => {
const middleware: Middleware = () => (next) => (action) => {
next(action);
Expand All @@ -413,7 +412,7 @@ export function defineSearchEngine<
...options,
middlewares: [...(options.middlewares ?? []), middleware],
});
const {engine, controllers} = await build({
const {engine, controllers} = build({
extend,
...(executeOptions?.controllers && {
controllers: executeOptions.controllers,
Expand All @@ -423,12 +422,12 @@ export function defineSearchEngine<
});

const hydrateInitialState: SearchEngineDefinition<TControllerDefinitions>['hydrateInitialState'] =
async (
(
...[hydrateOptions]: Parameters<
SearchEngineDefinition<TControllerDefinitions>['hydrateInitialState']
>
) => {
const {engine, controllers} = await build(
const {engine, controllers} = build(
'controllers' in hydrateOptions
? ({
controllers: hydrateOptions.controllers,
Expand Down

0 comments on commit 256aaab

Please sign in to comment.