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.

Sign up for GitHub

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

Jump to bottom

Update dependencies and testing workflow #1750

Merged
merged 4 commits into from
Jan 29, 2023
Merged

Update dependencies and testing workflow #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d88050
Bump eslint and node version
vladikoff Jan 29, 2023
42c5f95
Update more deps
vladikoff Jan 29, 2023
8fd096d
Bump to 16
vladikoff Jan 29, 2023
3f1e423
README updates
vladikoff Jan 29, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [12, 14, 16]
node: [16, 18, 19]
os: [ubuntu-latest, windows-latest]

steps:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
v1.6.0
date: 2023-01-28
changes:
- Requires node.js 16+.
- template.date now uses dateformat ~4.6.2.
- other dependency updates such as glob, rimraf, etc.
v1.5.3
date: 2022-04-23
changes:
Expand Down
16 changes: 8 additions & 8 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ module.exports = function(grunt) {
}
},
eslint: {
gruntfile_tasks: ['Gruntfile.js', 'internal-tasks/*.js'],
libs_n_tests: ['lib/**/*.js', '<%= nodeunit.all %>'],
gruntfileTasks: ['Gruntfile.js', 'internal-tasks/*.js'],
libsAndTests: ['lib/**/*.js', '<%= nodeunit.all %>'],
subgrunt: ['<%= subgrunt.all %>']
},
watch: {
gruntfile_tasks: {
files: ['<%= eslint.gruntfile_tasks %>'],
tasks: ['eslint:gruntfile_tasks']
gruntfileTasks: {
files: ['<%= eslint.gruntfileTasks %>'],
tasks: ['eslint:gruntfileTasks']
},
libs_n_tests: {
files: ['<%= eslint.libs_n_tests %>'],
tasks: ['eslint:libs_n_tests', 'nodeunit']
libsAndTests: {
files: ['<%= eslint.libsAndTests %>'],
tasks: ['eslint:libsAndTests', 'nodeunit']
},
subgrunt: {
files: ['<%= subgrunt.all %>'],
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,16 @@
[![Built with Grunt](https://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com/)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fgruntjs%2Fgrunt.svg?type=shield)](https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2Fgruntjs%2Fgrunt?ref=badge_shield)

<img align="right" height="260" src="http://gruntjs.com/img/grunt-logo-no-wordmark.svg">
<img align="right" height="260" src="https://gruntjs.com/img/grunt-logo-no-wordmark.svg">


### Documentation

Visit the [gruntjs.com](https://gruntjs.com/) website for all the things.

### Support / Contributing
Before you make an issue, please read our [Contributing](https://gruntjs.com/contributing) guide.

You can find the grunt team in [#grunt on irc.freenode.net](https://webchat.freenode.net/?channels=grunt).
Before you make an issue, please read our [Contributing](https://gruntjs.com/contributing) guide.

### Release History
See the [CHANGELOG](CHANGELOG).
Expand Down
20 changes: 10 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"repository": "https://github.com/gruntjs/grunt.git",
"license": "MIT",
"engines": {
"node": ">=8"
"node": ">=16"
Copy link

@newhouse newhouse Jan 30, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: I think that if you're following Semver, this is a breaking change, requiring a major version bump. Yet this was published in a minor version bump (1.5.X => 1.6.0).

This means that packages (like spectaql) that had something like this in their dependencies will now break for installations on Node < 16:

{
  ...
  "dependencies": {
    ...
    "grunt": "^1.5.3",
    ...
  }
  ...
}

@vladikoff @XhmikosR

UPDATE: already noticed in #1751

},
"scripts": {
"test": "node bin/grunt test",
Expand Down Expand Up @@ -37,29 +37,29 @@
"tool"
],
"dependencies": {
"dateformat": "~3.0.3",
"dateformat": "~4.6.2",
"eventemitter2": "~0.4.13",
"exit": "~0.1.2",
"findup-sync": "~0.3.0",
"glob": "~7.1.6",
"findup-sync": "~5.0.0",
"glob": "~8.1.0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vladikoff just FYI this bump could wreak havoc for Windows users since backslashes need to be escaped in v8.x.

"grunt-cli": "~1.4.3",
"grunt-known-options": "~2.0.0",
"grunt-legacy-log": "~3.0.0",
"grunt-legacy-util": "~2.0.1",
"iconv-lite": "~0.4.13",
"iconv-lite": "~0.6.3",
"js-yaml": "~3.14.0",
"minimatch": "~3.0.4",
"mkdirp": "~1.0.4",
"mkdirp": "~2.1.3",
"nopt": "~3.0.6",
"rimraf": "~3.0.2"
"rimraf": "~4.1.2"
},
"devDependencies": {
"difflet": "~1.0.1",
"eslint-config-grunt": "~1.0.1",
"eslint-config-grunt": "~2.0.1",
"grunt-contrib-nodeunit": "~4.0.0",
"grunt-contrib-watch": "~1.1.0",
"grunt-eslint": "~18.1.0",
"temporary": "~0.0.4",
"grunt-eslint": "~24.0.1",
"temporary": "~1.1.0",
"through2": "~4.0.2"
},
"files": [
Expand Down
62 changes: 31 additions & 31 deletions test/gruntfile/multi-task-files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module.exports = function(grunt) {
]
},
// File mapping options can be specified in these 2 formats.
built_mapping: {
builtMapping: {
options: {a: 6, c: 66},
expand: true,
cwd: '<%= mappings.cwd %>',
Expand All @@ -68,7 +68,7 @@ module.exports = function(grunt) {
rename: '<%= mappings.rename %>',
extra: 123
},
long3_mapping: {
long3Mapping: {
options: {a: 7, c: 77},
files: [
{
Expand All @@ -81,22 +81,22 @@ module.exports = function(grunt) {
}
]
},
long4_mapping: {
long4Mapping: {
options: {a: 8, c: 88},
files: [
'<%= run.long3_mapping.files %>'
'<%= run.long3Mapping.files %>'
]
},
long5_mapping: {
long5Mapping: {
options: {a: 9, c: 99},
files: [
'<%= run.long3_mapping.files %>',
'<%= run.long4_mapping.files %>'
'<%= run.long3Mapping.files %>',
'<%= run.long4Mapping.files %>'
]
},
// Need to ensure the task function is run if no files or options were
// specified!
no_files_or_options: {},
noFilesOrOptions: {},
},
});

Expand Down Expand Up @@ -124,7 +124,7 @@ module.exports = function(grunt) {
});

var expecteds = {
'run:no_files_or_options': {
'run:noFilesOrOptions': {
options: {a: 1, b: 11, d: 9},
files: [],
},
Expand Down Expand Up @@ -236,7 +236,7 @@ module.exports = function(grunt) {
},
],
},
'run:built_mapping': {
'run:builtMapping': {
options: {a: 6, b: 11, c: 66, d: 9},
files: [
{
Expand All @@ -248,7 +248,7 @@ module.exports = function(grunt) {
cwd: grunt.config.get('mappings.cwd'),
src: ['*1.js', '*2.js'],
dest: grunt.config.get('mappings.dest'),
rename: grunt.config.get('run.built_mapping.rename'),
rename: grunt.config.get('run.builtMapping.rename'),
extra: 123,
},
},
Expand All @@ -258,16 +258,16 @@ module.exports = function(grunt) {
extra: 123,
orig: {
expand: true,
cwd: grunt.config.get('run.built_mapping.cwd'),
cwd: grunt.config.get('run.builtMapping.cwd'),
src: ['*1.js', '*2.js'],
dest: grunt.config.get('run.built_mapping.dest'),
rename: grunt.config.get('run.built_mapping.rename'),
dest: grunt.config.get('run.builtMapping.dest'),
rename: grunt.config.get('run.builtMapping.rename'),
extra: 123,
},
},
],
},
'run:long3_mapping': {
'run:long3Mapping': {
options: {a: 7, b: 11, c: 77, d: 9},
files: [
{
Expand All @@ -292,13 +292,13 @@ module.exports = function(grunt) {
cwd: grunt.config.get('mappings.cwd'),
src: ['*1.js', '*2.js'],
dest: grunt.config.get('mappings.dest'),
rename: grunt.config.get('run.built_mapping.rename'),
rename: grunt.config.get('run.builtMapping.rename'),
extra: 123,
},
},
],
},
'run:long4_mapping': {
'run:long4Mapping': {
options: {a: 8, b: 11, c: 88, d: 9},
files: [
{
Expand All @@ -323,13 +323,13 @@ module.exports = function(grunt) {
cwd: grunt.config.get('mappings.cwd'),
src: ['*1.js', '*2.js'],
dest: grunt.config.get('mappings.dest'),
rename: grunt.config.get('run.built_mapping.rename'),
rename: grunt.config.get('run.builtMapping.rename'),
extra: 123,
},
},
],
},
'run:long5_mapping': {
'run:long5Mapping': {
options: {a: 9, b: 11, c: 99, d: 9},
files: [
{
Expand All @@ -354,7 +354,7 @@ module.exports = function(grunt) {
cwd: grunt.config.get('mappings.cwd'),
src: ['*1.js', '*2.js'],
dest: grunt.config.get('mappings.dest'),
rename: grunt.config.get('run.built_mapping.rename'),
rename: grunt.config.get('run.builtMapping.rename'),
extra: 123,
},
},
Expand All @@ -380,7 +380,7 @@ module.exports = function(grunt) {
cwd: grunt.config.get('mappings.cwd'),
src: ['*1.js', '*2.js'],
dest: grunt.config.get('mappings.dest'),
rename: grunt.config.get('run.built_mapping.rename'),
rename: grunt.config.get('run.builtMapping.rename'),
extra: 123,
},
},
Expand Down Expand Up @@ -427,8 +427,8 @@ module.exports = function(grunt) {
});

grunt.registerTask('default', [
'run:no_files_or_options',
'test:no_files_or_options',
'run:noFilesOrOptions',
'test:noFilesOrOptions',
'run:dist/built.js',
'test:dist/built.js',
'run:dist/built1.js',
Expand All @@ -441,14 +441,14 @@ module.exports = function(grunt) {
'test:long2',
'run:long3',
'test:long3',
'run:built_mapping',
'test:built_mapping',
'run:long3_mapping',
'test:long3_mapping',
'run:long4_mapping',
'test:long4_mapping',
'run:long5_mapping',
'test:long5_mapping',
'run:builtMapping',
'test:builtMapping',
'run:long3Mapping',
'test:long3Mapping',
'run:long4Mapping',
'test:long4Mapping',
'run:long5Mapping',
'test:long5Mapping',
'run',
'test:all',
'test:counters',
Expand Down