From d10ac0e532a9376106c50f0c21a0d0fd0483b700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Fri, 30 Dec 2016 12:17:00 +0100 Subject: [PATCH] Build: Drop support for building on Node.js 0.12 Node.js 0.12 is no longer supported by upstream. So far we had to keep a workaround that would skip running ESLint there (or even load its task) as it no longer supports Node.js <4; the same applied to Node smoke tests as jsdom has also dropped support for those old Node versions. Those workarounds have been removed now. Ref 030191ae32dfcb7ecb2efb61d17a4964a3633e44 Closes gh-3478 --- .travis.yml | 1 - Gruntfile.js | 39 +++++++++++---------------------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2dea0b6fa5..0a57584116 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: node_js sudo: false node_js: -- "0.12" - "4" - "6" - "7" diff --git a/Gruntfile.js b/Gruntfile.js index fbb271630d..12ae0087e8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,15 +13,7 @@ module.exports = function( grunt ) { } var fs = require( "fs" ), - gzip = require( "gzip-js" ), - oldNode = /^v0\./.test( process.version ); - - // Support: Node.js <4 - // Skip running tasks that dropped support for Node.js 0.12 - // in this Node version. - function runIfNewNode( task ) { - return oldNode ? "print_old_node_message:" + task : task; - } + gzip = require( "gzip-js" ); if ( !grunt.option( "filename" ) ) { grunt.option( "filename", "jquery.js" ); @@ -187,20 +179,11 @@ module.exports = function( grunt ) { } ); // Load grunt tasks from NPM packages - // Support: Node.js <4 - // Don't load the eslint task in old Node.js, it won't parse. - require( "load-grunt-tasks" )( grunt, { - pattern: oldNode ? [ "grunt-*", "!grunt-eslint" ] : [ "grunt-*" ] - } ); + require( "load-grunt-tasks" )( grunt ); // Integrate jQuery specific tasks grunt.loadTasks( "build/tasks" ); - grunt.registerTask( "print_old_node_message", function() { - var task = [].slice.call( arguments ).join( ":" ); - grunt.log.writeln( "Old Node.js detected, running the task \"" + task + "\" skipped..." ); - } ); - grunt.registerTask( "lint", [ "jsonlint", @@ -208,20 +191,20 @@ module.exports = function( grunt ) { // would run the dist target first which would point to errors in the built // file, making it harder to fix them. We want to check the built file only // if we already know the source files pass the linter. - runIfNewNode( "eslint:dev" ), - runIfNewNode( "eslint:dist" ) + "eslint:dev", + "eslint:dist" ] ); grunt.registerTask( "lint:newer", [ "newer:jsonlint", // Don't replace it with just the task; see the above comment. - runIfNewNode( "newer:eslint:dev" ), - runIfNewNode( "newer:eslint:dist" ) + "newer:eslint:dev", + "newer:eslint:dist" ] ); - grunt.registerTask( "test:fast", runIfNewNode( "node_smoke_tests" ) ); - grunt.registerTask( "test:slow", runIfNewNode( "promises_aplus_tests" ) ); + grunt.registerTask( "test:fast", "node_smoke_tests" ); + grunt.registerTask( "test:slow", "promises_aplus_tests" ); grunt.registerTask( "test", [ "test:fast", @@ -230,7 +213,7 @@ module.exports = function( grunt ) { grunt.registerTask( "dev", [ "build:*:*", - runIfNewNode( "newer:eslint:dev" ), + "newer:eslint:dev", "newer:uglify", "remove_map_comment", "dist:*", @@ -238,12 +221,12 @@ module.exports = function( grunt ) { ] ); grunt.registerTask( "default", [ - runIfNewNode( "eslint:dev" ), + "eslint:dev", "build:*:*", "uglify", "remove_map_comment", "dist:*", - runIfNewNode( "eslint:dist" ), + "eslint:dist", "test:fast", "compare_size" ] );