Skip to content

Commit

Permalink
Merge branch 'main' into initialize-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
ericcornelissen committed Aug 20, 2023
2 parents 7d6b43a + dee44a5 commit 8769dc7
Show file tree
Hide file tree
Showing 14 changed files with 304 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/fuzz-cmd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
with:
duration: 600 # seconds == 10 minutes
os: windows-2022
shell: cmd.exe
shell: cmd
targets: '["exec", "exec-file", "spawn"]'
2 changes: 1 addition & 1 deletion .github/workflows/fuzz-powershell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
with:
duration: 600 # seconds == 10 minutes
os: windows-2022
shell: powershell.exe
shell: powershell
targets: '["exec", "exec-file", "spawn"]'
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Versioning].

## [Unreleased]

- _No changes yet_
- Fix TypeScript type definition for the `Shescape` class. ([#963])
- Support `shell` values without `.exe` for Windows. ([#1137])

## [2.0.0-rc2] - 2023-08-09

Expand Down Expand Up @@ -305,6 +306,7 @@ Versioning].
[#1082]: https://github.com/ericcornelissen/shescape/pull/1082
[#1083]: https://github.com/ericcornelissen/shescape/pull/1083
[#1094]: https://github.com/ericcornelissen/shescape/pull/1094
[#1137]: https://github.com/ericcornelissen/shescape/pull/1137
[552e8ea]: https://github.com/ericcornelissen/shescape/commit/552e8eab56861720b1d4e5474fb65741643358f9
[keep a changelog]: https://keepachangelog.com/en/1.0.0/
[semantic versioning]: https://semver.org/spec/v2.0.0.html
5 changes: 3 additions & 2 deletions bench/bench.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
binZsh,
} from "../test/_constants.cjs";

import { noShell } from "../src/options.js";
import * as unix from "../src/unix.js";
import * as win from "../src/win.js";

Expand All @@ -27,7 +28,7 @@ const suite = new Benchmark.Suite("escapeShellArg", {
},
});

const escapeShellArgNoShellUnix = unix.getEscapeFunction(null);
const escapeShellArgNoShellUnix = unix.getEscapeFunction(noShell);
suite.add(`unix, no shell, ${sampleArg}`, () => {
escapeShellArgNoShellUnix(sampleArg);
});
Expand All @@ -52,7 +53,7 @@ suite.add(`unix, ${binZsh}, ${sampleArg}`, () => {
escapeShellArgZsh(sampleArg);
});

const escapeShellArgNoShellWin = win.getEscapeFunction(null);
const escapeShellArgNoShellWin = win.getEscapeFunction(noShell);
suite.add(`win, no shell, ${sampleArg}`, () => {
escapeShellArgNoShellWin(sampleArg);
});
Expand Down
210 changes: 189 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"knip": "2.19.5",
"licensee": "10.0.0",
"markdownlint-cli": "0.35.0",
"nve": "16.1.0",
"nve": "16.1.1",
"nyc": "15.1.0",
"prettier": "3.0.2",
"publint": "0.2.1",
Expand Down
Loading

0 comments on commit 8769dc7

Please sign in to comment.