Skip to content

Commit

Permalink
Updated Preact to v10 rc (#222)
Browse files Browse the repository at this point in the history
* Updated Preact to v10 alpha
* Added yarn.lock to gitignore
* Update package-lock.json

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
  • Loading branch information
arthurtyukayev authored and deathbeam committed Oct 17, 2019
1 parent c8b5111 commit 1e4f3a3
Show file tree
Hide file tree
Showing 15 changed files with 2,041 additions and 1,765 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ typings/
# Output of 'npm pack'
*.tgz

# Yarn Integrity file
# Yarn
.yarn-integrity
yarn.lock

# dotenv environment variables file
.env
Expand Down
5 changes: 2 additions & 3 deletions config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,8 @@ module.exports = override(
useBabelRc(),
useEslintRc(),
addWebpackAlias({
react: 'preact-compat',
'react-dom': 'preact-compat',
'mobx-react': 'mobx-preact'
react: 'preact/compat',
'react-dom': 'preact/compat'
}),
addSitePlugins()
)
3,767 changes: 2,022 additions & 1,745 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
"bootstrap": "4.3.1",
"dayjs": "1.8.5",
"platform": "1.3.5",
"preact": "8.4.2",
"preact-compat": "3.18.4",
"preact-redux": "2.0.3",
"preact-router": "2.6.1",
"preact": "^10.0.0",
"preact-router": "^3.0.1",
"ramda": "0.26.1",
"react-redux": "^7.1.0",
"recharts": "1.4.2",
"redux": "4.0.1",
"redux-actions": "2.6.4",
Expand Down
2 changes: 1 addition & 1 deletion src/components/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '@fortawesome/fontawesome-free/css/all.min.css'
import { h } from 'preact'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import Router from 'preact-router'
import { bindActionCreators } from 'redux'
import './app.scss'
Expand Down
2 changes: 1 addition & 1 deletion src/components/hero.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import platform from 'platform'
import { h, Component } from 'preact'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import { filter, find } from 'ramda'
import { bindActionCreators } from 'redux'
import { getChristmasImage } from '../season'
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { h, render } from 'preact'
import { Provider } from 'preact-redux'
import { Provider } from 'react-redux'
import App from './components/app'
import configureStore from './store'
import { sessionCheck } from './modules/account'
Expand All @@ -24,4 +24,4 @@ const Main = () => (

// Show website contents
const root = document.getElementById('root')
render(<Main />, root, root.firstElementChild)
render(<Main />, root)
2 changes: 1 addition & 1 deletion src/routes/account.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { h } from 'preact'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import { Link } from 'preact-router'
import { bindActionCreators } from 'redux'
import Layout from '../components/layout'
Expand Down
2 changes: 1 addition & 1 deletion src/routes/account/grand-exchange.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { h } from 'preact'
import ago from 's-ago'
import { numberWithCommas } from '../../util'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import {
fetchGe,
getFilteredGe,
Expand Down
2 changes: 1 addition & 1 deletion src/routes/account/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import '@gouch/to-title-case'
import { toMMSS } from '../../util'
import { bindActionCreators } from 'redux'
import { fetchConfig, getBossLog, getSlayerTask } from '../../modules/config'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import { fetchReleases } from '../../modules/git'
import prepare from '../../components/prepare'

Expand Down
2 changes: 1 addition & 1 deletion src/routes/account/loot-tracker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { h } from 'preact'
import '../../components/tooltip.css'
import './loot-tracker.css'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import {
fetchLoot,
getGroupedLoot,
Expand Down
2 changes: 1 addition & 1 deletion src/routes/home.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { h } from 'preact'
import './home.scss'
import './blog.scss'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import Feature from '../components/feature'
import Layout from '../components/layout'
import Hero from '../components/hero'
Expand Down
2 changes: 1 addition & 1 deletion src/routes/tag-show.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Meta from '../components/meta'
import { bindActionCreators } from 'redux'
import { fetchReleases, getLatestRelease } from '../modules/git'
import { fetchItemInfo } from '../modules/item'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import '../components/tooltip.css'
import './tag.css'
import prepare from '../components/prepare'
Expand Down
2 changes: 1 addition & 1 deletion src/routes/tag.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Meta from '../components/meta'
import { bindActionCreators } from 'redux'
import './tag.css'
import { setActiveTag } from '../modules/tag'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'

const Tag = ({ activeTag, setActiveTag }) => (
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/xp-show.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { h } from 'preact'
import { connect } from 'preact-redux'
import { connect } from 'react-redux'
import { Link } from 'preact-router'
import { bindActionCreators } from 'redux'
import dayjs from 'dayjs'
Expand Down

0 comments on commit 1e4f3a3

Please sign in to comment.