From 70dcf26d58d15aecf450ec90066501f0f89e917e Mon Sep 17 00:00:00 2001 From: ntr Date: Thu, 30 May 2019 16:33:55 +1000 Subject: [PATCH] revert preact x --- client/package.json | 9 +++------ client/src/app.jsx | 2 +- client/src/components/game.construct.jsx | 2 +- client/src/components/game.container.jsx | 2 +- client/src/components/header.container.jsx | 2 +- client/src/components/info.container.jsx | 2 +- client/src/components/instance.component.jsx | 2 +- client/src/components/instance.constructs.jsx | 2 +- client/src/components/instance.create.form.jsx | 2 +- client/src/components/instance.equip.jsx | 2 +- client/src/components/list.jsx | 2 +- client/src/components/login.container.jsx | 2 +- client/src/components/main.jsx | 2 +- client/src/components/menu.container.jsx | 2 +- client/src/components/mnml.jsx | 2 +- client/src/components/nav.jsx | 2 +- client/src/components/skill.btn.jsx | 2 +- client/src/components/targeting.arrows.jsx | 2 +- client/src/components/team.jsx | 2 +- client/src/components/vbox.component.jsx | 2 +- 20 files changed, 22 insertions(+), 25 deletions(-) diff --git a/client/package.json b/client/package.json index dd03ae0c..80d32b83 100644 --- a/client/package.json +++ b/client/package.json @@ -22,8 +22,9 @@ "lodash": "^4.17.11", "node-sass": "^4.12.0", "parcel": "^1.12.3", - "preact": "^10.0.0-beta.1", - "react-redux": "^7.0.3", + "preact": "^8.4.2", + "preact-context": "^1.1.3", + "preact-redux": "^2.1.0", "redux": "^4.0.0" }, "devDependencies": { @@ -36,9 +37,5 @@ "eslint-plugin-import": "^2.14.0", "eslint-plugin-react": "^7.11.1", "jest": "^18.0.0" - }, - "alias": { - "react": "preact/compat", - "react-dom": "preact/compat" } } diff --git a/client/src/app.jsx b/client/src/app.jsx index 715103e2..06da152a 100644 --- a/client/src/app.jsx +++ b/client/src/app.jsx @@ -1,7 +1,7 @@ const preact = require('preact'); // const logger = require('redux-diff-logger'); -const { Provider, connect } = require('react-redux'); +const { Provider, connect } = require('preact-redux'); const { createStore, combineReducers } = require('redux'); const reducers = require('./reducers'); diff --git a/client/src/components/game.construct.jsx b/client/src/components/game.construct.jsx index b749e37b..a12d231f 100644 --- a/client/src/components/game.construct.jsx +++ b/client/src/components/game.construct.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const preact = require('preact'); const range = require('lodash/range'); diff --git a/client/src/components/game.container.jsx b/client/src/components/game.container.jsx index 50ebb468..f6709c4c 100644 --- a/client/src/components/game.container.jsx +++ b/client/src/components/game.container.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const actions = require('../actions'); diff --git a/client/src/components/header.container.jsx b/client/src/components/header.container.jsx index 93f24dcf..a9a27313 100644 --- a/client/src/components/header.container.jsx +++ b/client/src/components/header.container.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const Header = require('./header.component'); diff --git a/client/src/components/info.container.jsx b/client/src/components/info.container.jsx index a5c75f2c..9d460ff9 100644 --- a/client/src/components/info.container.jsx +++ b/client/src/components/info.container.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const actions = require('../actions'); const Info = require('./info.component'); diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx index 2bc1b09c..796ac788 100644 --- a/client/src/components/instance.component.jsx +++ b/client/src/components/instance.component.jsx @@ -1,5 +1,5 @@ const preact = require('preact'); -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const Vbox = require('./vbox.component'); const InfoContainer = require('./info.container'); diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx index 91af7728..fabb665e 100644 --- a/client/src/components/instance.constructs.jsx +++ b/client/src/components/instance.constructs.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const preact = require('preact'); const range = require('lodash/range'); diff --git a/client/src/components/instance.create.form.jsx b/client/src/components/instance.create.form.jsx index 77a8abfc..33d7e219 100644 --- a/client/src/components/instance.create.form.jsx +++ b/client/src/components/instance.create.form.jsx @@ -1,5 +1,5 @@ const preact = require('preact'); -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const { Component } = require('preact'); const addState = connect( diff --git a/client/src/components/instance.equip.jsx b/client/src/components/instance.equip.jsx index a5f8f813..bc44bc0c 100644 --- a/client/src/components/instance.equip.jsx +++ b/client/src/components/instance.equip.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const preact = require('preact'); const range = require('lodash/range'); diff --git a/client/src/components/list.jsx b/client/src/components/list.jsx index d5f6c926..778f9e11 100644 --- a/client/src/components/list.jsx +++ b/client/src/components/list.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const preact = require('preact'); const { stringSort, NULL_UUID, COLOURS, constructAvatar } = require('./../utils'); diff --git a/client/src/components/login.container.jsx b/client/src/components/login.container.jsx index 32a451c4..d0ca7fe4 100644 --- a/client/src/components/login.container.jsx +++ b/client/src/components/login.container.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const Login = require('./login.component'); diff --git a/client/src/components/main.jsx b/client/src/components/main.jsx index ec4b132e..c38cd7cb 100644 --- a/client/src/components/main.jsx +++ b/client/src/components/main.jsx @@ -1,6 +1,6 @@ // eslint-disable-next-line const preact = require('preact'); -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const LoginContainer = require('./login.container'); const GameContainer = require('./game.container'); diff --git a/client/src/components/menu.container.jsx b/client/src/components/menu.container.jsx index a43dab97..c4918b72 100644 --- a/client/src/components/menu.container.jsx +++ b/client/src/components/menu.container.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const Menu = require('./menu.component'); const actions = require('./../actions'); diff --git a/client/src/components/mnml.jsx b/client/src/components/mnml.jsx index b69c718c..316886ce 100644 --- a/client/src/components/mnml.jsx +++ b/client/src/components/mnml.jsx @@ -1,5 +1,5 @@ const preact = require('preact'); -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const actions = require('./../actions'); const Header = require('./header.container'); diff --git a/client/src/components/nav.jsx b/client/src/components/nav.jsx index 244bce49..ce1c88e2 100644 --- a/client/src/components/nav.jsx +++ b/client/src/components/nav.jsx @@ -1,4 +1,4 @@ -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const preact = require('preact'); const { Fragment } = require('preact'); const actions = require('../actions'); diff --git a/client/src/components/skill.btn.jsx b/client/src/components/skill.btn.jsx index 58fc922a..1f2e2740 100644 --- a/client/src/components/skill.btn.jsx +++ b/client/src/components/skill.btn.jsx @@ -1,5 +1,5 @@ const preact = require('preact'); -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const actions = require('../actions'); diff --git a/client/src/components/targeting.arrows.jsx b/client/src/components/targeting.arrows.jsx index b114fb9d..6f578aa9 100644 --- a/client/src/components/targeting.arrows.jsx +++ b/client/src/components/targeting.arrows.jsx @@ -1,5 +1,5 @@ const preact = require('preact'); -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const addState = connect( ({ game, account, resolution }) => ({ game, account, resolution }) diff --git a/client/src/components/team.jsx b/client/src/components/team.jsx index 151c73d9..0acb1b3f 100644 --- a/client/src/components/team.jsx +++ b/client/src/components/team.jsx @@ -1,5 +1,5 @@ const preact = require('preact'); -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const range = require('lodash/range'); const actions = require('./../actions'); diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx index 555694ea..df699660 100644 --- a/client/src/components/vbox.component.jsx +++ b/client/src/components/vbox.component.jsx @@ -1,6 +1,6 @@ const preact = require('preact'); const range = require('lodash/range'); -const { connect } = require('react-redux'); +const { connect } = require('preact-redux'); const shapes = require('./shapes'); const { convertItem } = require('./../utils');