Skip to content

Commit cccb3f3

Browse files
mittalyashumittalyashu
committed
Update electron packages
* electron * electron-builder * electron-debug
1 parent 0b45822 commit cccb3f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+3357
-3809
lines changed

‎.babelrc‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,25 @@
33
"env": {
44
"main": {
55
"presets": [
6-
["env", {
6+
["@babel/preset-env", {
77
"targets": { "node": 7 }
8-
}],
9-
"stage-0"
8+
}]
109
]
1110
},
1211
"renderer": {
1312
"presets": [
14-
["env", {
13+
["@babel/preset-env", {
1514
"modules": false
16-
}],
17-
"stage-0"
15+
}]
1816
]
1917
},
2018
"web": {
2119
"presets": [
22-
["env", {
20+
["@babel/preset-env", {
2321
"modules": false
24-
}],
25-
"stage-0"
22+
}]
2623
]
2724
}
2825
},
29-
"plugins": ["transform-runtime"]
26+
"plugins": ["@babel/plugin-transform-runtime"]
3027
}

‎.eslintrc.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
module.exports = {
22
root: true,
3-
parser: "babel-eslint",
43
parserOptions: {
4+
parser: "babel-eslint",
55
sourceType: "module",
66
ecmaVersion: 8
77
},
88
env: {
99
browser: true,
1010
node: true
1111
},
12-
extends: ["standard", "prettier", "prettier/vue"],
12+
extends: [
13+
"plugin:vue/base",
14+
"plugin:vue/essential",
15+
"plugin:vue/strongly-recommended",
16+
"plugin:vue/recommended",
17+
"standard",
18+
],
1319
globals: {
1420
__static: true
1521
},
16-
plugins: ["html", "prettier"],
1722
rules: {
1823
// allow debugger during development
19-
"no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
20-
// allow paren-less arrow functions
21-
"arrow-parens": 0,
22-
// allow async-await
23-
"generator-star-spacing": 0,
24-
// enforce consistent single quotes
25-
quotes: [1, "double"],
26-
// enforce consistent indentation
27-
indent: [1, "tab"],
28-
// disallow semicolons instead of ASI
29-
semi: [1, "never"],
30-
// require camelCase
31-
camelcase: 1,
32-
// consistent line endings
33-
"linebreak-style": 1,
24+
"no-debugger": process.env.NODE_ENV === "testing" ? 2 : 0,
25+
// enable semicolons instead of ASI
26+
semi: [1, "always"],
3427
// disable console log
35-
"no-console": process.env.NODE_ENV === "production" ? 2 : 1,
36-
// disallow unused variables
37-
"no-unused-vars": 1
28+
"no-console": 1,
29+
// enforce consistent indentation
30+
"vue/html-indent": [2, "tab"]
31+
},
32+
"overrides": {
33+
"files": ["src/renderer/components/icon/**"],
34+
"rules": {
35+
"vue/max-attributes-per-line": 0,
36+
"vue/html-indent": 0
37+
}
3838
}
3939
}

‎package.json‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -58,53 +58,53 @@
5858
"dependencies": {
5959
"@sentry/electron": "^0.17.0",
6060
"axios": "^0.18.0",
61-
"simple-git": "^1.107.0",
62-
"vue": "^2.5.16",
61+
"simple-git": "1.110.0",
62+
"vue": "2.6.10",
6363
"vue-electron": "^1.0.6",
64-
"vue-router": "^3.0.1",
64+
"vue-router": "3.0.2",
6565
"vuex": "^3.0.1"
6666
},
6767
"devDependencies": {
68+
"@babel/core": "^7.4.3",
69+
"@babel/plugin-transform-runtime": "^7.4.3",
70+
"@babel/preset-env": "^7.4.3",
71+
"@babel/register": "^7.4.0",
72+
"@babel/runtime": "^7.4.3",
6873
"ajv": "^6.5.0",
69-
"babel-core": "^6.26.3",
70-
"babel-eslint": "^8.2.3",
71-
"babel-loader": "^7.1.4",
72-
"babel-plugin-transform-runtime": "^6.23.0",
73-
"babel-preset-env": "^1.7.0",
74-
"babel-preset-stage-0": "^6.24.1",
75-
"babel-register": "^6.26.0",
74+
"babel-eslint": "10.0.1",
75+
"babel-loader": "8.0.5",
7676
"babili-webpack-plugin": "^0.1.2",
7777
"cfonts": "^2.1.2",
7878
"chalk": "^2.4.2",
79-
"copy-webpack-plugin": "^4.5.1",
79+
"copy-webpack-plugin": "5.0.2",
8080
"cross-env": "^5.1.6",
81-
"css-loader": "^0.28.11",
82-
"del": "^3.0.0",
81+
"css-loader": "2.1.1",
82+
"del": "4.1.0",
8383
"devtron": "^1.4.0",
84-
"electron": "^2.0.4",
85-
"electron-builder": "^20.19.2",
86-
"electron-debug": "^1.5.0",
84+
"electron": "4.1.4",
85+
"electron-builder": "20.39.0",
86+
"electron-debug": "2.2.0",
8787
"electron-devtools-installer": "^2.2.4",
88-
"eslint": "^4.19.1",
88+
"eslint": "5.16.0",
8989
"eslint-config-prettier": "^4.1.0",
90-
"eslint-config-standard": "^11.0.0",
90+
"eslint-config-standard": "12.0.0",
9191
"eslint-friendly-formatter": "^4.0.1",
9292
"eslint-loader": "^2.0.0",
93-
"eslint-plugin-html": "^4.0.3",
9493
"eslint-plugin-import": "^2.12.0",
95-
"eslint-plugin-node": "^6.0.1",
94+
"eslint-plugin-node": "8.0.1",
9695
"eslint-plugin-prettier": "^3.0.1",
97-
"eslint-plugin-promise": "^3.8.0",
98-
"eslint-plugin-standard": "^3.1.0",
96+
"eslint-plugin-promise": "4.1.1",
97+
"eslint-plugin-standard": "4.0.0",
9998
"eslint-plugin-vue": "^5.2.2",
100-
"file-loader": "^1.1.11",
99+
"file-loader": "3.0.1",
101100
"html-webpack-plugin": "^3.2.0",
102-
"mini-css-extract-plugin": "0.4.0",
101+
"mini-css-extract-plugin": "0.5.0",
103102
"multispinner": "^0.2.1",
104103
"node-loader": "^0.6.0",
105104
"node-sass": "^4.9.2",
105+
"prettier": "^1.16.4",
106106
"sass-loader": "^7.0.3",
107-
"style-loader": "^0.21.0",
107+
"style-loader": "0.23.1",
108108
"url-loader": "^1.0.1",
109109
"vue-html-loader": "^1.2.4",
110110
"vue-js-toggle-button": "^1.3.2",

‎src/main/index.dev.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
// Install `vue-devtools`
99
require("electron").app.on("ready", () => {
10-
let installExtension = require("electron-devtools-installer")
10+
let installExtension = require("electron-devtools-installer");
1111
installExtension
1212
.default(installExtension.VUEJS_DEVTOOLS)
1313
.then(() => {})
1414
.catch(err => {
15-
console.log("Unable to install `vue-devtools`: \n", err)
16-
})
17-
})
15+
console.log("Unable to install `vue-devtools`: \n", err);
16+
});
17+
});
1818

1919
// Require `main` process to boot app
20-
require("./index")
20+
require("./index");

‎src/main/index.js‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
"use strict"
1+
"use strict";
22

3-
import { app, BrowserWindow } from "electron"
4-
import * as Sentry from "@sentry/electron"
3+
import { app, BrowserWindow } from "electron";
4+
import * as Sentry from "@sentry/electron";
55

6-
require("electron-debug")({ enabled: true })
6+
require("electron-debug")({ enabled: true });
77

88
Sentry.init({
99
dsn: "https://c3fb5f4c94aa4921a71b5fb887e1cfac@sentry.io/1422446",
1010
environment: process.env.NODE_ENV
11-
})
11+
});
1212

1313
/**
1414
* Set `__static` path to static files in production
@@ -17,14 +17,14 @@ Sentry.init({
1717
if (process.env.NODE_ENV !== "development") {
1818
global.__static = require("path")
1919
.join(__dirname, "/static")
20-
.replace(/\\/g, "\\\\")
20+
.replace(/\\/g, "\\\\");
2121
}
2222

23-
let mainWindow
23+
let mainWindow;
2424
const winURL =
2525
process.env.NODE_ENV === "development"
2626
? "http://localhost:9080"
27-
: `file://${__dirname}/index.html`
27+
: `file://${__dirname}/index.html`;
2828

2929
function createWindow() {
3030
/**
@@ -34,31 +34,34 @@ function createWindow() {
3434
height: 563,
3535
useContentSize: true,
3636
width: 1000,
37-
frame: false
38-
})
37+
frame: false,
38+
webPreferences: {
39+
nodeIntegration: true
40+
}
41+
});
3942

40-
mainWindow.loadURL(winURL)
43+
mainWindow.loadURL(winURL);
4144

4245
mainWindow.on("closed", () => {
43-
mainWindow = null
44-
})
46+
mainWindow = null;
47+
});
4548
}
4649

4750
app.on("ready", () => {
48-
createWindow()
49-
})
51+
createWindow();
52+
});
5053

5154
app.on("window-all-closed", () => {
5255
if (process.platform !== "darwin") {
53-
app.quit()
56+
app.quit();
5457
}
55-
})
58+
});
5659

5760
app.on("activate", () => {
5861
if (mainWindow === null) {
59-
createWindow()
62+
createWindow();
6063
}
61-
})
64+
});
6265

6366
/**
6467
* Auto Updater

‎src/renderer/App.vue‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
<template>
2-
<div id="app">
3-
<menubar />
4-
<router-view />
5-
<div
6-
v-if="this.$store.state.model.isActive"
7-
class="model__placeholder"
8-
>
9-
<div class="model__container">
10-
<addLocalRepository />
11-
<about />
12-
<exportCommitData />
13-
<newRemote />
14-
</div>
15-
</div>
16-
</div>
2+
<div id="app">
3+
<menubar />
4+
<router-view />
5+
<div
6+
v-if="this.$store.state.model.isActive"
7+
class="model__placeholder"
8+
>
9+
<div class="model__container">
10+
<addLocalRepository />
11+
<about />
12+
<exportCommitData />
13+
<newRemote />
14+
</div>
15+
</div>
16+
</div>
1717
</template>
1818

1919
<script>
20-
import menubar from "./components/menubar"
21-
import addLocalRepository from "./components/model/addLocalRepository"
22-
import about from "./components/model/about"
23-
import exportCommitData from "./components/model/exportCommitData"
24-
import newRemote from "./components/model/newRemote"
20+
import menubar from "./components/menubar";
21+
import addLocalRepository from "./components/model/addLocalRepository";
22+
import about from "./components/model/about";
23+
import exportCommitData from "./components/model/exportCommitData";
24+
import newRemote from "./components/model/newRemote";
2525
2626
export default {
2727
name: "App",
2828
components: {
29-
menubar,
29+
menubar,
3030
addLocalRepository,
3131
about,
3232
exportCommitData,
3333
newRemote
3434
}
35-
}
35+
};
3636
</script>
3737

3838
<style lang="sass">
39-
.model
40-
&__placeholder
41-
position: fixed
42-
left: 0
43-
top: 0
44-
width: 100%
45-
height: 100%
46-
background-color: rgba(0, 0, 0, .5)
47-
z-index: 9
39+
.model
40+
&__placeholder
41+
position: fixed
42+
left: 0
43+
top: 0
44+
width: 100%
45+
height: 100%
46+
background-color: rgba(0, 0, 0, .5)
47+
z-index: 9
4848
49-
&__container
50-
position: absolute
51-
top: 50%
52-
background-color: white
53-
border-radius: 5px
54-
left: 50%
55-
transform: translate(-50%, -50%)
56-
margin-left: 20px
57-
margin-right: 20px
49+
&__container
50+
position: absolute
51+
top: 50%
52+
background-color: white
53+
border-radius: 5px
54+
left: 50%
55+
transform: translate(-50%, -50%)
56+
margin-left: 20px
57+
margin-right: 20px
5858
59-
&--small
60-
width: 450px
59+
&--small
60+
width: 450px
6161
62-
&--medium
63-
width: 700px
62+
&--medium
63+
width: 700px
6464
65-
&--large
66-
width: 100%
65+
&--large
66+
width: 100%
6767
</style>

0 commit comments

Comments
 (0)