From c65c6cce3f626e4896a9d59250f0908be695adae Mon Sep 17 00:00:00 2001 From: Jakob Linskeseder Date: Fri, 21 Oct 2022 16:34:28 +0200 Subject: [PATCH] Test on Node 18 * Replaced outdated `grunt-bg-shell`-package to get rid of coffee-script warnings Backports parts of 785a63e0a84bc5d6617fd1619baa975f1380ddbd. --- .github/workflows/ci.yml | 4 +- Gruntfile.js | 12 +- package-lock.json | 129 +++++++++++++++----- package.json | 2 +- tests/integration/multi-nodejs-test/test.sh | 2 +- 5 files changed, 110 insertions(+), 39 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c692488..12d61ede 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: matrix: operating-system: ['ubuntu-latest', 'windows-latest'] # https://nodejs.org/en/about/releases/ - node-version: ['10', '12', '14', '16', '17'] + node-version: ['10', '12', '14', '16', '18'] steps: - name: Checkout @@ -54,7 +54,7 @@ jobs: - name: Test (Integration) # https://github.com/webpack/webpack/issues/14532 - if: ${{ matrix.node-version != '17' }} + if: ${{ matrix.node-version != '18' }} run: | cd ./tests/integration/rollup-test && ./test.sh && cd - cd ./tests/integration/webpack-babel-test && ./test.sh && cd - diff --git a/Gruntfile.js b/Gruntfile.js index 6506e058..9fa26f6b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -166,11 +166,9 @@ module.exports = function(grunt) { } }, - bgShell: { + shell: { integrationTests: { - cmd: './tests/integration/run-integration-tests.sh', - bg: false, - fail: true + command: './tests/integration/run-integration-tests.sh' } }, @@ -195,7 +193,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-babel'); - grunt.loadNpmTasks('grunt-bg-shell'); + grunt.loadNpmTasks('grunt-shell'); grunt.loadNpmTasks('grunt-webpack'); grunt.task.loadTasks('tasks'); @@ -214,7 +212,7 @@ module.exports = function(grunt) { // Requires secret properties from .travis.yaml grunt.registerTask('extensive-tests-and-publish-to-aws', [ 'default', - 'bgShell:integrationTests', + 'shell:integrationTests', 'metrics', 'publish-to-aws' ]); @@ -234,6 +232,6 @@ module.exports = function(grunt) { ); grunt.registerTask('integration-tests', [ 'default', - 'bgShell:integrationTests' + 'shell:integrationTests' ]); }; diff --git a/package-lock.json b/package-lock.json index ca788815..325c28e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,6 @@ "fs-extra": "^8.1.0", "grunt": "^1.0.4", "grunt-babel": "^5.0.0", - "grunt-bg-shell": "^2.3.3", "grunt-cli": "^1", "grunt-contrib-clean": "^1", "grunt-contrib-concat": "^1", @@ -46,6 +45,7 @@ "grunt-contrib-requirejs": "^1", "grunt-contrib-uglify": "^1", "grunt-contrib-watch": "^1.1.0", + "grunt-shell": "^4.0.0", "grunt-webpack": "^1.0.8", "husky": "^3.1.0", "jison": "~0.3.0", @@ -6346,18 +6346,6 @@ "node": ">=0.10.0" } }, - "node_modules/grunt-bg-shell": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/grunt-bg-shell/-/grunt-bg-shell-2.3.3.tgz", - "integrity": "sha1-E5ro+cdvaKDbTunbvU7IJbkif/8=", - "dev": true, - "engines": { - "node": ">= 0.8.0" - }, - "peerDependencies": { - "grunt": ">=0.4.0" - } - }, "node_modules/grunt-cli": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.3.2.tgz", @@ -6835,6 +6823,60 @@ "node": "*" } }, + "node_modules/grunt-shell": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/grunt-shell/-/grunt-shell-4.0.0.tgz", + "integrity": "sha512-dHFy8VZDfWGYLTeNvIHze4PKXGvIlDWuN0UE7hUZstTQeiEyv1VmW1MaDYQ3X5tE3bCi3bEia1gGKH8z/f1czQ==", + "dev": true, + "dependencies": { + "chalk": "^3.0.0", + "npm-run-path": "^2.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + }, + "peerDependencies": { + "grunt": ">=1" + } + }, + "node_modules/grunt-shell/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/grunt-shell/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/grunt-shell/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/grunt-webpack": { "version": "1.0.18", "resolved": "https://registry.npmjs.org/grunt-webpack/-/grunt-webpack-1.0.18.tgz", @@ -13842,12 +13884,12 @@ "dev": true }, "node_modules/strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "dependencies": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" }, "engines": { "node": ">=8" @@ -20360,13 +20402,6 @@ "babel-core": "^5.0.0" } }, - "grunt-bg-shell": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/grunt-bg-shell/-/grunt-bg-shell-2.3.3.tgz", - "integrity": "sha1-E5ro+cdvaKDbTunbvU7IJbkif/8=", - "dev": true, - "requires": {} - }, "grunt-cli": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.3.2.tgz", @@ -20738,6 +20773,44 @@ } } }, + "grunt-shell": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/grunt-shell/-/grunt-shell-4.0.0.tgz", + "integrity": "sha512-dHFy8VZDfWGYLTeNvIHze4PKXGvIlDWuN0UE7hUZstTQeiEyv1VmW1MaDYQ3X5tE3bCi3bEia1gGKH8z/f1czQ==", + "dev": true, + "requires": { + "chalk": "^3.0.0", + "npm-run-path": "^2.0.0", + "strip-ansi": "^6.0.1" + }, + "dependencies": { + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "grunt-webpack": { "version": "1.0.18", "resolved": "https://registry.npmjs.org/grunt-webpack/-/grunt-webpack-1.0.18.tgz", @@ -26283,12 +26356,12 @@ "dev": true }, "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "^5.0.1" } }, "strip-bom": { diff --git a/package.json b/package.json index 8eb977e8..69b179d6 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ "fs-extra": "^8.1.0", "grunt": "^1.0.4", "grunt-babel": "^5.0.0", - "grunt-bg-shell": "^2.3.3", "grunt-cli": "^1", "grunt-contrib-clean": "^1", "grunt-contrib-concat": "^1", @@ -58,6 +57,7 @@ "grunt-contrib-requirejs": "^1", "grunt-contrib-uglify": "^1", "grunt-contrib-watch": "^1.1.0", + "grunt-shell": "^4.0.0", "grunt-webpack": "^1.0.8", "husky": "^3.1.0", "jison": "~0.3.0", diff --git a/tests/integration/multi-nodejs-test/test.sh b/tests/integration/multi-nodejs-test/test.sh index 1c692084..8f817ff4 100755 --- a/tests/integration/multi-nodejs-test/test.sh +++ b/tests/integration/multi-nodejs-test/test.sh @@ -14,7 +14,7 @@ cd "$( dirname "$( readlink -f "$0" )" )" || exit 1 unset npm_config_prefix echo "Handlebars should be able to run in various versions of NodeJS" -for node_version_to_test in 0.10 0.12 4 5 6 7 8 9 10 11 12 13 14 15 16 17; do +for node_version_to_test in 0.10 0.12 4 5 6 7 8 9 10 11 12 13 14 15 16 18; do rm target node_modules package-lock.json -rf mkdir target