Skip to content

Commit 1e6bc04

Browse files
author
Kaspar Lyngsie
authored
Merge pull request #663 from snyk/dotkas/CLI-194/bump-shescape-drop-node-eol-versions
fix: [CLI-914] Removing EOL Node version `18` in favor of `20` - bump `shescape` to `v2.1.0`.
2 parents af0f5fa + ed15df4 commit 1e6bc04

6 files changed

Lines changed: 47 additions & 22 deletions

File tree

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ orbs:
99
defaults: &defaults
1010
resource_class: small
1111
docker:
12-
- image: cimg/node:18.20
12+
- image: cimg/node:20.19
1313
working_directory: ~/snyk-docker-plugin
1414

1515
windows_defaults: &windows_defaults
@@ -54,10 +54,10 @@ windows_big: &windows_big
5454
release_defaults: &release_defaults
5555
resource_class: small
5656
docker:
57-
- image: node:18
57+
- image: node:20
5858
working_directory: ~/snyk-docker-plugin
5959

60-
define: &windows_node_version "18"
60+
define: &windows_node_version "20.19.1"
6161

6262
commands:
6363
install_deps:

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ cache:
1717

1818
environment:
1919
matrix:
20-
- nodejs_version: "18"
2120
- nodejs_version: "20"
2221
- nodejs_version: "22"
22+
- nodejs_version: "24"
2323

2424
matrix:
2525
fast_finish: true

lib/sub-process.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as childProcess from "child_process";
2-
import { quoteAll } from "shescape";
2+
import { quoteAll } from "shescape/stateless";
33

44
export { execute, CmdOutput };
55
interface CmdOutput {
@@ -16,10 +16,10 @@ function execute(
1616
if (options && options.cwd) {
1717
spawnOptions.cwd = options.cwd;
1818
}
19-
args = quoteAll(args, spawnOptions);
19+
args = quoteAll(args, { ...spawnOptions, flagProtection: false });
2020

2121
// Before spawning an external process, we look if we need to restore the system proxy configuration,
22-
// which overides the cli internal proxy configuration.
22+
// which overrides the cli internal proxy configuration.
2323
if (process.env.SNYK_SYSTEM_HTTP_PROXY !== undefined) {
2424
spawnOptions.env.HTTP_PROXY = process.env.SNYK_SYSTEM_HTTP_PROXY;
2525
}

package-lock.json

Lines changed: 37 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"prepare": "npm run build"
2626
},
2727
"engines": {
28-
"node": ">=18"
28+
"node": ">=20"
2929
},
3030
"dependencies": {
3131
"@snyk/composer-lockfile-parser": "^1.4.1",
@@ -45,7 +45,7 @@
4545
"mkdirp": "^1.0.4",
4646
"packageurl-js": "1.2.0",
4747
"semver": "^7.6.3",
48-
"shescape": "^1.7.4",
48+
"shescape": "2.1.0",
4949
"snyk-nodejs-lockfile-parser": "^2.0.0",
5050
"snyk-poetry-lockfile-parser": "^1.4.0",
5151
"snyk-resolve-deps": "^4.7.1",

0 commit comments

Comments
 (0)