Skip to content

Commit

Permalink
revert react & electron version updates
Browse files Browse the repository at this point in the history
  • Loading branch information
xgi committed Jul 13, 2022
1 parent 874c702 commit 63225df
Show file tree
Hide file tree
Showing 4 changed files with 339 additions and 354 deletions.
25 changes: 12 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "houdoku",
"productName": "Houdoku",
"description": "Manga reader and library manager for the desktop",
"version": "2.9.1",
"version": "2.9.2",
"scripts": {
"build": "concurrently \"yarn build:main\" \"yarn build:renderer\"",
"build:main": "cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.main.prod.babel.js",
Expand Down Expand Up @@ -176,11 +176,11 @@
"@types/mousetrap": "^1.6.8",
"@types/node": "17.0.25",
"@types/node-fetch": "^2.5.12",
"@types/react": "^18.0.14",
"@types/react-dom": "^18.0.5",
"@types/react": "^17.0.37",
"@types/react-dom": "^17.0.11",
"@types/react-redux": "^7.1.20",
"@types/react-router-dom": "^5.1.6",
"@types/react-test-renderer": "^18.0.0",
"@types/react-test-renderer": "^17.0.1",
"@types/rimraf": "^3.0.2",
"@types/semver": "^7.3.9",
"@types/uuid": "^8.3.3",
Expand All @@ -201,11 +201,11 @@
"detect-port": "^1.3.0",
"discord-rpc": "^4.0.1",
"dom-parser": "^0.1.6",
"electron": "^19.0.7",
"electron-builder": "^23.1.0",
"electron": "^18.0.3",
"electron-builder": "^23.0.3",
"electron-devtools-installer": "^3.2.0",
"electron-notarize": "^1.0.0",
"electron-rebuild": "^3.2.7",
"electron-rebuild": "^3.2.5",
"eslint": "^8.5.0",
"eslint-config-airbnb": "^19.0.2",
"eslint-config-airbnb-typescript": "^16.1.0",
Expand All @@ -222,7 +222,7 @@
"eslint-plugin-react-hooks": "^4.3.0",
"file-loader": "^6.0.0",
"formdata-node": "^4.3.1",
"houdoku-extension-lib": "^1.7.2",
"houdoku-extension-lib": "^1.7.1",
"identity-obj-proxy": "^3.0.0",
"jest": "^27.4.5",
"lint-staged": "^12.1.3",
Expand All @@ -232,7 +232,7 @@
"pkce-challenge": "^2.2.0",
"prettier": "^2.5.1",
"react-refresh": "^0.11.0",
"react-test-renderer": "^18.2.0",
"react-test-renderer": "^17.0.2",
"rimraf": "^3.0.2",
"sass-loader": "^12.4.0",
"semver": "^7.3.5",
Expand All @@ -250,8 +250,7 @@
"dependencies": {
"@reduxjs/toolkit": "^1.7.1",
"aki-plugin-manager": "^1.3.3",
"antd": "^4.21.5",
"caniuse-lite": "^1.0.30001358",
"antd": "^4.17.4",
"connected-react-router": "^6.9.2",
"electron-debug": "^3.1.0",
"electron-log": "^4.4.3",
Expand All @@ -260,8 +259,8 @@
"jszip": "^3.6.0",
"mousetrap": "^1.6.5",
"node-fetch": "^2.6.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-redux": "^7.2.6",
"react-router-dom": "^5.2.0",
"redux": "^4.1.2",
Expand Down
11 changes: 4 additions & 7 deletions src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import React from 'react';
import { createRoot } from 'react-dom/client';
import { render } from 'react-dom';
import App from './App';
import './App.global.css';
import { ErrorBoundary } from './components/general/ErrorBoundary';
import { createWindowControlListeners } from './util/titlebar';

createWindowControlListeners();

const container = document.getElementById('root');
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const root = createRoot(container!);
root.render(
render(
<ErrorBoundary>
<App />
</ErrorBoundary>
</ErrorBoundary>,
document.getElementById('root')
);
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "houdoku",
"productName": "Houdoku",
"version": "2.9.1",
"version": "2.9.2",
"description": "Manga reader and library manager for the desktop",
"main": "./main.prod.js",
"author": {
Expand Down
Loading

0 comments on commit 63225df

Please sign in to comment.