From e953d04d80a0d4ce61f8b9ffd1b59bbef6521e89 Mon Sep 17 00:00:00 2001 From: Carlos Jimenez <=> Date: Thu, 25 Oct 2018 14:36:50 +0200 Subject: [PATCH] #750 configurar reglas de eslint para todos los equipos del proyecto --- .eslintrc.yml | 2 +- package-lock.json | 36 ---------- package.json | 167 +++++++++++++++++++++++----------------------- 3 files changed, 83 insertions(+), 122 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 43deac90a..641867a86 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -1,4 +1,4 @@ -extends: [eslint:recommended, google, plugin:jasmine/recommended] +extends: [google, plugin:jasmine/recommended] parserOptions: ecmaVersion: 2018 sourceType: "module" diff --git a/package-lock.json b/package-lock.json index e479d124c..48fe0ed94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5065,48 +5065,18 @@ } } }, - "eslint-config-angular": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/eslint-config-angular/-/eslint-config-angular-0.5.0.tgz", - "integrity": "sha1-4KrgEy4550Z98/dUf+yBpE02hcQ=", - "dev": true - }, "eslint-config-google": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.11.0.tgz", "integrity": "sha512-z541Fs5TFaY7/35v/z100InQ2f3V2J7e3u/0yKrnImgsHjh6JWgSRngfC/mZepn/+XN16jUydt64k//kxXc1fw==", "dev": true }, - "eslint-config-loopback": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-loopback/-/eslint-config-loopback-12.0.0.tgz", - "integrity": "sha512-Pxz7ecK+/4ufJIMMtQ+XimQUP8qpM9IdVvIg78N17w6/PMBoFEeX1ef+ylb3c4BrAGcTzm+gb8VFtFW2JXoWKA==", - "dev": true, - "requires": { - "eslint-plugin-mocha": "^4.11.0" - } - }, - "eslint-config-xo": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/eslint-config-xo/-/eslint-config-xo-0.25.0.tgz", - "integrity": "sha512-bViV+I3smPWzzhI15U9PIk5CTt1Ym/GqdtRMIK/LePqp0yKLgw+WC51bBZEPgrKcib79uwwOLVPrv+nzoJJj+g==", - "dev": true - }, "eslint-plugin-jasmine": { "version": "2.10.1", "resolved": "https://registry.npmjs.org/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.10.1.tgz", "integrity": "sha1-VzO3CedR9LxA4x4cFpib0s377Jc=", "dev": true }, - "eslint-plugin-mocha": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-4.12.1.tgz", - "integrity": "sha512-hxWtYHvLA0p/PKymRfDYh9Mxt5dYkg2Goy1vZDarTEEYfELP9ksga7kKG1NUKSQy27C8Qjc7YrSWTLUhOEOksA==", - "dev": true, - "requires": { - "ramda": "^0.25.0" - } - }, "eslint-scope": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", @@ -17642,12 +17612,6 @@ "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==", "dev": true }, - "ramda": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz", - "integrity": "sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ==", - "dev": true - }, "randomatic": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz", diff --git a/package.json b/package.json index e4b9d22d0..3ca24cc55 100644 --- a/package.json +++ b/package.json @@ -1,87 +1,84 @@ { - "name": "salix-app", - "version": "1.0.0", - "author": "Verdnatura Levante SL", - "description": "Salix application", - "license": "GPL-3.0", - "repository": { - "type": "git", - "url": "https://git.verdnatura.es/salix" - }, - "dependencies": { - "@uirouter/angularjs": "^1.0.20", - "angular": "^1.7.4", - "angular-cookies": "^1.7.4", - "angular-paging": "^2.2.2", - "angular-translate": "^2.18.1", - "angular-translate-loader-partial": "^2.18.1", - "flatpickr": "^4.5.2", - "fs-extra": "^5.0.0", - "js-yaml": "^3.12.0", - "material-design-lite": "^1.3.0", - "mg-crud": "^1.1.2", - "npm": "^5.10.0", - "oclazyload": "^0.6.3", - "require-yaml": "0.0.1", - "validator": "^6.3.0" - }, - "devDependencies": { - "angular-mocks": "^1.7.4", - "assets-webpack-plugin": "^3.9.6", - "babel": "^6.23.0", - "babel-core": "^6.26.3", - "babel-loader": "^7.1.5", - "babel-preset-es2015": "^6.24.1", - "cors": "^2.8.4", - "css-loader": "^0.25.0", - "del": "^2.2.2", - "eslint": "^5.7.0", - "eslint-config-angular": "^0.5.0", - "eslint-config-google": "^0.11.0", - "eslint-config-loopback": "^12.0.0", - "eslint-config-xo": "^0.25.0", - "eslint-plugin-jasmine": "^2.10.1", - "fancy-log": "^1.3.2", - "file-loader": "^1.1.11", - "gulp": "^3.9.1", - "gulp-concat": "^2.6.1", - "gulp-env": "^0.4.0", - "gulp-extend": "^0.2.0", - "gulp-install": "^1.1.0", - "gulp-jasmine": "^3.0.0", - "gulp-print": "^2.0.1", - "gulp-wrap": "^0.13.0", - "gulp-yaml": "^1.0.1", - "html-loader": "^0.4.5", - "jasmine": "^2.99.0", - "jasmine-spec-reporter": "^4.2.1", - "karma": "^1.7.1", - "karma-chrome-launcher": "^2.2.0", - "karma-firefox-launcher": "^1.1.0", - "karma-jasmine": "^1.1.2", - "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^2.0.13", - "merge-stream": "^1.0.1", - "minimist": "^1.2.0", - "mustache": "^2.3.2", - "mysql2": "^1.6.1", - "nightmare": "^3.0.1", - "node-sass": "^4.9.3", - "nodemon": "^1.18.4", - "plugin-error": "^1.0.1", - "raw-loader": "*", - "run-sequence": "^2.2.1", - "sass-loader": "^6.0.7", - "style-loader": "^0.20.3", - "webpack": "^3.12.0", - "webpack-dev-server": "^2.11.3", - "webpack-merge": "^4.1.4", - "yaml-loader": "^0.5.0" - }, - "scripts": { - "test": "nodemon -q services_tests.js -w services", - "dbtest": "nodemon -q db_tests.js -w services/db/tests", - "lint": "eslint ./ --cache --ignore-pattern .gitignore", - "services": "node --inspect ./node_modules/gulp/bin/gulp.js services" - } + "name": "salix-app", + "version": "1.0.0", + "author": "Verdnatura Levante SL", + "description": "Salix application", + "license": "GPL-3.0", + "repository": { + "type": "git", + "url": "https://git.verdnatura.es/salix" + }, + "dependencies": { + "@uirouter/angularjs": "^1.0.20", + "angular": "^1.7.4", + "angular-cookies": "^1.7.4", + "angular-paging": "^2.2.2", + "angular-translate": "^2.18.1", + "angular-translate-loader-partial": "^2.18.1", + "flatpickr": "^4.5.2", + "fs-extra": "^5.0.0", + "js-yaml": "^3.12.0", + "material-design-lite": "^1.3.0", + "mg-crud": "^1.1.2", + "npm": "^5.10.0", + "oclazyload": "^0.6.3", + "require-yaml": "0.0.1", + "validator": "^6.3.0" + }, + "devDependencies": { + "angular-mocks": "^1.7.4", + "assets-webpack-plugin": "^3.9.6", + "babel": "^6.23.0", + "babel-core": "^6.26.3", + "babel-loader": "^7.1.5", + "babel-preset-es2015": "^6.24.1", + "cors": "^2.8.4", + "css-loader": "^0.25.0", + "del": "^2.2.2", + "eslint": "^5.7.0", + "eslint-config-google": "^0.11.0", + "eslint-plugin-jasmine": "^2.10.1", + "fancy-log": "^1.3.2", + "file-loader": "^1.1.11", + "gulp": "^3.9.1", + "gulp-concat": "^2.6.1", + "gulp-env": "^0.4.0", + "gulp-extend": "^0.2.0", + "gulp-install": "^1.1.0", + "gulp-jasmine": "^3.0.0", + "gulp-print": "^2.0.1", + "gulp-wrap": "^0.13.0", + "gulp-yaml": "^1.0.1", + "html-loader": "^0.4.5", + "jasmine": "^2.99.0", + "jasmine-spec-reporter": "^4.2.1", + "karma": "^1.7.1", + "karma-chrome-launcher": "^2.2.0", + "karma-firefox-launcher": "^1.1.0", + "karma-jasmine": "^1.1.2", + "karma-sourcemap-loader": "^0.3.7", + "karma-webpack": "^2.0.13", + "merge-stream": "^1.0.1", + "minimist": "^1.2.0", + "mustache": "^2.3.2", + "mysql2": "^1.6.1", + "nightmare": "^3.0.1", + "node-sass": "^4.9.3", + "nodemon": "^1.18.4", + "plugin-error": "^1.0.1", + "raw-loader": "*", + "run-sequence": "^2.2.1", + "sass-loader": "^6.0.7", + "style-loader": "^0.20.3", + "webpack": "^3.12.0", + "webpack-dev-server": "^2.11.3", + "webpack-merge": "^4.1.4", + "yaml-loader": "^0.5.0" + }, + "scripts": { + "test": "nodemon -q services_tests.js -w services", + "dbtest": "nodemon -q db_tests.js -w services/db/tests", + "lint": "eslint ./ --cache --ignore-pattern .gitignore", + "services": "node --inspect ./node_modules/gulp/bin/gulp.js services" + } }