Skip to content

Commit

Permalink
fix(upgrade): upgrade eslint and babel
Browse files Browse the repository at this point in the history
  • Loading branch information
zack9433 committed May 8, 2016
1 parent d59d505 commit d511536
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 25 deletions.
4 changes: 4 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"presets": ["es2015"],
"plugins": ["transform-runtime", "add-module-exports"]
}
29 changes: 12 additions & 17 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
{
"parser": "babel-eslint",
"env": {
"node": 1,
"browser": 1,
"es6": 1
"extends": "eslint:recommended",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module"
},
"globals": {
"angular": 1
"env": {
"es6": true,
"browser": true,
"node": true
},
"rules": {
"quotes": [2, "single", "avoid-escape"],
"eqeqeq": 0,
"yoda": [2, "always"],
"no-use-before-define": 0,
"no-shadow": 0,
"brace-style": [2, "stroustrup"],
"eol-last": 0,
"no-nested-ternary": 1,
"padded-blocks": [1, "never"],
"space-before-function-paren": [1, "never"],
"space-before-blocks": [1, "always"]
"indent": [ 2, 2 ],
"quotes": [ 2, "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
"linebreak-style": [ 2, "unix" ],
"semi": [ 2, "always" ]
}
}
2 changes: 1 addition & 1 deletion app/sanji-window/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ app.controller('SanjiWindowController', SanjiWindowController);
app.controller('SanjiWindowStateController', SanjiWindowStateController);
app.component('sanjiWindow', SanjiWindowComponent);
app.component('sanjiWindowState', SanjiWindowStateComponent);
export default app = app.name
export default app = app.name;
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,19 @@
"devDependencies": {
"angular-mocks": "~1.5.0",
"autoprefixer-loader": "~3.2.0",
"babel-core": "~5.8.34",
"babel-eslint": "~4.1.6",
"babel-loader": "~5.3.3",
"babel-runtime": "~5.8.34",
"babel-core": "^6.0.0",
"babel-eslint": "^6.0.4",
"babel-loader": "^6.0.0",
"babel-plugin-add-module-exports": "^0.2.0",
"babel-plugin-transform-runtime": "^6.0.0",
"babel-preset-es2015": "^6.0.0",
"babel-runtime": "^6.6.1",
"codecov.io": "~0.1.6",
"commitizen": "~2.8.0",
"css-loader": "~0.23.0",
"cz-conventional-changelog": "~1.1.5",
"eslint": "~1.10.3",
"eslint-loader": "~1.2.1",
"eslint": "^2.0.0",
"eslint-loader": "^1.3.0",
"extract-text-webpack-plugin": "~1.0.1",
"file-loader": "~0.8.5",
"ghooks": "~1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var config = {
{test: /\.js$/, loader: "eslint", exclude: /(node_modules)/}
],
loaders: [
{test: /\.js$/, loader: 'ng-annotate!babel', exclude: /(node_modules)/},
{test: /\.js$/, loader: 'ng-annotate!babel?cacheDirectory', exclude: /(node_modules)/},
{test: /\.html$/, loader: 'ng-cache?prefix=[dir]/[dir]', exclude: /(node_modules)/}
],
noParse: []
Expand Down

0 comments on commit d511536

Please sign in to comment.