Skip to content

Commit c0ec459

Browse files
committedAug 17, 2018
chore(eslint): disable typescript eslint conflict rules
1 parent 4f8d7cb commit c0ec459

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed
 

‎.eslintrc.js

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ module.exports = {
66
extends: ['plugin:vue/essential', '@vue/airbnb', '@vue/typescript'],
77
rules: {
88
strict: 'off',
9+
indent: 'off',
10+
'space-infix-ops': 'off',
11+
'object-curly-newline': 'off',
912
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1013
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1114
'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],

‎src/main/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ function createMainWindow() {
2424
index: isDevelopment
2525
? process.env.WEBPACK_DEV_SERVER_URL
2626
: formatUrl({
27-
pathname: path.join(__dirname, 'index.html'),
28-
protocol: 'file',
29-
slashes: true,
30-
}),
27+
pathname: path.join(__dirname, 'index.html'),
28+
protocol: 'file',
29+
slashes: true,
30+
}),
3131
height: 190,
3232
width: 420,
3333
hasShadow: false,

‎yarn.lock

+1-2
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,6 @@
872872

873873
"@vue/cli-service@https://github.com/nklayman/vue-cli-plugin-electron-builder/raw/master/vue-cli-service-custom-2.tgz":
874874
version "3.0.0-rc.2"
875-
uid "3bc04776e28672df9e7297b83cab510cdca4c657"
876875
resolved "https://github.com/nklayman/vue-cli-plugin-electron-builder/raw/master/vue-cli-service-custom-2.tgz#3bc04776e28672df9e7297b83cab510cdca4c657"
877876
dependencies:
878877
"@vue/cli-overlay" "^3.0.0-rc.2"
@@ -925,7 +924,7 @@
925924
webpack-merge "^4.1.2"
926925
yorkie "^1.0.3"
927926

928-
"@vue/cli-shared-utils@^3.0.0", "@vue/cli-shared-utils@^3.0.0-rc.2":
927+
"@vue/cli-shared-utils@^3.0.0-rc.2":
929928
version "3.0.0"
930929
resolved "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-3.0.0.tgz#f4886ce9a62dd2088e112af4d54f61c1667318d0"
931930
dependencies:

0 commit comments

Comments
 (0)
Please sign in to comment.