IGNITE-3319 Add eslint run.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8ec0ede Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8ec0ede Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8ec0ede Branch: refs/heads/ignite-3262 Commit: e8ec0ede5c96917a2cdf046142f14b275a0fa5ef Parents: 00d8c0a Author: Andrey Novikov <[email protected]> Authored: Thu Jun 30 15:03:43 2016 +0700 Committer: Andrey Novikov <[email protected]> Committed: Thu Jun 30 15:03:43 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/gulpfile.babel.js/paths.js | 29 ++----------- .../main/js/gulpfile.babel.js/tasks/eslint.js | 43 -------------------- modules/web-console/src/main/js/package.json | 2 +- 3 files changed, 4 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e8ec0ede/modules/web-console/src/main/js/gulpfile.babel.js/paths.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js index 71d2bc6..0f46d01 100644 --- a/modules/web-console/src/main/js/gulpfile.babel.js/paths.js +++ b/modules/web-console/src/main/js/gulpfile.babel.js/paths.js @@ -24,26 +24,11 @@ const destDir = path.resolve('build'); const igniteModulesDir = process.env.IGNITE_MODULES ? path.normalize(process.env.IGNITE_MODULES) : './ignite_modules'; const igniteModulesTemp = path.resolve('ignite_modules_temp'); -const sassPaths = [ - './public/stylesheets/*.scss' -]; - const jadePaths = [ './views/*.jade', './views/**/*.jade' ]; -const jsPaths = [ - './{app,controllers,generator}/*.js', - './{app,controllers,generator}/**/*.js' -]; - -const appPaths = [ - './app/**/*.css', - './app/**/*.jade', - './app/data/*.json' -].concat(jsPaths); - const resourcePaths = [ './public/**/*.png', './public/*.ico' @@ -53,19 +38,16 @@ const jadeModulePaths = [ igniteModulesDir + '/**/view/**/*.jade' ]; -const jsModulePaths = [ +const appModulePaths = [ igniteModulesDir + '/index.js', igniteModulesDir + '/**/main.js', igniteModulesDir + '/**/module.js', igniteModulesDir + '/**/app/modules/*.js', igniteModulesDir + '/**/app/modules/**/*.js', - igniteModulesDir + '/**/app/modules/**/*.jade' -]; - -const appModulePaths = [ + igniteModulesDir + '/**/app/modules/**/*.jade', igniteModulesDir + '/**/app/**/*.css', igniteModulesDir + '/**/app/data/*.json' -].concat(jsModulePaths); +]; const resourceModulePaths = [ igniteModulesDir + '/**/images/*.png' @@ -78,15 +60,10 @@ export { igniteModulesDir, igniteModulesTemp, - sassPaths, - jadePaths, resourcePaths, - jsPaths, - appPaths, jadeModulePaths, resourceModulePaths, - jsModulePaths, appModulePaths }; http://git-wip-us.apache.org/repos/asf/ignite/blob/e8ec0ede/modules/web-console/src/main/js/gulpfile.babel.js/tasks/eslint.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/eslint.js b/modules/web-console/src/main/js/gulpfile.babel.js/tasks/eslint.js deleted file mode 100644 index 67d656e..0000000 --- a/modules/web-console/src/main/js/gulpfile.babel.js/tasks/eslint.js +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import gulp from 'gulp'; -import eslint from 'gulp-eslint'; -import sequence from 'gulp-sequence'; - -const paths = [ - './app/**/*.js', - './controllers/**/*.js', - './generator/**/*.js', - './ignite_modules_temp/**/*.js', - './gulpfile.babel.js/**/*.js', - './gulpfile.babel.js/*.js' -]; - -gulp.task('eslint:node', () => - gulp.src('./serve/**/*.js') - .pipe(eslint({envs: ['node']})) - .pipe(eslint.format()) -); - -gulp.task('eslint:browser', () => - gulp.src(paths) - .pipe(eslint({envs: ['browser']})) - .pipe(eslint.format()) -); - -gulp.task('eslint', (cb) => sequence('eslint:browser', 'eslint:node', cb)); http://git-wip-us.apache.org/repos/asf/ignite/blob/e8ec0ede/modules/web-console/src/main/js/package.json ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/package.json b/modules/web-console/src/main/js/package.json index ed7e480..b2c648d 100644 --- a/modules/web-console/src/main/js/package.json +++ b/modules/web-console/src/main/js/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "cross-env NODE_ENV=development gulp watch", "build": "cross-env NODE_ENV=production gulp build", - "eslint": "eslint --env node --format node_modules/eslint-friendly-formatter gulpfile.babel.js/ serve/" + "eslint": "eslint --env node --format node_modules/eslint-friendly-formatter gulpfile.babel.js/ serve/ app/ controllers/ generator/ ignite_modules/ ignite_modules_temp/" }, "author": "", "contributors": [
