Skip to content
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.

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

Dependencies update #14

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
362aa05
Dependencies update
MrRefactoring Oct 6, 2018
ad50dcc
dependencies updated
MrRefactoring Jan 19, 2019
5841b32
Greenkeeper/initial (#1)
MrRefactoring Jan 24, 2019
0901458
📚 GreenKeeper label removed
MrRefactoring Feb 19, 2019
24b6ce7
Update webpack to version 4.29.5 (#2)
MrRefactoring Feb 19, 2019
dbcd9f5
Update webpack-cli to version 3.2.3 (#3)
MrRefactoring Feb 19, 2019
a9f48d5
Update react (#4)
MrRefactoring Feb 19, 2019
52889fc
📚 Update readme
MrRefactoring Feb 19, 2019
fd752d5
Create .travis.yml
MrRefactoring Feb 19, 2019
8c669e7
Update package.json
MrRefactoring Feb 19, 2019
dd5d8c2
fixes
MrRefactoring Feb 19, 2019
3dc911b
dependencies versions bumped
MrRefactoring Mar 28, 2019
8e37b48
migration to new version of babel
MrRefactoring Mar 28, 2019
2d6b7b6
updated dependency and readme
MrRefactoring Mar 31, 2019
01ded16
versions bumped
MrRefactoring Apr 6, 2019
20a1cfa
webpack version update
MrRefactoring Apr 14, 2019
15706e5
update electron 4 -> electron 5
MrRefactoring Apr 27, 2019
bb2345c
dependecies update
MrRefactoring Jun 10, 2019
98c9bf3
Bump file-loader from 4.3.0 to 6.0.0 (#6)
dependabot-preview[bot] May 24, 2020
f71e3e3
Bump css-loader from 2.1.1 to 3.5.3 (#7)
dependabot-preview[bot] May 24, 2020
acdf7ab
Bump cross-env from 5.2.1 to 7.0.2 (#8)
dependabot-preview[bot] May 24, 2020
50ee916
Bump babel-loader from 8.0.6 to 8.1.0 (#9)
dependabot-preview[bot] May 24, 2020
f33e381
Bump electron from 5.0.13 to 9.0.0 (#5)
dependabot-preview[bot] May 24, 2020
f1707da
dependencies updates
MrRefactoring May 24, 2020
d4056c1
Bump @babel/preset-react from 7.9.4 to 7.10.0 (#10)
dependabot-preview[bot] May 27, 2020
7d20f9e
Bump @babel/core from 7.9.6 to 7.10.0 (#11)
dependabot-preview[bot] May 27, 2020
97f3953
Bump @babel/preset-env from 7.9.6 to 7.10.0 (#12)
dependabot-preview[bot] May 27, 2020
dbfc8b4
Bump @babel/preset-react from 7.10.0 to 7.10.1 (#15)
dependabot-preview[bot] Jun 1, 2020
27cb346
Bump @babel/core from 7.10.0 to 7.10.2 (#17)
dependabot-preview[bot] Jun 1, 2020
08d9f07
Bump electron from 9.0.0 to 9.0.2 (#19)
dependabot-preview[bot] Jun 3, 2020
62c9141
Bump css-loader from 3.5.3 to 3.6.0 (#22)
dependabot-preview[bot] Jun 16, 2020
af82f7d
Bump @babel/preset-env from 7.10.0 to 7.10.2 (#16)
dependabot-preview[bot] Jun 16, 2020
6e5535e
Bump electron from 9.0.2 to 9.0.4 (#21)
dependabot-preview[bot] Jun 16, 2020
549f6d4
Bump webpack-cli from 3.3.11 to 3.3.12 (#23)
dependabot-preview[bot] Jun 19, 2020
d8ec257
Bump electron from 9.0.4 to 9.0.5 (#26)
dependabot-preview[bot] Jun 23, 2020
539078e
Bump @babel/preset-env from 7.10.2 to 7.10.3 (#24)
dependabot-preview[bot] Jun 23, 2020
1de51c0
Bump @babel/preset-env from 7.10.3 to 7.10.4 (#29)
dependabot-preview[bot] Jul 5, 2020
5353718
Bump electron from 9.0.5 to 9.1.0 (#30)
dependabot-preview[bot] Jul 7, 2020
e0a7dd9
Bump @babel/core from 7.10.2 to 7.10.4 (#27)
dependabot-preview[bot] Jul 7, 2020
a37150d
Bump @babel/preset-react from 7.10.1 to 7.10.4 (#28)
dependabot-preview[bot] Jul 7, 2020
9084259
upgrading
MrRefactoring Sep 22, 2021
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
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["env", "react"]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ $ npm start

├── index.html # This HTML only uses build/ folder's files

├── main_process.js # Electron's main process. Whole app is launched from here
├── electronConfig.js # Electron's configuration. Whole app is launched from here
├── package.json
├── webpack.config.js # Webpack 4 setup
```
Expand Down
6 changes: 3 additions & 3 deletions app/build/bundle.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
* Use classes instead of ids
*/

._1WcHgGtKrxqKCsGYj62eVK {
._1S2e0v-Hsq59CJKiB9h-4C {
height: 100px;
}
/*
* Every class name will be hashed so it can be used their own component scoped
* Use classes instead of ids
*/

.sFVP9dDAE84wfL1CUC_NG {
._29aw_R5k2KsQVSNBJTu7U5 {
color: var(--primary-color); /* Using global constants example */
}

._1FRk9e-PmvCebL7xwPN-Hf { /* Composition example */
._uvxNHFF_5yCj0xAzeYli { /* Composition example */
text-decoration: none;
}
/*
Expand Down
295 changes: 83 additions & 212 deletions app/build/bundle.js

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions electronConfig.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Basic init
const { app, BrowserWindow } = require('electron');

// Let electron reloads by itself when webpack watches changes in ./app/
require('electron-reload')(__dirname);

// To avoid being garbage collected
let mainWindow;

app.on('ready', () => {
mainWindow = new BrowserWindow({width: 800, height: 600});
mainWindow.loadURL(`file://${__dirname}/app/index.html`);
});
17 changes: 0 additions & 17 deletions main_process.js

This file was deleted.

29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,31 @@
"name": "electron-react-webpack",
"version": "1.0.0",
"description": "Electron + React 16 + Webpack 4 template.",
"main": "main_process.js",
"main": "electronConfig.js",
"scripts": {
"start": "npm-run-all --parallel bundle serve",
"bundle": "webpack --mode development",
"serve": "electron .",
"start": "npm-run-all --parallel bundle serve"
"serve": "electron ."
},
"author": "J. Renato Ramos González <[email protected]>",
"repository": "pastahito/electron-react-webpack",
"license": "WTFPL",
"devDependencies": {
"babel-core": "^6.26.0",
"babel-loader": "^7.1.4",
"babel-core": "^6.26.3",
"babel-loader": "^7.1.5",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"css-loader": "^0.28.10",
"electron": "^1.8.2",
"electron-reload": "^1.2.2",
"css-loader": "^1.0.0",
"electron": "^3.0.2",
"electron-reload": "^1.2.5",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"file-loader": "^1.1.10",
"npm-run-all": "^4.1.2",
"webpack": "^4.1.1",
"webpack-cli": "^2.0.11"
"file-loader": "^2.0.0",
"npm-run-all": "^4.1.3",
"webpack": "^4.20.2",
"webpack-cli": "^3.1.2"
},
"dependencies": {
"react": "^16.2.0",
"react-dom": "^16.2.0"
"react": "^16.5.2",
"react-dom": "^16.5.2"
}
}
14 changes: 3 additions & 11 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
const ExtractTextPlugin = require('extract-text-webpack-plugin')
const ExtractTextPlugin = require('extract-text-webpack-plugin');

module.exports = {

watch: true,

target: 'electron-renderer',

entry: './app/src/renderer_process.js',

output: {
path: __dirname + '/app/build',
publicPath: 'build/',
filename: 'bundle.js'
},

module: {
rules: [
{
test: /\.jsx?$/,
loader: 'babel-loader',
options: {
presets: ['react']
}
exclude: /node_modules/
},
{
test: /\.css$/,
Expand Down Expand Up @@ -53,5 +46,4 @@ module.exports = {
resolve: {
extensions: ['.js', '.json', '.jsx']
}

}
};