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

fix(deps) Update all non-major dependencies #74

Merged
merged 12 commits into from
Sep 19, 2023
Merged
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
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"extends": [
"plugin:react/recommended",
"airbnb",
"plugin:storybook/recommended",
"plugin:storybook/recommended"
],
"globals": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
Expand Down
48 changes: 17 additions & 31 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,21 @@
const path = require('path');
module.exports = {
stories: ['./**/*.stories.mdx'],
addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-interactions', {
name: '@storybook/addon-postcss',
options: {
postcssLoaderOptions: {
implementation: require('postcss')
}
}
}, '@storybook/addon-docs', '@storybook/addon-mdx-gfm'],
webpackFinal: config => {
config.module.rules.push({
test: /\.(js|jsx)$/,
loader: require.resolve('babel-loader'),
options: {
presets: ['@babel/preset-env', '@babel/preset-react'],
plugins: ['@babel/plugin-proposal-nullish-coalescing-operator']
}
});
config.module.rules.push({
test: /\.scss$/,
use: ['style-loader', 'css-loader?modules&importLoaders', 'sass-loader'],
include: path.resolve(__dirname, '../')
});
return config;
},
/** @type { import('@storybook/react-webpack5').StorybookConfig } */
const config = {
stories: [
'./stories/**/*.mdx',
'./stories/**/*.stories.@(js|jsx|mjs|ts|tsx)',
],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-onboarding',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/react-webpack5',
options: {}
options: {},
},
docs: {
autodocs: true
}
};
autodocs: 'tag',
},
};
export default config;
5 changes: 0 additions & 5 deletions .storybook/preview-head.html

This file was deleted.

23 changes: 17 additions & 6 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
export const parameters = {
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
/** @type { import('@storybook/react').Preview } */

import '../node_modules/leaflet/dist/leaflet.css';
import '../node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css';
import '../node_modules/leaflet.markercluster/dist/MarkerCluster.css';
import './stories/examples/styles.css';

const preview = {
parameters: {
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
},
},
};

export default preview;
17 changes: 8 additions & 9 deletions .storybook/doc.stories.mdx → .storybook/stories/Configure.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Meta, Story, Canvas } from '@storybook/addon-docs';
import { Meta, Story } from "@storybook/blocks";

import {
BasicExample,
Expand All @@ -9,7 +9,7 @@ import {
MarkerTooltip,
} from './examples';

<Meta title="React Leaflet MarkerCluster" />
<Meta title="Documentation" />

# Basic example

Expand Down Expand Up @@ -41,10 +41,9 @@ import MarkerClusterGroup from 'react-leaflet-markercluster';

If you would like to pass some props to the Marker, please use [react-leaflet Marker component API](https://react-leaflet.js.org/docs/en/components.html#marker).

<Story name="Basic example">{BasicExample}</Story>
<BasicExample />

[GitHub source code](https://github.com/christopherpickering/react-leaflet-markercluster/blob/master/.storybook/examples/basic.js)

---

# Event listeners
Expand Down Expand Up @@ -100,7 +99,7 @@ import MarkerClusterGroup from 'react-leaflet-markercluster';
</MapContainer>;
```

<Story name="Event listeners">{EventListeners}</Story>
<EventListeners />

[GitHub source code](https://github.com/christopherpickering/react-leaflet-markercluster/blob/master/.storybook/examples/event-listeners.js)

Expand Down Expand Up @@ -173,7 +172,7 @@ And do not forget about styles for your class:

If you would like to pass some props to the Cluster, please check [List of all Leaflet.markercluster options](https://github.com/Leaflet/Leaflet.markercluster#all-options)

<Story name="Cluster custom icon">{MarkerClusterOptions}</Story>
<MarkerClusterOptions />


[GitHub source code](https://github.com/christopherpickering/react-leaflet-markercluster/blob/master/.storybook/examples/marker-cluster-options.js)
Expand Down Expand Up @@ -231,7 +230,7 @@ const redMarker = L.icon({

If you would like to pass some props to the Cluster, please check [List of all Leaflet Marker options](http://leafletjs.com/reference.html#marker-option)

<Story name="Marker icon and title">{MarkerOptions}</Story>
<MarkerOptions />

[GitHub source code](https://github.com/christopherpickering/react-leaflet-markercluster/blob/master/.storybook/examples/marker-options.js)

Expand Down Expand Up @@ -298,7 +297,7 @@ const redMarker = L.icon({

If you would like to pass some props to the Cluster, please check [List of all Leaflet Popup options](http://leafletjs.com/reference.html#popup-option)

<Story name="Marker popup">{MarkerPopup}</Story>
<MarkerPopup />

[GitHub source code](https://github.com/christopherpickering/react-leaflet-markercluster/blob/master/.storybook/examples/marker-popup.js)

Expand Down Expand Up @@ -352,6 +351,6 @@ import MarkerClusterGroup from 'react-leaflet-markercluster';

If you would like to pass some props to the Cluster, please check [List of all Leaflet Tooltip options](http://leafletjs.com/reference.html#tooltip-option)

<Story name="Marker tooltip">{MarkerTooltip}</Story>
<MarkerTooltip />

[GitHub source code](https://github.com/christopherpickering/react-leaflet-markercluster/blob/master/.storybook/examples/marker-tooltip.js)
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ import React from 'react';

import { MapContainer, TileLayer, Marker } from 'react-leaflet';

import MarkerClusterGroup from './../../src/react-leaflet-markercluster';
import MarkerClusterGroup from './../../../src/react-leaflet-markercluster';

import { MAP_ZOOM, MAP_MAX_ZOOM, MAP_CENTER_COORDINATES } from './constants';

import '../../dist/styles.min.css';
import './styles.css';

const BasicExample = () => (
<MapContainer
className="markercluster-map"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ import React from 'react';

import { MapContainer, TileLayer, Marker, Popup } from 'react-leaflet';

import MarkerClusterGroup from './../../src/react-leaflet-markercluster';
import MarkerClusterGroup from './../../../src/react-leaflet-markercluster';

import { logAction } from './helpers';
import { MAP_ZOOM, MAP_MAX_ZOOM, MAP_CENTER_COORDINATES } from './constants';

import '../../dist/styles.min.css';
import './styles.css';

const EventListeners = () => (
<MapContainer
className="markercluster-map"
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ import React from 'react';
import L from 'leaflet';
import { MapContainer, TileLayer, Marker } from 'react-leaflet';

import MarkerClusterGroup from './../../src/react-leaflet-markercluster';
import MarkerClusterGroup from './../../../src/react-leaflet-markercluster';

import { MAP_ZOOM, MAP_MAX_ZOOM, MAP_CENTER_COORDINATES } from './constants';

import '../../dist/styles.min.css';
import './styles.css';

// Function for creating custom icon for cluster group
// https://github.com/Leaflet/Leaflet.markercluster#customising-the-clustered-markers
// NOTE: iconCreateFunction is running by leaflet, which is not support ES6 arrow func syntax
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ import React from 'react';
import L from 'leaflet';
import { MapContainer, TileLayer, Marker } from 'react-leaflet';

import MarkerClusterGroup from './../../src/react-leaflet-markercluster';
import MarkerClusterGroup from './../../../src/react-leaflet-markercluster';

import redFilledMarker from './icons/red-filled-marker.svg';
import { MAP_ZOOM, MAP_MAX_ZOOM, MAP_CENTER_COORDINATES } from './constants';

import '../../dist/styles.min.css';
import './styles.css';

// Create marker icon according to the official leaflet documentation
const redMarker = L.icon({
iconUrl: redFilledMarker,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ import React from 'react';
import L from 'leaflet';
import { MapContainer, TileLayer, Marker, Popup } from 'react-leaflet';

import MarkerClusterGroup from './../../src/react-leaflet-markercluster';
import MarkerClusterGroup from './../../../src/react-leaflet-markercluster';

import redFilledMarker from './icons/red-filled-marker.svg';
import { MAP_ZOOM, MAP_MAX_ZOOM, MAP_CENTER_COORDINATES } from './constants';

import '../../dist/styles.min.css';
import './styles.css';

// Create marker icon according to the official leaflet documentation
const redMarker = L.icon({
iconUrl: redFilledMarker,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ import React from 'react';
import L from 'leaflet';
import { MapContainer, TileLayer, Marker, Tooltip } from 'react-leaflet';

import MarkerClusterGroup from './../../src/react-leaflet-markercluster';
import MarkerClusterGroup from './../../../src/react-leaflet-markercluster';

import { MAP_ZOOM, MAP_MAX_ZOOM, MAP_CENTER_COORDINATES } from './constants';

import '../../dist/styles.min.css';
import './styles.css';

// Setup Tooltip according to react-leaflet documentation
// https://react-leaflet.js.org/docs/en/examples.html
// http://leafletjs.com/reference.html#tooltip-option
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
/*@imoprt '../../node_modules/leaflet/dist/leaflet.css';
@import '../../src/styles.scss';

$puple: #9370db;
$gray: #ededed;
*/
.markercluster-map {
height: 90vh;
height: 400px;
}

/* Customize the Clustered Markers */
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading