Skip to content

Commit

Permalink
Minor updates & Typings
Browse files Browse the repository at this point in the history
  • Loading branch information
dmythro committed Feb 24, 2016
1 parent 0fcc7e5 commit 83ae241
Show file tree
Hide file tree
Showing 16 changed files with 4,950 additions and 18 deletions.
28 changes: 13 additions & 15 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,25 @@
"node": true,
"es6": true
},
"ecmaFeatures": {
"arrowFunctions": true,
"blockBindings": true,
"classes": true,
"defaultParams": true,
"jsx": true,
"modules": true,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"restParams": true,
"superInFunctions": true,
"templateStrings": true
},
"globals": {
"__dirname": true,
"process": true
},
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
"arrowFunctions": true,
"blockBindings": true,
"classes": true,
"defaultParams": true,
"jsx": true,
"modules": true,
"objectLiteralShorthandMethods": true,
"objectLiteralShorthandProperties": true,
"restParams": true,
"superInFunctions": true,
"templateStrings": true
}
},
"rules": {
Expand All @@ -41,7 +39,6 @@
"linebreak-style": [2, "unix"],
"new-cap": 0,
"no-bitwise": 2,
"no-unused-vars": 2,
"no-caller": 2,
"no-const-assign": 2,
"no-empty": 0,
Expand All @@ -52,6 +49,7 @@
"no-new": 2,
"no-trailing-spaces": [2, { "skipBlankLines": false }],
"no-undef": 2,
"no-unused-vars": 2,
"no-use-before-define": [2, "nofunc"],
"no-unused-expressions": 2,
"semi": [2, "always"],
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ node_modules
app/vendor
cache
build
typings

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
Expand Down
3 changes: 1 addition & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ let vendor = (path) => {
};

const
electronVersion = '0.36.7',
gulp = require('gulp'),
concat = require('gulp-concat'),
babel = require('gulp-babel'),
Expand Down Expand Up @@ -56,7 +55,7 @@ gulp.task('build:app', ['clean:app'], () => {
rebuild: false,
packaging: true,
asar: true,
version: 'v' + electronVersion,
version: 'v' + pkg.electronVersion,
platforms: [
'win32-ia32',
'win32-x64',
Expand Down
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"url": ""
},
"homepage": "",
"eslintConfig": ".eslintrc.json",
"dependencies": {
"react": "^0.14.7",
"react-dom": "^0.14.7"
Expand All @@ -36,12 +37,14 @@
"babel-preset-react": "*",
"babel-preset-stage-1": "*",
"babel-plugin-transform-decorators-legacy": "*",
"electron-prebuilt": "0.36.8",
"del": "*",
"gulp": "*",
"gulp-babel": "*",
"gulp-concat": "*",
"gulp-electron": "*",
"gulp-react": "*"
},
"electronVersion": "0.36.8",
"engine": "node >= 5.6.0"
}
Loading

0 comments on commit 83ae241

Please sign in to comment.