Skip to content

Commit f83f67a

Browse files
authored
Merge pull request #41 from snyk/dotkas/CLI-194/fix-shescape-migration
fix: [CLI-104] disabling `flagProtection` from shescape, bumping minium version to Node `20`
2 parents 7509dc7 + 40240fd commit f83f67a

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
resource_class: small
5555
<<: *defaults
5656
docker:
57-
- image: circleci/node:<< parameters.node_version >>
57+
- image: cimg/node:<< parameters.node_version >>
5858
steps:
5959
- checkout
6060
- show_node_npm_version
@@ -117,15 +117,15 @@ workflows:
117117

118118
- security-scans:
119119
name: Security Scans
120-
node_version: "12"
120+
node_version: "20.19.0"
121121
context:
122122
- open_source-managed
123123
- nodejs-install
124124

125125
- lint:
126126
name: lint
127127
context: nodejs-install
128-
node_version: "18.19.1"
128+
node_version: "20.19.0"
129129

130130
# UNIX tests
131131
- test-unix:
@@ -135,12 +135,12 @@ workflows:
135135
- lint
136136
matrix:
137137
parameters:
138-
node_version: ["18.19.1"]
138+
node_version: ["20.19.0"]
139139

140140
- release:
141141
name: Release
142142
context: nodejs-lib-release
143-
node_version: "lts"
143+
node_version: "20.19.0"
144144
requires:
145145
- lint
146146
- test-unix

.node-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
[![Known Vulnerabilities](https://snyk.io/test/github/snyk/snyk-cocoapods-plugin/badge.svg)](https://snyk.io/test/github/snyk/snyk-cocoapods-plugin)
66

7-
8-
Snyk helps you find, fix and monitor for known vulnerabilities in your dependencies, both on an ad hoc basis and as part of your CI (Build) system.
7+
Snyk helps you find, fix and monitor for known vulnerabilities in your dependencies, both on an ad hoc basis and as part
8+
of your CI (Build) system.
99

1010
| :information_source: This repository is only a plugin to be used with the Snyk CLI tool. To use this plugin to test and fix vulnerabilities in your project, install the Snyk CLI tool first. Head over to [snyk.io](https://github.com/snyk/snyk) to get started. |
11-
| --- |
12-
11+
|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
1312

1413
## Snyk snyk-cocoapods-plugin
14+
1515
Snyk CLI CocoaPods plugin

lib/sub-process.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { quoteAll } from 'shescape/stateless';
44
export function execute(
55
command: string,
66
args: string[] = [],
7-
options?: { cwd?: string }
7+
options?: { cwd?: string },
88
): Promise<string> {
99
const spawnOptions: {
1010
shell: boolean;
@@ -14,7 +14,7 @@ export function execute(
1414
spawnOptions.cwd = options.cwd;
1515
}
1616

17-
args = quoteAll(args, spawnOptions);
17+
args = quoteAll(args, { flagProtection: false });
1818

1919
return new Promise((resolve, reject) => {
2020
let stdout = '';

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
"@snyk/cli-interface": "^2.11.0",
3535
"@snyk/cocoapods-lockfile-parser": "3.6.2",
3636
"@snyk/dep-graph": "^1.23.1",
37-
"shescape": "2.1.0",
37+
"shescape": "2.1.4",
3838
"source-map-support": "^0.5.7",
3939
"tslib": "^2.0.0"
4040
},
4141
"devDependencies": {
4242
"@types/graphlib": "^2.1.6",
4343
"@types/jest": "28.1.1",
44-
"@types/node": "^8.10.60",
44+
"@types/node": "^20.17.57",
4545
"@typescript-eslint/eslint-plugin": "^2.33.0",
4646
"@typescript-eslint/parser": "^2.33.0",
4747
"eslint": "^6.8.0",
@@ -51,6 +51,6 @@
5151
"ts-jest": "28.0.8",
5252
"ts-node": "^8.10.1",
5353
"tsc-watch": "^2.2.1",
54-
"typescript": "4.9.3"
54+
"typescript": "5.8.3"
5555
}
5656
}

0 commit comments

Comments
 (0)