fix route redirect and dev server

This commit is contained in:
Jeff Colombo 2019-03-17 19:15:46 -04:00
parent f7cdba6a25
commit dc855f76aa
4 changed files with 14 additions and 7 deletions

11
dist/main-bundle.js vendored
View File

@ -25873,9 +25873,9 @@ Measure.propTypes.children = prop_types__WEBPACK_IMPORTED_MODULE_4___default.a.f
\***********************************************************/ \***********************************************************/
/*! exports provided: Provider, connectAdvanced, ReactReduxContext, connect */ /*! exports provided: Provider, connectAdvanced, ReactReduxContext, connect */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js because of ./node_modules/react-window/dist/index.esm.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js because of ./node_modules/react-window/dist/index.esm.js */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/extends.js because of ./node_modules/react-window/dist/index.esm.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/extends.js because of ./node_modules/react-measure/dist/index.esm.js */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js because of ./node_modules/react-window/dist/index.esm.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js because of ./node_modules/react-measure/dist/index.esm.js */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js because of ./node_modules/react-window/dist/index.esm.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js because of ./node_modules/react-measure/dist/index.esm.js */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/hoist-non-react-statics/dist/hoist-non-react-statics.cjs.js (<- Module is not an ECMAScript module) */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/hoist-non-react-statics/dist/hoist-non-react-statics.cjs.js (<- Module is not an ECMAScript module) */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/invariant/browser.js (<- Module is not an ECMAScript module) */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/invariant/browser.js (<- Module is not an ECMAScript module) */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/prop-types/index.js (<- Module is not an ECMAScript module) */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/prop-types/index.js (<- Module is not an ECMAScript module) */
@ -29619,7 +29619,7 @@ function pathToRegexp (path, keys, options) {
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js because of ./node_modules/react-redux/es/index.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js because of ./node_modules/react-redux/es/index.js */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/extends.js because of ./node_modules/react-redux/es/index.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/extends.js because of ./node_modules/react-redux/es/index.js */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js because of ./node_modules/react-redux/es/index.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js because of ./node_modules/react-redux/es/index.js */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js because of ./node_modules/react-redux/es/index.js */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js because of ./node_modules/react-measure/dist/index.esm.js */
/*! ModuleConcatenation bailout: Cannot concat with ./node_modules/react/index.js (<- Module is not an ECMAScript module) */ /*! ModuleConcatenation bailout: Cannot concat with ./node_modules/react/index.js (<- Module is not an ECMAScript module) */
/***/ (function(module, __webpack_exports__, __webpack_require__) { /***/ (function(module, __webpack_exports__, __webpack_require__) {
@ -40653,6 +40653,9 @@ react_dom_1.default.render(react_1.default.createElement(react_redux_1.Provider,
}, react_1.default.createElement(react_router_dom_1.BrowserRouter, null, react_1.default.createElement(react_router_dom_1.Switch, null, react_1.default.createElement(react_router_dom_1.Route, { }, react_1.default.createElement(react_router_dom_1.BrowserRouter, null, react_1.default.createElement(react_router_dom_1.Switch, null, react_1.default.createElement(react_router_dom_1.Route, {
path: "/explorer/:id/:form", path: "/explorer/:id/:form",
component: PokemonApp_1.ConnectedPokemonApp component: PokemonApp_1.ConnectedPokemonApp
}), react_1.default.createElement(react_router_dom_1.Redirect, {
from: "/",
to: "/explorer/1/0"
})))), document.getElementById('pokemon-mount')); // const BATCH_ACTION_TYPE = '_BATCHING_REDUCER_BATCH_ACTION_'; })))), document.getElementById('pokemon-mount')); // const BATCH_ACTION_TYPE = '_BATCHING_REDUCER_BATCH_ACTION_';
// // TODO Allow this to also take ThunkAction<any, any, any> // // TODO Allow this to also take ThunkAction<any, any, any>
// export function batchActions(actions : Array<Redux.Action>) : Redux.Action { // export function batchActions(actions : Array<Redux.Action>) : Redux.Action {

View File

@ -5,7 +5,7 @@
"lint": "tslint --project tslint.json", "lint": "tslint --project tslint.json",
"package": "yarn build -- --config webpack.config.prod.js --bail --display-used-exports -p", "package": "yarn build -- --config webpack.config.prod.js --bail --display-used-exports -p",
"package-for-test": "yarn build -- --config webpack.config.test.js --bail --display-used-exports", "package-for-test": "yarn build -- --config webpack.config.test.js --bail --display-used-exports",
"start": "webpack-dev-server --content-base ./ --inline --colors --port 8000 --env.WARN_ON_LINT", "start": "webpack-dev-server --progress --inline --colors --port 8000 --env.WARN_ON_LINT",
"watch": "yarn build -- --config webpack.config.js --colors --debug --output-pathinfo --progress --watch --env.WARN_ON_LINT", "watch": "yarn build -- --config webpack.config.js --colors --debug --output-pathinfo --progress --watch --env.WARN_ON_LINT",
"build": "node ./node_modules/webpack/bin/webpack.js --cache=true --display-error-details --profile", "build": "node ./node_modules/webpack/bin/webpack.js --cache=true --display-error-details --profile",
"clean": "rm -rf ./dist/*", "clean": "rm -rf ./dist/*",

View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { Provider } from 'react-redux'; import { Provider } from 'react-redux';
import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'; import { BrowserRouter as Router, Redirect, Route, Switch } from 'react-router-dom';
import * as Redux from 'redux'; import * as Redux from 'redux';
import thunk from 'redux-thunk'; import thunk from 'redux-thunk';
@ -39,8 +39,9 @@ ReactDOM.render(
<Provider store={ store }> <Provider store={ store }>
<Router> <Router>
<Switch> <Switch>
{ /* <Route exact={ true } path="/" component={ ConnectedPokemonApp } /> */ }
<Route path="/explorer/:id/:form" component={ ConnectedPokemonApp } /> <Route path="/explorer/:id/:form" component={ ConnectedPokemonApp } />
<Redirect from="/" to="/explorer/1/0" />
</Switch> </Switch>
</Router> </Router>
</Provider>, </Provider>,

View File

@ -33,7 +33,10 @@ module.exports = function (env) {
return { return {
devServer: { devServer: {
contentBase: __dirname,
historyApiFallback: true, historyApiFallback: true,
// writeToDisk: true,
// hot: false,
}, },
entry: { entry: {
'global': [ 'global': [