Replace jscs with eslint to fix lodash security issue

plus update dependencies
This commit is contained in:
Amandus Butzer 2019-09-06 13:46:59 +02:00
parent fc8458ee34
commit 3a6f7b2bb6
11 changed files with 5066 additions and 30 deletions

25
.eslintrc.json Normal file
View File

@ -0,0 +1,25 @@
{
"extends": ["eslint:recommended"],
"env": {
"es6": true,
"node": true
},
"parserOptions": {
"sourceType": "module",
"ecmaFeatures": {
"ecmaVersion": 8,
"jsx": true
}
},
"rules":{
"no-console": 0,
"curly": 1,
"eqeqeq": 1,
"no-eq-null": 1,
"wrap-iife": 1,
"no-use-before-define": 1,
"new-cap": 1,
"no-caller": 1,
"dot-notation": 1
}
}

View File

@ -1,3 +0,0 @@
{
"preset": "grunt"
}

View File

@ -3,10 +3,9 @@ sudo: false
language: node_js
node_js:
- "4"
- "6"
- "8"
- "9"
- "10"
matrix:
fast_finish: true

View File

@ -1,3 +1,8 @@
v1.1.1:
date: 2019-09-24
changes:
- Replace jscs with eslint due to security issue in used lodash version
- Update async, lodash, grunt, grunt-contrib-* dependencies
v1.1.0:
date: 2018-05-12
changes:

View File

@ -1 +1 @@
Please see the [Contributing to grunt](http://gruntjs.com/contributing) guide for information on contributing to this project.
Please see the [Contributing to grunt](https://gruntjs.com/contributing) guide for information on contributing to this project.

View File

@ -20,11 +20,11 @@ module.exports = function(grunt) {
jshintrc: '.jshintrc'
}
},
jscs: {
src: ['tasks/**/*.js', 'test/tasks/**/*.js'],
eslint: {
options: {
config: '.jscsrc'
}
configFile: '.eslintrc.json'
},
target: ['tasks/**/*.js', 'test/tasks/**/*.js', 'Gruntfile.js', ]
},
watch: {
all: {
@ -40,17 +40,18 @@ module.exports = function(grunt) {
// Dynamic alias task to nodeunit. Run individual tests with: grunt test:events
grunt.registerTask('test', function(file) {
grunt.task.run('jshint');
grunt.task.run('jscs');
grunt.task.run('eslint');
grunt.config('nodeunit.tests', String(grunt.config('nodeunit.tests')).replace('*', file || '*'));
grunt.task.run('nodeunit');
});
grunt.loadTasks('tasks');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-nodeunit');
grunt.loadNpmTasks('grunt-contrib-internal');
grunt.loadNpmTasks('grunt-jscs');
grunt.loadNpmTasks('grunt-eslint');
grunt.loadTasks('tasks');
grunt.registerTask('default', ['test', 'build-contrib']);
};

View File

@ -1,4 +1,4 @@
# grunt-contrib-watch v1.1.0 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-watch.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-watch) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/olyu3uhcq59avm8v/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-watch/branch/master)
# grunt-contrib-watch v1.1.1 [![Build Status: Linux](https://travis-ci.org/gruntjs/grunt-contrib-watch.svg?branch=master)](https://travis-ci.org/gruntjs/grunt-contrib-watch) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/olyu3uhcq59avm8v/branch/master?svg=true)](https://ci.appveyor.com/project/gruntjs/grunt-contrib-watch/branch/master)
> Run predefined tasks whenever watched file patterns are added, changed or deleted
@ -6,7 +6,7 @@
## Getting Started
If you haven't used [Grunt](http://gruntjs.com/) before, be sure to check out the [Getting Started](http://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](http://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
If you haven't used [Grunt](https://gruntjs.com/) before, be sure to check out the [Getting Started](https://gruntjs.com/getting-started) guide, as it explains how to create a [Gruntfile](https://gruntjs.com/sample-gruntfile) as well as install and use Grunt plugins. Once you're familiar with that process, you may install this plugin with this command:
```shell
npm install grunt-contrib-watch --save-dev
@ -483,6 +483,7 @@ You'll have the `connect` web server on separate port ex: port 9000 from your ma
## Release History
* 2019-09-24v1.1.1Replace jscs with eslint due to security issue in used lodash version
* 2018-05-12v1.1.0Update to `tiny-lr@1.1.1`, `lodash@4.17.10`, `async@2.6.0`
* 2018-04-20v1.0.1Update to `gaze@1.1`, `lodash@4`
* 2016-03-12v1.0.0Updated tiny-lr, gaze, async and lodash dependencies. Fix endless loop issue with `atBegin`/`nospawn`. Expose hostname parameter of tiny-lr. Support `cwd.event` to emit events relative to path. Removed peerDependencies setting.
@ -513,4 +514,4 @@ You'll have the `connect` web server on separate port ex: port 9000 from your ma
Task submitted by [Kyle Robinson Young](http://dontkry.com)
*This file was generated on Sat May 12 2018 21:15:02.*
*This file was generated on Tue Sep 24 2019 12:44:44.*

View File

@ -5,15 +5,11 @@ version: "{build}"
# What combinations to test
environment:
matrix:
- nodejs_version: "4"
platform: x64
- nodejs_version: "4"
platform: x86
- nodejs_version: "6"
platform: x86
- nodejs_version: "8"
platform: x86
- nodejs_version: "9"
- nodejs_version: "10"
platform: x86
install:

5011
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
{
"name": "grunt-contrib-watch",
"description": "Run predefined tasks whenever watched file patterns are added, changed or deleted",
"version": "1.1.0",
"version": "1.1.1",
"author": {
"name": "Grunt Team",
"url": "http://gruntjs.com/"
@ -16,18 +16,18 @@
"test": "grunt test -v"
},
"dependencies": {
"async": "^2.6.0",
"async": "^3.1.0",
"gaze": "^1.1.0",
"lodash": "^4.17.10",
"lodash": "^4.17.15",
"tiny-lr": "^1.1.1"
},
"devDependencies": {
"grunt": "^1.0.2",
"grunt": "^1.0.4",
"grunt-cli": "^1.2.0",
"grunt-contrib-internal": "^2.0.0",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-nodeunit": "^1.0.0",
"grunt-jscs": "^3.0.0",
"grunt-contrib-internal": "^3.1.0",
"grunt-contrib-jshint": "^2.1.0",
"grunt-contrib-nodeunit": "^2.0.0",
"grunt-eslint": "^21.1.0",
"underscore.string": "^3.2.2"
},
"keywords": [

View File

@ -1,6 +1,7 @@
var grunt = require('grunt');
var path = require('path');
var _ = require('lodash');
var helper = {};
module.exports = helper = {};