Skip to content

Commit 3275c5d

Browse files
authored
Merge pull request #3270 from JustFly1984/develop
merge dev to master
2 parents 8738d72 + 0bd9291 commit 3275c5d

File tree

78 files changed

+4687
-3164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+4687
-3164
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16.18.1
1+
v18.17.0

package.json

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
"resolutions": {
4848
"@babel/core": "7.22.9",
4949
"@types/jest": "29.5.3",
50-
"@types/node": "20.4.2",
51-
"@types/react": "18.2.15",
50+
"@types/node": "20.4.5",
51+
"@types/react": "18.2.16",
5252
"@types/react-dom": "18.2.7",
53-
"@typescript-eslint/eslint-plugin": "6.0.0",
54-
"@typescript-eslint/parser": "6.0.0"
53+
"@typescript-eslint/parser": "6.2.0",
54+
"@typescript-eslint/eslint-plugin": "6.2.0"
5555
},
5656
"devDependencies": {
5757
"@babel/core": "7.22.9",
@@ -79,31 +79,31 @@
7979
"@googlemaps/react-wrapper": "1.1.35",
8080
"@jest/types": "29.6.1",
8181
"@mdx-js/loader": "1.6.22",
82-
"@storybook/addon-actions": "7.0.27",
83-
"@storybook/addon-essentials": "7.0.27",
84-
"@storybook/addon-links": "7.0.27",
85-
"@storybook/builder-webpack5": "7.0.27",
86-
"@storybook/manager-webpack5": "6.5.13",
87-
"@storybook/react": "7.0.27",
82+
"@storybook/addon-actions": "7.1.1",
83+
"@storybook/addon-essentials": "7.1.1",
84+
"@storybook/addon-links": "7.1.1",
85+
"@storybook/builder-webpack5": "7.1.1",
86+
"@storybook/manager-webpack5": "6.5.16",
87+
"@storybook/react": "7.1.1",
8888
"@svgr/webpack": "8.0.1",
8989
"@testing-library/dom": "9.3.1",
90-
"@types/google.maps": "3.53.4",
90+
"@types/google.maps": "3.53.5",
9191
"@types/invariant": "2.2.35",
9292
"@types/jest": "29.5.3",
93-
"@types/node": "20.4.2",
94-
"@types/react": "18.2.15",
93+
"@types/node": "20.4.5",
94+
"@types/react": "18.2.16",
9595
"@types/react-dom": "18.2.7",
9696
"@types/supercluster": "7.1.0",
97-
"@typescript-eslint/eslint-plugin": "6.0.0",
98-
"@typescript-eslint/parser": "6.0.0",
97+
"@typescript-eslint/parser": "6.2.0",
98+
"@typescript-eslint/eslint-plugin": "6.2.0",
9999
"@typescript/lib-dom": "npm:@types/web",
100100
"acorn": "8.10.0",
101101
"acorn-jsx": "5.3.2",
102102
"autoprefixer": "10.4.14",
103103
"babel-loader": "9.1.3",
104104
"babel-plugin-macros": "3.1.0",
105-
"babel-plugin-polyfill-corejs3": "0.8.2",
106-
"babel-plugin-react-require": "4.0.0",
105+
"babel-plugin-polyfill-corejs3": "0.8.3",
106+
"babel-plugin-react-require": "4.0.1",
107107
"css-module-builder": "2.0.6",
108108
"eslint": "8.45.0",
109109
"eslint-config-prettier": "8.8.0",
@@ -128,7 +128,7 @@
128128
"eslint-plugin-prettier": "5.0.0",
129129
"eslint-plugin-promise": "6.1.1",
130130
"eslint-plugin-promiseparams": "1.0.8",
131-
"eslint-plugin-react": "7.32.2",
131+
"eslint-plugin-react": "7.33.0",
132132
"eslint-plugin-react-hooks": "4.6.0",
133133
"eslint-plugin-react-perf": "3.3.1",
134134
"eslint-plugin-security-node": "1.1.1",
@@ -138,9 +138,9 @@
138138
"jest": "29.6.1",
139139
"jest-environment-jsdom": "29.6.1",
140140
"jest-specific-snapshot": "8.0.0",
141-
"lerna": "7.1.3",
141+
"lerna": "7.1.4",
142142
"lint-staged": "13.2.3",
143-
"postcss": "8.4.26",
143+
"postcss": "8.4.27",
144144
"postcss-flexbugs-fixes": "5.0.2",
145145
"prettier": "3.0.0",
146146
"react": "18.2.0",
@@ -152,7 +152,7 @@
152152
"tsconfig-paths-webpack-plugin": "4.1.0",
153153
"typescript": "5.1.6",
154154
"url-loader": "4.1.1",
155-
"webpack": "5.88.1"
155+
"webpack": "5.88.2"
156156
},
157157
"husky": {
158158
"hooks": {

packages/react-google-maps-api-gatsby-example/. eslintrc

Whitespace-only changes.

packages/react-google-maps-api-gatsby-example/.babelrc

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16.18.1
1+
v18.17.0

packages/react-google-maps-api-gatsby-example/package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@react-google-maps/gatsby-example",
33
"description": "React Google Maps Gatsby.js example",
4-
"version": "1.9.2",
4+
"version": "2.19.0",
55
"author": {
66
"name": "Alexey Lyakhov",
77
"email": "justfly1984@gmail.com",
@@ -14,40 +14,40 @@
1414
"access": "public"
1515
},
1616
"resolutions": {
17-
"@babel/core": "7.20.12"
17+
"@babel/core": "7.22.9"
1818
},
1919
"dependencies": {
20-
"@babel/core": "7.20.12",
21-
"@babel/node": "7.20.7",
22-
"@babel/preset-env": "7.20.2",
23-
"@babel/preset-react": "7.18.6",
24-
"@babel/runtime": "7.20.13",
25-
"@react-google-maps/api": "2.18.1",
26-
"@sentry/browser": "7.34.0",
20+
"@babel/core": "7.22.9",
21+
"@babel/node": "7.22.6",
22+
"@babel/preset-env": "7.22.9",
23+
"@babel/preset-react": "7.22.5",
24+
"@babel/runtime": "7.22.6",
25+
"@react-google-maps/api": "2.19.2",
26+
"@sentry/browser": "7.60.1",
2727
"cross-env": "7.0.3",
28-
"gatsby": "5.5.0",
29-
"gatsby-plugin-manifest": "5.5.0",
28+
"gatsby": "5.11.0",
29+
"gatsby-plugin-manifest": "5.11.0",
3030
"gatsby-plugin-purgecss": "6.2.1",
31-
"gatsby-plugin-react-helmet": "6.5.0",
32-
"gatsby-plugin-sitemap": "6.5.0",
33-
"gatsby-plugin-typescript": "5.5.0",
34-
"immutable": "4.2.2",
31+
"gatsby-plugin-react-helmet": "6.11.0",
32+
"gatsby-plugin-sitemap": "6.11.0",
33+
"gatsby-plugin-typescript": "5.11.0",
34+
"immutable": "4.3.1",
3535
"intl": "1.2.5",
3636
"prop-types": "15.8.1",
3737
"react-helmet": "6.1.0",
38-
"react-redux": "8.0.5",
38+
"react-redux": "8.1.1",
3939
"react-refresh": "0.14.0",
4040
"redux": "4.2.1",
41-
"redux-actions": "2.6.5",
41+
"redux-actions": "3.0.0",
4242
"redux-immutable": "4.0.0",
4343
"redux-thunk": "2.4.2",
44-
"stylelint": "14.14.1",
44+
"stylelint": "15.10.2",
4545
"stylelint-a11y": "1.2.3",
46-
"stylelint-config-css-modules": "4.1.0",
47-
"stylelint-config-recommended": "9.0.0",
48-
"stylelint-config-standard": "29.0.0",
46+
"stylelint-config-css-modules": "4.3.0",
47+
"stylelint-config-recommended": "13.0.0",
48+
"stylelint-config-standard": "34.0.0",
4949
"stylelint-css-modules": "1.2.2",
50-
"stylelint-high-performance-animation": "1.6.0",
50+
"stylelint-high-performance-animation": "1.8.0",
5151
"uniqid": "5.4.0"
5252
},
5353
"keywords": [
@@ -70,12 +70,12 @@
7070
"update": "npm-check -u"
7171
},
7272
"devDependencies": {
73-
"@babel/plugin-transform-runtime": "7.19.6",
73+
"@babel/plugin-transform-runtime": "7.22.9",
7474
"babel-eslint": "10.1.0",
7575
"babel-plugin-transform-react-remove-prop-types": "0.4.24",
76-
"jest": "29.2.2",
77-
"jest-cli": "29.2.2",
78-
"rimraf": "3.0.2"
76+
"jest": "29.6.1",
77+
"jest-cli": "29.6.1",
78+
"rimraf": "5.0.1"
7979
},
8080
"repository": {
8181
"type": "git",

packages/react-google-maps-api-gatsby-example/src/components/button-load-script.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { memo } from 'react'
1+
// eslint-disable-next-line node/no-extraneous-import
2+
import { memo, useCallback } from 'react'
23
import { useSelector, useDispatch } from 'react-redux'
34

45
import { toggleLoadScript } from '../actions/app'
@@ -15,7 +16,7 @@ function selector(state) {
1516
function ButtonLoadScript() {
1617
const dispatch = useDispatch()
1718

18-
const onClick = React.useCallback(() => {
19+
const onClick = useCallback(() => {
1920
dispatch(toggleLoadScript())
2021
}, [dispatch])
2122

packages/react-google-maps-api-gatsby-example/src/components/card.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import * as React from 'react'
1+
// eslint-disable-next-line node/no-extraneous-import
2+
import { memo } from 'react'
23
import PropTypes from 'prop-types'
34

45
function Card({ children }) {
@@ -13,4 +14,4 @@ Card.propTypes = {
1314
children: PropTypes.node.isRequired,
1415
}
1516

16-
export default React.memo(Card)
17+
export default memo(Card)

packages/react-google-maps-api-gatsby-example/src/components/checkbox-bicycling.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import * as React from 'react'
1+
// eslint-disable-next-line node/no-extraneous-import
2+
import { memo } from 'react'
23
import { useDispatch, useSelector } from 'react-redux'
34

45
import { toggleBicycling } from '../actions/app'
@@ -41,4 +42,4 @@ function CheckboxBicycling() {
4142
)
4243
}
4344

44-
export default React.memo(CheckboxBicycling)
45+
export default memo(CheckboxBicycling)

packages/react-google-maps-api-gatsby-example/src/components/checkbox-data.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import * as React from 'react'
1+
// eslint-disable-next-line node/no-extraneous-import
2+
import { memo , useCallback } from 'react'
23
import { useSelector, useDispatch } from 'react-redux'
34

45
import { toggleData } from '../actions/app'
@@ -14,7 +15,7 @@ function selector(state) {
1415
function CheckboxData() {
1516
const dispatch = useDispatch()
1617

17-
const onChange = React.useCallback(
18+
const onChange = useCallback(
1819
({ target: { checked } }) => {
1920
dispatch(
2021
toggleData({
@@ -44,4 +45,4 @@ function CheckboxData() {
4445
)
4546
}
4647

47-
export default React.memo(CheckboxData)
48+
export default memo(CheckboxData)

0 commit comments

Comments
 (0)