Skip to content

Commit 228b714

Browse files
JustFly1984JustFly1984
committed
updated dependencies, [email protected], releasing 2.19
1 parent f16e0f2 commit 228b714

File tree

11 files changed

+5550
-5031
lines changed

11 files changed

+5550
-5031
lines changed

‎.eslintrc.js

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ module.exports = {
2121
'react',
2222
'jsx-a11y',
2323
'react-perf',
24-
'react-functional-set-state',
2524
'jest',
2625
'jest-dom',
2726
'prettier',

‎package.json

+73-68
Original file line numberDiff line numberDiff line change
@@ -45,109 +45,114 @@
4545
]
4646
},
4747
"resolutions": {
48-
"@types/react": "18.0.25",
49-
"@types/react-dom": "18.0.8"
48+
"@babel/core": "7.22.9",
49+
"@types/jest": "29.5.3",
50+
"@types/node": "20.4.2",
51+
"@types/react": "18.2.15",
52+
"@types/react-dom": "18.2.7",
53+
"@typescript-eslint/eslint-plugin": "6.0.0",
54+
"@typescript-eslint/parser": "6.0.0"
5055
},
5156
"devDependencies": {
52-
"@babel/core": "7.20.2",
57+
"@babel/core": "7.22.9",
5358
"@babel/plugin-proposal-class-properties": "7.18.6",
54-
"@babel/plugin-proposal-decorators": "7.20.2",
55-
"@babel/plugin-proposal-export-default-from": "7.18.10",
59+
"@babel/plugin-proposal-decorators": "7.22.7",
60+
"@babel/plugin-proposal-export-default-from": "7.22.5",
5661
"@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
57-
"@babel/plugin-proposal-object-rest-spread": "7.20.2",
58-
"@babel/plugin-proposal-optional-chaining": "7.18.9",
62+
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
63+
"@babel/plugin-proposal-optional-chaining": "7.21.0",
5964
"@babel/plugin-proposal-private-methods": "7.18.6",
6065
"@babel/plugin-syntax-dynamic-import": "7.8.3",
61-
"@babel/plugin-syntax-jsx": "7.18.6",
62-
"@babel/plugin-syntax-typescript": "7.20.0",
63-
"@babel/plugin-transform-arrow-functions": "7.18.6",
64-
"@babel/plugin-transform-classes": "7.20.2",
65-
"@babel/plugin-transform-destructuring": "7.20.2",
66-
"@babel/plugin-transform-for-of": "7.18.8",
67-
"@babel/plugin-transform-parameters": "7.20.1",
68-
"@babel/plugin-transform-react-jsx": "7.19.0",
69-
"@babel/plugin-transform-spread": "7.19.0",
70-
"@babel/plugin-transform-typescript": "7.20.2",
71-
"@babel/preset-env": "7.20.2",
72-
"@babel/preset-react": "7.18.6",
73-
"@babel/preset-typescript": "7.18.6",
66+
"@babel/plugin-syntax-jsx": "7.22.5",
67+
"@babel/plugin-syntax-typescript": "7.22.5",
68+
"@babel/plugin-transform-arrow-functions": "7.22.5",
69+
"@babel/plugin-transform-classes": "7.22.6",
70+
"@babel/plugin-transform-destructuring": "7.22.5",
71+
"@babel/plugin-transform-for-of": "7.22.5",
72+
"@babel/plugin-transform-parameters": "7.22.5",
73+
"@babel/plugin-transform-react-jsx": "7.22.5",
74+
"@babel/plugin-transform-spread": "7.22.5",
75+
"@babel/plugin-transform-typescript": "7.22.9",
76+
"@babel/preset-env": "7.22.9",
77+
"@babel/preset-react": "7.22.5",
78+
"@babel/preset-typescript": "7.22.5",
7479
"@googlemaps/react-wrapper": "1.1.35",
75-
"@jest/types": "29.2.1",
80+
"@jest/types": "29.6.1",
7681
"@mdx-js/loader": "1.6.22",
77-
"@storybook/addon-actions": "6.5.13",
78-
"@storybook/addon-essentials": "6.5.13",
79-
"@storybook/addon-links": "6.5.13",
80-
"@storybook/builder-webpack5": "6.5.13",
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",
8186
"@storybook/manager-webpack5": "6.5.13",
82-
"@storybook/react": "6.5.13",
83-
"@svgr/webpack": "6.5.1",
84-
"@types/google.maps": "3.50.5",
87+
"@storybook/react": "7.0.27",
88+
"@svgr/webpack": "8.0.1",
89+
"@testing-library/dom": "9.3.1",
90+
"@types/google.maps": "3.53.4",
8591
"@types/invariant": "2.2.35",
86-
"@types/jest": "29.2.2",
87-
"@types/node": "18.11.9",
88-
"@types/react": "18.0.25",
89-
"@types/react-dom": "18.0.8",
92+
"@types/jest": "29.5.3",
93+
"@types/node": "20.4.2",
94+
"@types/react": "18.2.15",
95+
"@types/react-dom": "18.2.7",
9096
"@types/supercluster": "7.1.0",
91-
"@typescript-eslint/eslint-plugin": "5.42.0",
92-
"@typescript-eslint/parser": "5.42.0",
97+
"@typescript-eslint/eslint-plugin": "6.0.0",
98+
"@typescript-eslint/parser": "6.0.0",
9399
"@typescript/lib-dom": "npm:@types/web",
94-
"acorn": "8.8.1",
100+
"acorn": "8.10.0",
95101
"acorn-jsx": "5.3.2",
96-
"autoprefixer": "10.4.13",
97-
"babel-loader": "9.1.0",
102+
"autoprefixer": "10.4.14",
103+
"babel-loader": "9.1.3",
98104
"babel-plugin-macros": "3.1.0",
99-
"babel-plugin-polyfill-corejs3": "0.6.0",
100-
"babel-plugin-react-require": "3.1.3",
101-
"css-module-builder": "2.0.0",
102-
"eslint": "8.27.0",
103-
"eslint-config-prettier": "8.5.0",
104-
"eslint-config-standard": "17.0.0",
105-
"eslint-import-resolver-typescript": "3.5.2",
105+
"babel-plugin-polyfill-corejs3": "0.8.2",
106+
"babel-plugin-react-require": "4.0.0",
107+
"css-module-builder": "2.0.6",
108+
"eslint": "8.45.0",
109+
"eslint-config-prettier": "8.8.0",
110+
"eslint-config-standard": "17.1.0",
111+
"eslint-import-resolver-typescript": "3.5.5",
106112
"eslint-import-resolver-webpack": "0.13.2",
107113
"eslint-plugin-ascii": "1.0.0",
108114
"eslint-plugin-babel": "5.3.1",
109-
"eslint-plugin-compat": "4.0.2",
115+
"eslint-plugin-compat": "4.1.4",
110116
"eslint-plugin-css-modules": "2.11.0",
111117
"eslint-plugin-filenames": "1.3.2",
112118
"eslint-plugin-html": "7.1.0",
113-
"eslint-plugin-import": "2.26.0",
114-
"eslint-plugin-jest": "27.1.4",
115-
"eslint-plugin-jest-dom": "4.0.2",
119+
"eslint-plugin-import": "2.27.5",
120+
"eslint-plugin-jest": "27.2.3",
121+
"eslint-plugin-jest-dom": "5.0.1",
116122
"eslint-plugin-json": "3.1.0",
117-
"eslint-plugin-jsx-a11y": "6.6.1",
118-
"eslint-plugin-n": "15.5.0",
123+
"eslint-plugin-jsx-a11y": "6.7.1",
124+
"eslint-plugin-n": "16.0.1",
119125
"eslint-plugin-no-inferred-method-name": "2.0.0",
120126
"eslint-plugin-node": "11.1.0",
121127
"eslint-plugin-optimize-regex": "1.2.1",
122-
"eslint-plugin-prettier": "4.2.1",
128+
"eslint-plugin-prettier": "5.0.0",
123129
"eslint-plugin-promise": "6.1.1",
124130
"eslint-plugin-promiseparams": "1.0.8",
125-
"eslint-plugin-react": "7.31.10",
126-
"eslint-plugin-react-functional-set-state": "1.2.1",
131+
"eslint-plugin-react": "7.32.2",
127132
"eslint-plugin-react-hooks": "4.6.0",
128133
"eslint-plugin-react-perf": "3.3.1",
129134
"eslint-plugin-security-node": "1.1.1",
130135
"eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
131-
"fork-ts-checker-webpack-plugin": "7.2.13",
132-
"husky": "8.0.1",
133-
"jest": "29.2.2",
134-
"jest-environment-jsdom": "29.2.2",
135-
"jest-specific-snapshot": "5.0.0",
136-
"lerna": "6.0.1",
137-
"lint-staged": "13.0.3",
138-
"postcss": "8.4.18",
136+
"fork-ts-checker-webpack-plugin": "8.0.0",
137+
"husky": "8.0.3",
138+
"jest": "29.6.1",
139+
"jest-environment-jsdom": "29.6.1",
140+
"jest-specific-snapshot": "8.0.0",
141+
"lerna": "7.1.3",
142+
"lint-staged": "13.2.3",
143+
"postcss": "8.4.26",
139144
"postcss-flexbugs-fixes": "5.0.2",
140-
"prettier": "2.7.1",
145+
"prettier": "3.0.0",
141146
"react": "18.2.0",
142147
"react-dom": "18.2.0",
143148
"require-from-string": "2.0.2",
144-
"sass-loader": "13.1.0",
149+
"sass-loader": "13.3.2",
145150
"source-map-explorer": "2.5.3",
146-
"ts-jest": "29.0.3",
147-
"tsconfig-paths-webpack-plugin": "4.0.0",
148-
"typescript": "4.9.0-dev.20220823",
149-
"url-loader": "^4.1.1",
150-
"webpack": "5.74.0"
151+
"ts-jest": "29.1.1",
152+
"tsconfig-paths-webpack-plugin": "4.1.0",
153+
"typescript": "5.1.6",
154+
"url-loader": "4.1.1",
155+
"webpack": "5.88.1"
151156
},
152157
"husky": {
153158
"hooks": {

‎packages/react-google-maps-api-marker-clusterer/src/Cluster.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* global google */
2-
/* eslint-disable filenames/match-regex */
3-
import { Clusterer } from './Clusterer'
2+
3+
import type { Clusterer } from './Clusterer'
44

55
import { ClusterIcon } from './ClusterIcon'
66

7-
import { MarkerExtended } from './types'
7+
import type { MarkerExtended } from './types'
88

99
export class Cluster {
1010
markerClusterer: Clusterer
@@ -75,8 +75,8 @@ export class Cluster {
7575

7676
const markers = this.getMarkers()
7777

78-
for (let i = 0; i < markers.length; i++) {
79-
const position = markers[i].getPosition()
78+
for (const marker of markers) {
79+
const position = marker.getPosition()
8080

8181
if (position) {
8282
bounds.extend(position)
@@ -148,8 +148,8 @@ export class Cluster {
148148
}
149149
} else if (mCount === this.minClusterSize) {
150150
// Hide the markers that were showing.
151-
for (let i = 0; i < mCount; i++) {
152-
this.markers[i].setMap(null)
151+
for (const markerElement of this.markers) {
152+
markerElement.setMap(null)
153153
}
154154
} else {
155155
marker.setMap(null)

‎packages/react-google-maps-api-marker-clusterer/src/ClusterIcon.tsx

+23-20
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* global google */
22
/* eslint-disable filenames/match-regex */
3-
import { Cluster } from './Cluster'
3+
import type { Cluster } from './Cluster'
44

5-
import { ClusterIconStyle, ClusterIconInfo } from './types'
5+
import type { ClusterIconStyle, ClusterIconInfo } from './types'
66

77
export class ClusterIcon {
88
cluster: Cluster
@@ -16,8 +16,8 @@ export class ClusterIcon {
1616
url: string
1717
height: number
1818
width: number
19-
anchorText: number[]
20-
anchorIcon: number[]
19+
anchorText: [number, number]
20+
anchorIcon: [number, number]
2121
textColor: string
2222
textSize: number
2323
textDecoration: string
@@ -274,8 +274,8 @@ export class ClusterIcon {
274274
// NOTE: values must be specified in px units
275275
const bp = this.backgroundPosition.split(' ')
276276

277-
const spriteH = parseInt(bp[0].replace(/^\s+|\s+$/g, ''), 10)
278-
const spriteV = parseInt(bp[1].replace(/^\s+|\s+$/g, ''), 10)
277+
const spriteH = parseInt(bp[0]?.replace(/^\s+|\s+$/g, '') || '0', 10)
278+
const spriteV = parseInt(bp[1]?.replace(/^\s+|\s+$/g, '') || '0', 10)
279279

280280
const pos = this.getPosFromLatLng(this.center)
281281

@@ -324,29 +324,32 @@ export class ClusterIcon {
324324
const style =
325325
styles[Math.min(styles.length - 1, Math.max(0, sums.index - 1))]
326326

327-
this.url = style.url
328-
this.height = style.height
329-
this.width = style.width
327+
if (style) {
328+
this.url = style.url
329+
this.height = style.height
330+
this.width = style.width
330331

331-
if (style.className)
332-
this.className = `${this.clusterClassName} ${style.className}`
332+
if (style.className) {
333+
this.className = `${this.clusterClassName} ${style.className}`
334+
}
333335

334-
this.anchorText = style.anchorText || [0, 0]
335-
this.anchorIcon = style.anchorIcon || [this.height / 2, this.width / 2]
336+
this.anchorText = style.anchorText || [0, 0]
337+
this.anchorIcon = style.anchorIcon || [this.height / 2, this.width / 2]
336338

337-
this.textColor = style.textColor || 'black'
339+
this.textColor = style.textColor || 'black'
338340

339-
this.textSize = style.textSize || 11
341+
this.textSize = style.textSize || 11
340342

341-
this.textDecoration = style.textDecoration || 'none'
343+
this.textDecoration = style.textDecoration || 'none'
342344

343-
this.fontWeight = style.fontWeight || 'bold'
345+
this.fontWeight = style.fontWeight || 'bold'
344346

345-
this.fontStyle = style.fontStyle || 'normal'
347+
this.fontStyle = style.fontStyle || 'normal'
346348

347-
this.fontFamily = style.fontFamily || 'Arial,sans-serif'
349+
this.fontFamily = style.fontFamily || 'Arial,sans-serif'
348350

349-
this.backgroundPosition = style.backgroundPosition || '0 0'
351+
this.backgroundPosition = style.backgroundPosition || '0 0'
352+
}
350353
}
351354

352355
setCenter(center: google.maps.LatLng) {

0 commit comments

Comments
 (0)