Skip to content

Commit 11f1bc0

Browse files
authored
feat: license update, prodsec/security_scans added (#4)
1 parent 61f3fdd commit 11f1bc0

4 files changed

Lines changed: 21 additions & 6 deletions

File tree

.circleci/config.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2.1
22

33
orbs:
44
win: circleci/windows@2.4.0
5-
prodsec: snyk/prodsec-orb@1.0
5+
prodsec: snyk/prodsec-orb@1
66

77
filters_branches_ignore_main: &filters_branches_ignore_main
88
filters:
@@ -61,6 +61,16 @@ commands:
6161
command: npm --version
6262

6363
jobs:
64+
security-scans:
65+
<<: *defaults
66+
resource_class: small
67+
docker:
68+
- image: cimg/node:<< parameters.node_version >>
69+
steps:
70+
- checkout
71+
- install_deps
72+
- prodsec/security_scans:
73+
mode: auto
6474
lint:
6575
<<: *defaults
6676
docker:
@@ -108,6 +118,11 @@ workflows:
108118
context:
109119
- snyk-bot-slack
110120
channel: os-team-managed-alerts
121+
- security-scans:
122+
name: Perform security scans for PRs
123+
context:
124+
- open_source-managed
125+
<<: *filters_branches_ignore_main
111126
- lint:
112127
name: Lint
113128
context: nodejs-install
@@ -131,5 +146,4 @@ workflows:
131146
context: nodejs-install
132147
requires:
133148
- Lint
134-
<<: *filters_branches_ignore_main
135-
149+
<<: *filters_branches_ignore_main

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2018 Snyk Ltd.
1+
Copyright 2024 Snyk Ltd.
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

lib/npm-modules-parser.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ import * as baseDebug from 'debug';
55
import { isEmpty } from 'lodash';
66
import { Options } from './types';
77
import { getFileContents } from './utils';
8+
import { PkgTree } from 'snyk-nodejs-lockfile-parser';
89

910
const debug = baseDebug('snyk-nodejs-plugin');
1011

1112
export async function parse(
1213
root: string,
1314
targetFile: string,
1415
options: Options,
15-
): Promise<resolveNodeDeps.PackageExpanded> {
16+
): Promise<PkgTree> {
1617
if (targetFile.endsWith('yarn.lock')) {
1718
options.file =
1819
options.file && options.file.replace('yarn.lock', 'package.json');

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"lodash.sortby": "^4.7.0",
4444
"micromatch": "4.0.2",
4545
"snyk-nodejs-lockfile-parser": "1.52.11",
46-
"snyk-resolve-deps": "4.7.3"
46+
"snyk-resolve-deps": "4.8.0"
4747
},
4848
"devDependencies": {
4949
"@types/jest": "^29.5.3",

0 commit comments

Comments
 (0)