Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 0 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,6 @@ jobs:
fail-fast: false
matrix:
node-version:
- 6
- 7
- 8
- 9
- 10
- 11
- 12
- 13
- 14
- 15
- 16
- 17
- 18
- 19
- 20
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
commands, providing an easy solution for simple Unix-like, cross-platform
commands in npm package scripts.

`shx` is proudly tested on every node release since <!-- start minVersion -->`v6`<!-- stop minVersion -->!
`shx` is proudly tested on every node release since <!-- start minVersion -->`v18`<!-- stop minVersion -->!

## Difference Between ShellJS and shx

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,24 @@
"babel-register": "^6.7.2",
"concurrently": "^5.3.0",
"eslint": "^5.16.0",
"eslint-import-resolver-node": "0.3.7",
"eslint-config-airbnb-base": "^14.2.1",
"eslint-import-resolver-node": "0.3.7",
"eslint-plugin-import": "^2.26.0",
"js-yaml": "^3.12.0",
"mocha": "^6.2.3",
"nyc": "^14.1.1",
"rimraf": "^2.5.2",
"shelljs-changelog": "^0.2.6",
"shelljs-plugin-open": "^0.2.1",
"shelljs-plugin-open": "^0.3.0",
"shelljs-release": "^0.5.2",
"should": "^13.2.3",
"watch": "^1.0.2"
},
"dependencies": {
"minimist": "^1.2.6",
"shelljs": "^0.8.5"
"shelljs": "^0.9.1"
},
"engines": {
"node": ">=6"
"node": ">=18"
}
}
2 changes: 1 addition & 1 deletion scripts/check-node-support.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var yaml = require('js-yaml');
var shell = require('shelljs');

// This is the authoritative list of supported node versions.
var MIN_NODE_VERSION = 6;
var MIN_NODE_VERSION = 18;
var MAX_NODE_VERSION = 22;

function checkReadme(minNodeVersion) {
Expand Down
3 changes: 1 addition & 2 deletions src/shx.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ export function shx(argv) {
const parsedArgs = minimist(argv.slice(2), { stopEarly: true, boolean: true });
if (parsedArgs.version) {
const shxVersion = require('../package.json').version;
const shelljsVersion = require('shelljs/package.json').version;
console.log(`shx v${shxVersion} (using ShellJS v${shelljsVersion})`);
console.log(`shx v${shxVersion}`);
return EXIT_CODES.SUCCESS;
}
const [fnName, ...args] = parsedArgs._;
Expand Down
4 changes: 2 additions & 2 deletions test/specs/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ describe('cli', () => {
describe('global flags', () => {
it('supports --version', () => {
const output = cli('--version');
output.stdout.should.match(/shx v\S+ \(using ShellJS v\S+\)\n/);
output.stdout.should.match(/shx v\S+\n/);
output.stderr.should.equal('');
output.code.should.equal(0);
});
Expand Down Expand Up @@ -351,7 +351,7 @@ describe('cli', () => {
it('works with /g and -i', () => {
const output = cli('sed', '-i', 's/foo/bar/g', testFileName1);
const expected = 'bar\nbarsomething\nbarbarsomething\n';
output.stdout.should.equal(expected);
output.stdout.should.equal('');
shell.cat(testFileName1).stdout.should.equal(expected);
});

Expand Down