Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace jscs with eslint to fix lodash security issue #565

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -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
}
}
3 changes: 0 additions & 3 deletions .jscsrc

This file was deleted.

3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ sudo: false
language: node_js

node_js:
- "4"
- "6"
- "8"
- "9"
- "10"

matrix:
fast_finish: true
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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.
17 changes: 9 additions & 8 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand 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']);
};
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# 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



## 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
Expand Down Expand Up @@ -483,6 +483,7 @@ You'll have the `connect` web server on separate port ex: port 9000 from your ma

## Release History

* 2019-09-24   v1.1.1   Replace jscs with eslint due to security issue in used lodash version
* 2018-05-12   v1.1.0   Update to `[email protected]`, `[email protected]`, `[email protected]`
* 2018-04-20   v1.0.1   Update to `[email protected]`, `lodash@4`
* 2016-03-12   v1.0.0   Updated 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.
Expand Down Expand Up @@ -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.*
6 changes: 1 addition & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading