fix: HMR
This commit is contained in:
parent
4d1d857be1
commit
c7c7ca5edb
|
@ -2,29 +2,18 @@ import './humus.scss';
|
||||||
|
|
||||||
import {hot} from 'react-hot-loader';
|
import {hot} from 'react-hot-loader';
|
||||||
|
|
||||||
// TODO should be betta
|
|
||||||
import 'pixi.js-legacy';
|
|
||||||
|
|
||||||
import {LatusContext, useLatus} from '@latus/react/client';
|
|
||||||
import {Provider, useStore} from '@latus/redux';
|
|
||||||
import {ConnectedRouter} from 'connected-react-router';
|
import {ConnectedRouter} from 'connected-react-router';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import {
|
|
||||||
__RouterContext,
|
|
||||||
} from 'react-router';
|
|
||||||
import {
|
import {
|
||||||
Redirect,
|
Redirect,
|
||||||
Route,
|
Route,
|
||||||
Switch,
|
Switch,
|
||||||
useLocation,
|
|
||||||
} from 'react-router-dom';
|
} from 'react-router-dom';
|
||||||
|
|
||||||
import Dumb from 'components/renderers/dumb';
|
|
||||||
import Login from 'components/login';
|
import Login from 'components/login';
|
||||||
import Play from 'components/play';
|
import Play from 'components/play';
|
||||||
import Stage from 'components/stage';
|
import Renderer from 'components/renderer';
|
||||||
import RoomView from 'components/renderers/room-view';
|
|
||||||
import Title from 'components/title';
|
import Title from 'components/title';
|
||||||
import Ui from 'components/ui';
|
import Ui from 'components/ui';
|
||||||
import Universe from 'components/universe';
|
import Universe from 'components/universe';
|
||||||
|
@ -36,36 +25,12 @@ const HEIGHT = 900;
|
||||||
|
|
||||||
const isLoggedIn = true;
|
const isLoggedIn = true;
|
||||||
|
|
||||||
const RoutedStage = () => {
|
|
||||||
const location = useLocation();
|
|
||||||
const latus = useLatus();
|
|
||||||
const store = useStore();
|
|
||||||
return (
|
|
||||||
<Stage width={320} height={180}>
|
|
||||||
<LatusContext.Provider value={latus} >
|
|
||||||
<__RouterContext.Provider value={{location}}>
|
|
||||||
<Provider store={store}>
|
|
||||||
<Switch>
|
|
||||||
<Route path="/login">
|
|
||||||
<Dumb />
|
|
||||||
</Route>
|
|
||||||
<Route path="/universe">
|
|
||||||
<RoomView />
|
|
||||||
</Route>
|
|
||||||
</Switch>
|
|
||||||
</Provider>
|
|
||||||
</__RouterContext.Provider>
|
|
||||||
</LatusContext.Provider>
|
|
||||||
</Stage>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const Humus = ({history}) => {
|
const Humus = ({history}) => {
|
||||||
const isNative = useIsNative();
|
const isNative = useIsNative();
|
||||||
return (
|
return (
|
||||||
<div className="humus">
|
<div className="humus">
|
||||||
<ConnectedRouter history={history}>
|
<ConnectedRouter history={history}>
|
||||||
<RoutedStage />
|
<Renderer />
|
||||||
<Ui width={WIDTH} height={HEIGHT}>
|
<Ui width={WIDTH} height={HEIGHT}>
|
||||||
<Switch>
|
<Switch>
|
||||||
<Route path="/login">
|
<Route path="/login">
|
||||||
|
|
|
@ -4,7 +4,6 @@ import {ActionRegistry, InputNormalizer} from '@avocado/input';
|
||||||
import {setSelfEntity, useSelfEntity} from '@humus/core';
|
import {setSelfEntity, useSelfEntity} from '@humus/core';
|
||||||
import {useDispatch} from '@latus/redux';
|
import {useDispatch} from '@latus/redux';
|
||||||
import {useSocket} from '@latus/socket';
|
import {useSocket} from '@latus/socket';
|
||||||
import {hot} from 'react-hot-loader';
|
|
||||||
import React, {useEffect, useRef} from 'react';
|
import React, {useEffect, useRef} from 'react';
|
||||||
import {useParams} from 'react-router';
|
import {useParams} from 'react-router';
|
||||||
|
|
||||||
|
@ -64,4 +63,4 @@ const Play = () => {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default hot(module)(Play);
|
export default Play;
|
||||||
|
|
49
app/src/react/components/renderer/index.jsx
Normal file
49
app/src/react/components/renderer/index.jsx
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
// TODO should be betta
|
||||||
|
import 'pixi.js-legacy';
|
||||||
|
|
||||||
|
import {LatusContext, useLatus} from '@latus/react/client';
|
||||||
|
import {Provider, useStore} from '@latus/redux';
|
||||||
|
import React from 'react';
|
||||||
|
import {
|
||||||
|
__RouterContext,
|
||||||
|
} from 'react-router';
|
||||||
|
import {
|
||||||
|
Route,
|
||||||
|
Switch,
|
||||||
|
useLocation,
|
||||||
|
} from 'react-router-dom';
|
||||||
|
|
||||||
|
import Stage from 'components/stage';
|
||||||
|
|
||||||
|
import Dumb from './dumb';
|
||||||
|
import RoomView from './room-view';
|
||||||
|
|
||||||
|
const Renderer = () => {
|
||||||
|
const location = useLocation();
|
||||||
|
const latus = useLatus();
|
||||||
|
const store = useStore();
|
||||||
|
return (
|
||||||
|
<Stage width={320} height={180}>
|
||||||
|
<LatusContext.Provider value={latus} >
|
||||||
|
<__RouterContext.Provider value={{location}}>
|
||||||
|
<Provider store={store}>
|
||||||
|
<Switch>
|
||||||
|
<Route path="/login">
|
||||||
|
<Dumb />
|
||||||
|
</Route>
|
||||||
|
<Route path="/universe">
|
||||||
|
<RoomView />
|
||||||
|
</Route>
|
||||||
|
</Switch>
|
||||||
|
</Provider>
|
||||||
|
</__RouterContext.Provider>
|
||||||
|
</LatusContext.Provider>
|
||||||
|
</Stage>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Renderer;
|
||||||
|
|
||||||
|
if (module.hot) {
|
||||||
|
module.hot.decline();
|
||||||
|
}
|
|
@ -1,6 +1,5 @@
|
||||||
import './index.scss';
|
import './index.scss';
|
||||||
|
|
||||||
import {hot} from 'react-hot-loader';
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
|
@ -34,4 +33,4 @@ const Title = () => (
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
export default hot(module)(Title);
|
export default Title;
|
||||||
|
|
|
@ -2,7 +2,6 @@ import './index.scss';
|
||||||
|
|
||||||
import {universesByLocalitySelector} from '@humus/universe';
|
import {universesByLocalitySelector} from '@humus/universe';
|
||||||
import {useSelector} from '@latus/redux';
|
import {useSelector} from '@latus/redux';
|
||||||
import {hot} from 'react-hot-loader';
|
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
|
@ -23,4 +22,4 @@ Universes.propTypes = {
|
||||||
isLocal: PropTypes.bool.isRequired,
|
isLocal: PropTypes.bool.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default hot(module)(Universes);
|
export default Universes;
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
import './ui.scss';
|
import './ui.scss';
|
||||||
|
|
||||||
import {hot} from 'react-hot-loader';
|
|
||||||
|
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import React, {useEffect, useRef} from 'react';
|
import React, {useEffect, useRef} from 'react';
|
||||||
|
|
||||||
|
@ -56,4 +54,4 @@ Ui.propTypes = {
|
||||||
width: PropTypes.number,
|
width: PropTypes.number,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default hot(module)(Ui);
|
export default Ui;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user