Drop Node.js < 6 support, fix Windows tests, update devDependencies and use https.

2018-09-17 22:47:24 +03:00 · 2018-09-17 22:47:24 +03:00 · 5fd16e73cc
commit 5fd16e73cc
parent 3b7ddf4453
14 changed files with 5508 additions and 35 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -3,10 +3,9 @@ sudo: false
 language: node_js

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

 matrix:
  fast_finish: true
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -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.
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -1,6 +1,6 @@
 /*
 * grunt-contrib-watch
- * http://gruntjs.com/
+ * https://gruntjs.com/
 *
 * Copyright (c) 2018 "Cowboy" Ben Alman, contributors
 * Licensed under the MIT license.
@ -52,5 +52,5 @@ module.exports = function(grunt) {
  grunt.loadNpmTasks('grunt-contrib-internal');
  grunt.loadNpmTasks('grunt-jscs');

-  grunt.registerTask('default', ['test', 'build-contrib']);
+  grunt.registerTask('default', ['test', 'contrib-core', 'contrib-ci:skipIfExists']);
 };
--- a/README.md
+++ b/README.md
@ -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
@ -212,7 +212,7 @@ watch: {
        port: 9000,
        key: grunt.file.read('path/to/ssl.key'),
        cert: grunt.file.read('path/to/ssl.crt')
-        // you can pass in any other options you'd like to the https server, as listed here: http://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener
+        // you can pass in any other options you'd like to the https server, as listed here: https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener
      }
    },
  },
@ -300,7 +300,7 @@ grunt.event.on('watch', function(action, filepath, target) {
 });
 ```

-**The `watch` event is not intended for replacing the standard Grunt API for configuring and running tasks. If you're trying to run tasks from within the `watch` event you're more than likely doing it wrong. Please read [configuring tasks](http://gruntjs.com/configuring-tasks).**
+**The `watch` event is not intended for replacing the standard Grunt API for configuring and running tasks. If you're trying to run tasks from within the `watch` event you're more than likely doing it wrong. Please read [configuring tasks](https://gruntjs.com/configuring-tasks).**

 ##### Compiling Files As Needed
 A very common request is to only compile files as needed. Here is an example that will only lint changed files with the `jshint` task:
@ -458,7 +458,7 @@ grunt.initConfig({
 #### How do I fix the error `EMFILE: Too many opened files.`?
 This is because of your system's max opened file limit. For OSX the default is very low (256). Temporarily increase your limit with `ulimit -n 10480`, the number being the new max limit.

-In some versions of OSX the above solution doesn't work. In that case try `launchctl limit maxfiles 10480 10480 ` and restart your terminal. See [here](http://superuser.com/questions/261023/how-to-change-default-ulimit-values-in-mac-os-x-10-6).
+In some versions of OSX the above solution doesn't work. In that case try `launchctl limit maxfiles 10480 10480 ` and restart your terminal. See [here](https://superuser.com/questions/261023/how-to-change-default-ulimit-values-in-mac-os-x-10-6).

 #### Can I use this with Grunt v0.3?
 `grunt-contrib-watch@0.1.x` is compatible with Grunt v0.3 but it is highly recommended to upgrade Grunt instead.
@ -513,4 +513,4 @@ You'll have the `connect` web server on seperate 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 Mon Sep 17 2018 22:46:42.*
--- a/appveyor.yml
+++ b/appveyor.yml
@ -5,17 +5,18 @@ 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

+init:
+  # Enable symlinks in git; note that this requires to clone
+  # the repo with admin rights, which AppVeyor does by default
+  - git config --global core.symlinks true
+
 install:
  - ps: Install-Product node $env:nodejs_version $env:platform
  - npm install
--- a/docs/watch-examples.md
+++ b/docs/watch-examples.md
@ -46,7 +46,7 @@ grunt.event.on('watch', function(action, filepath, target) {
 });
 ```

-**The `watch` event is not intended for replacing the standard Grunt API for configuring and running tasks. If you're trying to run tasks from within the `watch` event you're more than likely doing it wrong. Please read [configuring tasks](http://gruntjs.com/configuring-tasks).**
+**The `watch` event is not intended for replacing the standard Grunt API for configuring and running tasks. If you're trying to run tasks from within the `watch` event you're more than likely doing it wrong. Please read [configuring tasks](https://gruntjs.com/configuring-tasks).**

 ### Compiling Files As Needed
 A very common request is to only compile files as needed. Here is an example that will only lint changed files with the `jshint` task:
@ -204,7 +204,7 @@ grunt.initConfig({
 ## How do I fix the error `EMFILE: Too many opened files.`?
 This is because of your system's max opened file limit. For OSX the default is very low (256). Temporarily increase your limit with `ulimit -n 10480`, the number being the new max limit.

-In some versions of OSX the above solution doesn't work. In that case try `launchctl limit maxfiles 10480 10480 ` and restart your terminal. See [here](http://superuser.com/questions/261023/how-to-change-default-ulimit-values-in-mac-os-x-10-6).
+In some versions of OSX the above solution doesn't work. In that case try `launchctl limit maxfiles 10480 10480 ` and restart your terminal. See [here](https://superuser.com/questions/261023/how-to-change-default-ulimit-values-in-mac-os-x-10-6).

 ## Can I use this with Grunt v0.3?
 `grunt-contrib-watch@0.1.x` is compatible with Grunt v0.3 but it is highly recommended to upgrade Grunt instead.
--- a/docs/watch-options.md
+++ b/docs/watch-options.md
@ -185,7 +185,7 @@ watch: {
        port: 9000,
        key: grunt.file.read('path/to/ssl.key'),
        cert: grunt.file.read('path/to/ssl.crt')
-        // you can pass in any other options you'd like to the https server, as listed here: http://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener
+        // you can pass in any other options you'd like to the https server, as listed here: https://nodejs.org/api/tls.html#tls_tls_createserver_options_secureconnectionlistener
      }
    },
  },
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -4,31 +4,30 @@
  "version": "1.1.0",
  "author": {
    "name": "Grunt Team",
-    "url": "http://gruntjs.com/"
+    "url": "https://gruntjs.com/"
  },
  "repository": "gruntjs/grunt-contrib-watch",
  "license": "MIT",
  "engines": {
-    "node": ">=0.10.0"
+    "node": ">=6"
  },
  "main": "tasks/watch.js",
  "scripts": {
    "test": "grunt test -v"
  },
  "dependencies": {
-    "async": "^2.6.0",
-    "gaze": "^1.1.0",
-    "lodash": "^4.17.10",
+    "async": "^2.6.1",
+    "gaze": "^1.1.3",
+    "lodash": "^4.17.11",
    "tiny-lr": "^1.1.1"
  },
  "devDependencies": {
-    "grunt": "^1.0.2",
-    "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",
-    "underscore.string": "^3.2.2"
+    "grunt": "^1.0.3",
+    "grunt-contrib-internal": "^3.1.0",
+    "grunt-contrib-jshint": "^1.1.0",
+    "grunt-contrib-nodeunit": "^2.0.0",
+    "grunt-jscs": "^3.0.1",
+    "underscore.string": "^3.3.4"
  },
  "keywords": [
    "gruntplugin",
--- a/tasks/lib/livereload.js
+++ b/tasks/lib/livereload.js
@ -1,6 +1,6 @@
 /*
 * grunt-contrib-watch
- * http://gruntjs.com/
+ * https://gruntjs.com/
 *
 * Copyright (c) 2018 "Cowboy" Ben Alman, contributors
 * Licensed under the MIT license.
--- a/tasks/lib/taskrun.js
+++ b/tasks/lib/taskrun.js
@ -1,6 +1,6 @@
 /*
 * grunt-contrib-watch
- * http://gruntjs.com/
+ * https://gruntjs.com/
 *
 * Copyright (c) 2018 "Cowboy" Ben Alman, contributors
 * Licensed under the MIT license.
--- a/tasks/lib/taskrunner.js
+++ b/tasks/lib/taskrunner.js
@ -1,6 +1,6 @@
 /*
 * grunt-contrib-watch
- * http://gruntjs.com/
+ * https://gruntjs.com/
 *
 * Copyright (c) 2018 "Cowboy" Ben Alman, contributors
 * Licensed under the MIT license.
--- a/tasks/watch.js
+++ b/tasks/watch.js
@ -1,6 +1,6 @@
 /*
 * grunt-contrib-watch
- * http://gruntjs.com/
+ * https://gruntjs.com/
 *
 * Copyright (c) 2018 "Cowboy" Ben Alman, contributors
 * Licensed under the MIT license.
--- a/test/fixtures/tasks/echo.js
+++ b/test/fixtures/tasks/echo.js
@ -1,6 +1,6 @@
 /*
 * grunt-contrib-watch
- * http://gruntjs.com/
+ * https://gruntjs.com/
 *
 * Copyright (c) 2016 "Cowboy" Ben Alman, contributors
 * Licensed under the MIT license.