Skip to content

Upgraded boilerplate all package to latest version #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Upgraded boilerplate all package to latest version #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8d7796a
Upgraded all package and updated react render api, electron-forge config
NorthBei Jul 24, 2022
4bd2c3c
Replace eslint-plugin-node with eslint-plugin-n for eslint-config-sta…
NorthBei Jul 24, 2022
903920f
Upgrade typescript-eslint relative package to latest
NorthBei Jul 27, 2022
5473d9b
Upgrade electron relative package to latest
NorthBei Jul 27, 2022
20d8899
Add img-src directive to support https image loading
NorthBei Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 42 additions & 41 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Diego Fernandes <[email protected]>",
"version": "2.0.0",
"description": "An Electron boilerplate including TypeScript, React, Jest and ESLint.",
"main": "./.webpack/main/index.js",
"main": "./.webpack/main",
"scripts": {
"start": "electron-forge start",
"package": "electron-forge package",
Expand All @@ -15,52 +15,52 @@
"keywords": [],
"license": "MIT",
"dependencies": {
"react": "17.0.2",
"react-dom": "17.0.2",
"react-hot-loader": "4.13.0",
"styled-components": "5.3.0"
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hot-loader": "^4.13.0",
"styled-components": "^5.3.5"
},
"devDependencies": {
"@babel/core": "7.14.6",
"@babel/plugin-transform-runtime": "7.14.5",
"@babel/preset-env": "7.14.5",
"@babel/preset-react": "7.14.5",
"@babel/preset-typescript": "7.14.5",
"@electron-forge/cli": "6.0.0-beta.57",
"@electron-forge/maker-deb": "6.0.0-beta.57",
"@electron-forge/maker-rpm": "6.0.0-beta.57",
"@electron-forge/maker-squirrel": "6.0.0-beta.57",
"@electron-forge/maker-zip": "6.0.0-beta.57",
"@electron-forge/plugin-webpack": "6.0.0-beta.57",
"@babel/core": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.18.6",
"@babel/preset-env": "^7.18.6",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "^7.18.6",
"@electron-forge/cli": "^6.0.0-beta.65",
"@electron-forge/maker-deb": "^6.0.0-beta.65",
"@electron-forge/maker-rpm": "^6.0.0-beta.65",
"@electron-forge/maker-squirrel": "^6.0.0-beta.65",
"@electron-forge/maker-zip": "^6.0.0-beta.65",
"@electron-forge/plugin-webpack": "^6.0.0-beta.65",
"@marshallofsound/webpack-asset-relocator-loader": "0.5.0",
"@testing-library/jest-dom": "5.14.1",
"@testing-library/react": "11.2.7",
"@types/electron-devtools-installer": "2.2.0",
"@types/jest": "26.0.23",
"@types/react": "17.0.11",
"@types/react-dom": "17.0.8",
"@types/styled-components": "5.1.10",
"@typescript-eslint/eslint-plugin": "4.27.0",
"@typescript-eslint/parser": "4.27.0",
"babel-loader": "8.2.2",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@types/electron-devtools-installer": "^2.2.2",
"@types/jest": "^28.1.5",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@types/styled-components": "^5.1.25",
"@typescript-eslint/eslint-plugin": "^5.31.0",
"@typescript-eslint/parser": "^5.31.0",
"babel-loader": "^8.2.5",
"cross-env": "7.0.3",
"electron": "13.1.2",
"eslint": "7.29.0",
"eslint-config-prettier": "8.3.0",
"eslint-config-standard": "16.0.3",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "3.4.0",
"eslint-plugin-promise": "5.1.0",
"eslint-plugin-react": "7.24.0",
"eslint-plugin-standard": "5.0.0",
"electron": "^19.0.10",
"eslint": "^8.19.0",
"eslint-config-prettier": "^8.5.0",
"eslint-config-standard": "^17.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-n": "^15.2.4",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-react": "^7.30.1",
"eslint-plugin-standard": "^5.0.0",
"file-loader": "^6.2.0",
"jest": "27.0.4",
"jest": "^28.1.3",
"npm-run-all": "4.1.5",
"prettier": "2.3.1",
"ts-jest": "27.0.3",
"typescript": "4.3.4",
"wait-on": "5.3.0"
"prettier": "^2.7.1",
"ts-jest": "^28.0.6",
"typescript": "^4.7.4",
"wait-on": "^6.0.1"
},
"config": {
"forge": {
Expand All @@ -77,6 +77,7 @@
"@electron-forge/plugin-webpack",
{
"mainConfig": "./webpack/main.webpack.js",
"devContentSecurityPolicy": "default-src 'self' 'unsafe-inline' data:; script-src 'self' 'unsafe-eval' 'unsafe-inline' data:; img-src 'self' 'unsafe-eval' 'unsafe-inline' data: https:",
"renderer": {
"config": "./webpack/renderer.webpack.js",
"entryPoints": [
Expand Down
12 changes: 9 additions & 3 deletions src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import ReactDOM from "react-dom";
import { App } from "./App";
import React from 'react'
import ReactDOM from 'react-dom/client'
import { App } from './App'

ReactDOM.render(<App />, document.getElementById("root"));
const root = ReactDOM.createRoot(document.getElementById('root') || new HTMLBodyElement())
root.render(
<React.StrictMode>
<App />
</React.StrictMode>
)
Loading