Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JustFly1984/react-google-maps-api
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2b5ced2be6e5e7525baee2769bff072c74b3ff89
Choose a base ref
..
head repository: JustFly1984/react-google-maps-api
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 47370294ee0afbff3a12c869abd9efcec97ebb4c
Choose a head ref
Showing with 2,063 additions and 2,202 deletions.
  1. 0 packages/react-google-maps-api-gatsby-example/{gatsby-browser.js → gatsby-browser.tsx}
  2. 0 packages/react-google-maps-api-gatsby-example/{gatsby-node.js → gatsby-node.ts}
  3. +15 −11 packages/react-google-maps-api-gatsby-example/{gatsby-ssr.js → gatsby-ssr.tsx}
  4. +14 −14 packages/react-google-maps-api-gatsby-example/package.json
  5. +1,802 −2,106 packages/react-google-maps-api-gatsby-example/yarn.lock
  6. +38 −0 packages/react-google-maps-api/CHANGELOG.md
  7. +2 −2 packages/react-google-maps-api/package.json
  8. +2 −1 packages/react-google-maps-api/rollup.config.js
  9. +1 −1 packages/react-google-maps-api/src/GoogleMap.tsx
  10. +13 −19 packages/react-google-maps-api/src/components/addons/GoogleMarkerClusterer.stories.tsx
  11. +17 −6 packages/react-google-maps-api/src/components/addons/MarkerClusterer.md
  12. +25 −8 packages/react-google-maps-api/src/components/addons/MarkerClusterer.stories.tsx
  13. +26 −9 packages/react-google-maps-api/src/components/addons/MarkerClustererF.stories.tsx
  14. +22 −12 packages/react-google-maps-api/src/components/dom/Overlay.tsx
  15. +20 −1 packages/react-google-maps-api/src/components/dom/OverlayView.stories.tsx
  16. +4 −2 packages/react-google-maps-api/src/components/dom/OverlayView.tsx
  17. +1 −1 packages/react-google-maps-api/src/components/drawing/Marker.tsx
  18. +56 −5 packages/react-google-maps-api/src/components/overlays/GroundOverlay.tsx
  19. +1 −0 packages/react-google-maps-api/src/index.ts
  20. +1 −1 packages/react-google-maps-api/yarn.lock
  21. +3 −3 yarn.lock
0 ...maps-api-gatsby-example/gatsby-browser.js → ...aps-api-gatsby-example/gatsby-browser.tsx
View file
File renamed without changes.
0 ...le-maps-api-gatsby-example/gatsby-node.js → ...le-maps-api-gatsby-example/gatsby-node.ts
View file
File renamed without changes.
26 changes: 15 additions & 11 deletions ...gle-maps-api-gatsby-example/gatsby-ssr.js → ...le-maps-api-gatsby-example/gatsby-ssr.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
const React = require('react')
const PropTypes = require('prop-types')
const { Provider } = require('react-redux')
const { Map: IMap } = require('immutable')
// const React = require('react')
// const PropTypes = require('prop-types')
// const { Provider } = require('react-redux')
// const { Map: IMap } = require('immutable')

import * as React from 'react'
import { Provider } from 'react-redux'
import { Map as IMap } from 'immutable'

const { createStore, compose, applyMiddleware } = require('redux')

const thunk = require('redux-thunk').default
const reducers = require('./src/reducers').default

exports.wrapRootElement = ({ element }) => {
const configureStore = (initialState = new IMap()) => {
export const wrapRootElement = ({ element }) => {
const configureStore = (initialState = IMap()) => {
const store = createStore(
reducers,
initialState,
@@ -23,17 +27,17 @@ exports.wrapRootElement = ({ element }) => {

const ConnectedRootElement = <Provider store={store}>{element}</Provider>

ConnectedRootElement.propTypes = {
element: PropTypes.node.isRequired,
}
// ConnectedRootElement.propTypes = {
// element: PropTypes.node.isRequired,
// }

return ConnectedRootElement
}

exports.onPreRenderHTML = () => {
export const onPreRenderHTML = () => {
// console.log('onPreRenderHTML') // eslint-disable-line no-console
}

exports.onRenderBody = (obj) => {
export const onRenderBody = (obj) => {
// console.log('onRenderBody') // eslint-disable-line no-console
}
28 changes: 14 additions & 14 deletions packages/react-google-maps-api-gatsby-example/package.json
View file
Original file line number Diff line number Diff line change
@@ -14,30 +14,30 @@
"access": "public"
},
"resolutions": {
"@babel/core": "7.20.2"
"@babel/core": "7.20.12"
},
"dependencies": {
"@babel/core": "7.20.2",
"@babel/node": "7.20.2",
"@babel/core": "7.20.12",
"@babel/node": "7.20.7",
"@babel/preset-env": "7.20.2",
"@babel/preset-react": "7.18.6",
"@babel/runtime": "7.20.1",
"@react-google-maps/api": "2.17.0",
"@sentry/browser": "7.19.0",
"@babel/runtime": "7.20.13",
"@react-google-maps/api": "2.18.1",
"@sentry/browser": "7.34.0",
"cross-env": "7.0.3",
"gatsby": "4.21.1",
"gatsby-plugin-manifest": "4.21.0",
"gatsby-plugin-purgecss": "6.1.2",
"gatsby-plugin-react-helmet": "5.21.0",
"gatsby-plugin-sitemap": "5.21.0",
"gatsby-plugin-typescript": "4.21.0",
"immutable": "4.1.0",
"gatsby": "5.5.0",
"gatsby-plugin-manifest": "5.5.0",
"gatsby-plugin-purgecss": "6.2.1",
"gatsby-plugin-react-helmet": "6.5.0",
"gatsby-plugin-sitemap": "6.5.0",
"gatsby-plugin-typescript": "5.5.0",
"immutable": "4.2.2",
"intl": "1.2.5",
"prop-types": "15.8.1",
"react-helmet": "6.1.0",
"react-redux": "8.0.5",
"react-refresh": "0.14.0",
"redux": "4.2.0",
"redux": "4.2.1",
"redux-actions": "2.6.5",
"redux-immutable": "4.0.0",
"redux-thunk": "2.4.2",
Loading