Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

Commit

Permalink
Fix webpack failing due to warning and fix react-pdf compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
fadeenk committed Oct 21, 2018
1 parent 5986426 commit c7420ae
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ sudo: false
language: node_js
script:
- npm run eslint
- unset CI
- npm run build
- CI=true
node_js:
- "6"
- "8"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"react": "16.5.2",
"react-dom": "16.5.2",
"react-particles-js": "2.3.0",
"react-pdf": "3.0.5",
"react-pdf": "4.0.0-beta.5",
"react-redux": "5.0.7",
"react-router": "4.3.1",
"react-router-dom": "4.3.1",
Expand Down Expand Up @@ -50,4 +50,4 @@
"not ie <= 11",
"not op_mini all"
]
}
}
13 changes: 8 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@ import React from 'react';
import ReactDOM from 'react-dom';
import theme from './muiTheme';
import { MuiThemeProvider, createMuiTheme } from '@material-ui/core/styles'; // v1.x
import { createStore, combineReducers, applyMiddleware } from 'redux'
import { Provider } from 'react-redux'
import { ConnectedRouter, routerReducer, routerMiddleware } from 'react-router-redux'
import { Route } from 'react-router'
import createHistory from 'history/createBrowserHistory'
import { createStore, combineReducers, applyMiddleware } from 'redux';
import { Provider } from 'react-redux';
import { ConnectedRouter, routerReducer, routerMiddleware } from 'react-router-redux';
import { Route } from 'react-router';
import createHistory from 'history/createBrowserHistory';
import createRavenMiddleware from "raven-for-redux";
import App from './pages/index';
import reducers from './reducers';
import './index.css';
import { pdfjs } from 'react-pdf';
pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;


const history = createHistory()
const middleware = routerMiddleware(history)
Expand Down

0 comments on commit c7420ae

Please sign in to comment.