Skip to content

Commit

Permalink
[Chore] bump and fix examples for v3.0.0.alpha.0 (#2030)
Browse files Browse the repository at this point in the history
* bump and fix examples
* add resolutions for demo-app, to fix website build
  • Loading branch information
igorDykhta committed Nov 18, 2022
1 parent c216d09 commit dbba7da
Show file tree
Hide file tree
Showing 36 changed files with 72 additions and 56 deletions.
5 changes: 3 additions & 2 deletions examples/custom-map-style/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
},
"dependencies": {
"global": "^4.3.0",
"kepler.gl": "^2.5.5",
"@kepler.gl/components": "^3.0.0-alpha.0",
"@kepler.gl/reducers": "^3.0.0-alpha.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-palm": "^3.3.6",
Expand All @@ -27,4 +28,4 @@
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.24.3"
}
}
}
2 changes: 1 addition & 1 deletion examples/custom-map-style/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import React from 'react';
import {connect} from 'react-redux';
import KeplerGl from 'kepler.gl';
import KeplerGl from '@kepler.gl/components';
import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';

const localeMessages = {
Expand Down
3 changes: 1 addition & 2 deletions examples/custom-map-style/src/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
// THE SOFTWARE.

import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
import keplerGlReducer from '@kepler.gl/reducers';
import {enhanceReduxMiddleware} from '@kepler.gl/middleware';
import keplerGlReducer, {enhanceReduxMiddleware} from '@kepler.gl/reducers';

const mapStyles = {
voyager: {
Expand Down
6 changes: 4 additions & 2 deletions examples/custom-reducer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
},
"dependencies": {
"global": "^4.3.0",
"kepler.gl": "^2.5.5",
"@kepler.gl/actions": "^3.0.0-alpha.0",
"@kepler.gl/components": "^3.0.0-alpha.0",
"@kepler.gl/reducers": "^3.0.0-alpha.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-palm": "^3.3.6",
Expand All @@ -27,4 +29,4 @@
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.24.3"
}
}
}
2 changes: 1 addition & 1 deletion examples/custom-reducer/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import React, {Component} from 'react';
import {connect} from 'react-redux';
import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
import KeplerGl from 'kepler.gl';
import KeplerGl from '@kepler.gl/components';
import {createAction} from 'redux-actions';

import {addDataToMap, wrapTo} from '@kepler.gl/actions';
Expand Down
3 changes: 1 addition & 2 deletions examples/custom-reducer/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
// THE SOFTWARE.

import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
import keplerGlReducer, {uiStateUpdaters} from '@kepler.gl/reducers';
import {enhanceReduxMiddleware} from '@kepler.gl/middleware';
import keplerGlReducer, {uiStateUpdaters, enhanceReduxMiddleware} from '@kepler.gl/reducers';
import appReducer from './app-reducer';
import window from 'global/window';

Expand Down
5 changes: 3 additions & 2 deletions examples/custom-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
},
"dependencies": {
"global": "^4.3.0",
"kepler.gl": "^2.5.5",
"@kepler.gl/components": "^3.0.0-alpha.0",
"@kepler.gl/reducers": "^3.0.0-alpha.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-palm": "^3.3.6",
Expand All @@ -27,4 +28,4 @@
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.24.3"
}
}
}
2 changes: 1 addition & 1 deletion examples/custom-theme/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import React, {useEffect, useState} from 'react';
import styled from 'styled-components';
import window from 'global/window';
import {connect} from 'react-redux';
import KeplerGl from 'kepler.gl';
import KeplerGl from '@kepler.gl/components';

const MAPBOX_TOKEN = process.env.MapboxAccessToken; // eslint-disable-line

Expand Down
2 changes: 1 addition & 1 deletion examples/custom-theme/src/reducers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import {combineReducers} from 'redux';
import {handleActions} from 'redux-actions';

import keplerGlReducer from 'kepler.gl/reducers';
import keplerGlReducer from '@kepler.gl/reducers';

import {INIT} from '../actions';

Expand Down
2 changes: 1 addition & 1 deletion examples/custom-theme/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import window from 'global/window';
import {combineReducers, createStore, applyMiddleware, compose} from 'redux';
import {enhanceReduxMiddleware} from 'kepler.gl/middleware';
import {enhanceReduxMiddleware} from '@kepler.gl/reducers';

import demoReducer from './reducers/index';

Expand Down
14 changes: 12 additions & 2 deletions examples/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
"d3-request": "^1.0.6",
"dropbox": "^4.0.12",
"global": "^4.3.0",
"kepler.gl": "^2.5.5",
"@kepler.gl/actions": "^3.0.0-alpha.0",
"@kepler.gl/components": "^3.0.0-alpha.0",
"@kepler.gl/constants": "^3.0.0-alpha.0",
"@kepler.gl/processors": "^3.0.0-alpha.0",
"@kepler.gl/reducers": "^3.0.0-alpha.0",
"@kepler.gl/styles": "^3.0.0-alpha.0",
"lodash.debounce": "^4.0.8",
"lodash.get": "^4.4.2",
"react": "^16.8.4",
Expand Down Expand Up @@ -43,5 +48,10 @@
"webpack-dev-middleware": "^3.5.1",
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.24.3"
},
"resolutions": {
"@luma.gl/webgl": "8.5.16",
"@deck.gl/core": "8.8.9",
"@deck.gl/extensions": "8.8.9"
}
}
}
2 changes: 1 addition & 1 deletion examples/demo-app/src/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import {push} from 'react-router-redux';
import {request, text as requestText, json as requestJson} from 'd3-request';
import {loadFiles, toggleModal} from 'kepler.gl/actions';
import {loadFiles, toggleModal} from '@kepler.gl/actions';

import {
LOADING_SAMPLE_ERROR_MESSAGE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import PropTypes from 'prop-types';
import styled from 'styled-components';
import {CORS_LINK} from '../../constants/default-settings';
import {FormattedHTMLMessage, FormattedMessage} from 'react-intl';
import {Button} from 'kepler.gl/components';
import {Button} from '@kepler.gl/components';
import {validateUrl} from '../../utils/url';

const propTypes = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import React, {useEffect} from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import {format} from 'd3-format';
import {LoadingDialog} from 'kepler.gl/components';
import {LoadingDialog} from '@kepler.gl/components';
import {FormattedMessage} from 'react-intl';

const numFormat = format(',');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import React from 'react';
import styled from 'styled-components';
import {Icons} from '@kepler.gl/components';
import {media} from 'kepler.gl/styles';
import {media} from '@kepler.gl/styles';
import {FormattedMessage} from 'react-intl';

import {ASSETS_URL} from '../../constants/default-settings';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import React, {useState} from 'react';
import classnames from 'classnames';
import styled from 'styled-components';
import {Icons, IconRoundSmall, MapControlButton} from 'kepler.gl/components';
import {Icons, IconRoundSmall, MapControlButton} from '@kepler.gl/components';

import ReactMarkdown from 'react-markdown';

Expand Down
2 changes: 1 addition & 1 deletion examples/demo-app/src/factories/map-control.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import React from 'react';
import styled from 'styled-components';
import {MapControlFactory, withState} from 'kepler.gl/components';
import {MapControlFactory, withState} from '@kepler.gl/components';
import {SampleMapPanel} from '../components/map-control/map-control';

CustomMapControlFactory.deps = MapControlFactory.deps;
Expand Down
4 changes: 2 additions & 2 deletions examples/demo-app/src/factories/panel-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import {PanelHeaderFactory, Icons} from 'kepler.gl/components';
import {BUG_REPORT_LINK, USER_GUIDE_DOC} from 'kepler.gl/constants';
import {PanelHeaderFactory, Icons} from '@kepler.gl/components';
import {BUG_REPORT_LINK, USER_GUIDE_DOC} from '@kepler.gl/constants';

export function CustomPanelHeaderFactory(...deps) {
const PanelHeader = PanelHeaderFactory(...deps);
Expand Down
8 changes: 4 additions & 4 deletions examples/demo-app/src/reducers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import {combineReducers} from 'redux';
import {handleActions} from 'redux-actions';

import keplerGlReducer, {combinedUpdaters, uiStateUpdaters} from 'kepler.gl/reducers';
import {processGeojson, processCsvData} from 'kepler.gl/processors';
import KeplerGlSchema from 'kepler.gl/schemas';
import {EXPORT_MAP_FORMATS} from 'kepler.gl/constants';
import keplerGlReducer, {combinedUpdaters, uiStateUpdaters} from '@kepler.gl/reducers';
import {processGeojson, processCsvData} from '@kepler.gl/processors';
import KeplerGlSchema from '@kepler.gl/schemas';
import {EXPORT_MAP_FORMATS} from '@kepler.gl/constants';

import {
INIT,
Expand Down
2 changes: 1 addition & 1 deletion examples/demo-app/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import {combineReducers, createStore, applyMiddleware, compose} from 'redux';
import {routerReducer, routerMiddleware} from 'react-router-redux';
import {browserHistory} from 'react-router';
import {enhanceReduxMiddleware} from '@kepler.gl/middleware';
import {enhanceReduxMiddleware} from '@kepler.gl/reducers';
import thunk from 'redux-thunk';
// eslint-disable-next-line no-unused-vars
import window from 'global/window';
Expand Down
5 changes: 3 additions & 2 deletions examples/node-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"dependencies": {
"express": "^4.17.1",
"global": "^4.3.0",
"kepler.gl": "^2.5.5",
"@kepler.gl/components": "^3.0.0-alpha.0",
"@kepler.gl/reducers": "^3.0.0-alpha.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-palm": "^3.3.6",
Expand All @@ -28,4 +29,4 @@
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.25.0"
}
}
}
2 changes: 1 addition & 1 deletion examples/node-app/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import React from 'react';
import {connect} from 'react-redux';
import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
import styled from 'styled-components';
import KeplerGl from 'kepler.gl';
import KeplerGl from '@kepler.gl/components';

const MAPBOX_TOKEN = process.env.MapboxAccessToken; // eslint-disable-line

Expand Down
3 changes: 1 addition & 2 deletions examples/node-app/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
// THE SOFTWARE.

import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
import keplerGlReducer from 'kepler.gl/reducers';
import {enhanceReduxMiddleware} from 'kepler.gl/middleware';
import keplerGlReducer, {enhanceReduxMiddleware} from '@kepler.gl/reducers';
import appReducer from './app-reducer';

const reducers = combineReducers({
Expand Down
6 changes: 4 additions & 2 deletions examples/open-modal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
},
"dependencies": {
"global": "^4.3.0",
"kepler.gl": "^2.5.5",
"@kepler.gl/actions": "^3.0.0-alpha.0",
"@kepler.gl/components": "^3.0.0-alpha.0",
"@kepler.gl/reducers": "^3.0.0-alpha.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-modal": "^3.1.10",
Expand All @@ -28,4 +30,4 @@
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.24.3"
}
}
}
2 changes: 1 addition & 1 deletion examples/open-modal/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import React, {Component} from 'react';
import {connect} from 'react-redux';
import {addDataToMap, wrapTo} from 'kepler.gl/actions';
import {addDataToMap, wrapTo} from '@kepler.gl/actions';

import Modal from 'react-modal';
import {showModal} from './app-reducer';
Expand Down
4 changes: 2 additions & 2 deletions examples/open-modal/src/components/fresh-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

import React, {Component} from 'react';
import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
import {addDataToMap, wrapTo} from 'kepler.gl/actions';
import KeplerGl from 'kepler.gl';
import {addDataToMap, wrapTo} from '@kepler.gl/actions';
import KeplerGl from '@kepler.gl/components';

import sampleData from '../data/sample-data';
import config from '../configurations/config';
Expand Down
2 changes: 1 addition & 1 deletion examples/open-modal/src/components/saved-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

import React, {Component} from 'react';
import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
import KeplerGl from 'kepler.gl';
import KeplerGl from '@kepler.gl/components';

export default class SavedMap extends Component {
render() {
Expand Down
3 changes: 1 addition & 2 deletions examples/open-modal/src/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
// THE SOFTWARE.

import {createStore, combineReducers, applyMiddleware, compose} from 'redux';
import keplerGlReducer from 'kepler.gl/reducers';
import {enhanceReduxMiddleware} from 'kepler.gl/middleware';
import keplerGlReducer, {enhanceReduxMiddleware} from '@kepler.gl/reducers';

import appReducer from './app-reducer';
import window from 'global/window';
Expand Down
8 changes: 6 additions & 2 deletions examples/replace-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
},
"dependencies": {
"global": "^4.3.0",
"kepler.gl": "^2.5.5",
"@kepler.gl/actions": "^3.0.0-alpha.0",
"@kepler.gl/components": "^3.0.0-alpha.0",
"@kepler.gl/reducers": "^3.0.0-alpha.0",
"@kepler.gl/schemas": "^3.0.0-alpha.0",
"@kepler.gl/styles": "^3.0.0-alpha.0",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"react-palm": "^3.3.6",
Expand All @@ -27,4 +31,4 @@
"webpack-dev-server": "^3.1.14",
"webpack-hot-middleware": "^2.24.3"
}
}
}
6 changes: 3 additions & 3 deletions examples/replace-component/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

import React, {Component} from 'react';
import {connect} from 'react-redux';
import {addDataToMap, wrapTo} from 'kepler.gl/actions';
import {addDataToMap, wrapTo} from '@kepler.gl/actions';
import AutoSizer from 'react-virtualized/dist/commonjs/AutoSizer';
import styled from 'styled-components';
import {theme} from 'kepler.gl/styles';
import {theme} from '@kepler.gl/styles';

import sampleData, {config} from './data/sample-data';

Expand All @@ -36,7 +36,7 @@ import {
CustomPanelsFactory,
MapPopoverFactory,
injectComponents
} from 'kepler.gl/components';
} from '@kepler.gl/components';

import CustomPanelHeaderFactory from './components/panel-header';
import CustomSidebarFactory from './components/side-bar';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// THE SOFTWARE.

import React from 'react';
import {MapPopoverFactory} from 'kepler.gl/components';
import {MapPopoverFactory} from '@kepler.gl/components';

const CustomMapPopoverFactory = (...deps) => {
const MapPopover = MapPopoverFactory(...deps);
Expand Down
2 changes: 1 addition & 1 deletion examples/replace-component/src/components/panel-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

import {PanelHeaderFactory} from 'kepler.gl/components';
import {PanelHeaderFactory} from '@kepler.gl/components';

// Custom Panel Header renders default panel header, changing its default props
// to avoid rendering any action items on the top right
Expand Down
4 changes: 2 additions & 2 deletions examples/replace-component/src/components/panel-toggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import React from 'react';
import styled from 'styled-components';

import {PanelToggleFactory, Button, Icons, withState} from 'kepler.gl/components';
import {visStateLens} from 'kepler.gl/reducers';
import {PanelToggleFactory, Button, Icons, withState} from '@kepler.gl/components';
import {visStateLens} from '@kepler.gl/reducers';

import {setMapConfig} from '../app-reducer';

Expand Down

0 comments on commit dbba7da

Please sign in to comment.