Skip to content

Commit 8c0de6d

Browse files
rix0rrrrix0rrr
authored
chore: upgrade dependencies to remove vm2 vulnerability (#25355)
Not that anybody uses the PAC resolver feature, but that feature uses `vm2` and `vm2` has vulnerabilities reported against it every other week. Upgrade all dependencies to remove the use of vulnerable versions of that dependency. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 04323c4 commit 8c0de6d

File tree

30 files changed

+878
-969
lines changed

30 files changed

+878
-969
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
"build-all": "tsc -b"
1616
},
1717
"devDependencies": {
18+
"@nrwl/cli": "^15.9.1",
19+
"@nrwl/workspace": "^15.9.1",
1820
"@types/node": "18.11.19",
1921
"@types/prettier": "2.6.0",
2022
"@yarnpkg/lockfile": "^1.1.0",
@@ -28,12 +30,10 @@
2830
"jsii-reflect": "1.78.1",
2931
"jsii-rosetta": "~5.0.7",
3032
"lerna": "^6.6.1",
33+
"nx": "^15.9.1",
3134
"patch-package": "^6.5.1",
3235
"semver": "^6.3.0",
3336
"standard-version": "^9.5.0",
34-
"@nrwl/cli": "^15.9.1",
35-
"@nrwl/workspace": "^15.9.1",
36-
"nx": "^15.9.1",
3737
"typescript": "~4.9.5"
3838
},
3939
"resolutions": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-lambda-nodejs/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"experimentalDecorators": true,
1010
"incremental": true,
1111
"lib": [
12-
"es2020"
12+
"es2020",
13+
"dom"
1314
],
1415
"module": "CommonJS",
1516
"newLine": "lf",

‎packages/@aws-cdk/cdk-cli-wrapper/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"target": "ES2020",
44
"module": "commonjs",
5-
"lib": ["es2020"],
5+
"lib": ["es2020", "dom"],
66
"strict": true,
77
"alwaysStrict": true,
88
"declaration": true,

‎packages/@aws-cdk/cfnspec/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"target":"ES2020",
44
"module": "commonjs",
5-
"lib": ["es2016", "es2017.object", "es2017.string"],
5+
"lib": ["es2016", "es2017.object", "es2017.string", "dom"],
66
"declaration": true,
77
"composite": true,
88
"strict": true,

‎packages/@aws-cdk/cli-lib-alpha/THIRD_PARTY_LICENSES

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
268268

269269
----------------
270270

271-
** aws-sdk@2.1329.0 - https://www.npmjs.com/package/aws-sdk/v/2.1329.0 | Apache-2.0
271+
** aws-sdk@2.1367.0 - https://www.npmjs.com/package/aws-sdk/v/2.1367.0 | Apache-2.0
272272
AWS SDK for JavaScript
273273
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
274274

@@ -915,7 +915,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
915915

916916
----------------
917917

918-
** [email protected].2 - https://www.npmjs.com/package/degenerator/v/3.0.2 | MIT
918+
** [email protected].4 - https://www.npmjs.com/package/degenerator/v/3.0.4 | MIT
919919

920920
----------------
921921

@@ -1439,7 +1439,7 @@ https://creativecommons.org/licenses/by-sa/4.0/
14391439

14401440
----------------
14411441

1442-
** [email protected].10 - https://www.npmjs.com/package/graceful-fs/v/4.2.10 | ISC
1442+
** [email protected].11 - https://www.npmjs.com/package/graceful-fs/v/4.2.11 | ISC
14431443
The ISC License
14441444

14451445
Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
@@ -2597,7 +2597,7 @@ IN THE SOFTWARE.
25972597

25982598
----------------
25992599

2600-
** [email protected].1 - https://www.npmjs.com/package/readable-stream/v/3.6.1 | MIT
2600+
** [email protected].2 - https://www.npmjs.com/package/readable-stream/v/3.6.2 | MIT
26012601
Node.js is licensed for use as follows:
26022602

26032603
"""
@@ -2649,7 +2649,7 @@ IN THE SOFTWARE.
26492649

26502650
----------------
26512651

2652-
** [email protected].2 - https://www.npmjs.com/package/readdir-glob/v/1.1.2 | Apache-2.0
2652+
** [email protected].3 - https://www.npmjs.com/package/readdir-glob/v/1.1.3 | Apache-2.0
26532653
Apache License
26542654
Version 2.0, January 2004
26552655
http://www.apache.org/licenses/
@@ -3031,7 +3031,7 @@ License, as follows:
30313031

30323032
----------------
30333033

3034-
** semver@7.3.8 - https://www.npmjs.com/package/semver/v/7.3.8 | ISC
3034+
** semver@7.5.0 - https://www.npmjs.com/package/semver/v/7.5.0 | ISC
30353035
The ISC License
30363036

30373037
Copyright (c) Isaac Z. Schlueter and Contributors
@@ -3612,7 +3612,7 @@ OTHER DEALINGS IN THE SOFTWARE.
36123612

36133613
----------------
36143614

3615-
** [email protected].14 - https://www.npmjs.com/package/vm2/v/3.9.14 | MIT
3615+
** [email protected].17 - https://www.npmjs.com/package/vm2/v/3.9.17 | MIT
36163616

36173617
----------------
36183618

@@ -3650,7 +3650,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
36503650

36513651
----------------
36523652

3653-
** xml2js@0.4.19 - https://www.npmjs.com/package/xml2js/v/0.4.19 | MIT
3653+
** xml2js@0.5.0 - https://www.npmjs.com/package/xml2js/v/0.5.0 | MIT
36543654
Copyright 2010, 2011, 2012, 2013. All rights reserved.
36553655

36563656
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -3674,7 +3674,7 @@ IN THE SOFTWARE.
36743674

36753675
----------------
36763676

3677-
** xmlbuilder@9.0.7 - https://www.npmjs.com/package/xmlbuilder/v/9.0.7 | MIT
3677+
** xmlbuilder@11.0.1 - https://www.npmjs.com/package/xmlbuilder/v/11.0.1 | MIT
36783678
The MIT License (MIT)
36793679

36803680
Copyright (c) 2013 Ozgur Ozcitak

‎packages/@aws-cdk/cloudformation-diff/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compilerOptions": {
33
"target":"ES2020",
44
"module": "commonjs",
5-
"lib": ["es2020"],
5+
"lib": ["es2020", "dom"],
66
"declaration": true,
77
"composite": true,
88
"strict": true,

‎packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
156156

157157
----------------
158158

159-
** aws-sdk@2.1329.0 - https://www.npmjs.com/package/aws-sdk/v/2.1329.0 | Apache-2.0
159+
** aws-sdk@2.1367.0 - https://www.npmjs.com/package/aws-sdk/v/2.1367.0 | Apache-2.0
160160
AWS SDK for JavaScript
161161
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
162162

@@ -875,7 +875,7 @@ https://creativecommons.org/licenses/by-sa/4.0/
875875

876876
----------------
877877

878-
** [email protected].10 - https://www.npmjs.com/package/graceful-fs/v/4.2.10 | ISC
878+
** [email protected].11 - https://www.npmjs.com/package/graceful-fs/v/4.2.11 | ISC
879879
The ISC License
880880

881881
Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
@@ -1586,7 +1586,7 @@ IN THE SOFTWARE.
15861586

15871587
----------------
15881588

1589-
** [email protected].1 - https://www.npmjs.com/package/readable-stream/v/3.6.1 | MIT
1589+
** [email protected].2 - https://www.npmjs.com/package/readable-stream/v/3.6.2 | MIT
15901590
Node.js is licensed for use as follows:
15911591

15921592
"""
@@ -1638,7 +1638,7 @@ IN THE SOFTWARE.
16381638

16391639
----------------
16401640

1641-
** [email protected].2 - https://www.npmjs.com/package/readdir-glob/v/1.1.2 | Apache-2.0
1641+
** [email protected].3 - https://www.npmjs.com/package/readdir-glob/v/1.1.3 | Apache-2.0
16421642
Apache License
16431643
Version 2.0, January 2004
16441644
http://www.apache.org/licenses/
@@ -1968,7 +1968,7 @@ License, as follows:
19681968

19691969
----------------
19701970

1971-
** semver@7.3.8 - https://www.npmjs.com/package/semver/v/7.3.8 | ISC
1971+
** semver@7.5.0 - https://www.npmjs.com/package/semver/v/7.5.0 | ISC
19721972
The ISC License
19731973

19741974
Copyright (c) Isaac Z. Schlueter and Contributors
@@ -2503,7 +2503,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
25032503

25042504
----------------
25052505

2506-
** xml2js@0.4.19 - https://www.npmjs.com/package/xml2js/v/0.4.19 | MIT
2506+
** xml2js@0.5.0 - https://www.npmjs.com/package/xml2js/v/0.5.0 | MIT
25072507
Copyright 2010, 2011, 2012, 2013. All rights reserved.
25082508

25092509
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -2527,7 +2527,7 @@ IN THE SOFTWARE.
25272527

25282528
----------------
25292529

2530-
** xmlbuilder@9.0.7 - https://www.npmjs.com/package/xmlbuilder/v/9.0.7 | MIT
2530+
** xmlbuilder@11.0.1 - https://www.npmjs.com/package/xmlbuilder/v/11.0.1 | MIT
25312531
The MIT License (MIT)
25322532

25332533
Copyright (c) 2013 Ozgur Ozcitak

‎packages/aws-cdk-lib/aws-lambda-nodejs/test/testtsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"experimentalDecorators": true,
1010
"incremental": true,
1111
"lib": [
12-
"es2020"
12+
"es2020",
13+
"dom"
1314
],
1415
"module": "CommonJS",
1516
"newLine": "lf",

‎packages/aws-cdk-lib/custom-resources/lib/aws-custom-resource/sdk-api-metadata.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,5 +1284,16 @@
12841284
},
12851285
"internetmonitor": {
12861286
"name": "InternetMonitor"
1287+
},
1288+
"ivsrealtime": {
1289+
"prefix": "ivs-realtime",
1290+
"name": "IVSRealTime"
1291+
},
1292+
"vpclattice": {
1293+
"prefix": "vpc-lattice",
1294+
"name": "VPCLattice"
1295+
},
1296+
"osis": {
1297+
"name": "OSIS"
12871298
}
12881299
}

‎packages/aws-cdk-lib/tsconfig.dev.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"experimentalDecorators": true,
99
"incremental": true,
1010
"lib": [
11-
"es2020"
11+
"es2020",
12+
"dom"
1213
],
1314
"module": "CommonJS",
1415
"noFallthroughCasesInSwitch": true,

‎packages/aws-cdk/THIRD_PARTY_LICENSES

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE
268268

269269
----------------
270270

271-
** aws-sdk@2.1329.0 - https://www.npmjs.com/package/aws-sdk/v/2.1329.0 | Apache-2.0
271+
** aws-sdk@2.1367.0 - https://www.npmjs.com/package/aws-sdk/v/2.1367.0 | Apache-2.0
272272
AWS SDK for JavaScript
273273
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
274274

@@ -915,7 +915,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
915915

916916
----------------
917917

918-
** [email protected].2 - https://www.npmjs.com/package/degenerator/v/3.0.2 | MIT
918+
** [email protected].4 - https://www.npmjs.com/package/degenerator/v/3.0.4 | MIT
919919

920920
----------------
921921

@@ -1439,7 +1439,7 @@ https://creativecommons.org/licenses/by-sa/4.0/
14391439

14401440
----------------
14411441

1442-
** [email protected].10 - https://www.npmjs.com/package/graceful-fs/v/4.2.10 | ISC
1442+
** [email protected].11 - https://www.npmjs.com/package/graceful-fs/v/4.2.11 | ISC
14431443
The ISC License
14441444

14451445
Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
@@ -2597,7 +2597,7 @@ IN THE SOFTWARE.
25972597

25982598
----------------
25992599

2600-
** [email protected].1 - https://www.npmjs.com/package/readable-stream/v/3.6.1 | MIT
2600+
** [email protected].2 - https://www.npmjs.com/package/readable-stream/v/3.6.2 | MIT
26012601
Node.js is licensed for use as follows:
26022602

26032603
"""
@@ -2649,7 +2649,7 @@ IN THE SOFTWARE.
26492649

26502650
----------------
26512651

2652-
** [email protected].2 - https://www.npmjs.com/package/readdir-glob/v/1.1.2 | Apache-2.0
2652+
** [email protected].3 - https://www.npmjs.com/package/readdir-glob/v/1.1.3 | Apache-2.0
26532653
Apache License
26542654
Version 2.0, January 2004
26552655
http://www.apache.org/licenses/
@@ -3031,7 +3031,7 @@ License, as follows:
30313031

30323032
----------------
30333033

3034-
** semver@7.3.8 - https://www.npmjs.com/package/semver/v/7.3.8 | ISC
3034+
** semver@7.5.0 - https://www.npmjs.com/package/semver/v/7.5.0 | ISC
30353035
The ISC License
30363036

30373037
Copyright (c) Isaac Z. Schlueter and Contributors
@@ -3612,7 +3612,7 @@ OTHER DEALINGS IN THE SOFTWARE.
36123612

36133613
----------------
36143614

3615-
** [email protected].14 - https://www.npmjs.com/package/vm2/v/3.9.14 | MIT
3615+
** [email protected].17 - https://www.npmjs.com/package/vm2/v/3.9.17 | MIT
36163616

36173617
----------------
36183618

@@ -3650,7 +3650,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
36503650

36513651
----------------
36523652

3653-
** xml2js@0.4.19 - https://www.npmjs.com/package/xml2js/v/0.4.19 | MIT
3653+
** xml2js@0.5.0 - https://www.npmjs.com/package/xml2js/v/0.5.0 | MIT
36543654
Copyright 2010, 2011, 2012, 2013. All rights reserved.
36553655

36563656
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -3674,7 +3674,7 @@ IN THE SOFTWARE.
36743674

36753675
----------------
36763676

3677-
** xmlbuilder@9.0.7 - https://www.npmjs.com/package/xmlbuilder/v/9.0.7 | MIT
3677+
** xmlbuilder@11.0.1 - https://www.npmjs.com/package/xmlbuilder/v/11.0.1 | MIT
36783678
The MIT License (MIT)
36793679

36803680
Copyright (c) 2013 Ozgur Ozcitak

‎packages/aws-cdk/lib/api/cxapp/cloud-assembly.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import * as cxapi from '@aws-cdk/cx-api';
22
import * as chalk from 'chalk';
3+
import { minimatch } from 'minimatch';
34
import * as semver from 'semver';
45
import { error, print, warning } from '../../logging';
56
import { flatten } from '../../util';
67
import { versionNumber } from '../../version';
78

8-
// namespace object imports won't work in the bundle for function exports
9-
// eslint-disable-next-line @typescript-eslint/no-require-imports
10-
const minimatch = require('minimatch');
11-
129

1310
export enum DefaultSelection {
1411
/**

‎packages/aws-cdk/lib/api/cxapp/environments.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import * as cxapi from '@aws-cdk/cx-api';
2+
import { minimatch } from 'minimatch';
23
import { StackCollection } from './cloud-assembly';
34
import { SdkProvider } from '../aws-auth';
45

5-
// namespace object imports won't work in the bundle for function exports
6-
// eslint-disable-next-line @typescript-eslint/no-require-imports
7-
const minimatch = require('minimatch');
8-
96
export function looksLikeGlob(environment: string) {
107
return environment.indexOf('*') > -1;
118
}

‎packages/aws-cdk/lib/commands/context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as chalk from 'chalk';
2-
import * as minimatch from 'minimatch';
2+
import { minimatch } from 'minimatch';
33
import * as version from '../../lib/version';
44
import { CommandOptions } from '../command-api';
55
import { print, error, warning } from '../logging';

‎packages/aws-cdk/lib/init-templates/app/typescript/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"target": "ES2020",
44
"module": "commonjs",
55
"lib": [
6-
"es2020"
6+
"es2020",
7+
"dom"
78
],
89
"declaration": true,
910
"strict": true,

‎packages/aws-cdk/lib/init-templates/lib/typescript/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"target": "ES2020",
44
"module": "commonjs",
55
"lib": [
6-
"es2020"
6+
"es2020",
7+
"dom"
78
],
89
"declaration": true,
910
"strict": true,

‎packages/aws-cdk/lib/init-templates/sample-app/javascript/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"target": "ES2020",
44
"module": "commonjs",
55
"lib": [
6-
"es2020"
6+
"es2020",
7+
"dom"
78
],
89
"declaration": true,
910
"strict": true,

‎packages/aws-cdk/lib/init-templates/sample-app/typescript/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"target": "ES2020",
44
"module": "commonjs",
55
"lib": [
6-
"es2020"
6+
"es2020",
7+
"dom"
78
],
89
"declaration": true,
910
"strict": true,

0 commit comments

Comments
 (0)