From 5faccb9683215fe0d7f6998d65668eecf871c7e8 Mon Sep 17 00:00:00 2001 From: Anton Timmermans Date: Mon, 24 Dec 2018 13:53:11 +0000 Subject: [PATCH] Build tools: Fix the `travis:js` build. After [44359] it is impossible to not use ES6 syntax for some logic in the `Gruntfile.js`, so adjust the `esversion` setting for the `Gruntfile.js` to 6. Because the previous setting in `.jshintrc` was not compatible with setting `esversion`, set the `esversion` in the `.jshintrc` explicitly. See #44492. git-svn-id: https://develop.svn.wordpress.org/trunk@44361 602fd350-edb4-49c9-b593-d223f7449a82 --- .jshintrc | 2 +- Gruntfile.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.jshintrc b/.jshintrc index 1b7387f4a2..20dadcd1fa 100644 --- a/.jshintrc +++ b/.jshintrc @@ -3,7 +3,7 @@ "curly": true, "eqeqeq": true, "eqnull": true, - "es3": true, + "esversion": 3, "expr": true, "immed": true, "noarg": true, diff --git a/Gruntfile.js b/Gruntfile.js index d93a3c331e..8b14962152 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,5 @@ /* jshint node:true */ +/* jshint esversion: 6 */ /* globals Set */ var webpackConfig = require( './webpack.config' );