Skip to content

Commit

Permalink
DEV remove browserrouter
Browse files Browse the repository at this point in the history
  • Loading branch information
cdcabrera committed Dec 16, 2022
1 parent ec8ebe1 commit ea16fbf
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 7 deletions.
5 changes: 4 additions & 1 deletion config/build.plugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@ const setCommonPlugins = () => {
}),
fedModulePlugin({
root: RELATIVE_DIRNAME,
shared: [{ 'react-redux': { requiredVersion: dependencies['react-redux'] } }]
shared: [
{ 'react-router-dom': { singleton: true, requiredVersion: '*' } },
{ 'react-redux': { requiredVersion: dependencies['react-redux'] } }
]
})
];

Expand Down
6 changes: 1 addition & 5 deletions src/AppEntry.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
import React from 'react';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import { routerHelpers } from './components/router';
import { store } from './redux';
import App from './app';
import './styles/index.scss';
import '@patternfly/react-styles/css/components/Select/select.css';

const AppEntry = () => (
<Provider store={store}>
<BrowserRouter basename={routerHelpers.dynamicBaseName()}>
<App />
</BrowserRouter>
<App />
</Provider>
);

Expand Down
18 changes: 18 additions & 0 deletions src/index.appEntry.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import { Provider } from 'react-redux';
import { BrowserRouter } from 'react-router-dom';
import { routerHelpers } from './components/router';
import { store } from './redux';
import App from './app';
import './styles/index.scss';
import '@patternfly/react-styles/css/components/Select/select.css';

const AppEntry = () => (
<Provider store={store}>
<BrowserRouter basename={routerHelpers.dynamicBaseName()}>
<App />
</BrowserRouter>
</Provider>
);

export { AppEntry as default, AppEntry };
7 changes: 7 additions & 0 deletions src/index.bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { AppEntry } from './index.appEntry';

const root = document.getElementById('root');

ReactDOM.render(<AppEntry />, root, () => root.setAttribute('data-ouia-safe', true));
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
import './styles/standalone.scss';
import '@patternfly/react-core/dist/styles/base.css';
import('./bootstrap');
import('./index.bootstrap');
import { routerHelpers } from './components/router';

window.insights = {
Expand Down

0 comments on commit ea16fbf

Please sign in to comment.