Skip to content

Wip/tunji/cure 584 revert algolia search upgrade #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Tsulaeman wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Wip/tunji/cure 584 revert algolia search upgrade #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ddc938
CURE-584: Revert algoliaseach upgrade
Jan 27, 2025
7de4b8d
CURE-584: Fix type error
Jan 27, 2025
c56b6b4
CURE-584: Updated version
Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/e-commerce/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Component, AfterViewInit } from '@angular/core';
import { liteClient } from 'algoliasearch/lite';
import algoliasearch from 'algoliasearch/lite';

@Component({
selector: 'app-root',
templateUrl: './app.component.html',
standalone: false
selector: 'app-root',
templateUrl: './app.component.html',
standalone: false,
})
export class AppComponent implements AfterViewInit {
config = {
searchClient: liteClient('latency', '6be0576ff61c053d5f9a3225e2a90f76'),
searchClient: algoliasearch('latency', '6be0576ff61c053d5f9a3225e2a90f76'),
indexName: 'instant_search',
routing: true,
};
Expand Down
2 changes: 1 addition & 1 deletion apps/e-commerce/src/app/reset-filters-mobile/reset-filters-mobile.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { connectClearRefinements } from 'instantsearch.js/es/connectors';
`,
standalone: false
})
export class ResetFiltersMobile extends BaseWidget<unknown> {
export class ResetFiltersMobile extends BaseWidget<Record<string, unknown>> {
public state = {
hasRefinements: false,
refine: () => {},
Expand Down
4 changes: 2 additions & 2 deletions libs/angular-instantsearch/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@carnegie-learning/angular-instantsearch",
"version": "6.0.0",
"version": "6.0.1",
"peerDependencies": {
"@angular/common": ">=17.0.0 <20.0.0",
"@angular/core": ">=17.0.0 <20.0.0",
"algoliasearch": "^5.1.1",
"algoliasearch": "^4.22.1",
"algoliasearch-helper": "^3.16.3",
"instantsearch.js": "^4.75.7",
"nouislider": "^10.0.0",
Expand Down
11 changes: 9 additions & 2 deletions libs/angular-instantsearch/src/create-ssr-search-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { liteClient as algoliasearchProxy, SearchTypeDefault } from 'algoliasearch/lite';
import * as algoliasearchProxy from 'algoliasearch/lite';
import * as encodeProxy from 'querystring-es3/encode';
import {
VERSION as AngularVersion,
Expand Down Expand Up @@ -30,7 +30,14 @@ type RequestOptions = {
// compatibility with different typescript settings:
// - esModuleInterop
// - allowSyntheticDefaultImports
const algoliasearch = algoliasearchProxy;
const algoliasearch = (
typeof algoliasearchProxy.default === 'function'
? algoliasearchProxy.default
: algoliasearchProxy
// eslint-disable-next-line @typescript-eslint/ban-types
) as typeof algoliasearchProxy.default extends Function
? typeof algoliasearchProxy.default
: typeof algoliasearchProxy;

const encode = encodeProxy.default || encodeProxy;

Expand Down
10 changes: 5 additions & 5 deletions libs/angular-instantsearch/src/instantsearch/instantsearch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
VERSION as AngularVersion,
} from '@angular/core';

import { liteClient } from 'algoliasearch/lite';
import * as algoliasearchProxy from 'algoliasearch/lite';
import instantsearch from 'instantsearch.js/es';

import { Widget } from '../typed-base-widget';
Expand All @@ -22,7 +22,7 @@ export { SearchClient, Hit } from 'instantsearch.js/es/types';
export { PlainSearchParameters as SearchParameters } from 'algoliasearch-helper';

// this is needed for different webpack/typescript configurations
const _algoliasearch = liteClient;
const _algoliasearch = algoliasearchProxy.default || algoliasearchProxy;

export type FacetSortByStringOptions =
| 'count'
Expand All @@ -37,9 +37,9 @@ export type InstantSearchConfig = InstantSearchOptions;
export type InstantSearchInstance = InstantSearch;

@Component({
selector: 'ais-instantsearch',
template: '<ng-content></ng-content>',
standalone: false
selector: 'ais-instantsearch',
template: '<ng-content></ng-content>',
standalone: false,
})
export class NgAisInstantSearch implements AfterViewInit, OnInit, OnDestroy {
@Input() public config: InstantSearchConfig;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@angular/platform-server": "19.0.7",
"@angular/router": "19.0.7",
"@angular/ssr": "19.0.7",
"algoliasearch": "^5.1.1",
"algoliasearch": "^4.22.1",
"algoliasearch-helper": "^3.16.3",
"express": "^4.15.2",
"instantsearch.css": "^7.3.1",
Expand Down