Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

fix: Remove CVE-2020-36632 vulnerability #1366

Merged
tracyboehrer merged 5 commits into from
Apr 9, 2024
Merged

fix: Remove CVE-2020-36632 vulnerability #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
924aaea
Upgrade mocha and @types/mocha to latest version
ceciliaavila Mar 19, 2024
34e9f1b
update mocha configuration to execute unit tests
JhontSouth Apr 3, 2024
1782d8e
remove pending mocha.opts
JhontSouth Apr 3, 2024
8106694
Merge remote-tracking branch 'origin/main' into southworks/fix/flat-v…
JhontSouth Apr 5, 2024
0cca6c1
Merge remote-tracking branch 'MS/main' into southworks/fix/flat-vulne…
JhontSouth Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
817 changes: 366 additions & 451 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 15 additions & 3 deletions packages/chatdown/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"latest-version": "^4.0.0",
"mime-types": "^2.1.18",
"minimist": "^1.2.6",
"axios":"~0.24.0",
"axios": "~0.24.0",
"https-proxy-agent": "^5.0.0",
"please-upgrade-node": "^3.0.1",
"semver": "^5.5.1",
Expand All @@ -32,13 +32,13 @@
"@oclif/tslint": "^3.1.1",
"@types/chai": "^4.1.7",
"@types/fs-extra": "^5.0.5",
"@types/mocha": "^5.2.6",
"@types/mocha": "^10.0.6",
"@types/node": "^10.14.6",
"@types/rimraf": "^2.0.2",
"chai": "^4.2.0",
"globby": "^8.0.2",
"mocha": "^6.2.2",
"nyc": "^15.1.0",
"mocha": "^10.4.0",
"rimraf": "^2.6.3",
"ts-node": "^9.0.0",
"tslint": "^5.16.0",
Expand Down Expand Up @@ -66,6 +66,18 @@
"@oclif/plugin-help"
]
},
"mocha": {
"extension": [
".test.js",
".test.ts"
],
"recursive": true,
"timeout": 10000,
"require": [
"../../test/hook.js",
"source-map-support/register"
]
},
"repository": "https://github.com/microsoft/botframework-cli/tree/master/packages/chatdown",
"scripts": {
"prepack": "npm run clean && npm run build && npm run doc:readme",
Expand Down
5 changes: 0 additions & 5 deletions packages/chatdown/test/mocha.opts
View file
Open in desktop

This file was deleted.

18 changes: 15 additions & 3 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@
"init": "./lib/hooks/init/inithook"
}
},
"mocha": {
"extension": [
".test.js",
".test.ts"
],
"recursive": true,
"timeout": 60000,
"require": [
"../../test/hook.js",
"source-map-support/register"
]
},
"repository": "https://github.com/microsoft/botframework-cli/tree/master/packages/cli",
"scripts": {
"postinstall": "node scripts/postinstall.js",
Expand Down Expand Up @@ -71,7 +83,7 @@
"chalk": "2.4.1",
"cli-ux": "^5.3.0",
"fs-extra": "^7.0.1",
"is-ci":"2.0.0",
"is-ci": "2.0.0",
"latest-version": "^4.0.0",
"semver": "^5.5.1",
"tslib": "^2.0.3"
Expand All @@ -82,12 +94,12 @@
"@oclif/tslint": "^3.1.1",
"@types/chai": "^4.1.7",
"@types/fs-extra": "^5.0.5",
"@types/mocha": "^5.2.6",
"@types/mocha": "^10.0.6",
"@types/nock": "^11.1.0",
"@types/node": "^10.14.6",
"chai": "^4.2.0",
"globby": "^8.0.2",
"mocha": "^6.2.2",
"mocha": "^10.4.0",
"nock": "^11.7.0",
"nyc": "^15.1.0",
"rimraf": "^2.6.3",
Expand Down
5 changes: 0 additions & 5 deletions packages/cli/test/mocha.opts
View file
Open in desktop

This file was deleted.

16 changes: 14 additions & 2 deletions packages/command/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@
"keywords": [],
"license": "MIT",
"main": "lib/index.js",
"mocha": {
"extension": [
".test.js",
".test.ts"
],
"recursive": true,
"timeout": 60000,
"require": [
"../../test/hook.js",
"source-map-support/register"
]
},
"repository": "https://github.com/microsoft/botframework-cli",
"scripts": {
"postpack": "",
Expand Down Expand Up @@ -46,15 +58,15 @@
"@types/ansi-styles": "^3.2.1",
"@types/chai": "^4.1.7",
"@types/fs-extra": "^5.0.5",
"@types/mocha": "^5.2.6",
"@types/mocha": "^10.0.6",
"@types/nock": "^9.3.1",
"@types/node": "^11.13.7",
"@types/proxyquire": "^1.3.28",
"@types/sinon": "^7.0.11",
"@types/supports-color": "^5.3.0",
"chai": "^4.2.0",
"fancy-test": "^1.4.3",
"mocha": "^6.2.2",
"mocha": "^10.4.0",
"nock": "^11.7.0",
"nyc": "^15.1.0",
"proxyquire": "^2.1.0",
Expand Down
5 changes: 0 additions & 5 deletions packages/command/test/mocha.opts
View file
Open in desktop

This file was deleted.

16 changes: 14 additions & 2 deletions packages/config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@
"@oclif/plugin-help"
]
},
"mocha": {
"extension": [
".test.js",
".test.ts"
],
"recursive": true,
"timeout": 10000,
"require": [
"../../test/hook.js",
"source-map-support/register"
]
},
"repository": "https://github.com/microsoft/botframework-cli/tree/master/packages/config",
"scripts": {
"postpack": "rimraf oclif.manifest.json",
Expand Down Expand Up @@ -52,12 +64,12 @@
"@oclif/test": "^1.2.4",
"@oclif/tslint": "^3.1.1",
"@types/chai": "^4.1.7",
"@types/mocha": "^5.2.7",
"@types/mocha": "^10.0.6",
"@types/node": "^10.14.12",
"chai": "^4.2.0",
"globby": "^10.0.1",
"mocha": "^6.2.2",
"nyc": "^15.1.0",
"mocha": "^10.4.0",
"rimraf": "^2.6.3",
"ts-node": "^9.0.0",
"tslint": "^5.18.0",
Expand Down
5 changes: 0 additions & 5 deletions packages/config/test/mocha.opts
View file
Open in desktop

This file was deleted.

17 changes: 15 additions & 2 deletions packages/dialog/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,19 @@
"@oclif/plugin-help"
]
},
"mocha": {
"extension": [
".test.js",
".test.ts"
],
"recursive": true,
"timeout": 60000,
"slow": 10000,
"require": [
"../../test/hook.js",
"source-map-support/register"
]
},
"repository": "https://github.com/microsoft/botframework-cli/tree/master/packages/dialog",
"scripts": {
"postpack": "rimraf oclif.manifest.json",
Expand Down Expand Up @@ -69,11 +82,11 @@
"@oclif/tslint": "^3.1.1",
"@types/chai": "^4.2.0",
"@types/fs-extra": "^8.0.0",
"@types/mocha": "^5.2.7",
"@types/mocha": "^10.0.6",
"@types/node": "^10.14.15",
"@types/seedrandom": "~2.4.28",
"chai": "^4.2.0",
"mocha": "^6.2.2",
"mocha": "^10.4.0",
"nock": "^13.0.11",
"nyc": "^15.1.0",
"rimraf": "^2.6.3",
Expand Down
6 changes: 0 additions & 6 deletions packages/dialog/test/mocha.opts
View file
Open in desktop

This file was deleted.

16 changes: 14 additions & 2 deletions packages/dispatcher/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"devDependencies": {
"@types/argparse": "^1.0.36",
"@types/chai": "^4.2.4",
"@types/mocha": "^5.2.7",
"@types/mocha": "^10.0.6",
"@types/node": "^10.17.3",
"chai": "^4.2.0",
"globby": "^10.0.1",
"mocha": "^5.2.0",
"nyc": "^15.1.0",
"mocha": "^10.4.0",
"rimraf": "^3.0.0",
"ts-node": "^8.4.1",
"tslint": "^5.20.1",
Expand All @@ -39,6 +39,18 @@
"oclif-plugin"
],
"license": "MIT",
"mocha": {
"extension": [
".test.js",
".test.ts"
],
"recursive": true,
"timeout": 10000,
"require": [
"../../test/hook.js",
"source-map-support/register"
]
},
"repository": "https://github.com/microsoft/botframework-cli/tree/master/packages/dispatcher",
"scripts": {
"prepack": "npm run clean && npm run build && npm run doc:readme",
Expand Down
5 changes: 0 additions & 5 deletions packages/dispatcher/test/mocha.opts
View file
Open in desktop

This file was deleted.

26 changes: 19 additions & 7 deletions packages/lg/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,38 @@
"bugs": "https://github.com/microsoft/botframework-cli/issues",
"dependencies": {
"@types/fs-extra": "^8.0.1",
"@types/node-fetch":"2.5.4",
"@types/node-fetch": "2.5.4",
"@types/readline-sync": "^1.4.3",
"@microsoft/bf-cli-command": "1.0.0",
"@oclif/command": "^1.5.19",
"@oclif/config": "^1.14.0",
"botbuilder-lg":"4.13.0",
"adaptive-expressions":"4.13.0",
"botbuilder-lg": "4.13.0",
"adaptive-expressions": "4.13.0",
"delay": "^4.3.0",
"fs-extra": "^8.1.0",
"lodash": "^4.17.21",
"tslib": "^2.0.3",
"read-text-file": "^1.1.0",
"readline-sync": "^1.4.10",
"axios":"~0.24.0",
"axios": "~0.24.0",
"https-proxy-agent": "^5.0.0"
},
"devDependencies": {
"@oclif/dev-cli": "^1.22.2",
"@oclif/plugin-help": "^2.2.3",
"@oclif/errors":"^1.2.2",
"@oclif/errors": "^1.2.2",
"@oclif/test": "^1.2.5",
"@types/chai": "^4.2.9",
"@types/lodash": "~4.14.146",
"@types/mocha": "^5.2.7",
"@types/mocha": "^10.0.6",
"@types/node": "^10.17.15",
"chai": "^4.2.0",
"eslint": "^5.16.0",
"eslint-config-oclif": "^3.1.0",
"eslint-config-oclif-typescript": "^0.1.0",
"globby": "^10.0.2",
"mocha": "^5.2.0",
"nyc": "^15.1.0",
"mocha": "^10.4.0",
"ts-node": "^9.0.0",
"typescript": "^4.0.3",
"rimraf": "^2.6.3"
Expand All @@ -61,6 +61,18 @@
"@oclif/plugin-help"
]
},
"mocha": {
"extension": [
".test.js",
".test.ts"
],
"recursive": true,
"timeout": 150000,
"require": [
"../../test/hook.js",
"source-map-support/register"
]
},
"repository": "https://github.com/microsoft/botframework-cli/tree/master/packages/lg",
"scripts": {
"unittest": "rush test -t @microsoft/bf-lg-cli",
Expand Down
5 changes: 0 additions & 5 deletions packages/lg/test/mocha.opts
View file
Open in desktop

This file was deleted.

16 changes: 14 additions & 2 deletions packages/lu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@
],
"homepage": "https://github.com/microsoft/botframework-cli",
"license": "MIT",
"mocha": {
"extension": [
".test.js",
".test.ts"
],
"recursive": true,
"timeout": 60000,
"require": [
"../../test/hook.js",
"source-map-support/register"
]
},
"repository": "https://github.com/microsoft/botframework-cli/tree/master/packages/lu",
"scripts": {
"prepack": "npm run clean && npm run build",
Expand Down Expand Up @@ -53,11 +65,11 @@
"devDependencies": {
"@types/chai": "^4.2.0",
"@types/lodash": "~4.14.159",
"@types/mocha": "^5.2.7",
"@types/mocha": "^10.0.6",
"@types/nock": "^11.1.0",
"@types/node": "^10.14.15",
"chai": "^4.2.0",
"mocha": "^6.2.2",
"mocha": "^10.4.0",
"nock": "^11.7.0",
"nyc": "^15.1.0",
"rimraf": "^2.6.3",
Expand Down
5 changes: 0 additions & 5 deletions packages/lu/test/mocha.opts
View file
Open in desktop

This file was deleted.

Loading