Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: Use eslint instead of grunt-eslint

Browse source
This commit is contained in:
1ambda 2017-04-14 09:40:25 +09:00
parent 7b585c7399
commit 4baadbb0aa
3 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
zeppelin-web/.eslintrc
View file

@ -1,5 +1,5 @@
{
"preset": "google",
"extends": ["eslint:recommended", "google", "standard"],
"env": {
"browser": true,
"jasmine": true,

27
zeppelin-web/Gruntfile.js
View file

@ -104,13 +104,6 @@ module.exports = function(grunt) {
files: ['bower.json'],
tasks: ['wiredep']
},
js: {
files: [
'<%= yeoman.app %>/app/**/*.js',
'<%= yeoman.app %>/components/**/*.js'
],
tasks: ['newer:eslint:all'],
},
html: {
files: [
'<%= yeoman.app %>/**/*.html'
@ -120,7 +113,6 @@ module.exports = function(grunt) {
jsTest: {
files: ['test/spec/{,*/}*.js'],
tasks: [
'newer:eslint:test',
'karma'
]
},
@ -148,24 +140,6 @@ module.exports = function(grunt) {
}
},
eslint: {
all: {
src: [
'Gruntfile.js',
'<%= yeoman.app %>/app/**/*.js',
'<%= yeoman.app %>/components/**/*.js'
]
},
test: {
options: {
rules: {
'no-undef': 0
}
},
src: ['test/spec/{,*/}*.js']
}
},
// Add vendor prefixed styles
postcss: {
options: {
@ -430,7 +404,6 @@ module.exports = function(grunt) {
]);
grunt.registerTask('pre-webpack-dist', [
'eslint',
'htmlhint',
'wiredep',
]);

18
zeppelin-web/package.json
View file

@ -8,13 +8,15 @@
"scripts": {
"clean": "rimraf dist && rimraf .tmp",
"postinstall": "bower install --silent",
"prebuild": "npm-run-all clean",
"prebuild": "npm-run-all clean lint:once",
"build": "grunt pre-webpack-dist && webpack && grunt post-webpack-dist",
"lint:watch": "esw --watch src",
"lint:once": "eslint src",
"predev": "grunt pre-webpack-dev",
"dev:server": "webpack-dev-server --hot",
"dev:helium": "HELIUM_BUNDLE_DEV=true webpack-dev-server --hot",
"dev:watch": "grunt watch-webpack-dev",
"dev": "npm-run-all --parallel dev:server dev:watch",
"dev": "npm-run-all --parallel dev:server lint:watch dev:watch",
"visdev": "npm-run-all --parallel visdev:server dev:watch",
"pretest": "npm install karma-phantomjs-launcher babel-polyfill",
"test": "karma start karma.conf.js"
@ -33,7 +35,14 @@
"bower": "^1.8.0",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.26.1",
"eslint": "^3.19.0",
"eslint-config-google": "^0.7.1",
"eslint-config-standard": "^10.2.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-node": "^4.2.2",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-standard": "^3.0.1",
"eslint-watch": "^3.1.0",
"express": "^4.14.0",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.9.0",
@ -47,7 +56,6 @@
"grunt-contrib-htmlmin": "^0.3.0",
"grunt-contrib-uglify": "^0.4.0",
"grunt-contrib-watch": "^0.6.1",
"grunt-eslint": "^19.0.0",
"grunt-filerev": "^0.2.1",
"grunt-htmlhint": "^0.9.13",
"grunt-newer": "^0.7.0",
@ -70,11 +78,11 @@
"postcss-loader": "^1.2.1",
"raw-loader": "^0.5.1",
"rimraf": "^2.5.4",
"string-replace-webpack-plugin": "^0.1.3",
"style-loader": "^0.13.1",
"time-grunt": "^0.3.1",
"webpack": "^1.14.0",
"webpack-dev-server": "^1.16.2",
"string-replace-webpack-plugin": "^0.1.3"
"webpack-dev-server": "^1.16.2"
},
"repository": {
"type": "git",