Skip to content
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.

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

Support node v18 #10

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
plugins: ['react', 'prettier', 'jest'],
env: {
browser: true,
Expand All @@ -11,18 +11,18 @@ module.exports = {
},
extends: [
'airbnb',
'prettier',
'plugin:prettier/recommended',
'prettier/react',
'prettier/standard',
'plugin:jest/recommended',
],
rules: {
indent: 0,
camelcase: 0,
'no-underscore-dangle': 0,

'prettier/prettier': 'error',

'class-methods-use-this': 0,
'react/function-component-definition': 0,
'react/no-unknown-property': ['error', { ignore: ['css'] }],
'react/jsx-indent': 0,
'react/jsx-indent-props': 0,
'react/jsx-filename-extension': 0,
Expand All @@ -34,6 +34,6 @@ module.exports = {
'react/jsx-fragments': 0,
'prettier/prettier': 0,
'react/no-danger': 0,
'no-console': 0
'no-console': 0,
},
};
61 changes: 31 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,40 @@
{
"name": "reactivesearch-shopify-plugin",
"name": "geo-search-template",
"version": "0.2.0",
"private": true,
"author": {
"name": "Divyanshu Maithani",
"email": "[email protected]",
"url": "https://github.com/divyanshu013"
},
"dependencies": {
"@appbaseio/reactivemaps": "3.0.0",
"@appbaseio/reactivesearch": "^3.42.1",
"@emotion/core": "^10.0.35",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"antd": "3.26.20",
"babel-eslint": "^10.1.0",
"dompurify": "^2.3.6",
"emotion": "10.0.27",
"lodash.get": "4.4.2",
"prop-types": "15.7.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-highlight-words": "0.16.0",
"react-router-dom": "^4.3.1",
"react-scripts": "4.0.3"
},
"devDependencies": {
"babel-plugin-direct-import": "0.6.2",
"babel-plugin-emotion": "10.0.33",
"babel-plugin-import": "1.13.1",
"customize-cra": "^1.0.0",
"eslint": "7.12.0",
"eslint-config-airbnb": "18.2.0",
"eslint-config-prettier": "6.14.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jest": "24.1.0",
"eslint-plugin-jsx-a11y": "6.4.0",
"eslint-plugin-prettier": "3.1.4",
"eslint-plugin-react": "7.21.5",
"prettier": "2.1.2",
"react-app-rewired": "^2.1.6"
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "PORT=1358 react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test --env=jsdom",
"start": "PORT=1358 react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"lint": "eslint ."
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
Expand All @@ -60,6 +48,19 @@
]
},
"engines": {
"node": ">=16.x <17"
"node": ">=16.x <19"
},
"devDependencies": {
"@babel/core": "^7.20.5",
"@babel/eslint-parser": "^7.19.1",
"babel-eslint": "^10.1.0",
"eslint": "^8.29.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "3.1.4",
"eslint-plugin-react": "^7.31.11",
"prettier": "^2.8.1",
"pretty-quick": "^3.1.3"
}
}
2 changes: 2 additions & 0 deletions src/components/GeoLayout/GeoResultsLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ function GeoResultsLayout({
}}
showMarkerClusters={showMarkerClusters}
showSearchAsMove={showSearchAsMove}
// eslint-disable-next-line
onPopoverClick={(item) => {
const handle = isPreview
? ''
Expand Down Expand Up @@ -403,6 +404,7 @@ function GeoResultsLayout({
}}
showMarkerClusters={showMarkerClusters}
showSearchAsMove={showSearchAsMove}
// eslint-disable-next-line
onPopoverClick={(item) => {
const handle = isPreview
? ''
Expand Down
29 changes: 10 additions & 19 deletions src/components/Search.js
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,6 @@ class Search extends Component {
}
};

getMultiListProps = (listComponentProps) => {
const { title, ...restProps } = listComponentProps;
return restProps;
};

handleToggleFilter = () => {
this.setState(({ toggleFilters }) => ({
toggleFilters: !toggleFilters,
Expand All @@ -358,9 +353,7 @@ class Search extends Component {
return fontFamily ? { fontFamily } : {};
};

isMobile = () => {
return window.innerWidth <= 768;
};
isMobile = () => window.innerWidth <= 768;

renderCategorySearch = (categorySearchProps) => {
const { toggleFilters, value } = this.state;
Expand Down Expand Up @@ -429,17 +422,15 @@ class Search extends Component {
onChange={(val) => {
this.setState({ value: val });
}}
renderItem={(suggestion) => {
return (
<Suggestion
suggestion={suggestion}
fields={get(this.searchSettings, 'fields', {})}
themeConfig={this.theme}
highlight={this.searchSettings.rsConfig.highlight}
currentValue={value}
/>
);
}}
renderItem={(suggestion) => (
<Suggestion
suggestion={suggestion}
fields={get(this.searchSettings, 'fields', {})}
themeConfig={this.theme}
highlight={this.searchSettings.rsConfig.highlight}
currentValue={value}
/>
)}
{...categorySearchProps}
showDistinctSuggestions
highlight={get(this.resultSettings, 'resultHighlight', false)}
Expand Down
5 changes: 0 additions & 5 deletions src/components/SearchPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,6 @@ class App extends Component {
'rsConfig',
defaultPreferences.themeSettings.rsConfig,
);
this.themeType = get(
this.themeSettings,
'type',
defaultPreferences.themeSettings.type,
);
this.pageSettings = get(this.preferences, 'pageSettings', {});
this.componentSettings = get(
this.pageSettings,
Expand Down
Loading