Skip to content

Commit 2b404da

Browse files
JustFly1984JustFly1984
committed
updated dependencies, improved build, prepared for release
1 parent e2c97ab commit 2b404da

14 files changed

+4843
-2423
lines changed

‎package.json

+71-71
Original file line numberDiff line numberDiff line change
@@ -45,114 +45,114 @@
4545
]
4646
},
4747
"resolutions": {
48-
"@babel/core": "7.22.9",
49-
"@types/jest": "29.5.3",
50-
"@types/node": "20.4.5",
51-
"@types/react": "18.2.16",
52-
"@types/react-dom": "18.2.7",
53-
"@typescript-eslint/parser": "6.2.0",
54-
"@typescript-eslint/eslint-plugin": "6.2.0"
48+
"@babel/core": "7.23.9",
49+
"@types/jest": "29.5.12",
50+
"@types/node": "20.11.17",
51+
"@types/react": "18.2.55",
52+
"@types/react-dom": "18.2.19",
53+
"@typescript-eslint/parser": "6.21.0",
54+
"@typescript-eslint/eslint-plugin": "6.21.0"
5555
},
5656
"devDependencies": {
57-
"@babel/core": "7.22.9",
57+
"@babel/core": "7.23.9",
5858
"@babel/plugin-proposal-class-properties": "7.18.6",
59-
"@babel/plugin-proposal-decorators": "7.22.7",
60-
"@babel/plugin-proposal-export-default-from": "7.22.5",
59+
"@babel/plugin-proposal-decorators": "7.23.9",
60+
"@babel/plugin-proposal-export-default-from": "7.23.3",
6161
"@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
6262
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
6363
"@babel/plugin-proposal-optional-chaining": "7.21.0",
6464
"@babel/plugin-proposal-private-methods": "7.18.6",
6565
"@babel/plugin-syntax-dynamic-import": "7.8.3",
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",
66+
"@babel/plugin-syntax-jsx": "7.23.3",
67+
"@babel/plugin-syntax-typescript": "7.23.3",
68+
"@babel/plugin-transform-arrow-functions": "7.23.3",
69+
"@babel/plugin-transform-classes": "7.23.8",
70+
"@babel/plugin-transform-destructuring": "7.23.3",
71+
"@babel/plugin-transform-for-of": "7.23.6",
72+
"@babel/plugin-transform-parameters": "7.23.3",
73+
"@babel/plugin-transform-react-jsx": "7.23.4",
74+
"@babel/plugin-transform-spread": "7.23.3",
75+
"@babel/plugin-transform-typescript": "7.23.3",
76+
"@babel/preset-env": "7.23.9",
77+
"@babel/preset-react": "7.23.3",
78+
"@babel/preset-typescript": "7.23.3",
7979
"@googlemaps/react-wrapper": "1.1.35",
80-
"@jest/types": "29.6.1",
80+
"@jest/types": "29.6.3",
8181
"@mdx-js/loader": "1.6.22",
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",
82+
"@storybook/addon-actions": "7.6.14",
83+
"@storybook/addon-essentials": "7.6.14",
84+
"@storybook/addon-links": "7.6.14",
85+
"@storybook/builder-webpack5": "7.6.14",
8686
"@storybook/manager-webpack5": "6.5.16",
8787
"@storybook/react": "7.1.1",
88-
"@svgr/webpack": "8.0.1",
89-
"@testing-library/dom": "9.3.1",
90-
"@types/google.maps": "3.53.5",
91-
"@types/invariant": "2.2.35",
92-
"@types/jest": "29.5.3",
93-
"@types/node": "20.4.5",
94-
"@types/react": "18.2.16",
95-
"@types/react-dom": "18.2.7",
96-
"@types/supercluster": "7.1.0",
97-
"@typescript-eslint/parser": "6.2.0",
98-
"@typescript-eslint/eslint-plugin": "6.2.0",
88+
"@svgr/webpack": "8.1.0",
89+
"@testing-library/dom": "9.3.4",
90+
"@types/google.maps": "3.55.2",
91+
"@types/invariant": "2.2.37",
92+
"@types/jest": "29.5.12",
93+
"@types/node": "20.11.17",
94+
"@types/react": "18.2.55",
95+
"@types/react-dom": "18.2.19",
96+
"@types/supercluster": "7.1.3",
97+
"@typescript-eslint/parser": "6.21.0",
98+
"@typescript-eslint/eslint-plugin": "6.21.0",
9999
"@typescript/lib-dom": "npm:@types/web",
100-
"acorn": "8.10.0",
100+
"acorn": "8.11.3",
101101
"acorn-jsx": "5.3.2",
102-
"autoprefixer": "10.4.14",
102+
"autoprefixer": "10.4.17",
103103
"babel-loader": "9.1.3",
104104
"babel-plugin-macros": "3.1.0",
105-
"babel-plugin-polyfill-corejs3": "0.8.3",
106-
"babel-plugin-react-require": "4.0.1",
105+
"babel-plugin-polyfill-corejs3": "0.9.0",
106+
"babel-plugin-react-require": "4.0.2",
107107
"css-module-builder": "2.0.6",
108-
"eslint": "8.45.0",
109-
"eslint-config-prettier": "8.8.0",
108+
"eslint": "8.56.0",
109+
"eslint-config-prettier": "9.1.0",
110110
"eslint-config-standard": "17.1.0",
111-
"eslint-import-resolver-typescript": "3.5.5",
112-
"eslint-import-resolver-webpack": "0.13.2",
111+
"eslint-import-resolver-typescript": "3.6.1",
112+
"eslint-import-resolver-webpack": "0.13.8",
113113
"eslint-plugin-ascii": "1.0.0",
114114
"eslint-plugin-babel": "5.3.1",
115-
"eslint-plugin-compat": "4.1.4",
116-
"eslint-plugin-css-modules": "2.11.0",
115+
"eslint-plugin-compat": "4.2.0",
116+
"eslint-plugin-css-modules": "2.12.0",
117117
"eslint-plugin-filenames": "1.3.2",
118-
"eslint-plugin-html": "7.1.0",
119-
"eslint-plugin-import": "2.27.5",
120-
"eslint-plugin-jest": "27.2.3",
121-
"eslint-plugin-jest-dom": "5.0.1",
118+
"eslint-plugin-html": "8.0.0",
119+
"eslint-plugin-import": "2.29.1",
120+
"eslint-plugin-jest": "27.6.3",
121+
"eslint-plugin-jest-dom": "5.1.0",
122122
"eslint-plugin-json": "3.1.0",
123-
"eslint-plugin-jsx-a11y": "6.7.1",
124-
"eslint-plugin-n": "16.0.1",
123+
"eslint-plugin-jsx-a11y": "6.8.0",
124+
"eslint-plugin-n": "16.6.2",
125125
"eslint-plugin-no-inferred-method-name": "2.0.0",
126126
"eslint-plugin-node": "11.1.0",
127127
"eslint-plugin-optimize-regex": "1.2.1",
128-
"eslint-plugin-prettier": "5.0.0",
128+
"eslint-plugin-prettier": "5.1.3",
129129
"eslint-plugin-promise": "6.1.1",
130130
"eslint-plugin-promiseparams": "1.0.8",
131-
"eslint-plugin-react": "7.33.0",
131+
"eslint-plugin-react": "7.33.2",
132132
"eslint-plugin-react-hooks": "4.6.0",
133-
"eslint-plugin-react-perf": "3.3.1",
134-
"eslint-plugin-security-node": "1.1.1",
135-
"eslint-plugin-you-dont-need-lodash-underscore": "6.12.0",
136-
"fork-ts-checker-webpack-plugin": "8.0.0",
133+
"eslint-plugin-react-perf": "3.3.2",
134+
"eslint-plugin-security-node": "1.1.4",
135+
"eslint-plugin-you-dont-need-lodash-underscore": "6.13.0",
136+
"fork-ts-checker-webpack-plugin": "9.0.2",
137137
"husky": "8.0.3",
138-
"jest": "29.6.1",
139-
"jest-environment-jsdom": "29.6.1",
138+
"jest": "29.7.0",
139+
"jest-environment-jsdom": "29.7.0",
140140
"jest-specific-snapshot": "8.0.0",
141-
"lerna": "7.1.4",
142-
"lint-staged": "13.2.3",
143-
"postcss": "8.4.27",
141+
"lerna": "8.1.2",
142+
"lint-staged": "15.2.2",
143+
"postcss": "8.4.35",
144144
"postcss-flexbugs-fixes": "5.0.2",
145-
"prettier": "3.0.0",
145+
"prettier": "3.2.5",
146146
"react": "18.2.0",
147147
"react-dom": "18.2.0",
148148
"require-from-string": "2.0.2",
149-
"sass-loader": "13.3.2",
149+
"sass-loader": "14.1.0",
150150
"source-map-explorer": "2.5.3",
151-
"ts-jest": "29.1.1",
151+
"ts-jest": "29.1.2",
152152
"tsconfig-paths-webpack-plugin": "4.1.0",
153-
"typescript": "5.1.6",
153+
"typescript": "5.3.3",
154154
"url-loader": "4.1.1",
155-
"webpack": "5.88.2"
155+
"webpack": "5.90.1"
156156
},
157157
"husky": {
158158
"hooks": {

‎packages/react-google-maps-api/CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Changelog
22

3+
## 2.19.3 fixes to MarkerF functionality by Fabian Scherer
4+
35
## 2.19.2 fix @react-google-maps/infobox boxStyle type
46

57
## 2.19.0 fix to MarkerF animation, update Typescript@5.1.6

‎packages/react-google-maps-api/package.json

+17-12
Original file line numberDiff line numberDiff line change
@@ -84,33 +84,38 @@
8484
"pub:next": "yarn publish . --tag next",
8585
"prepublishOnly": "yarn build"
8686
},
87+
"resolutions": {
88+
"@types/node": "20.11.17",
89+
"@types/react": "18.2.55",
90+
"@types/react-dom": "18.2.19"
91+
},
8792
"dependencies": {
8893
"@googlemaps/js-api-loader": "1.16.2",
89-
"@googlemaps/markerclusterer": "2.3.2",
94+
"@googlemaps/markerclusterer": "2.5.3",
9095
"@react-google-maps/infobox": "2.19.2",
9196
"@react-google-maps/marker-clusterer": "2.19.2",
92-
"@types/google.maps": "3.53.5",
97+
"@types/google.maps": "3.55.2",
9398
"invariant": "2.2.4"
9499
},
95100
"peerDependencies": {
96101
"react": "^16.8 || ^17 || ^18",
97102
"react-dom": "^16.8 || ^17 || ^18"
98103
},
99104
"devDependencies": {
100-
"@rollup/plugin-commonjs": "25.0.3",
101-
"@rollup/plugin-node-resolve": "15.1.0",
102-
"@rollup/plugin-typescript": "11.1.2",
103-
"@testing-library/react": "14.0.0",
104-
"jest": "29.6.1",
105-
"jest-cli": "29.6.1",
106-
"react-docgen": "6.0.2",
105+
"@rollup/plugin-commonjs": "25.0.7",
106+
"@rollup/plugin-node-resolve": "15.2.3",
107+
"@rollup/plugin-typescript": "11.1.6",
108+
"@testing-library/react": "14.2.1",
109+
"jest": "29.7.0",
110+
"jest-cli": "29.7.0",
111+
"react-docgen": "7.0.3",
107112
"react-docgen-typescript": "2.2.2",
108-
"react-styleguidist": "13.1.1",
109-
"rimraf": "5.0.1",
113+
"react-styleguidist": "13.1.2",
114+
"rimraf": "5.0.5",
110115
"rollup": "2.78.1",
111116
"rollup-plugin-dts": "5.3.0",
112117
"rollup-plugin-terser": "7.0.2",
113-
"ts-loader": "9.4.4"
118+
"ts-loader": "9.5.1"
114119
},
115120
"gitHead": "80167ddcc3d8e356dbf0b0c3a6292c6a3a989f83"
116121
}

‎packages/react-google-maps-api/rollup.config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ const output = (format) => {
2828

2929
export default [
3030
{
31-
plugins: [typescript(), nodeResolve(), commonjs()],
31+
plugins: [typescript({
32+
exclude: ["**/*.test.ts", "**/*.stories.tsx"]
33+
}), nodeResolve(), commonjs()],
3234
external: ['react', 'react-dom', 'react/jsx-runtime'],
3335

3436
input: 'src/index.ts',

‎packages/react-google-maps-api/src/GoogleMap.stories.tsx

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import type { ComponentStory, ComponentMeta } from '@storybook/react'
1+
// eslint-disable-next-line node/no-extraneous-import
2+
import type { StoryFn, Meta } from '@storybook/react'
23
import { GoogleMap } from '.'
34

4-
export default {
5+
const exp: Meta<typeof GoogleMap> = {
56
title: 'Example/GoogleMap',
67
component: GoogleMap,
78
args: {
@@ -15,16 +16,23 @@ export default {
1516
lng: -38.523,
1617
},
1718
},
18-
} as ComponentMeta<typeof GoogleMap>
19+
}
20+
21+
export default exp
1922

20-
const Template: ComponentStory<typeof GoogleMap> = (args) => (
23+
const Template: StoryFn<typeof GoogleMap> = (args) => (
2124
<GoogleMap {...args} />
2225
)
2326

27+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
28+
// @ts-ignore
2429
export const Default = Template.bind({})
2530
Default.args = {
2631
zoom: 8,
2732
}
33+
34+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
35+
// @ts-ignore
2836
export const Satellite = Template.bind({})
2937
Satellite.args = {
3038
zoom: 15,

‎packages/react-google-maps-api/src/GoogleMap.tsx

+11-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { type CSSProperties, PureComponent, type ReactNode, useState, useRef, useEffect, memo } from 'react'
1+
import { type CSSProperties, PureComponent, type JSX, type ReactNode, useState, useRef, useEffect, memo } from 'react'
22

33
import MapContext from './map-context'
44

@@ -362,23 +362,21 @@ function GoogleMapFunctional({
362362
if (onUnmount) {
363363
onUnmount(map)
364364
}
365-
366-
367365
}
368366
}
369367
}, [])
370368

371369
return (
372370
<div
373-
id={id}
374-
ref={ref}
375-
style={mapContainerStyle}
376-
className={mapContainerClassName}
377-
>
378-
<MapContext.Provider value={map}>
379-
{map !== null ? children : <></>}
380-
</MapContext.Provider>
381-
</div>
371+
id={id}
372+
ref={ref}
373+
style={mapContainerStyle}
374+
className={mapContainerClassName}
375+
>
376+
<MapContext.Provider value={map}>
377+
{map !== null ? children : null}
378+
</MapContext.Provider>
379+
</div>
382380
)
383381
}
384382

@@ -471,7 +469,7 @@ export class GoogleMap extends PureComponent<GoogleMapProps, GoogleMapState> {
471469
className={this.props.mapContainerClassName}
472470
>
473471
<MapContext.Provider value={this.state.map}>
474-
{this.state.map !== null ? this.props.children : <></>}
472+
{this.state.map !== null ? this.props.children : null}
475473
</MapContext.Provider>
476474
</div>
477475
)

‎packages/react-google-maps-api/src/LoadScriptNext.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { memo, ReactElement, useEffect } from 'react'
1+
import { memo, ReactElement, useEffect, type JSX } from 'react'
22

33
import { DefaultLoadingElement } from './LoadScript'
44
import { useLoadScript, UseLoadScriptOptions } from './useLoadScript'

‎packages/react-google-maps-api/src/__tests__/components/circle.test.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/**
22
* @jest-environment jsdom
33
*/
4+
import type { JSX } from 'react'
45

56
import { render, cleanup } from "@testing-library/react"
67
import GoogleMap from "../../GoogleMap"
@@ -17,7 +18,7 @@ function onCircleLoad(circle: google.maps.Circle) {
1718
instance = circle
1819
}
1920

20-
function getCircle(props: CircleProps) {
21+
function getCircle(props: CircleProps): JSX.Element {
2122
return <GoogleMap><Circle {...props} /></GoogleMap>
2223
}
2324

0 commit comments

Comments
 (0)